303 files changed, 144532 insertions, 103391 deletions

diff --git a/ChangeLog b/ChangeLog
index 6020856..4df7e65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,686 @@
+2009-07-26	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.413) (+23 -10)
+		README (1.203) (+20 -18)
+		configure.ac (1.214) (+5 -5)
+
+	Bump to 5.2.4.
+
+2009-07-21	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-papers.c (1.118) (+4 -1)
+		src/main/print-escp2.c (1.424) (+6 -2)
+		src/main/print-escp2.h (1.137) (+3 -2)
+		src/xml/escp2/inputslots/r2400.xml (1.4) (+1 -0)
+
+	Fix printing to manual sheet guide on R2400
+
+2009-07-18	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.178) (+5 -5)
+
+	Fix the translation of resolutions in global PPD files.
+
+	Correct the data type of int parameters in the *ParamCustom declaration.
+
+2009-07-12	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.423) (+7 -1)
+
+	Export ChannelNames parameter so escputil can correctly print ink
+	warnings.
+
+2009-06-30	<rlk@sourceforge.net>
+
+	Files:	po/da.po (1.97) (+5154 -4292)
+
+	Update Danish translation
+
+2009-06-30	<rlk@sourceforge.net>
+
+	Files:	po/ru.po (1.2) (+1815 -1773)
+
+	Updated Russian translation
+
+2009-06-24	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.213) (+3 -3)
+		po/ru.po (1.1) (added)
+
+	Add Russian translation
+
+2009-06-22	<rlk@sourceforge.net>
+
+	Files:	src/main/print-olympus.c (1.94) (+5 -1)
+
+	Add comment explaining laminate pattern.
+
+2009-06-22	<rlk@sourceforge.net>
+
+	Files:	po/it.po (1.7) (+11 -5)
+
+	Update Italian translation
+
+2009-06-22	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.177) (+3 -3)
+
+	Hide the fine adjustment option, not the primary option.
+
+2009-06-21	<rlk@sourceforge.net>
+
+	Files:	po/it.po (1.6) (+5542 -4410)
+
+	Update Italian translation
+
+2009-06-20	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.422) (+2 -1)
+
+	Flag string for not a printf string, per Marco Poletti.
+
+2009-06-20	<faust3@sourceforge.net>
+
+	Files:	NEWS (1.412) (+1 -0)
+		src/foomatic/foomatic-printermap (1.192) (+1 -0)
+		src/xml/printers.xml (1.37) (+2 -1)
+
+	According to https://bugs.launchpad.net/bugs/389014
+	the PIXMA iX4000 can be used with the iX5000 driver
+
+2009-06-14	<rlk@sourceforge.net>
+
+	Files:	po/nl.po (1.80) (+5157 -4316)
+
+	Updated Dutch translation
+
+2009-06-14	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/testpatterny.y (1.39) (+9 -38)
+
+	Allow arbitrary number of string arguments to message command.
+
+2009-06-14	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/testpatterny.y (1.38) (+3 -3)
+
+	Rename Output to Print to avoid possible confusion.
+
+2009-06-14	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/testpatterny.y (1.37) (+1 -2)
+
+	Remove unused token declaration.
+
+2009-06-14	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/testpatterny.y (1.36) (+3 -9)
+
+	A few minor simplifications.
+
+2009-06-14	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/testpattern.c (1.57) (+5 -2)
+		src/testpattern/testpatternl.l (1.25) (+3 -10)
+		src/testpattern/testpatterny.y (1.35) (+29 -41)
+
+	Eliminate bison warnings.
+
+	Allow mode specification without bit depth.
+
+	Print out number of passing cases as well as failures and skipped.
+
+===============================================================================
+Name: gutenprint-5_2_4_rc1
+
+2009-06-14	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.411) (+3 -3)
+		README (1.202) (+13 -13)
+		configure.ac (1.212) (+4 -4)
+
+	Prep for 5.2.4-rc1
+
+2009-06-08	<rlk@sourceforge.net>
+
+	Files:	test/run-weavetest (1.30) (+1 -1)
+
+	Remove some particularly long-running cases that are not likely to be
+	used in real life.
+
+2009-06-08	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.410) (+44 -3)
+		README (1.201) (+11 -11)
+		src/main/print-escp2.c (1.421) (+3 -3)
+		src/testpattern/run-testpattern-2.in (1.35) (+8 -5)
+		src/testpattern/testpattern.c (1.56) (+44 -12)
+		test/run-weavetest (1.29) (+1 -1)
+
+	Testpattern shouldn't fail if it provides a combination of arguments that
+	fails validation during automatic run.
+
+	Epson driver should be more consistent about accepting RawChannels
+	argument.
+
+	Testpattern generator should reset page count for each argument.
+
+	Weave pattern test generator should test additional cases.
+
+	Update top level doc for release.
+
+2009-06-07	<rlk@sourceforge.net>
+
+	Files:	configure.ac (1.211) (+16 -14)
+		scripts/autogen.sh (1.37) (+1 -1)
+		src/main/bit-ops.c (1.14) (+179 -168)
+
+	Minor code cleanup in bit-ops.c
+
+	Don't include --enable-compiler-warnings in autogen.sh (no longer needed)
+
+	Bump version, make warning about missing devel package more obvious.
+
+2009-06-07	<rlk@sourceforge.net>
+
+	Files:	src/cups/cups-genppdupdate.in (1.57) (+36 -35)
+		src/cups/genppd.c (1.176) (+5 -4)
+
+	Improve command names for genppd speedup
+
+2009-06-03	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/testpatternl.l (1.24) (+2 -2)
+
+	Accept double-quoted strings with zero characters
+
+2009-06-02	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/testpatternl.l (1.23) (+5 -2)
+		src/testpattern/testpatterny.y (1.34) (+49 -46)
+
+	Fix compatibility with Bison 2.4
+
+2009-05-30	<rlk@sourceforge.net>
+
+	Files:	src/xml/Makefile.am (1.5) (+2 -2)
+		src/xml/escp2/Makefile.am (1.9) (+3 -1)
+		src/xml/escp2/inks/Makefile.am (1.9) (+2 -1)
+		src/xml/escp2/inputslots/Makefile.am (1.7) (+2 -1)
+		src/xml/escp2/media/Makefile.am (1.13) (+2 -1)
+		src/xml/escp2/mediasizes/Makefile.am (1.4) (+2 -1)
+		src/xml/escp2/model/Makefile.am (1.16) (+2 -1)
+		src/xml/escp2/qualitypresets/Makefile.am (1.4) (+2 -1)
+		src/xml/escp2/weaves/Makefile.am (1.3) (+2 -1)
+
+	dist-hook needs xml-stamp to be created
+
+2009-05-24	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.191) (+1 -0)
+		src/xml/printers.xml (1.36) (+2 -1)
+
+	Add Epson DX4000
+
+2009-05-24	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.175) (+16 -6)
+
+	Fix calls to putenv, which must use permanent memory.
+
+2009-05-24	<rlk@sourceforge.net>
+
+	Files:	src/main/print-weave.c (1.75) (+2 -2)
+
+	Fix printf warning
+
+2009-05-24	<rlk@sourceforge.net>
+
+	Files:	scripts/mkchlog (1.18) (+8 -2)
+
+	Fix error with reporting date, time, and author.
+
+2009-05-23	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/model/model_96.xml (1.5) (+1 -1)
+
+	Send job start sequence for Artisan printers per recommendation.
+
+2009-05-23	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-2.in (1.34) (+51 -1)
+
+	Add help
+
+2009-05-20	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/media/f360_ultrachrome_k3v.xml (1.3) (+149 -149)
+
+	Fix Print Methods based on manual.
+
+2009-05-17	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/inks/f360_ultrachrome_k3v.xml (1.5) (+3 -3)
+
+	Retune light inks on R2880.
+
+2009-05-17	<rlk@sourceforge.net>
+
+	Files:	include/gutenprint/bit-ops.h (1.4) (+84 -1)
+		src/cups/cups-genppdupdate.in (1.56) (+36 -5)
+		src/cups/genppd.c (1.174) (+21 -0)
+		src/main/bit-ops.c (1.13) (+259 -482)
+		src/main/print-escp2.c (1.420) (+16 -2)
+		src/main/print-escp2.h (1.136) (+3 -2)
+		src/main/print-weave.c (1.74) (+8 -40)
+		src/xml/escp2/inks/f360_ultrachrome_k3v.xml (1.4) (+2 -2)
+
+	Speed up cups-genppdupdate by reusing server binary
+
+2009-04-21	<m0m@sourceforge.net>
+
+	Files:	src/main/print-olympus.c (1.93) (+2 -2)
+
+	fixed memory leak in dyesub_print_row()
+
+	    dnp-ds40
+	        Color+300x300..............................................==5555== Invalid read of size 2
+	    ==5555==    at 0x476427: dyesub_print (print-olympus.c:2485)
+	    ==5555==    by 0x404450: main (in /home/rlk/sandbox/print-5.1/src/testpattern/testpattern)
+	    ==5555==  Address 0x6c56ea8 is 0 bytes after a block of size 11,520 alloc'd
+	    ==5555==    at 0x4C256AE: malloc (in /usr/lib64/valgrind/amd64-linux/vgpreload_memcheck.so)
+	    ==5555==    by 0x413209: stp_malloc (print-util.c:427)
+	    ==5555==    by 0x475A95: dyesub_print (print-olympus.c:2447)
+	    ==5555==    by 0x404450: main (in /home/rlk/sandbox/print-5.1/src/testpattern/testpattern)
+
+2009-04-14	<rlk@sourceforge.net>
+
+	Files:	src/xml/papers.xml (1.7) (+3 -3)
+
+	Fix definition of L photo paper.
+
+2009-04-11	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/inputslots/r2880.xml (1.2) (+1 -0)
+		src/xml/escp2/model/model_98.xml (1.4) (+1 -1)
+
+	Fix CD definition for R2880
+
+2009-04-11	<rlk@sourceforge.net>
+
+	Files:	src/cups/cups-genppdupdate.in (1.55) (+3 -34)
+
+	Back out unintended change
+
+2009-04-11	<rlk@sourceforge.net>
+
+	Files:	src/cups/cups-genppdupdate.in (1.54) (+35 -4)
+		src/cups/genppd.c (1.173) (+14 -13)
+		src/cups/i18n.c (1.8) (+4 -4)
+		src/cups/i18n.h (1.3) (+4 -4)
+
+	Fix memory leaks
+
+2009-04-11	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.172) (+5 -5)
+		src/cups/i18n.c (1.7) (+5 -3)
+		src/cups/i18n.h (1.2) (+3 -3)
+
+	Fix memory leaks
+
+2009-04-11	<rlk@sourceforge.net>
+
+	Files:	src/main/print-olympus.c (1.92) (+7 -7)
+
+	Fix up declaration syntax
+
+2009-04-11	<rlk@sourceforge.net>
+
+	Files:	src/cups/Makefile.am (1.119) (+3 -2)
+
+	2661138 Parallel build breaks for cups/ppd
+
+2009-04-08	<rlk@sourceforge.net>
+
+	Files:	scripts/mkchlog (1.17) (+35 -8)
+
+	Handle newer version of CVS.
+
+2009-04-08	<rlk@sourceforge.net>
+
+	Files:	scripts/mkchlog (1.16) (+12 -7)
+
+	Remove spurious printout.
+
+2009-04-08	<rlk@sourceforge.net>
+
+	Files:	scripts/mkchlog (1.15) (+41 -13)
+
+	Allow use of RCS filename.
+
+	Simplify print logic a bit.
+
+2009-04-08	<rlk@sourceforge.net>
+
+	Files:	scripts/mkchlog (1.14) (+17 -19)
+
+	Print last file correctly.
+
+2009-04-05	<rleigh@sourceforge.net>
+
+	Files:	src/xml/printers.xml (1.35) (+2 -2)
+
+	Correct typo in Epson Stylus Office TX300F name
+
+2009-03-30	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/inks/f360_ultrachrome_k3v.xml (1.3) (+2 -2)
+
+	Revert black shades to previous.
+
+2009-03-30	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/media/f360_ultrachrome_k3v.xml (1.2) (+195 -195)
+
+	Tune photo black ink.
+
+2009-03-30	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/model/model_98.xml (1.3) (+8 -8)
+
+	Improve the density; fix some other parameters.
+
+2009-03-29	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/inks/f360_ultrachrome_k3v.xml (1.2) (+6 -6)
+
+	Retune inks.  Photo black is tested; matte black is not.
+
+2009-03-27	<tillkamppeter@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.190) (+61 -133)
+		src/xml/printers.xml (1.34) (+62 -134)
+
+	Syncronized model names of Ricoh and OEM printers with the names in the OpenPrinting database/Ricoh's PPDs.
+
+2009-03-22	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.189) (+1 -0)
+		src/xml/escp2/inputslots/Makefile.am (1.6) (+2 -1)
+		src/xml/escp2/inputslots/r2880.xml (1.1) (added)
+		src/xml/escp2/model/model_98.xml (1.2) (+14 -14)
+		src/xml/printers.xml (1.33) (+2 -1)
+
+	Partial tuning of R2880
+
+2009-03-22	<rlk@sourceforge.net>
+
+	Files:	README (1.200) (+57 -4)
+		configure.ac (1.210) (+13 -3)
+
+	Try to make it more clear that development packages often have to be
+	installed to compile GIMP plugin or CUPS driver.
+
+2009-03-22	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.188) (+1 -0)
+		src/xml/escp2/inks/Makefile.am (1.8) (+2 -1)
+		src/xml/escp2/inks/f360_ultrachrome_k3v.xml (1.1) (added)
+		src/xml/escp2/media/Makefile.am (1.12) (+2 -1)
+		src/xml/escp2/media/f360_ultrachrome_k3v.xml (1.1) (added)
+		src/xml/escp2/model/Makefile.am (1.15) (+3 -2)
+		src/xml/escp2/model/model_98.xml (1.1) (added)
+		src/xml/printers.xml (1.32) (+2 -1)
+
+	Preliminary support for Epson Stylus Photo R2880
+
+2009-03-22	<rlk@sourceforge.net>
+
+	Files:	src/escputil/escputil.c (1.100) (+14 -14)
+
+	Widen field for ink cartridge name for Stylus Photo R2880.
+
+2009-03-16	<rlk@sourceforge.net>
+
+	Files:	test/parse-escp2 (1.25) (+3 -1)
+
+	Suppress (minor) undesired output.
+
+2009-03-15	<rlk@sourceforge.net>
+
+	Files:	scripts/mkchlog (1.13) (+6 -2)
+
+	Add option to reverse output.
+
+	Handle whitespace in filenames.
+
+2009-03-15	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/inputslots/artisan.xml (1.2) (+2 -2)
+
+	Change names of trays to match what Epson calls them.
+
+2009-03-15	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/media/Makefile.am (1.11) (+2 -1)
+
+	Add new media definitions for Artisan printers.
+
+2009-03-14	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/media/artisan.xml (1.1) (added)
+		src/xml/escp2/model/model_96.xml (1.4) (+1 -1)
+
+	Correct paper definitions for Artisan printers
+
+2009-03-07	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-channels.c (1.89) (+3 -1)
+		src/main/print-escp2.c (1.419) (+139 -6)
+		src/main/print-escp2.h (1.135) (+5 -4)
+		src/xml/escp2/inks/c64.xml (1.7) (+36 -1)
+		src/xml/escp2/inks/c80.xml (1.8) (+35 -0)
+		src/xml/escp2/inks/c82.xml (1.8) (+35 -0)
+		src/xml/escp2/inks/cx3650.xml (1.8) (+35 -0)
+		src/xml/escp2/inks/f360.xml (1.8) (+35 -0)
+		src/xml/escp2/inks/photo_gen0.xml (1.8) (+82 -0)
+		src/xml/escp2/inks/photo_gen1.xml (1.8) (+82 -0)
+		src/xml/escp2/inks/photo_gen2.xml (1.8) (+82 -0)
+		src/xml/escp2/inks/photo_gen3.xml (1.8) (+82 -0)
+		src/xml/escp2/inks/photo_gen3_4.xml (1.8) (+35 -0)
+		src/xml/escp2/inks/pro_gen1.xml (1.8) (+82 -0)
+		src/xml/escp2/inks/pro_gen2.xml (1.8) (+82 -0)
+		src/xml/escp2/inks/standard.xml (1.8) (+35 -0)
+		src/xml/escp2/inks/standard_gen0.xml (1.8) (+35 -0)
+		src/xml/escp2/media/c64.xml (1.8) (+323 -0)
+		src/xml/escp2/media/c80.xml (1.8) (+323 -0)
+		src/xml/escp2/media/c82.xml (1.8) (+323 -0)
+		src/xml/escp2/media/cx3650.xml (1.8) (+323 -0)
+		src/xml/escp2/media/f360.xml (1.8) (+323 -0)
+		src/xml/escp2/media/photo_gen0.xml (1.8) (+751 -105)
+		src/xml/escp2/media/photo_gen1.xml (1.8) (+766 -120)
+		src/xml/escp2/media/photo_gen2.xml (1.8) (+780 -134)
+		src/xml/escp2/media/photo_gen3.xml (1.8) (+1152 -183)
+		src/xml/escp2/media/photo_gen3_4.xml (1.8) (+778 -132)
+		src/xml/escp2/media/pro_gen1.xml (1.8) (+788 -142)
+		src/xml/escp2/media/pro_gen2.xml (1.8) (+746 -100)
+		src/xml/escp2/media/standard.xml (1.8) (+323 -0)
+		src/xml/escp2/media/standard_gen0.xml (1.8) (+323 -0)
+		test/unprint.c (1.44) (+32 -13)
+
+	Add MIS quadtone and six tone inksets.
+
+2009-03-07	<rlk@sourceforge.net>
+
+	Files:	src/main/print-weave.c (1.73) (+62 -6)
+
+	Add more debugging in case of error.
+
+2009-03-07	<rlk@sourceforge.net>
+
+	Files:	scripts/autogen.sh (1.36) (+1 -1)
+
+	Correctly check version for newer versions of libtool.  E. g.
+
+	$ libtool --version
+	ltmain.sh (GNU libtool) 2.2.6
+
+	in addition to
+
+	$ libtool --version
+	ltmain.sh (GNU libtool) 1.5.26 (1.1220.2.492 2008/01/30 06:40:56)
+
+2009-03-05	<rlk@sourceforge.net>
+
+	Files:	src/main/print-escp2.c (1.418) (+45 -5)
+
+	Put quadtone ink parameters in PPD files, so that quadtone users can
+	adjust ink settings.
+
+2009-03-04	<m0m@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.187) (+2 -0)
+		src/main/print-olympus.c (1.91) (+121 -2)
+		src/xml/printers.xml (1.31) (+3 -1)
+
+	applied DNP dyesub printer driver patch from jordi <jordif.starblitz@gmail.com>
+
+2009-03-02	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/inks/c80.xml (1.7) (+4 -4)
+		src/xml/escp2/inks/c82.xml (1.7) (+4 -4)
+		src/xml/escp2/inks/cx3650.xml (1.7) (+4 -4)
+		src/xml/escp2/inks/f360.xml (1.7) (+4 -4)
+		src/xml/escp2/inks/photo_gen0.xml (1.7) (+4 -4)
+		src/xml/escp2/inks/photo_gen1.xml (1.7) (+4 -4)
+		src/xml/escp2/inks/photo_gen2.xml (1.7) (+4 -4)
+		src/xml/escp2/inks/photo_gen3.xml (1.7) (+4 -4)
+		src/xml/escp2/inks/photo_gen3_4.xml (1.7) (+4 -4)
+		src/xml/escp2/inks/pro_gen1.xml (1.7) (+4 -4)
+		src/xml/escp2/inks/pro_gen2.xml (1.7) (+4 -4)
+		src/xml/escp2/inks/standard.xml (1.7) (+4 -4)
+		src/xml/escp2/inks/standard_gen0.xml (1.7) (+4 -4)
+
+	Fix gray transition parameter names for quadtone inks
+
+2009-03-01	<rlk@sourceforge.net>
+
+	Files:	test/unprint.c (1.43) (+2 -2)
+
+	Reorder quadtone inks to get correct constants.
+
+2009-03-01	<rlk@sourceforge.net>
+
+	Files:	src/main/channel.c (1.32) (+4 -4)
+
+	Add appropriate newlines in debug output.
+
+2009-01-21	<m0m@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.186) (+1 -0)
+		src/main/print-olympus.c (1.90) (+48 -1)
+		src/xml/printers.xml (1.30) (+2 -1)
+
+	added support for Canon SELPHY CP-520
+	patch submited by Simon Waid
+
+2009-01-07	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/model/model_95.xml (1.2) (+1 -1)
+
+	2473672 Print quality poor at paper borders, Epson DX4800
+
+2009-01-05	<rlk@sourceforge.net>
+
+	Files:	src/xml/papers.xml (1.6) (+11 -1)
+
+	Add L-size paper with tear-off borders.
+
+2009-01-04	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/inks/cmykrb.xml (1.9) (+9 -9)
+		src/xml/escp2/inks/cmykro.xml (1.7) (+10 -10)
+
+	Change Gloss to Gloss Optimizer
+
+2009-01-03	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-channels.c (1.88) (+7 -1)
+		src/main/print-escp2.c (1.417) (+59 -3)
+		src/main/print-escp2.h (1.134) (+4 -2)
+		src/xml/escp2/inks/artisan.xml (1.2) (+37 -37)
+		src/xml/escp2/inks/b500.xml (1.5) (+15 -15)
+		src/xml/escp2/inks/c120.xml (1.5) (+15 -15)
+		src/xml/escp2/inks/c64.xml (1.6) (+19 -19)
+		src/xml/escp2/inks/c80.xml (1.6) (+19 -19)
+		src/xml/escp2/inks/c82.xml (1.6) (+19 -19)
+		src/xml/escp2/inks/claria.xml (1.6) (+37 -37)
+		src/xml/escp2/inks/cmy.xml (1.5) (+3 -3)
+		src/xml/escp2/inks/cmykrb.xml (1.8) (+84 -84)
+		src/xml/escp2/inks/cmykro.xml (1.6) (+84 -84)
+		src/xml/escp2/inks/cx3650.xml (1.6) (+19 -19)
+		src/xml/escp2/inks/defaultblack.xml (1.3) (+1 -1)
+		src/xml/escp2/inks/f360.xml (1.6) (+19 -19)
+		src/xml/escp2/inks/f360_photo.xml (1.6) (+37 -37)
+		src/xml/escp2/inks/f360_photo7_japan.xml (1.6) (+66 -66)
+		src/xml/escp2/inks/f360_ultrachrome.xml (1.6) (+127 -112)
+		src/xml/escp2/inks/f360_ultrachrome_k3.xml (1.7) (+100 -82)
+		src/xml/escp2/inks/nx100.xml (1.2) (+15 -15)
+		src/xml/escp2/inks/photo_gen0.xml (1.6) (+42 -42)
+		src/xml/escp2/inks/photo_gen1.xml (1.6) (+41 -41)
+		src/xml/escp2/inks/photo_gen2.xml (1.6) (+42 -41)
+		src/xml/escp2/inks/photo_gen3.xml (1.6) (+41 -41)
+		src/xml/escp2/inks/photo_gen3_4.xml (1.6) (+19 -19)
+		src/xml/escp2/inks/photo_gen4.xml (1.6) (+37 -37)
+		src/xml/escp2/inks/photo_pigment.xml (1.6) (+37 -37)
+		src/xml/escp2/inks/picturemate_4.xml (1.5) (+8 -8)
+		src/xml/escp2/inks/picturemate_6.xml (1.7) (+20 -20)
+		src/xml/escp2/inks/pro_gen1.xml (1.6) (+41 -41)
+		src/xml/escp2/inks/pro_gen2.xml (1.6) (+41 -41)
+		src/xml/escp2/inks/pro_pigment.xml (1.6) (+37 -37)
+		src/xml/escp2/inks/pro_ultrachrome.xml (1.6) (+125 -110)
+		src/xml/escp2/inks/pro_ultrachrome_k3.xml (1.8) (+100 -82)
+		src/xml/escp2/inks/standard.xml (1.6) (+19 -19)
+		src/xml/escp2/inks/standard_gen0.xml (1.6) (+19 -19)
+		src/xml/escp2/inks/ultrachrome.xml (1.6) (+125 -110)
+		src/xml/escp2/inks/wf40.xml (1.2) (+15 -15)
+		src/xml/escp2/inks/wf500.xml (1.2) (+15 -15)
+		src/xml/escp2/inks/x80.xml (1.5) (+15 -15)
+
+	Add RawChannels parameter to enable fetching names of each channel
+
+2009-01-03	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/run-testpattern-2.in (1.33) (+6 -5)
+
+	Combine raw channels and ink set, since we want to check all
+	combinations.
+
+	Be more selective about omitting raw channels.
+
+2009-01-03	<rlk@sourceforge.net>
+
+	Files:	src/testpattern/testpattern.c (1.55) (+4 -3)
+
+	Make sure we free everything even if we can't print for some reason.
+
+2009-01-03	<rlk@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.185) (+2 -2)
+		src/xml/printers.xml (1.29) (+3 -3)
+
+	Correct names of P/TX 700/800 (700W, 800FW).
+
+===============================================================================
+Name: gutenprint-5_2_bp
+
+2009-01-01	<rlk@sourceforge.net>
+
+	Files:	src/xml/escp2/model/model_77.xml (1.10) (+15 -8)
+
+	Try to fix PM-D600 (bug 1575384)
+
 ===============================================================================
 Name: gutenprint-5_2_3
 
@@ -6395,7 +7078,6 @@ Name: gutenprint-5_1_2
 	Files:	src/main/escp2-inks.c (1.52) (+2 -2)
 		src/main/escp2-papers.c (1.104) (+5 -5)
 		src/main/print-escp2-data.c (1.219) (+5 -5)
-		src/main/print-escp2-data.c (1.220) (+2 -2)
 
 	Further RX580 tuning
 
@@ -24593,7 +25275,6 @@ Name: gimp-print-4_3_6
 		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
@@ -24733,9 +25414,7 @@ Name: gimp-print-4_3_5
 2002-09-26	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.76) (+506 -17)
-		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)
 
@@ -35521,10 +36200,8 @@ Name: print-4_1_3
 		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) (added)
 		src/ghost/.cvsignore (1.1) (added)
-		src/ghost/.cvsignore (1.2) (+14 -0)
 		src/gimp/.cvsignore (1.1) (added)
 		src/include/.cvsignore (1.1) (added)
 		src/main/.cvsignore (1.1) (added)
diff --git a/Makefile.in b/Makefile.in
index 788e091..96ca9fc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -45,11 +45,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -101,10 +104,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -114,16 +113,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -168,6 +166,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -179,6 +178,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -191,8 +191,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -226,8 +230,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -272,6 +275,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -284,6 +288,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4 -I m4local
diff --git a/NEWS b/NEWS
index edd1f2a..0acd7ed 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
-Welcome to Gutenprint 5.2.3, a stable release of Gutenprint 5.2.  This
-release has bug fixes over 5.2.2.  Please read these release notes
-carefully.
+Welcome to Gutenprint 5.2.4, a stable release of Gutenprint 5.2.  This
+release has bug fixes and a few new features over 5.2.3.  Please read
+these release notes carefully.
 
 Gutenprint is a suite of printer drivers that may be used with most
 common UNIX print spooling systems, including CUPS, lpr, LPRng, or
@@ -21,6 +21,7 @@ These release notes contain the following sections:
 I)    General Requirements
 II)   Critical Upgrade Note
 III)  Changes from Previous Releases
+        * Changes from 5.2.3
         * Changes from 5.2.2
         * Changes from 5.2.1
 IV)   Overall changes from 5.0.2 to 5.2
@@ -246,6 +247,59 @@ device.  We have determined that the data is in fact written by the
 
 III) MAJOR CHANGES FROM PREVIOUS RELEASES
 
+* Changes from 5.2.3
+
+   1) New printers supported in this release:
+
+      Canon PIXMA iX4000
+      Canon SELPHY CP-520
+      EPSON Stylus Photo R2880
+      EPSON Stylus DX4000
+
+   2) Printing to the Epson PM-D600 has been corrected.
+
+   3) Printing using the manual sheet guide on the Epson Stylus Photo
+      R2400 has been corrected.
+
+   4) Printing to the EPSON Artisan 700 and 800 and Stylus Photo
+      P/TX700 and 800 series printers has been corrected.  Among other
+      issues, it should now be possible to print reliably using the
+      photo tray.
+
+   5) The names of the following Epson printers have been corrected:
+
+      EPSON Stylus Photo PX700W
+      EPSON Stylus Photo TX700W
+      EPSON Stylus Photo PX800FW
+      EPSON Stylus Photo TX800FW
+
+   6) The names of various Ricoh and Ricoh-based printers have been
+      corrected to match Ricoh's model names and the OpenPrinting
+      database.
+
+   7) The EPSON inkjet utility, escputil, now correctly prints the
+      color name for low ink warnings.
+
+   8) Printing resolution names have been fixed in non-English locales
+      in CUPS PPD files.
+
+   9) A Russian translation has been added.  The Danish and Italian
+      translations have been updated.
+
+   10) Support has been added for L-size paper with tear-off borders.
+
+   11) The ordering of inks in quadtone ink sets on Epson printers has
+      been corrected.  In addition, support has been added for MIS
+      quadtone and 6 tone inks.
+
+   12) It is now possible to adjust the ink parameters for quadtone
+      inks in CUPS.  Previously, these parameters could only be
+      adjusted in the enhanced Print plugin for GIMP and other native
+      Gutenprint applications.
+
+   13) Updating CUPS PPD files is now faster.
+
+
 * Changes from 5.2.2
 
    1) CUPS PPD files in non-English locales are now generated
@@ -297,6 +351,7 @@ III) MAJOR CHANGES FROM PREVIOUS RELEASES
 
    6) Preliminary support has been added for the Canon PIXMA iP4600.
 
+   7) Preliminary support has been added for the Canon PIXMA iX4000.
 
 ----------------
 
diff --git a/README b/README
index da96736..cf0355c 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Welcome to Gutenprint 5.2.3!  Please read these notes carefully.
+Welcome to Gutenprint 5.2.4!  Please read these notes carefully.
 
 *** NOTE TO PACKAGERS: Please read the file README.package for issues
     that are of interest to distributors and packagers of Gutenprint.
@@ -8,7 +8,7 @@ Welcome to Gutenprint 5.2.3!  Please read these notes carefully.
 
 I) INTRODUCTION
 
-    This is Gutenprint version 5.2.3, a stable release of Gutenprint
+    This is Gutenprint version 5.2.4, a stable release of Gutenprint
     5.2.  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
@@ -120,7 +120,7 @@ A) OVERVIEW
 	gimp-print-devel@lists.sourceforge.net
 
 	================================================================
-	  Release: gutenprint 5.2.2 generated on 18 Oct 2008
+	  Release: gutenprint 5.2.4 generated on 07 Jun 2009
 
 	  Features:
 	    Build CUPS:                                 yes, installing in /usr
@@ -170,6 +170,14 @@ A) OVERVIEW
     the development packages to match exactly the versions of the
     runtime packages they are related to.
 
+    PLEASE INSPECT THE OUTPUT CAREFULLY BEFORE PROCEEDING.  If you
+    expect to build a particular component (particularly the CUPS
+    driver or enhanced Print plugin for GIMP), and the configure
+    output states that that component will not be built, please make
+    certain that you have the required development packages installed,
+    as described below in the sections for the particular components.
+
+
 ----------------
 
 B) CORE DRIVER LIBRARY
@@ -213,9 +221,33 @@ C) CUPS
     install other development packages depending upon how your
     distribution has built CUPS.  The list of packages varies, but
     commonly development packages for TIFF (libtiff-devel), JPEG
-    (jpeg-devel or libjpeg-devel), PNG (libpng-devel) and OpenSSL
-    (openssl-devel) will be required.  Failure to install these
-    packages will lead to errors when the package is compiled.
+    (jpeg-devel or libjpeg-devel), PNG (libpng-devel), OpenSSL
+    (openssl-devel), and libc (glibc-devel or libc-devel) will be
+    required.  Failure to install these packages will lead to errors
+    when the package is compiled.  The errors will typically look like
+    this; the important error is "cups/cups.h: No such file or
+    directory" (other ".h" files may also be missing, depending upon
+    the missing packages):
+
+	make[3]: Entering directory `/opt/gutenprint/gutenprint-5.2.4/src/cups'
+	gcc -DHAVE_CONFIG_H -I. -I../..  -I../../include -I../../include
+	   -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes
+	   -Wmissing-declarations -Wnested-externs -Wwrite-strings
+	   -Werror-implicit-function-declaration -Winline -Wformat=2
+	   -finline-limit=131072  -DCUPS_DRIVER_INTERFACE -DALL_LINGUAS='"cs da
+	   de el en_GB es fr hu it ja nb nl pl pt sk sv zh_TW"'
+	   -Disfinite=finite  -O6 -MT gutenprint_5_2-genppd.o -MD -MP -MF
+	   .deps/gutenprint_5_2-genppd.Tpo -c -o gutenprint_5_2-genppd.o
+	   `test -f 'genppd.c' || echo './'`genppd.c
+	genppd.c:79:23: error: cups/cups.h: No such file or directory
+	genppd.c:80:25: error: cups/raster.h: No such file or directory
+	make[3]: *** [gutenprint_5_2-genppd.o] Error 1
+	make[3]: Leaving directory `/opt/gutenprint/gutenprint-5.2.4/src/cups'
+	make[2]: *** [all-recursive] Error 1
+	make[2]: Leaving directory `/opt/gutenprint/gutenprint-5.2.4/src'
+	make[1]: *** [all-recursive] Error 1
+	make[1]: Leaving directory `/opt/gutenprint/gutenprint-5.2.4'
+	make: *** [all] Error 2
 
     Installing the CUPS driver for Gutenprint 5.2 will not interfere
     with your ability to continue using the Gutenprint 5.0 or
@@ -559,7 +591,30 @@ E) GIMP
     If your system separates development packages from runtime
     packages, you will typically have to install development packages
     for GIMP itself, in addition to Gtk and Glib.  With GIMP 2.x and
-    GTK 2.x, additional packages may be required.
+    GTK 2.x, additional packages may be required.  Failure to install
+    these packages will lead to errors when the package is compiled.
+    The errors will typically look like this; the important errors are
+    the ones "No such file or directory".
+
+	make[3]: Entering directory `/opt/gutenprint/gutenprint-5.2.4/src/gimp2'
+	gcc -DHAVE_CONFIG_H -I. -I../..  -I../../include -I../../include
+	   -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes
+	   -Wmissing-declarations -Wnested-externs -Wwrite-strings
+	   -Werror-implicit-function-declaration -Winline -Wformat=2
+	   -finline-limit=131072   -Disfinite=finite  -O6 -MT print-image-gimp.o
+	   -MD -MP -MF .deps/print-image-gimp.Tpo -c -o print-image-gimp.o
+	   print-image-gimp.c
+	In file included from print-image-gimp.c:30:
+	print_gimp.h:36:21: error: gtk/gtk.h: No such file or directory
+	print_gimp.h:37:26: error: libgimp/gimp.h: No such file or directory
+	print_gimp.h:38:28: error: libgimp/gimpui.h: No such file or directory
+	make[3]: *** [print-image-gimp.o] Error 1
+	make[3]: Leaving directory `/opt/gutenprint/gutenprint-5.2.4/src/gimp2'
+	make[2]: *** [all-recursive] Error 1
+	make[2]: Leaving directory `/opt/gutenprint/gutenprint-5.2.4/src'
+	make[1]: *** [all-recursive] Error 1
+	make[1]: Leaving directory `/opt/gutenprint/gutenprint-5.2.4'
+	make: *** [all] Error 2
 
     Normally, the Gutenprint configure script detects which version,
     if any, of GIMP is installed and builds an appropriate plugin.  If
@@ -576,8 +631,8 @@ E) GIMP
     It is not possible for Gimp-Print 4.2, Gutenprint 5.0, and
     Gutenprint 5.2 (or any future release) to coexist in the same
     installation of GIMP.  The Gutenprint 5.2-based plugin can read
-    settings from previous versions of Gimp-Print, but the
-    configuration file format in Gutenprint 5.2 cannot be read by
+    settings from previous versions of Gutenprint and Gimp-Print, but
+    the configuration file format in Gutenprint 5.2 cannot be read by
     older versions of Gimp-Print or Gutenprint.
 
 
diff --git a/aclocal.m4 b/aclocal.m4
index 5fafa26..1dd931c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,6648 +13,12 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
+m4_if(AC_AUTOCONF_VERSION, [2.63],,
+[m4_warning([this file was generated for autoconf 2.63.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
-# serial 52 AC_PROG_LIBTOOL
-
-
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
-         [],
-         [m4_define([AC_PROVIDE_IFELSE],
-	         [m4_ifdef([AC_PROVIDE_$1],
-		           [$2], [$3])])])
-
-
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-  ])])
-dnl And a similar setup for Fortran 77 support
-  AC_PROVIDE_IFELSE([AC_PROG_F77],
-    [AC_LIBTOOL_F77],
-    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-      [AC_LIBTOOL_GCJ],
-      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	[AC_LIBTOOL_GCJ],
-      [ifdef([AC_PROG_GCJ],
-	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([A][M_PROG_GCJ],
-	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([LT_AC_PROG_GCJ],
-	     [define([LT_AC_PROG_GCJ],
-		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
-
-
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
-
-
-# AC_LIBTOOL_SETUP
-# ----------------
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
-
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-
-# Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-_LT_REQUIRED_DARWIN_CHECKS
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-enable_win32_dll=yes, enable_win32_dll=no)
-
-AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-AC_ARG_WITH([pic],
-    [AC_HELP_STRING([--with-pic],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
-    [pic_mode=default])
-test -z "$pic_mode" && pic_mode=default
-
-# Use C for the default configuration in the libtool script
-tagname=
-AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
-])# AC_LIBTOOL_SETUP
-
-
-# _LT_AC_SYS_COMPILER
-# -------------------
-AC_DEFUN([_LT_AC_SYS_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_AC_SYS_COMPILER
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-AC_DEFUN([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# --------------------------
-# Check for some things on darwin
-AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-   # By default we will add the -single_module flag. You can override
-   # by either setting the environment variable LT_MULTI_MODULE
-   # non-empty at configure time, or by adding -multi_module to the
-   # link flags.
-   echo "int foo(void){return 1;}" > conftest.c
-   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-     -dynamiclib ${wl}-single_module conftest.c
-   if test -f libconftest.dylib; then
-     lt_cv_apple_cc_single_mod=yes
-     rm -rf libconftest.dylib*
-   fi
-   rm conftest.c
-      fi])
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-   [lt_cv_ld_exported_symbols_list=yes],
-   [lt_cv_ld_exported_symbols_list=no])
-   LDFLAGS="$save_LDFLAGS"
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[0123]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*)
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-   10.[[012]]*)
-     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-   10.*)
-     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-    fi
-    if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil="~$DSYMUTIL \$lib || :"
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
-
-# _LT_AC_SYS_LIBPATH_AIX
-# ----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_AC_SYS_LIBPATH_AIX
-
-
-# _LT_AC_SHELL_INIT(ARG)
-# ----------------------
-AC_DEFUN([_LT_AC_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-	 [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_AC_SHELL_INIT
-
-
-# _LT_AC_PROG_ECHO_BACKSLASH
-# --------------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-[_LT_AC_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-echo=${ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-[$]*
-EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "[$]0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(ECHO)
-])])# _LT_AC_PROG_ECHO_BACKSLASH
-
-
-# _LT_AC_LOCK
-# -----------
-AC_DEFUN([_LT_AC_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-   fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *32-bit*)
-      case $host in
-        x86_64-*kfreebsd*-gnu)
-          LD="${LD-ld} -m elf_i386_fbsd"
-          ;;
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      case $host in
-        x86_64-*kfreebsd*-gnu)
-          LD="${LD-ld} -m elf_x86_64_fbsd"
-          ;;
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-sparc*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)
-        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-  ])
-esac
-
-need_locks="$enable_libtool_lock"
-
-])# _LT_AC_LOCK
-
-
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   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.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $rm conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$5], , :, [$5])
-else
-    ifelse([$6], , :, [$6])
-fi
-])# AC_LIBTOOL_COMPILER_OPTION
-
-
-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                          [ACTION-SUCCESS], [ACTION-FAILURE])
-# ------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $rm -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$4], , :, [$4])
-else
-    ifelse([$5], , :, [$5])
-fi
-])# AC_LIBTOOL_LINKER_OPTION
-
-
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
-# --------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-[# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-	       = "XX$teststring") >/dev/null 2>&1 &&
-	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	      lt_cv_sys_max_cmd_len=$new_result &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on massive
-      # amounts of additional arguments before passing them to the linker.
-      # It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-
-
-# _LT_AC_CHECK_DLFCN
-# ------------------
-AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)dnl
-])# _LT_AC_CHECK_DLFCN
-
-
-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ---------------------------------------------------------------------
-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-    exit (status);
-}]
-EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_AC_TRY_DLOPEN_SELF
-
-
-# AC_LIBTOOL_DLOPEN_SELF
-# ----------------------
-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-   ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-    	  lt_cv_dlopen_self_static, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-])# AC_LIBTOOL_DLOPEN_SELF
-
-
-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-# ---------------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler
-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-])
-])# AC_LIBTOOL_PROG_CC_C_O
-
-
-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-# -----------------------------------------
-# Check to see if we can do hard links to lock some files if needed
-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-[AC_REQUIRE([_LT_AC_LOCK])dnl
-
-hard_links="nottested"
-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-
-
-# AC_LIBTOOL_OBJDIR
-# -----------------
-AC_DEFUN([AC_LIBTOOL_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-])# AC_LIBTOOL_OBJDIR
-
-
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-# ----------------------------------------------
-# Check hardcoding attributes.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_AC_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_AC_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-
-
-# AC_LIBTOOL_SYS_LIB_STRIP
-# ------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
-[striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         old_striplib="$STRIP -S"
-         AC_MSG_RESULT([yes])
-       else
-  AC_MSG_RESULT([no])
-fi
-       ;;
-   *)
-  AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-])# AC_LIBTOOL_SYS_LIB_STRIP
-
-
-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-m4_if($1,[],[
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
-  sys_lib_search_path_spec=`echo $lt_search_path_spec`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[[4-9]]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux
-  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'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-  m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  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
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-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
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix[[3-9]]*)
-  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'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-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'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  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=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  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=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  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
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-uts4*)
-  version_type=linux
-  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
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
-[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
-[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
-
-# _LT_AC_TAGCONFIG
-# ----------------
-AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_ARG_WITH([tags],
-    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
-        [include additional configurations @<:@automatic@:>@])],
-    [tagnames="$withval"])
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    AC_MSG_WARN([output file `$ofile' does not exist])
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
-    else
-      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-    fi
-  fi
-  if test -z "$LTCFLAGS"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-  fi
-
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
-    IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
-    "") ;;
-    *)  AC_MSG_ERROR([invalid tag name: $tagname])
-	;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      AC_MSG_ERROR([tag name \"$tagname\" already exists])
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      case $tagname in
-      CXX)
-	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-	    (test "X$CXX" != "Xg++"))) ; then
-	  AC_LIBTOOL_LANG_CXX_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-	  AC_LIBTOOL_LANG_F77_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      GCJ)
-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-	  AC_LIBTOOL_LANG_GCJ_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      RC)
-	AC_LIBTOOL_LANG_RC_CONFIG
-	;;
-
-      *)
-	AC_MSG_ERROR([Unsupported tag name: $tagname])
-	;;
-      esac
-
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    AC_MSG_ERROR([unable to update list of available tagged configurations.])
-  fi
-fi
-])# _LT_AC_TAGCONFIG
-
-
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_DLOPEN
-
-
-# AC_LIBTOOL_WIN32_DLL
-# --------------------
-# declare package support for building win32 DLLs
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_WIN32_DLL
-
-
-# AC_ENABLE_SHARED([DEFAULT])
-# ---------------------------
-# implement the --enable-shared flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([shared],
-    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-])# AC_ENABLE_SHARED
-
-
-# AC_DISABLE_SHARED
-# -----------------
-# set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)
-])# AC_DISABLE_SHARED
-
-
-# AC_ENABLE_STATIC([DEFAULT])
-# ---------------------------
-# implement the --enable-static flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([static],
-    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-])# AC_ENABLE_STATIC
-
-
-# AC_DISABLE_STATIC
-# -----------------
-# set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)
-])# AC_DISABLE_STATIC
-
-
-# AC_ENABLE_FAST_INSTALL([DEFAULT])
-# ---------------------------------
-# implement the --enable-fast-install flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([fast-install],
-    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-])# AC_ENABLE_FAST_INSTALL
-
-
-# AC_DISABLE_FAST_INSTALL
-# -----------------------
-# set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)
-])# AC_DISABLE_FAST_INSTALL
-
-
-# AC_LIBTOOL_PICMODE([MODE])
-# --------------------------
-# implement the --with-pic flag
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)
-])# AC_LIBTOOL_PICMODE
-
-
-# AC_PROG_EGREP
-# -------------
-# This is predefined starting with Autoconf 2.54, so this conditional
-# definition can be removed once we require Autoconf 2.54 or later.
-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi])
- EGREP=$ac_cv_prog_egrep
- AC_SUBST([EGREP])
-])])
-
-
-# AC_PATH_TOOL_PREFIX
-# -------------------
-# find a file program which can recognize shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])# AC_PATH_TOOL_PREFIX
-
-
-# AC_PATH_MAGIC
-# -------------
-# find a file program which can recognize a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# AC_PATH_MAGIC
-
-
-# AC_PROG_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
-    [AC_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])
-AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])# AC_PROG_LD
-
-
-# AC_PROG_LD_GNU
-# --------------
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# AC_PROG_LD_GNU
-
-
-# AC_PROG_LD_RELOAD_FLAG
-# ----------------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-])# AC_PROG_LD_RELOAD_FLAG
-
-
-# AC_DEPLIBS_CHECK_METHOD
-# -----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognize dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[[4-9]]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[[45]]*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[[3-9]]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-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
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-])# AC_DEPLIBS_CHECK_METHOD
-
-
-# AC_PROG_NM
-# ----------
-# find the pathname to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-])# AC_PROG_NM
-
-
-# AC_CHECK_LIBM
-# -------------
-# check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-])# AC_CHECK_LIBM
-
-
-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl convenience library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
-# (note the single quotes!).  If your package is not flat and you're not
-# using automake, define top_builddir and top_srcdir appropriately in
-# the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_CONVENIENCE
-
-
-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl installable library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# and an installed libltdl is not found, it is assumed to be `libltdl'.
-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and top_srcdir
-# appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, lt_dlinit,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    LTDLINCL=
-  fi
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_INSTALLABLE
-
-
-# AC_LIBTOOL_CXX
-# --------------
-# enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX],
-[AC_REQUIRE([_LT_AC_LANG_CXX])
-])# AC_LIBTOOL_CXX
-
-
-# _LT_AC_LANG_CXX
-# ---------------
-AC_DEFUN([_LT_AC_LANG_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-])# _LT_AC_LANG_CXX
-
-# _LT_AC_PROG_CXXCPP
-# ------------------
-AC_DEFUN([_LT_AC_PROG_CXXCPP],
-[
-AC_REQUIRE([AC_PROG_CXX])
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-fi
-])# _LT_AC_PROG_CXXCPP
-
-# AC_LIBTOOL_F77
-# --------------
-# enable support for Fortran 77 libraries
-AC_DEFUN([AC_LIBTOOL_F77],
-[AC_REQUIRE([_LT_AC_LANG_F77])
-])# AC_LIBTOOL_F77
-
-
-# _LT_AC_LANG_F77
-# ---------------
-AC_DEFUN([_LT_AC_LANG_F77],
-[AC_REQUIRE([AC_PROG_F77])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-])# _LT_AC_LANG_F77
-
-
-# AC_LIBTOOL_GCJ
-# --------------
-# enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],
-[AC_REQUIRE([_LT_AC_LANG_GCJ])
-])# AC_LIBTOOL_GCJ
-
-
-# _LT_AC_LANG_GCJ
-# ---------------
-AC_DEFUN([_LT_AC_LANG_GCJ],
-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
-])# _LT_AC_LANG_GCJ
-
-
-# AC_LIBTOOL_RC
-# -------------
-# enable support for Windows resource files
-AC_DEFUN([AC_LIBTOOL_RC],
-[AC_REQUIRE([LT_AC_PROG_RC])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-])# AC_LIBTOOL_RC
-
-
-# AC_LIBTOOL_LANG_C_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-[lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF
-
-# Report which library types will actually be built
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix[[4-9]]*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-    ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_C_CONFIG
-
-
-# AC_LIBTOOL_LANG_CXX_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
-[AC_LANG_PUSH(C++)
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Dependencies to place before and after the object being linked:
-_LT_AC_TAGVAR(predep_objects, $1)=
-_LT_AC_TAGVAR(postdep_objects, $1)=
-_LT_AC_TAGVAR(predeps, $1)=
-_LT_AC_TAGVAR(postdeps, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
-  $as_unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
-  lt_cv_path_LD=$lt_cv_path_LDCXX
-else
-  $as_unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-else
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-fi
-
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
-
-  AC_PROG_LD
-
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if test "$with_gnu_ld" = yes; then
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-    #     investigate it a little bit more. (MM)
-    wlarc='${wl}'
-
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-	grep 'no-whole-archive' > /dev/null; then
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    with_gnu_ld=no
-    wlarc=
-
-    # A generic and very simple default shared library creation
-    # command for GNU C++ for the case where it uses the native
-    # linker, instead of GNU ld.  If possible, this setting should
-    # overridden to take advantage of the native linker features on
-    # the platform it is being used on.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
-
-  # Commands to make compiler produce verbose output that lists
-  # what "hidden" libraries, object files and flags are used when
-  # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-else
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  aix[[4-9]]*)
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
-
-      # Test if we are trying to use run time linking or normal
-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-      # need to do runtime linking.
-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	for ld_flag in $LDFLAGS; do
-	  case $ld_flag in
-	  *-brtl*)
-	    aix_use_runtimelinking=yes
-	    break
-	    ;;
-	  esac
-	done
-	;;
-      esac
-
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-    _LT_AC_TAGVAR(archive_cmds, $1)=''
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    if test "$GXX" = yes; then
-      case $host_os in aix4.[[012]]|aix4.[[012]].*)
-      # We only want to do this on AIX 4.2 and lower, the check
-      # below for broken collect2 doesn't work under 4.3+
-	collect2name=`${CC} -print-prog-name=collect2`
-	if test -f "$collect2name" && \
-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	then
-	  # We have reworked collect2
-	  :
-	else
-	  # We have old collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	fi
-	;;
-      esac
-      shared_flag='-shared'
-      if test "$aix_use_runtimelinking" = yes; then
-	shared_flag="$shared_flag "'${wl}-G'
-      fi
-    else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	shared_flag='-G'
-      else
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='${wl}-G'
-	else
-	  shared_flag='${wl}-bM:SRE'
-	fi
-      fi
-    fi
-
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      _LT_AC_SYS_LIBPATH_AIX
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-      if test "$host_cpu" = ia64; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-      else
-	# Determine the default libpath from the value encoded in an empty executable.
-	_LT_AC_SYS_LIBPATH_AIX
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	# Warning - without using the other run time loading flags,
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	# Exported symbols can be pulled into shared objects from archives
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	# This is similar to how AIX traditionally builds its shared libraries.
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-      fi
-    fi
-    ;;
-
-  beos*)
-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-      # support --undefined.  This deserves some investigation.  FIXME
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-    ;;
-
-  chorus*)
-    case $cc_basename in
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-    # as there is no search path for DLLs.
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      # If the export-symbols file already is a .def file (1st line
-      # is EXPORTS), use it as is; otherwise, prepend...
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	cp $export_symbols $output_objdir/$soname.def;
-      else
-	echo EXPORTS > $output_objdir/$soname.def;
-	cat $export_symbols >> $output_objdir/$soname.def;
-      fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-  ;;
-      darwin* | rhapsody*)
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-      if test "$GXX" = yes ; then
-      output_verbose_link_cmd='echo'
-      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-      fi
-      else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-          ;;
-      esac
-      fi
-        ;;
-
-  dgux*)
-    case $cc_basename in
-      ec++*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      ghcx*)
-	# Green Hills C++ Compiler
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  freebsd[[12]]*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  freebsd-elf*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    ;;
-  freebsd* | dragonfly*)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				# but as the default
-				# location of the library.
-
-    case $cc_basename in
-    CC*)
-      # FIXME: insert proper C++ library support
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    aCC*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      #
-      # There doesn't appear to be a way to prevent this compiler from
-      # explicitly linking system object files so we need to strip them
-      # from the output so that they don't get included in the library
-      # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-      ;;
-    *)
-      if test "$GXX" = yes; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-        # FIXME: insert proper C++ library support
-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-      case $host_cpu in
-      hppa*64*|ia64*) ;;
-      *)
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        ;;
-      esac
-    fi
-    case $host_cpu in
-    hppa*64*|ia64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-    *)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    esac
-
-    case $cc_basename in
-      CC*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      aCC*)
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	esac
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test $with_gnu_ld = no; then
-	    case $host_cpu in
-	    hppa*64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    ia64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    esac
-	  fi
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  interix[[3-9]]*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-    # Instead, shared libraries are loaded at an image base (0x10000000 by
-    # default) and relocated if they conflict, which is a slow very memory
-    # consuming and fragmenting process.  To avoid this, we pick a random,
-    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC*)
-	# SGI C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	# Archives containing C++ object files must be created using
-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test "$with_gnu_ld" = no; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	  else
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-	  fi
-	fi
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-	;;
-    esac
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    ;;
-  linux* | k*bsd*-gnu)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	;;
-      icpc*)
-	# Intel C++
-	with_gnu_ld=yes
-	# version 8.0 and above of icpc choke on multiply defined symbols
-	# if we add $predep_objects and $postdep_objects, however 7.1 and
-	# earlier do not add the objects themselves.
-	case `$CC -V 2>&1` in
-	*"Version 7."*)
-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	*)  # Version 8.0 or newer
-	  tmp_idyn=
-	  case $host_cpu in
-	    ia64*) tmp_idyn=' -i_dynamic';;
-	  esac
-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	esac
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	;;
-      pgCC* | pgcpp*)
-        # Portland Group C++ compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-        ;;
-      cxx*)
-	# Compaq C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	runpath_var=LD_RUN_PATH
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C++ 5.9
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-
-	  # Not sure whether something based on
-	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	  # would be better.
-	  output_verbose_link_cmd='echo'
-
-	  # Archives containing C++ object files must be created using
-	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	  # necessary to make sure instantiated templates are included
-	  # in the archive.
-	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	  ;;
-	esac
-	;;
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  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=
-      _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
-    fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-    ;;
-  openbsd2*)
-    # C++ shared libraries are fairly broken
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  openbsd*)
-    if test -f /usr/libexec/ld.so; then
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      fi
-      output_verbose_link_cmd='echo'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-    ;;
-  osf3*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx*)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  osf4* | osf5*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx*)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
-	  $rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.x
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      lcc*)
-	# Lucid
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.2, 5.x and Centerline C++
-        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	case $host_os in
-	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	  *)
-	    # The compiler driver will combine and reorder linker options,
-	    # but understands `-z linker_flag'.
-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	    ;;
-	esac
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-	output_verbose_link_cmd='echo'
-
-	# Archives containing C++ object files must be created using
-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	;;
-      gcx*)
-	# Green Hills C++ Compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	# The C++ compiler must be used to create the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	;;
-      *)
-	# GNU C++ compiler with Solaris linker
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  else
-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	    # platform.
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  fi
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	  case $host_os in
-	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	  *)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	    ;;
-	  esac
-	fi
-	;;
-    esac
-    ;;
-  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  sysv5* | sco3.2v5* | sco5v6*)
-    # Note: We can NOT use -z defs as we might desire, because we do not
-    # link with -lc, and that would cause any symbols used from libc to
-    # always be unresolved, which means just about no library would
-    # ever link correctly.  If we're not using GNU ld we use -z text
-    # though, which does catch some bad symbols but isn't as heavy-handed
-    # as -z defs.
-    # For security reasons, it is highly recommended that you always
-    # use absolute paths for naming shared libraries, and exclude the
-    # DT_RUNPATH tag from executables and libraries.  But doing so
-    # requires that you compile everything twice, which is a pain.
-    # So that behaviour is only enabled if SCOABSPATH is set to a
-    # non-empty value in the environment.  Most likely only useful for
-    # creating official distributions of packages.
-    # This is a hack until libtool officially supports absolute path
-    # names for shared libraries.
-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC*)
-	# NonStop-UX NCC 3.20
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-esac
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_AC_TAGVAR(GCC, $1)="$GXX"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_POSTDEP_PREDEP($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-])# AC_LIBTOOL_LANG_CXX_CONFIG
-
-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
-int a;
-void foo (void) { a = 0; }
-EOF
-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-EOF
-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-
-  for p in `eval $output_verbose_link_cmd`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" \
-	  || test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
-	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
-	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$rm -f confest.$objext
-
-_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-
-# PORTME: override above test on systems where it is broken
-ifelse([$1],[CXX],
-[case $host_os in
-interix[[3-9]]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_AC_TAGVAR(predep_objects,$1)=
-  _LT_AC_TAGVAR(postdep_objects,$1)=
-  _LT_AC_TAGVAR(postdeps,$1)=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-    #
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-])
-case " $_LT_AC_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
-])# AC_LIBTOOL_POSTDEP_PREDEP
-
-# AC_LIBTOOL_LANG_F77_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-[AC_REQUIRE([AC_PROG_F77])
-AC_LANG_PUSH(Fortran 77)
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="\
-      program t
-      end
-"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-aix[[4-9]]*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-_LT_AC_TAGVAR(GCC, $1)="$G77"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_F77_CONFIG
-
-
-# AC_LIBTOOL_LANG_GCJ_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_GCJ_CONFIG
-
-
-# AC_LIBTOOL_LANG_RC_CONFIG
-# -------------------------
-# Ensure that the configuration vars for the Windows resource compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_RC_CONFIG
-
-
-# AC_LIBTOOL_CONFIG([TAGNAME])
-# ----------------------------
-# If TAGNAME is not passed, then create an initial libtool script
-# with a default configuration from the untagged config vars.  Otherwise
-# add code to config.status for appending the configuration named by
-# TAGNAME from the matching tagged config vars.
-AC_DEFUN([AC_LIBTOOL_CONFIG],
-[# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    _LT_AC_TAGVAR(compiler, $1) \
-    _LT_AC_TAGVAR(CC, $1) \
-    _LT_AC_TAGVAR(LD, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
-    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
-    _LT_AC_TAGVAR(old_archive_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
-    _LT_AC_TAGVAR(predep_objects, $1) \
-    _LT_AC_TAGVAR(postdep_objects, $1) \
-    _LT_AC_TAGVAR(predeps, $1) \
-    _LT_AC_TAGVAR(postdeps, $1) \
-    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
-    _LT_AC_TAGVAR(archive_cmds, $1) \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(postinstall_cmds, $1) \
-    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
-    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
-    _LT_AC_TAGVAR(no_undefined_flag, $1) \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
-    _LT_AC_TAGVAR(hardcode_automatic, $1) \
-    _LT_AC_TAGVAR(module_cmds, $1) \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
-    _LT_AC_TAGVAR(exclude_expsyms, $1) \
-    _LT_AC_TAGVAR(include_expsyms, $1); do
-
-    case $var in
-    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(module_cmds, $1) | \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\[$]0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
-    ;;
-  esac
-
-ifelse([$1], [],
-  [cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  AC_MSG_NOTICE([creating $ofile])],
-  [cfgfile="$ofile"])
-
-  cat <<__EOF__ >> "$cfgfile"
-ifelse([$1], [],
-[#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e 1s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG],
-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-
-# Is the compiler the GNU C compiler?
-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-
-# Symbols that must always be exported.
-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
-
-ifelse([$1],[],
-[# ### END LIBTOOL CONFIG],
-[# ### END LIBTOOL TAG CONFIG: $tagname])
-
-__EOF__
-
-ifelse([$1],[], [
-  case $host_os in
-  aix3*)
-    cat <<\EOF >> "$cfgfile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-    ;;
-  esac
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-])
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-])# AC_LIBTOOL_CONFIG
-
-
-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-
-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
-
-
-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-# ---------------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([LT_AC_PROG_SED])
-AC_REQUIRE([AC_PROG_NM])
-AC_REQUIRE([AC_OBJEXT])
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-linux* | k*bsd*-gnu)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDGIRSTW]]'
-    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[[]] =
-{
-EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-
-
-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-# ---------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
-
-AC_MSG_CHECKING([for $compiler option to produce PIC])
- ifelse([$1],[CXX],[
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[[4-9]]*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-       darwin*)
-         # PIC is the default on this platform
-         # Common symbols not allowed in MH_DYLIB files
-         case $cc_basename in
-           xlc*)
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           ;;
-         esac
-       ;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  icpc* | ecpc*)
-	    # Intel C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler.
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-         ;;
-       esac
-       ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      m4_if([$1], [GCJ], [],
-	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    linux* | k*bsd*-gnu)
-      case $cc_basename in
-      icc* | ecc*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      *)
-        case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C 5.9
-	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
-    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-])
-
-
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
-# See if the linker supports building shared libraries.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-ifelse([$1],[CXX],[
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix[[4-9]]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
-  cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-  ;;
-  *)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-],[
-  runpath_var=
-  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_AC_TAGVAR(archive_cmds, $1)=
-  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
-  _LT_AC_TAGVAR(module_cmds, $1)=
-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(always_export_symbols, $1)=no
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_AC_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  _LT_CC_BASENAME([$compiler])
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[[3-9]]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    interix[[3-9]]*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | k*bsd*-gnu)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
-	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	*)
-	  tmp_sharedflag='-shared' ;;
-	esac
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-	if test $supports_anon_versioning = yes; then
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    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=
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-	  else
-	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix[[4-9]]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_AC_TAGVAR(archive_cmds, $1)=''
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  :
-	  else
-  	  # We have old collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       _LT_AC_SYS_LIBPATH_AIX
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 _LT_AC_SYS_LIBPATH_AIX
-	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      # see comment about different semantics on the GNU ld section
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    bsdi[[45]]*)
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    freebsd1*)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _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
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$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'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    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
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _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
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	     ;;
-	   *)
-	     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-        fi
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	wlarc=''
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_AC_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $rm conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
-      ;;
-    esac
-  fi
-  ;;
-esac
-])# AC_LIBTOOL_PROG_LD_SHLIBS
-
-
-# _LT_AC_FILE_LTDLL_C
-# -------------------
-# Be careful that the start marker always follows a newline.
-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
-# /* ltdll.c starts here */
-# #define WIN32_LEAN_AND_MEAN
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
-#
-# #ifndef __CYGWIN__
-# #  ifdef __CYGWIN32__
-# #    define __CYGWIN__ __CYGWIN32__
-# #  endif
-# #endif
-#
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-# #ifdef __cplusplus
-# }
-# #endif
-#
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
-#
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
-#   __hDllInstance_base = hInst;
-#   return TRUE;
-# }
-# /* ltdll.c ends here */
-])# _LT_AC_FILE_LTDLL_C
-
-
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-# ---------------------------------
-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-
-
-# old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
-])
-
-
-# Cheap backport of AS_EXECUTABLE_P and required macros
-# from Autoconf 2.59; we should not use $as_executable_p directly.
-
-# _AS_TEST_PREPARE
-# ----------------
-m4_ifndef([_AS_TEST_PREPARE],
-[m4_defun([_AS_TEST_PREPARE],
-[if test -x / >/dev/null 2>&1; then
-  as_executable_p='test -x'
-else
-  as_executable_p='test -f'
-fi
-])])# _AS_TEST_PREPARE
-
-# AS_EXECUTABLE_P
-# ---------------
-# Check whether a file is executable.
-m4_ifndef([AS_EXECUTABLE_P],
-[m4_defun([AS_EXECUTABLE_P],
-[AS_REQUIRE([_AS_TEST_PREPARE])dnl
-$as_executable_p $1[]dnl
-])])# AS_EXECUTABLE_P
-
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-# LT_AC_PROG_SED
-# --------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-AC_DEFUN([LT_AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])
-
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 # 
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
@@ -7800,6 +1164,11 @@ m4_include([m4/isc-posix.m4])
 m4_include([m4/lib-ld.m4])
 m4_include([m4/lib-link.m4])
 m4_include([m4/lib-prefix.m4])
+m4_include([m4/libtool.m4])
+m4_include([m4/ltoptions.m4])
+m4_include([m4/ltsugar.m4])
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
 m4_include([m4/nls.m4])
 m4_include([m4/po.m4])
 m4_include([m4/progtest.m4])
diff --git a/config.h.in b/config.h.in
index e5f1151..c075fb4 100644
--- a/config.h.in
+++ b/config.h.in
@@ -126,6 +126,10 @@
 /* Define to 1 if you have the `usleep' function. */
 #undef HAVE_USLEEP
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
 /* Build a modular libgutenprint */
 #undef MODULE
 
diff --git a/configure b/configure
index 19f4af6..f0019b7 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,12 @@
 #! /bin/sh
-# From configure.ac Revision: 1.209 .
+# From configure.ac Revision: 1.214 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for gutenprint 5.2.3.
+# Generated by GNU Autoconf 2.63 for gutenprint 5.2.4.
 #
 # Report bugs to <gimp-print-devel@lists.sourceforge.net>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
@@ -35,7 +35,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -57,17 +57,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -83,8 +111,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -107,7 +133,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -120,17 +146,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -152,7 +171,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -178,7 +197,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -260,7 +279,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -281,7 +300,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -361,10 +380,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -433,9 +452,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf@gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -471,7 +491,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -499,7 +519,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -512,19 +531,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -549,10 +571,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -573,22 +595,22 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 # Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-case X$ECHO in
+case X$lt_ECHO in
 X*--fallback-echo)
   # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
   ;;
 esac
 
-echo=${ECHO-echo}
+ECHO=${lt_ECHO-echo}
 if test "X$1" = X--no-reexec; then
   # Discard the --no-reexec flag, and continue.
   shift
 elif test "X$1" = X--fallback-echo; then
   # Avoid inline document here, it may be left over
   :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $ECHO works!
   :
 else
   # Restart under the correct shell.
@@ -598,9 +620,9 @@ fi
 if test "X$1" = X--fallback-echo; then
   # used as fallback echo
   shift
-  cat <<EOF
+  cat <<_LT_EOF
 $*
-EOF
+_LT_EOF
   exit 0
 fi
 
@@ -608,121 +630,116 @@ fi
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
+if test -z "$lt_ECHO"; then
+  if test "X${echo_test_string+set}" != Xset; then
+    # find a string as large as possible, as long as the shell can cope with it
+    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+      then
+        break
+      fi
+    done
+  fi
 
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
+  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+     test "X$echo_testing_string" = "X$echo_test_string"; then
+    :
+  else
+    # The Solaris, AIX, and Digital Unix default echo programs unquote
+    # backslashes.  This makes it impossible to quote backslashes using
+    #   echo "$something" | sed 's/\\/\\\\/g'
+    #
+    # So, first we look for a working echo in the user's PATH.
 
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for dir in $PATH /usr/ucb; do
+      IFS="$lt_save_ifs"
+      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        ECHO="$dir/echo"
+        break
+      fi
+    done
     IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
 
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL $0 --fallback-echo"
+    if test "X$ECHO" = Xecho; then
+      # We didn't find a better echo, so look for alternatives.
+      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        # This shell has a builtin print -r that does the trick.
+        ECHO='print -r'
+      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+	   test "X$CONFIG_SHELL" != X/bin/ksh; then
+        # If we have ksh, try running configure again with it.
+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+        export ORIGINAL_CONFIG_SHELL
+        CONFIG_SHELL=/bin/ksh
+        export CONFIG_SHELL
+        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
       else
-	# maybe with a smaller string...
-	prev=:
+        # Try using printf.
+        ECHO='printf %s\n'
+        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	  # Cool, printf works
+	  :
+        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	  export CONFIG_SHELL
+	  SHELL="$CONFIG_SHELL"
+	  export SHELL
+	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
+        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
+        else
+	  # maybe with a smaller string...
+	  prev=:
 
-	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
+	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+	    then
+	      break
+	    fi
+	    prev="$cmd"
+	  done
 
-	if test "$prev" != 'sed 50q "$0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
+	  if test "$prev" != 'sed 50q "$0"'; then
+	    echo_test_string=`eval $prev`
+	    export echo_test_string
+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
+	  else
+	    # Oops.  We lost completely, so just stick with echo.
+	    ECHO=echo
+	  fi
+        fi
       fi
     fi
   fi
 fi
-fi
 
 # Copy echo and quote the copy suitably for passing to libtool from
 # the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
 fi
 
 
 
 
-tagnames=${tagnames+${tagnames},}CXX
-
-tagnames=${tagnames+${tagnames},}F77
-
 exec 7<&0 </dev/null 6>&1
 
 # Name of the host.
@@ -746,8 +763,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='gutenprint'
 PACKAGE_TARNAME='gutenprint'
-PACKAGE_VERSION='5.2.3'
-PACKAGE_STRING='gutenprint 5.2.3'
+PACKAGE_VERSION='5.2.4'
+PACKAGE_STRING='gutenprint 5.2.4'
 PACKAGE_BUGREPORT='gimp-print-devel@lists.sourceforge.net'
 
 ac_unique_file="src/main/print-vars.c"
@@ -788,253 +805,295 @@ ac_includes_default="\
 #endif"
 
 gt_needs=
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-GUTENPRINT_MAJOR_VERSION
-GUTENPRINT_MINOR_VERSION
-GUTENPRINT_MICRO_VERSION
-GUTENPRINT_CURRENT_INTERFACE
-GUTENPRINT_INTERFACE_AGE
-GUTENPRINT_BINARY_AGE
-GUTENPRINT_VERSION
-GUTENPRINTUI2_CURRENT_INTERFACE
-GUTENPRINTUI2_INTERFACE_AGE
-GUTENPRINTUI2_BINARY_AGE
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-am__isrc
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-ALL_LINGUAS
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
-SED
-GREP
-EGREP
-LN_S
-ECHO
-AR
-RANLIB
-DSYMUTIL
-NMEDIT
+ac_subst_vars='LTALLOCA
+LTLIBOBJS
+LIBOBJS
+BUILD_CUPS_PPDS
+WHICH_PPDS
+PLUG_IN_PATH
+MAINTAINER_CFLAGS
+LIBREADLINE_DEPS
+gutenprintui2_libdeps
+gutenprintui2_libs
+gutenprintui2_cflags
+gutenprint_libdeps
+gutenprint_libs
+gutenprint_cflags
+GUTENPRINTUI2_VERSION
+GUTENPRINTUI2_LIBDEPS
+GUTENPRINTUI2_LIBS
+GUTENPRINTUI2_CFLAGS
+GUTENPRINT_LIBDEPS
+GUTENPRINT_LIBS
+GUTENPRINT_CFLAGS
+gimp2_plug_indir
+RM
+IJS_LIBS
+IJS_CFLAGS
+GENPPD_LIBS
+CUPS_PPD_PS_LEVEL
+CUPS_LIBS
+CUPS_CFLAGS
+cups_conf_serverroot
+cups_conf_serverbin
+cups_conf_datadir
+cups_sbindir
+cups_bindir
+cups_exec_prefix
+cups_prefix
+RELEASE_DATE
+BUILD_GENPPD_STATIC_FALSE
+BUILD_GENPPD_STATIC_TRUE
+BUILD_MODULES_FALSE
+BUILD_MODULES_TRUE
+INSTALL_USER_GUIDE_FALSE
+INSTALL_USER_GUIDE_TRUE
+INSTALL_SAMPLES_FALSE
+INSTALL_SAMPLES_TRUE
+BUILD_GIMP2_AS_GUTENPRINT_FALSE
+BUILD_GIMP2_AS_GUTENPRINT_TRUE
+BUILD_GIMP2_FALSE
+BUILD_GIMP2_TRUE
+BUILD_LIBGUTENPRINTUI2_FALSE
+BUILD_LIBGUTENPRINTUI2_TRUE
+BUILD_TESTPATTERN_FALSE
+BUILD_TESTPATTERN_TRUE
+BUILD_TEST_FALSE
+BUILD_TEST_TRUE
+BUILD_ESCPUTIL_FALSE
+BUILD_ESCPUTIL_TRUE
+USE_LEVEL3_PS_FALSE
+USE_LEVEL3_PS_TRUE
+BUILD_SIMPLIFIED_CUPS_PPDS_FALSE
+BUILD_SIMPLIFIED_CUPS_PPDS_TRUE
+BUILD_GLOBALIZED_CUPS_PPDS_FALSE
+BUILD_GLOBALIZED_CUPS_PPDS_TRUE
+BUILD_TRANSLATED_CUPS_PPDS_FALSE
+BUILD_TRANSLATED_CUPS_PPDS_TRUE
+CUPS_PPDS_AT_TOP_LEVEL_FALSE
+CUPS_PPDS_AT_TOP_LEVEL_TRUE
+BUILD_CUPS_PPDS_FALSE
+BUILD_CUPS_PPDS_TRUE
+BUILD_CUPS_1_2_FALSE
+BUILD_CUPS_1_2_TRUE
+BUILD_CUPS_FALSE
+BUILD_CUPS_TRUE
+BUILD_GHOSTSCRIPT_FALSE
+BUILD_GHOSTSCRIPT_TRUE
+BUILD_FOOMATIC_3_FALSE
+BUILD_FOOMATIC_3_TRUE
+BUILD_FOOMATIC_FALSE
+BUILD_FOOMATIC_TRUE
+GNUCFLAGS
+FOOMATIC_KITLOAD
+DIALOG
+DOXYGEN
+DB2HTML
+DB2PS
+DVIPDF
+DB2PDF
+DVIPS
+TEXI2HTML
+CONVERT
+GLIB_MKENUMS
+PERL
+FIND
+TRUE
+TEST
+YFLAGS
+YACC
+LEXLIB
+LEX_OUTPUT_ROOT
+LEX
+GIMP2_LIBS
+GIMP2_CFLAGS
+GTK2_LIBS
+GTK2_CFLAGS
+PKG_CONFIG
+GIMPTOOL2_CHECK
+IJS_CONFIG
+FOOMATIC_PPDFILE
+FOOMATIC_CONFIGURE
+USE_NLS_FALSE
+USE_NLS_TRUE
+POSUB
+LTLIBINTL
+LIBINTL
+INTLLIBS
+LTLIBICONV
+LIBICONV
+INTL_MACOSX_LIBS
+MSGMERGE
+XGETTEXT_015
+XGETTEXT
+GMSGFMT_015
+MSGFMT_015
+GMSGFMT
+MSGFMT
+USE_NLS
+CUPS_CONFIG
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+LIBTOOL_DEPS
 CPP
-CXX
-CXXFLAGS
-ac_ct_CXX
-CXXDEPMODE
-am__fastdepCXX_TRUE
-am__fastdepCXX_FALSE
-CXXCPP
-F77
-FFLAGS
-ac_ct_F77
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+lt_ECHO
+RANLIB
+AR
+OBJDUMP
+LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+EGREP
+GREP
+SED
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
 LIBTOOL
-LIBTOOL_DEPS
-MAINTAINER_MODE_TRUE
-MAINTAINER_MODE_FALSE
-MAINT
-CUPS_CONFIG
-USE_NLS
-MSGFMT
-GMSGFMT
-MSGFMT_015
-GMSGFMT_015
-XGETTEXT
-XGETTEXT_015
-MSGMERGE
-INTL_MACOSX_LIBS
-LIBICONV
-LTLIBICONV
-INTLLIBS
-LIBINTL
-LTLIBINTL
-POSUB
-USE_NLS_TRUE
-USE_NLS_FALSE
-FOOMATIC_CONFIGURE
-FOOMATIC_PPDFILE
-IJS_CONFIG
-GIMPTOOL2_CHECK
-PKG_CONFIG
-GTK2_CFLAGS
-GTK2_LIBS
-GIMP2_CFLAGS
-GIMP2_LIBS
-LEX
-LEX_OUTPUT_ROOT
-LEXLIB
-YACC
-YFLAGS
-TEST
-TRUE
-FIND
-PERL
-GLIB_MKENUMS
-CONVERT
-TEXI2HTML
-DVIPS
-DB2PDF
-DVIPDF
-DB2PS
-DB2HTML
-DOXYGEN
-DIALOG
-FOOMATIC_KITLOAD
-GNUCFLAGS
-BUILD_FOOMATIC_TRUE
-BUILD_FOOMATIC_FALSE
-BUILD_FOOMATIC_3_TRUE
-BUILD_FOOMATIC_3_FALSE
-BUILD_GHOSTSCRIPT_TRUE
-BUILD_GHOSTSCRIPT_FALSE
-BUILD_CUPS_TRUE
-BUILD_CUPS_FALSE
-BUILD_CUPS_1_2_TRUE
-BUILD_CUPS_1_2_FALSE
-BUILD_CUPS_PPDS_TRUE
-BUILD_CUPS_PPDS_FALSE
-CUPS_PPDS_AT_TOP_LEVEL_TRUE
-CUPS_PPDS_AT_TOP_LEVEL_FALSE
-BUILD_TRANSLATED_CUPS_PPDS_TRUE
-BUILD_TRANSLATED_CUPS_PPDS_FALSE
-BUILD_GLOBALIZED_CUPS_PPDS_TRUE
-BUILD_GLOBALIZED_CUPS_PPDS_FALSE
-BUILD_SIMPLIFIED_CUPS_PPDS_TRUE
-BUILD_SIMPLIFIED_CUPS_PPDS_FALSE
-USE_LEVEL3_PS_TRUE
-USE_LEVEL3_PS_FALSE
-BUILD_ESCPUTIL_TRUE
-BUILD_ESCPUTIL_FALSE
-BUILD_TEST_TRUE
-BUILD_TEST_FALSE
-BUILD_TESTPATTERN_TRUE
-BUILD_TESTPATTERN_FALSE
-BUILD_LIBGUTENPRINTUI2_TRUE
-BUILD_LIBGUTENPRINTUI2_FALSE
-BUILD_GIMP2_TRUE
-BUILD_GIMP2_FALSE
-BUILD_GIMP2_AS_GUTENPRINT_TRUE
-BUILD_GIMP2_AS_GUTENPRINT_FALSE
-INSTALL_SAMPLES_TRUE
-INSTALL_SAMPLES_FALSE
-INSTALL_USER_GUIDE_TRUE
-INSTALL_USER_GUIDE_FALSE
-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
-gimp2_plug_indir
-GUTENPRINT_CFLAGS
-GUTENPRINT_LIBS
-GUTENPRINT_LIBDEPS
-GUTENPRINTUI2_CFLAGS
-GUTENPRINTUI2_LIBS
-GUTENPRINTUI2_LIBDEPS
-GUTENPRINTUI2_VERSION
-gutenprint_cflags
-gutenprint_libs
-gutenprint_libdeps
-gutenprintui2_cflags
-gutenprintui2_libs
-gutenprintui2_libdeps
-LIBREADLINE_DEPS
-MAINTAINER_CFLAGS
-PLUG_IN_PATH
-WHICH_PPDS
-BUILD_CUPS_PPDS
-LIBOBJS
-LTLIBOBJS
-LTALLOCA'
+ALL_LINGUAS
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+GUTENPRINTUI2_BINARY_AGE
+GUTENPRINTUI2_INTERFACE_AGE
+GUTENPRINTUI2_CURRENT_INTERFACE
+GUTENPRINT_VERSION
+GUTENPRINT_BINARY_AGE
+GUTENPRINT_INTERFACE_AGE
+GUTENPRINT_CURRENT_INTERFACE
+GUTENPRINT_MICRO_VERSION
+GUTENPRINT_MINOR_VERSION
+GUTENPRINT_MAJOR_VERSION
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_static
+enable_shared
+with_pic
+enable_fast_install
+enable_dependency_tracking
+with_gnu_ld
+enable_libtool_lock
+enable_maintainer_mode
+with_cups
+enable_nls
+enable_rpath
+with_libiconv_prefix
+with_libintl_prefix
+enable_nls_macosx
+enable_cups_ppds
+enable_cups_1_2_enhancements
+enable_translated_cups_ppds
+enable_globalized_cups_ppds
+enable_simplified_cups_ppds
+enable_cups_ppds_at_top_level
+enable_cups_level3_ppds
+enable_static_genppd
+with_foomatic
+with_foomatic3
+with_ghostscript
+with_modules
+enable_debug
+enable_profile
+with_readline
+with_gimp2
+with_gimp2_as_gutenprint
+enable_libgutenprintui2
+enable_samples
+enable_escputil
+enable_test
+enable_testpattern
+enable_user_install
+with_cups_nickname
+with_archflags
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -1044,12 +1103,6 @@ LDFLAGS
 LIBS
 CPPFLAGS
 CPP
-CXX
-CXXFLAGS
-CCC
-CXXCPP
-F77
-FFLAGS
 PKG_CONFIG
 GTK2_CFLAGS
 GTK2_LIBS
@@ -1062,6 +1115,8 @@ YFLAGS'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -1160,13 +1215,21 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -1179,13 +1242,21 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1376,22 +1447,38 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1411,7 +1498,7 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1420,16 +1507,16 @@ Try \`$0 --help' for more information." >&2
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1438,22 +1525,38 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1468,7 +1571,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1484,10 +1587,10 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1495,12 +1598,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1527,12 +1630,12 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1559,7 +1662,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.2.3 to adapt to many kinds of systems.
+\`configure' configures gutenprint 5.2.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1581,9 +1684,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1593,25 +1696,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/gutenprint]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/gutenprint]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1629,11 +1732,12 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gutenprint 5.2.3:";;
+     short | recursive ) echo "Configuration of gutenprint 5.2.4:";;
    esac
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
@@ -1680,10 +1784,9 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
-  --with-tags[=TAGS]      include additional configurations [automatic]
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-cups=PREFIX      whether to build CUPS driver (default PREFIX=/usr)
                           [(automatic)]
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
@@ -1716,11 +1819,6 @@ Some influential environment variables:
   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  CXXCPP      C++ preprocessor
-  F77         Fortran 77 compiler command
-  FFLAGS      Fortran 77 compiler flags
   PKG_CONFIG  path to pkg-config utility
   GTK2_CFLAGS C compiler flags for GTK2, overriding pkg-config
   GTK2_LIBS   linker flags for GTK2, overriding pkg-config
@@ -1744,15 +1842,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1788,7 +1888,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1797,11 +1897,11 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gutenprint configure 5.2.3
-generated by GNU Autoconf 2.61
+gutenprint configure 5.2.4
+generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
@@ -1828,8 +1928,8 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gutenprint $as_me 5.2.3, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+It was created by gutenprint $as_me 5.2.4, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
 
@@ -1865,7 +1965,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1900,7 +2000,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1952,11 +2052,12 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1986,9 +2087,9 @@ _ASBOX
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -2003,9 +2104,9 @@ _ASBOX
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -2021,8 +2122,8 @@ _ASBOX
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -2064,21 +2165,24 @@ _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -2088,16 +2192,16 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -2112,29 +2216,38 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -2144,10 +2257,12 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -2202,8 +2317,8 @@ for ac_dir in scripts "$srcdir"/scripts; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in scripts \"$srcdir\"/scripts" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in scripts \"$srcdir\"/scripts" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in scripts \"$srcdir\"/scripts" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in scripts \"$srcdir\"/scripts" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -2221,12 +2336,12 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 GUTENPRINT_MAJOR_VERSION=5
 GUTENPRINT_MINOR_VERSION=2
-GUTENPRINT_MICRO_VERSION=3
+GUTENPRINT_MICRO_VERSION=4
 GUTENPRINT_EXTRA_VERSION=
 GUTENPRINT_CURRENT_INTERFACE=2
-GUTENPRINT_INTERFACE_AGE=3
+GUTENPRINT_INTERFACE_AGE=5
 GUTENPRINT_BINARY_AGE=0
-GUTENPRINT_VERSION=5.2.3
+GUTENPRINT_VERSION=5.2.4
 GUTENPRINTUI2_CURRENT_INTERFACE=1
 GUTENPRINTUI2_INTERFACE_AGE=0
 GUTENPRINTUI2_BINARY_AGE=0
@@ -2273,11 +2388,12 @@ am__api_version='1.10'
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -2306,17 +2422,29 @@ case $as_dir/ in
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
+
 done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -2329,8 +2457,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -2340,8 +2468,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
 # Just in case
 sleep 1
 echo timestamp > conftest.file
@@ -2364,9 +2492,9 @@ if (
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&2;}
    { (exit 1); exit 1; }; }
    fi
@@ -2377,26 +2505,23 @@ then
    # Ok.
    :
 else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
 Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
+$as_echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
   program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
+# Double any \ or $.
 # By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -2407,15 +2532,15 @@ if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
   if test "${ac_cv_path_mkdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
@@ -2450,8 +2575,8 @@ fi
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-echo "${ECHO_T}$MKDIR_P" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
 
 mkdir_p="$MKDIR_P"
 case $mkdir_p in
@@ -2463,10 +2588,10 @@ for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -2479,7 +2604,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2490,22 +2615,23 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
@@ -2522,12 +2648,12 @@ esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -2546,8 +2672,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
@@ -2564,7 +2690,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gutenprint'
- VERSION='5.2.3'
+ VERSION='5.2.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2602,10 +2728,10 @@ if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -2618,7 +2744,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2629,11 +2755,11 @@ fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2642,10 +2768,10 @@ if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -2658,7 +2784,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2669,11 +2795,11 @@ fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -2681,12 +2807,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -2705,8 +2827,8 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AMTAR=${AMTAR-"${am_missing_run}tar"}
 
 
-{ echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5
-echo $ECHO_N "checking how to create a ustar tar archive... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5
+$as_echo_n "checking how to create a ustar tar archive... " >&6; }
 # Loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar plaintar pax cpio none'
 _am_tools=${am_cv_prog_tar_ustar-$_am_tools}
@@ -2779,13 +2901,13 @@ done
 rm -rf conftest.dir
 
 if test "${am_cv_prog_tar_ustar+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   am_cv_prog_tar_ustar=$_am_tool
 fi
 
-{ echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5
-echo "${ECHO_T}$am_cv_prog_tar_ustar" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5
+$as_echo "$am_cv_prog_tar_ustar" >&6; }
 
 
 
@@ -2806,9 +2928,11 @@ GUTENPRINTUI2_LIBDEPS="${GUTENPRINTUI2_LIBDEPS} \$(GUTENPRINT_LIBS)"
 ac_config_headers="$ac_config_headers config.h"
 
 
-ALL_LINGUAS="cs da de el en_GB es fr hu it ja nb nl pl pt sk sv zh_TW"
+ALL_LINGUAS="cs da de el en_GB es fr hu it ja nb nl pl pt ru sk sv zh_TW"
 
 
+enable_dlopen=yes
+
 
 
 # We need static libraries for CUPS genppd program for now, for bug 865265
@@ -2837,85 +2961,69 @@ else
 fi
 
 
+
+
+
+
+
+
+
 #AC_DISABLE_SHARED
-# Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval=$enable_shared; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_shared=yes
-fi
+case `pwd` in
+  *\ * | *\	*)
+    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.2.6'
+macro_revision='1.3012'
+
+
+
 
 
-# Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
-  enableval=$enable_fast_install; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_fast_install=yes
-fi
 
 
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
 if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 build=$ac_cv_build
@@ -2932,27 +3040,27 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
 if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 host=$ac_cv_host
@@ -2981,8 +3089,8 @@ am__doit:
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
 _am_result=none
@@ -3009,8 +3117,8 @@ if test "$am__include" = "#"; then
 fi
 
 
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
 rm -f confinc confmf
 
 # Check whether --enable-dependency-tracking was given.
@@ -3039,10 +3147,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3055,7 +3163,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3066,11 +3174,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3079,10 +3187,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -3095,7 +3203,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3106,11 +3214,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -3118,12 +3226,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -3136,10 +3240,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3152,7 +3256,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3163,11 +3267,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3176,10 +3280,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3197,7 +3301,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3220,11 +3324,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3235,10 +3339,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3251,7 +3355,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3262,11 +3366,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3279,10 +3383,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -3295,7 +3399,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3306,11 +3410,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -3322,12 +3426,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -3337,44 +3437,50 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -3393,27 +3499,22 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -3424,10 +3525,11 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -3438,7 +3540,7 @@ for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -3465,25 +3567,27 @@ else
   ac_file=''
 fi
 
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -3492,49 +3596,53 @@ if test "$cross_compiling" != yes; then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -3543,31 +3651,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3590,40 +3700,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3649,20 +3762,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -3672,15 +3786,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -3707,20 +3825,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -3745,20 +3864,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -3784,20 +3904,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3812,8 +3933,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -3829,10 +3950,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -3903,20 +4024,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3932,15 +4054,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -3952,10 +4074,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 depcc="$CC"   am_compiler_list=
 
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -4043,8 +4165,8 @@ else
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
  if
@@ -4058,101 +4180,121 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
-if test "${lt_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if test "${ac_cv_path_SED+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  # Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     $as_unset ac_script || ac_script=
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
+  for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
     done
   done
 done
 IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
+  if test -z "$ac_cv_path_SED"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
+else
+  ac_cv_path_SED=$SED
+fi
 
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
 
-SED=$lt_cv_path_SED
 
-{ echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6; }
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -4167,74 +4309,60 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -4249,34 +4377,113 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
 fi
 
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+   fi
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
 
+{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if test "${ac_cv_path_FGREP+set}" = set; then
+  $as_echo_n "(cached) " >&6
 else
-  ac_cv_path_EGREP=$EGREP
-fi
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_prog in fgrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
 
+      $ac_path_FGREP_found && break 3
+    done
+  done
+done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
+else
+  ac_cv_path_FGREP=$FGREP
+fi
 
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -4290,8 +4497,8 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -4304,9 +4511,9 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
     [\\/]* | ?:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
       # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD="$ac_prog"
       ;;
@@ -4320,14 +4527,14 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
 if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -4357,19 +4564,19 @@ fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
@@ -4381,40 +4588,22 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
-{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
 
-{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
 if test "${lt_cv_path_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
@@ -4457,28 +4646,493 @@ else
     done
     IFS="$lt_save_ifs"
   done
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
 fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6; }
-NM="$lt_cv_path_NM"
 
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+
+    test -n "$DUMPBIN" && break
+  done
+fi
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DUMPBIN=$ac_ct_DUMPBIN
+  fi
+fi
+
+
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if test "${lt_cv_nm_interface+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:4777: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:4780: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:4783: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
+
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
-{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+    i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+
+fi
+
+if test -n $lt_cv_sys_max_cmd_len ; then
+  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: none" >&5
+$as_echo "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+
+
+
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
+$as_echo "$xsi_shell" >&6; }
+
+
+{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
+$as_echo "$lt_shell_append" >&6; }
+
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+
+
+
+
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if test "${lt_cv_ld_reload_flag+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_reload_flag='-r'
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
 if test "${lt_cv_deplibs_check_method+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -4528,12 +5182,18 @@ mingw* | pw32*)
   fi
   ;;
 
+cegcc)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
 darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
@@ -4591,7 +5251,7 @@ linux* | k*bsd*-gnu)
   ;;
 
 netbsd*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+  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
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
@@ -4604,12 +5264,12 @@ newos6*)
   lt_cv_file_magic_test_file=/usr/lib/libnls.so
   ;;
 
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
   ;;
 
 openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
   else
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
@@ -4628,6 +5288,10 @@ solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
 sysv4 | sysv4.3*)
   case $host_vendor in
   motorola)
@@ -4655,14 +5319,14 @@ sysv4 | sysv4.3*)
   esac
   ;;
 
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+tpf*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 esac
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -4670,6 +5334,367 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
 
 
 
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_AR="${ac_tool_prefix}ar"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AR"; then
+  ac_ct_AR=$AR
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_AR="ar"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+else
+  AR="$ac_cv_prog_AR"
+fi
+
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+test -z "$STRIP" && STRIP=:
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+test -z "$RANLIB" && RANLIB=:
+
+
+
+
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
@@ -4680,6 +5705,256 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 compiler=$CC
 
 
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDEGRST]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {last_section=section; section=\$ 3};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+const struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { $as_echo "$as_me:$LINENO: result: failed" >&5
+$as_echo "failed" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 # Check whether --enable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then
   enableval=$enable_libtool_lock;
@@ -4696,104 +5971,104 @@ ia64-*-hpux*)
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.$ac_objext` in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
     esac
   fi
   rm -rf conftest*
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4714 "configure"' > conftest.$ac_ext
+  echo '#line 5989 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-   fi
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
   fi
   rm -rf conftest*
   ;;
 
 x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|sparc*-*linux*)
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.o` in
-    *32-bit*)
-      case $host in
-        x86_64-*kfreebsd*-gnu)
-          LD="${LD-ld} -m elf_i386_fbsd"
-          ;;
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      case $host in
-        x86_64-*kfreebsd*-gnu)
-          LD="${LD-ld} -m elf_x86_64_fbsd"
-          ;;
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  ppc64-*linux*|powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  ppc*-*linux*|powerpc*-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
     esac
   fi
   rm -rf conftest*
@@ -4803,10 +6078,10 @@ s390*-*linux*|sparc*-*linux*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
 if test "${lt_cv_cc_needs_belf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -4835,26 +6110,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   lt_cv_cc_needs_belf=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	lt_cv_cc_needs_belf=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
@@ -4864,8 +6143,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
@@ -4877,14 +6156,14 @@ sparc*-*solaris*)
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*) LD="${LD-ld} -m elf64_sparc" ;;
       *)
-        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
 	fi
 	;;
@@ -4894,27 +6173,638 @@ sparc*-*solaris*)
   fi
   rm -rf conftest*
   ;;
+esac
+
+need_locks="$enable_libtool_lock"
 
 
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
 esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
 
-need_locks="$enable_libtool_lock"
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_NMEDIT+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LIPO+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OTOOL+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OTOOL="otool"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_OTOOL64+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_OTOOL64="otool64"
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&5
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  lt_cv_ld_exported_symbols_list=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	lt_cv_ld_exported_symbols_list=no
+fi
 
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+	LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[012]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -4946,20 +6836,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -4983,13 +6874,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -4997,7 +6889,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -5022,8 +6914,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -5051,20 +6943,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -5088,13 +6981,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -5102,7 +6996,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -5118,11 +7012,13 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=c
@@ -5132,10 +7028,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5162,20 +7058,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -5267,37 +7164,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -5319,11 +7219,11 @@ fi
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5341,20 +7241,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -5362,12 +7263,15 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -5378,27 +7282,20 @@ done
 
 for ac_header in dlfcn.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+  $as_echo_n "(cached) " >&6
 else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
@@ -5407,1443 +7304,222 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
+  eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_header_compiler=no
+	eval "$as_ac_Header=no"
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ----------------------------------------------------- ##
-## Report this to gimp-print-devel@lists.sourceforge.net ##
-## ----------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
 
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
 
+# Set options
 
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
 
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
 
 
-  test -n "$ac_ct_CXX" && break
-done
+  enable_win32_dll=no
 
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
 
-  fi
+            # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_shared=yes
 fi
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_compiler_gnu=no
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cxx_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	CXXFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-int
-main ()
-{
 
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cxx_g=yes
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then
+  withval=$with_pic; pic_mode="$withval"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  pic_mode=default
+fi
 
 
-fi
+test -z "$pic_mode" && pic_mode=default
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-depcc="$CXX"  am_compiler_list=
 
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
 
-  am_cv_CXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
+  # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
       ;;
-    none) break ;;
     esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
 else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
+  enable_fast_install=yes
 fi
 
 
 
 
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
-if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
 
-rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
 
-rm -f conftest.err conftest.$ac_ext
 
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
 
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
 
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
 
-  # Broken: fails on valid input.
-continue
-fi
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
-rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
 
-rm -f conftest.err conftest.$ac_ext
 
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-fi
 
 
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$F77"; then
-  ac_cv_prog_F77="$F77" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
 
-fi
-fi
-F77=$ac_cv_prog_F77
-if test -n "$F77"; then
-  { echo "$as_me:$LINENO: result: $F77" >&5
-echo "${ECHO_T}$F77" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
 
 
-    test -n "$F77" && break
-  done
-fi
-if test -z "$F77"; then
-  ac_ct_F77=$F77
-  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_F77"; then
-  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_F77="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
 
-fi
-fi
-ac_ct_F77=$ac_cv_prog_ac_ct_F77
-if test -n "$ac_ct_F77"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-echo "${ECHO_T}$ac_ct_F77" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
 
 
-  test -n "$ac_ct_F77" && break
-done
 
-  if test "x$ac_ct_F77" = x; then
-    F77=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    F77=$ac_ct_F77
-  fi
-fi
 
 
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-rm -f a.out
 
-# If we don't use `.F' as extension, the preprocessor is not run on the
-# input file.  (Note that this only needs to work for GNU compilers.)
-ac_save_ext=$ac_ext
-ac_ext=F
-{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
-if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-      program main
-#ifndef __GNUC__
-       choke me
-#endif
 
-      end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_f77_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_compiler_gnu=no
-fi
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_f77_compiler_gnu=$ac_compiler_gnu
 
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
-ac_ext=$ac_save_ext
-ac_test_FFLAGS=${FFLAGS+set}
-ac_save_FFLAGS=$FFLAGS
-FFLAGS=
-{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_f77_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  FFLAGS=-g
-cat >conftest.$ac_ext <<_ACEOF
-      program main
 
-      end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_f77_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_f77_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_prog_f77_g=no
-fi
+test -z "$LN_S" && LN_S="ln -s"
 
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
-if test "$ac_test_FFLAGS" = set; then
-  FFLAGS=$ac_save_FFLAGS
-elif test $ac_cv_prog_f77_g = yes; then
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-g -O2"
-  else
-    FFLAGS="-g"
-  fi
-else
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-O2"
-  else
-    FFLAGS=
-  fi
-fi
 
-G77=`test $ac_compiler_gnu = yes && echo yes`
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-# find the maximum length of command line arguments
-{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-    i=0
-  teststring="ABCD"
 
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
 
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
 
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
 
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
 
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
 
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ 	]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
-	       = "XX$teststring") >/dev/null 2>&1 &&
-	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	      lt_cv_sys_max_cmd_len=$new_result &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on massive
-      # amounts of additional arguments before passing them to the linker.
-      # It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
 
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
 fi
 
-if test -n $lt_cv_sys_max_cmd_len ; then
-  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if test "${lt_cv_objdir+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
 else
-  { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
 fi
+rmdir .libs 2>/dev/null
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
 
 
 
 
 
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
 
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
 
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
 
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
 
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
 
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
 
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDEGRST]'
-  fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-linux* | k*bsd*-gnu)
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDGIRSTW]'
-    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris*)
-  symcode='[BDRT]'
-  ;;
-sco3.2v5*)
-  symcode='[DT]'
-  ;;
-sysv4.2uw2*)
-  symcode='[DT]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[ABDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
 
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
 
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
 
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
 
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
 
-  # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[] =
-{
-EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6; }
-else
-  { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
-fi
-
-{ echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
-if test "${lt_cv_objdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
 
 
 
@@ -6863,360 +7539,41 @@ esac
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
 
 # Same as above, but do not quote variable references.
-double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
 
 # Sed substitution to delay expansion of an escaped shell variable in a
 # double_quote_subst'ed string.
 delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
 
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
 # Sed substitution to avoid accidental globbing in evaled expressions
 no_glob_subst='s/\*/\\\*/g'
 
-# Constants:
-rm="rm -f"
-
 # Global variables:
-default_ofile=libtool
+ofile=libtool
 can_build_shared=yes
 
 # All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-else
-  AR="$ac_cv_prog_AR"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
 
+with_gnu_ld="$lt_cv_prog_gnu_ld"
 
 old_CC="$CC"
 old_CFLAGS="$CFLAGS"
 
 # Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
 test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$DLLTOOL" && DLLTOOL=dlltool
 test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
 test -z "$ac_objext" && ac_objext=o
 
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
 for cc_temp in $compiler""; do
   case $cc_temp in
     compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
@@ -7225,17 +7582,18 @@ for cc_temp in $compiler""; do
     *) break;;
   esac
 done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
 # Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -7259,7 +7617,7 @@ else
 	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
 	  else
-	    cat <<EOF 1>&2
+	    cat <<_LT_EOF 1>&2
 
 *** Warning: the command libtool uses to detect shared libraries,
 *** $file_magic_cmd, produces output that libtool cannot recognize.
@@ -7270,7 +7628,7 @@ else
 *** may want to report the problem to your system manager and/or to
 *** bug-libtool@gnu.org
 
-EOF
+_LT_EOF
 	  fi ;;
 	esac
       fi
@@ -7285,19 +7643,23 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
+
+
+
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { echo "$as_me:$LINENO: checking for file" >&5
-echo $ECHO_N "checking for file... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
@@ -7321,7 +7683,7 @@ else
 	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
 	  else
-	    cat <<EOF 1>&2
+	    cat <<_LT_EOF 1>&2
 
 *** Warning: the command libtool uses to detect shared libraries,
 *** $file_magic_cmd, produces output that libtool cannot recognize.
@@ -7332,7 +7694,7 @@ else
 *** may want to report the problem to your system manager and/or to
 *** bug-libtool@gnu.org
 
-EOF
+_LT_EOF
 	  fi ;;
 	esac
       fi
@@ -7347,13 +7709,14 @@ fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   else
     MAGIC_CMD=:
   fi
@@ -7363,340 +7726,8 @@ fi
   ;;
 esac
 
-
-  case $host_os in
-    rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-echo "${ECHO_T}$DSYMUTIL" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
-  fi
-else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { echo "$as_me:$LINENO: result: $NMEDIT" >&5
-echo "${ECHO_T}$NMEDIT" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    NMEDIT=$ac_ct_NMEDIT
-  fi
-else
-  NMEDIT="$ac_cv_prog_NMEDIT"
-fi
-
-
-    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-   # By default we will add the -single_module flag. You can override
-   # by either setting the environment variable LT_MULTI_MODULE
-   # non-empty at configure time, or by adding -multi_module to the
-   # link flags.
-   echo "int foo(void){return 1;}" > conftest.c
-   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-     -dynamiclib ${wl}-single_module conftest.c
-   if test -f libconftest.dylib; then
-     lt_cv_apple_cc_single_mod=yes
-     rm -rf libconftest.dylib*
-   fi
-   rm conftest.c
-      fi
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
-    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  lt_cv_ld_exported_symbols_list=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	lt_cv_ld_exported_symbols_list=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
-    case $host_os in
-    rhapsody* | darwin1.[0123])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*)
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-   10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-   10.[012]*)
-     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-   10.*)
-     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-    fi
-    if test "$DSYMUTIL" != ":"; then
-      _lt_dsymutil="~$DSYMUTIL \$lib || :"
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-
-
-enable_dlopen=yes
-enable_win32_dll=no
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval=$enable_libtool_lock;
-fi
-
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then
-  withval=$with_pic; pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-test -z "$pic_mode" && pic_mode=default
-
 # Use C for the default configuration in the libtool script
-tagname=
+
 lt_save_CC="$CC"
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -7719,6 +7750,11 @@ lt_simple_compile_test_code="int some_variable = 0;"
 lt_simple_link_test_code='int main(){return(0);}'
 
 
+
+
+
+
+
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
@@ -7728,35 +7764,42 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
 echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
+$RM conftest*
 
 ac_outfile=conftest.$ac_objext
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
+$RM -r conftest*
 
 
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
 
 lt_prog_compiler_no_builtin_flag=
 
 if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
-
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
-  ac_outfile=conftest.$ac_objext
+   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -7768,25 +7811,25 @@ 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:7771: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7814: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7775: \$? = $ac_status" >&5
+   echo "$as_me:7818: \$? = $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.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
-   $rm conftest*
+   $RM conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
@@ -7796,12 +7839,17 @@ fi
 
 fi
 
-lt_prog_compiler_wl=
+
+
+
+
+
+  lt_prog_compiler_wl=
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -7817,17 +7865,25 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       ;;
 
     amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
       ;;
 
     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | cygwin* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -7841,6 +7897,20 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_pic='-fno-common'
       ;;
 
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
     interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
@@ -7853,25 +7923,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       enable_shared=no
       ;;
 
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
     sysv4*MP*)
       if test -d /usr/nec; then
 	lt_prog_compiler_pic=-Kconform_pic
       fi
       ;;
 
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
-
     *)
       lt_prog_compiler_pic='-fPIC'
       ;;
@@ -7888,18 +7951,8 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
 	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         lt_prog_compiler_pic='-qnocommon'
-         lt_prog_compiler_wl='-Wl,'
-         ;;
-       esac
-       ;;
 
-    mingw* | cygwin* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic='-DDLL_EXPORT'
@@ -7927,18 +7980,27 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
     linux* | k*bsd*-gnu)
       case $cc_basename in
-      icc* | ecc*)
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-KPIC'
 	lt_prog_compiler_static='-static'
         ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='--shared'
+	lt_prog_compiler_static='--static'
+	;;
       pgcc* | pgf77* | pgf90* | pgf95*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
@@ -7951,8 +8013,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
+      xl*)
+	# IBM XL C 8.0/Fortran 10.1 on PPC
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-qpic'
+	lt_prog_compiler_static='-qstaticlink'
+	;;
       *)
-        case `$CC -V 2>&1 | sed 5q` in
+	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
@@ -7970,6 +8038,17 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
       esac
       ;;
 
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
     osf3* | osf4* | osf5*)
       lt_prog_compiler_wl='-Wl,'
       # All OSF/1 code is PIC.
@@ -8032,21 +8111,34 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
     esac
   fi
 
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+$as_echo "$lt_prog_compiler_pic" >&6; }
+
+
+
+
+
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works=no
-  ac_outfile=conftest.$ac_objext
+   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
    # Insert the option either (1) after the last *FLAGS variable, or
@@ -8058,25 +8150,25 @@ 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:8061: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8153: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8065: \$? = $ac_status" >&5
+   echo "$as_me:8157: \$? = $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.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
      fi
    fi
-   $rm conftest*
+   $RM conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
@@ -8089,24 +8181,20 @@ else
 fi
 
 fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
+
+
+
+
+
 
 #
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if test "${lt_cv_prog_compiler_static_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
@@ -8118,7 +8206,7 @@ else
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
@@ -8127,12 +8215,12 @@ else
        lt_cv_prog_compiler_static_works=yes
      fi
    fi
-   $rm -r conftest*
+   $RM -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works" = xyes; then
     :
@@ -8141,13 +8229,18 @@ else
 fi
 
 
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
-   $rm -r conftest 2>/dev/null
+   $RM -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
    mkdir out
@@ -8162,83 +8255,148 @@ 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:8165: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8258: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8169: \$? = $ac_status" >&5
+   echo "$as_me:8262: \$? = $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
      # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
    chmod u+w . 2>&5
-   $rm conftest*
+   $RM conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
    cd ..
-   rmdir conftest
-   $rm conftest*
+   $RM -r conftest
+   $RM conftest*
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -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:8313: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:8317: \$? = $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
+     # So say no if there are warnings
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
 
 
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
-  $rm conftest*
+  $RM conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag=
-  enable_shared_with_static_runtimes=no
+  always_export_symbols=no
   archive_cmds=
   archive_expsym_cmds=
-  old_archive_From_new_cmds=
-  old_archive_from_expsyms_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
   export_dynamic_flag_spec=
-  whole_archive_flag_spec=
-  thread_safe_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
   hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
-  hardcode_direct=no
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
   link_all_deplibs=unknown
-  hardcode_automatic=no
   module_cmds=
   module_expsym_cmds=
-  always_export_symbols=no
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
   # include_expsyms should be a list of space-separated symbols to be *always*
   # included in the symbol list
   include_expsyms=
@@ -8254,19 +8412,9 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # preloaded symbol tables.
   # Exclude shared library initialization/finalization symbols.
   extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
   case $host_os in
-  cygwin* | mingw* | pw32*)
+  cygwin* | mingw* | pw32* | cegcc*)
     # FIXME: the MSVC++ port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
     # Microsoft Visual C++.
@@ -8292,16 +8440,16 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
     # are reset later if shared libraries are not supported. Putting them
     # here allows them to be overridden if necessary.
     runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
     export_dynamic_flag_spec='${wl}--export-dynamic'
     # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec=
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
     fi
     supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
+    case `$LD -v 2>&1` in
       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -8315,7 +8463,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs=no
-	cat <<EOF 1>&2
+	cat <<_LT_EOF 1>&2
 
 *** Warning: the GNU linker, at least up to release 2.9.1, is reported
 *** to be unable to reliably create shared libraries on AIX.
@@ -8323,26 +8471,27 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 *** really care for shared libraries, you may want to modify your PATH
 *** so that a non-GNU linker is found, and then restart.
 
-EOF
+_LT_EOF
       fi
       ;;
 
     amigaos*)
-      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs=no
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
       ;;
 
     beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 	allow_undefined_flag=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined.  This deserves some investigation.  FIXME
@@ -8352,16 +8501,16 @@ EOF
       fi
       ;;
 
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	# If the export-symbols file already is a .def file (1st line
 	# is EXPORTS), use it as is; otherwise, prepend...
@@ -8392,48 +8541,78 @@ EOF
       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    gnu* | linux* | k*bsd*-gnu)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+    gnu* | linux* | tpf* | k*bsd*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
 	tmp_addflag=
+	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+        pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
 	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
 	  tmp_addflag=' -i_dynamic -nofor_main' ;;
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  whole_archive_flag_spec=
+	  tmp_sharedflag='--shared' ;;
+	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
 	  tmp_sharedflag='-G' ;;
-	*)
-	  tmp_sharedflag='-shared' ;;
 	esac
 	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
-	if test $supports_anon_versioning = yes; then
-	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
+        if test "x$supports_anon_versioning" = xyes; then
+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+	  hardcode_libdir_flag_spec=
+	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
       else
-	ld_shlibs=no
+        ld_shlibs=no
       fi
       ;;
 
     netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
@@ -8443,9 +8622,9 @@ EOF
       ;;
 
     solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
-	cat <<EOF 1>&2
+	cat <<_LT_EOF 1>&2
 
 *** Warning: The releases 2.8.* of the GNU linker cannot reliably
 *** create shared libraries on Solaris systems.  Therefore, libtool
@@ -8454,8 +8633,8 @@ EOF
 *** your PATH or compiler configuration so that the native linker is
 *** used, and then restart.
 
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
@@ -8479,10 +8658,14 @@ EOF
 _LT_EOF
 	;;
 	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 	  else
 	    ld_shlibs=no
 	  fi
@@ -8498,7 +8681,7 @@ _LT_EOF
       ;;
 
     *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
@@ -8540,10 +8723,10 @@ _LT_EOF
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	else
-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
@@ -8552,10 +8735,10 @@ _LT_EOF
 	# need to do runtime linking.
 	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
 	  done
 	  ;;
 	esac
@@ -8572,28 +8755,30 @@ _LT_EOF
 
       archive_cmds=''
       hardcode_direct=yes
+      hardcode_direct_absolute=yes
       hardcode_libdir_separator=':'
       link_all_deplibs=yes
+      file_list_spec='${wl}-f,'
 
       if test "$GCC" = yes; then
 	case $host_os in aix4.[012]|aix4.[012].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
 	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	  then
-  	  # We have reworked collect2
-  	  :
+	  # We have reworked collect2
+	  :
 	  else
-  	  # We have old collect2
-  	  hardcode_direct=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  hardcode_minus_L=yes
-  	  hardcode_libdir_flag_spec='-L$libdir'
-  	  hardcode_libdir_separator=
+	  # We have old collect2
+	  hardcode_direct=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L=yes
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_libdir_separator=
 	  fi
 	  ;;
 	esac
@@ -8604,8 +8789,8 @@ _LT_EOF
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
 	  if test "$aix_use_runtimelinking" = yes; then
@@ -8616,6 +8801,7 @@ _LT_EOF
 	fi
       fi
 
+      export_dynamic_flag_spec='${wl}-bexpall'
       # It seems that -bexpall does not export symbols beginning with
       # underscore (_), so it is better to generate a list of symbols to export.
       always_export_symbols=yes
@@ -8623,8 +8809,9 @@ _LT_EOF
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	allow_undefined_flag='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -8645,18 +8832,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -8671,25 +8861,27 @@ if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
-       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
 	if test "$host_cpu" = ia64; then
 	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
 	  allow_undefined_flag="-z nodefs"
 	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
 	else
-	 # Determine the default libpath from the value encoded in an empty executable.
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
 	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8711,18 +8903,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -8737,12 +8932,13 @@ if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -8762,18 +8958,25 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     amigaos*)
-      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs=no
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
       ;;
 
     bsdi[45]*)
       export_dynamic_flag_spec=-rdynamic
       ;;
 
-    cygwin* | mingw* | pw32*)
+    cygwin* | mingw* | pw32* | cegcc*)
       # When not using gcc, we currently assume that we are using
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -8785,9 +8988,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # Tell ltmain to make .dll files, not .so files.
       shrext_cmds=".dll"
       # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
       # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds='true'
+      old_archive_from_new_cmds='true'
       # FIXME: Should let the user specify the lib program.
       old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path='`cygpath -w "$srcfile"`'
@@ -8795,52 +8998,30 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      archive_cmds_need_lc=no
-      hardcode_direct=no
-      hardcode_automatic=yes
-      hardcode_shlibpath_var=unsupported
-      whole_archive_flag_spec=''
-      link_all_deplibs=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-        module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-        archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-        module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs=no
-          ;;
-      esac
-    fi
+
+
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  whole_archive_flag_spec=''
+  link_all_deplibs=yes
+  allow_undefined_flag="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=echo
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+
+  else
+  ld_shlibs=no
+  fi
+
       ;;
 
     dgux*)
@@ -8882,9 +9063,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
     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'
+	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'
       else
-	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
       hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
       hardcode_libdir_separator=:
@@ -8904,11 +9085,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
-
 	hardcode_direct=yes
+	hardcode_direct_absolute=yes
 	export_dynamic_flag_spec='${wl}-E'
-
 	# hardcode_minus_L: Not really in the search PATH,
 	# but as the default location of the library.
 	hardcode_minus_L=yes
@@ -8922,7 +9103,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
 	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -8947,12 +9128,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
 	case $host_cpu in
 	hppa*64*|ia64*)
-	  hardcode_libdir_flag_spec_ld='+b $libdir'
 	  hardcode_direct=no
 	  hardcode_shlibpath_var=no
 	  ;;
 	*)
 	  hardcode_direct=yes
+	  hardcode_direct_absolute=yes
 	  export_dynamic_flag_spec='${wl}-E'
 
 	  # hardcode_minus_L: Not really in the search PATH,
@@ -8965,18 +9146,62 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+        save_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+        cat >conftest.$ac_ext <<_ACEOF
+int foo(void) {}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+        LDFLAGS="$save_LDFLAGS"
       else
-	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
       fi
+      archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       hardcode_libdir_separator=:
+      inherit_rpath=yes
       link_all_deplibs=yes
       ;;
 
     netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
 	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
@@ -8994,11 +9219,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
+    *nto* | *qnx*)
+      ;;
+
     openbsd*)
       if test -f /usr/libexec/ld.so; then
 	hardcode_direct=yes
 	hardcode_shlibpath_var=no
-	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	hardcode_direct_absolute=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
@@ -9014,7 +9243,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
 	     ;;
 	  esac
-        fi
+	fi
       else
 	ld_shlibs=no
       fi
@@ -9024,18 +9253,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
-      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
       fi
+      archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       hardcode_libdir_separator=:
       ;;
@@ -9043,32 +9273,43 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
       fi
+      archive_cmds_need_lc='no'
       hardcode_libdir_separator=:
       ;;
 
     solaris*)
-      no_undefined_flag=' -z text'
+      no_undefined_flag=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
-	wlarc=''
-	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
       fi
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_shlibpath_var=no
@@ -9078,7 +9319,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	# The compiler driver will combine and reorder linker options,
 	# but understands `-z linker_flag'.  GCC discards it without `$wl',
 	# but is careful enough not to reorder.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
 	if test "$GCC" = yes; then
 	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
 	else
@@ -9167,18 +9408,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       allow_undefined_flag='${wl}-z,nodefs'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_flag_spec='${wl}-R,$libdir'
       hardcode_libdir_separator=':'
       link_all_deplibs=yes
       export_dynamic_flag_spec='${wl}-Bexport'
       runpath_var='LD_RUN_PATH'
 
       if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
@@ -9192,12 +9433,36 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ld_shlibs=no
       ;;
     esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	export_dynamic_flag_spec='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
   fi
 
-{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-echo "${ECHO_T}$ld_shlibs" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
 test "$ld_shlibs" = no && can_build_shared=no
 
+with_gnu_ld=$with_gnu_ld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #
 # Do we need to explicitly link libc?
 #
@@ -9215,15 +9480,15 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-      $rm conftest*
+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+      $RM conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -9238,10 +9503,10 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
         libname=conftest
         lt_save_allow_undefined_flag=$allow_undefined_flag
         allow_undefined_flag=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
         then
 	  archive_cmds_need_lc=no
@@ -9252,30 +9517,173 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&
       else
         cat conftest.err 1>&5
       fi
-      $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
+      $RM conftest*
+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+$as_echo "$archive_cmds_need_lc" >&6; }
       ;;
     esac
   fi
   ;;
 esac
 
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 
 if test "$GCC" = yes; then
   case $host_os in
@@ -9283,14 +9691,14 @@ if test "$GCC" = yes; then
     *) lt_awk_arg="/^libraries:/" ;;
   esac
   lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
   else
-    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
   fi
   # Ok, now we have the path, separated by spaces, we can step through it
   # and add multilib dir if necessary.
@@ -9304,7 +9712,7 @@ if test "$GCC" = yes; then
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
-  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
 BEGIN {RS=" "; FS="/|\n";} {
   lt_foo="";
   lt_count=0;
@@ -9324,10 +9732,23 @@ BEGIN {RS=" "; FS="/|\n";} {
   if (lt_foo != "") { lt_freq[lt_foo]++; }
   if (lt_freq[lt_foo] == 1) { print lt_foo; }
 }'`
-  sys_lib_search_path_spec=`echo $lt_search_path_spec`
+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -9364,7 +9785,7 @@ aix[4-9]*)
       aix4 | aix4.[01] | aix4.[01].*)
       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
 	:
       else
 	can_build_shared=no
@@ -9390,9 +9811,18 @@ aix[4-9]*)
   ;;
 
 amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
   ;;
 
 beos*)
@@ -9415,25 +9845,28 @@ bsdi[45]*)
   # libtool to hard-code these into programs
   ;;
 
-cygwin* | mingw* | pw32*)
+cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
   shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
   case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
       $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
-       $rm \$dlpath'
+       $RM \$dlpath'
     shlibpath_overrides_runpath=yes
 
     case $host_os in
@@ -9442,20 +9875,20 @@ cygwin* | mingw* | pw32*)
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
       ;;
-    mingw*)
+    mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
         # It is most probably a Windows format PATH printed by
         # mingw gcc, but we are running on Cygwin. Gcc prints its search
         # path with ; separators, and with drive letters. We can handle the
         # drive letters (cygwin fileutils understands them), so leave them,
         # especially as we might pass files found there to a mingw objdump,
         # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
       else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
       fi
       ;;
     pw32*)
@@ -9479,7 +9912,7 @@ darwin* | rhapsody*)
   version_type=darwin
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
@@ -9578,18 +10011,18 @@ hpux9* | hpux10* | hpux11*)
     fi
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
     shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
@@ -9666,6 +10099,64 @@ linux* | k*bsd*-gnu)
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+  # Some binutils ld are patched to set DT_RUNPATH
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+  shlibpath_overrides_runpath=yes
+fi
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
+
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
@@ -9673,7 +10164,7 @@ linux* | k*bsd*-gnu)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -9690,7 +10181,7 @@ netbsd*)
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
@@ -9711,14 +10202,16 @@ newsos6)
   shlibpath_overrides_runpath=yes
   ;;
 
-nto-qnx*)
-  version_type=linux
+*nto* | *qnx*)
+  version_type=qnx
   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=yes
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
   ;;
 
 openbsd*)
@@ -9727,13 +10220,13 @@ openbsd*)
   need_lib_prefix=no
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
   case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
   esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
     case $host_os in
       openbsd2.[89] | openbsd2.[89].*)
 	shlibpath_overrides_runpath=no
@@ -9805,7 +10298,6 @@ sysv4 | sysv4.3*)
     sni)
       shlibpath_overrides_runpath=no
       need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
       runpath_var=LD_RUN_PATH
       ;;
     siemens)
@@ -9836,13 +10328,12 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
   if test "$with_gnu_ld" = yes; then
     sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
   else
     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
     case $host_os in
       sco3.2v5*)
         sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
@@ -9852,6 +10343,17 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   sys_lib_dlsearch_path_spec='/usr/lib'
   ;;
 
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  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}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
 uts4*)
   version_type=linux
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -9863,43 +10365,121 @@ uts4*)
   dynamic_linker=no
   ;;
 esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
 if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
 fi
 
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
 
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
-   test -n "$runpath_var" || \
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
    test "X$hardcode_automatic" = "Xyes" ; then
 
-  # We can hardcode non-existant directories.
+  # We can hardcode non-existent directories.
   if test "$hardcode_direct" != no &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library
      # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
      test "$hardcode_minus_L" != no; then
     # Linking always hardcodes the temporary library directory.
     hardcode_action=relink
@@ -9912,10 +10492,11 @@ else
   # directories.
   hardcode_action=unsupported
 fi
-{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
 
-if test "$hardcode_action" = relink; then
+if test "$hardcode_action" = relink ||
+   test "$inherit_rpath" = yes; then
   # Fast installation is not supported
   enable_fast_install=no
 elif test "$shlibpath_overrides_runpath" = yes ||
@@ -9924,37 +10505,12 @@ elif test "$shlibpath_overrides_runpath" = yes ||
   enable_fast_install=needless
 fi
 
-striplib=
-old_striplib=
-{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         old_striplib="$STRIP -S"
-         { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-       else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-       ;;
-   *)
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-    ;;
-  esac
-fi
 
-if test "x$enable_dlopen" != xyes; then
+
+
+
+
+  if test "x$enable_dlopen" != xyes; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
   enable_dlopen_self_static=unknown
@@ -9969,22 +10525,22 @@ else
     lt_cv_dlopen_self=yes
     ;;
 
-  mingw* | pw32*)
+  mingw* | pw32* | cegcc*)
     lt_cv_dlopen="LoadLibrary"
     lt_cv_dlopen_libs=
-   ;;
+    ;;
 
   cygwin*)
     lt_cv_dlopen="dlopen"
     lt_cv_dlopen_libs=
-   ;;
+    ;;
 
   darwin*)
   # if libdl is installed we need to link against it
-    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -10016,33 +10572,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
 
@@ -10052,13 +10612,13 @@ else
 
 fi
 
-   ;;
+    ;;
 
   *)
-    { echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
+$as_echo_n "checking for shl_load... " >&6; }
 if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -10111,38 +10671,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_shl_load=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
-if test $ac_cv_func_shl_load = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+$as_echo "$ac_cv_func_shl_load" >&6; }
+if test "x$ac_cv_func_shl_load" = x""yes; then
   lt_cv_dlopen="shl_load"
 else
-  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
 if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -10174,39 +10738,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dld_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_shl_load=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
-if test $ac_cv_lib_dld_shl_load = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
-  { echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+$as_echo_n "checking for dlopen... " >&6; }
 if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -10259,38 +10827,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
-if test $ac_cv_func_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+$as_echo "$ac_cv_func_dlopen" >&6; }
+if test "x$ac_cv_func_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen"
 else
-  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -10322,39 +10894,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
 if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
@@ -10386,39 +10962,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_svld_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_svld_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
-if test $ac_cv_lib_svld_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
 if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
@@ -10450,33 +11030,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dld_dld_link=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dld_dld_link=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
-if test $ac_cv_lib_dld_dld_link = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
@@ -10515,18 +11099,18 @@ fi
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
 if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 10529 "configure"
+  cat > conftest.$ac_ext <<_LT_EOF
+#line 11113 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10567,10 +11151,6 @@ else
 #  endif
 #endif
 
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
 void fnord() { int i=42;}
 int main ()
 {
@@ -10586,13 +11166,13 @@ int main ()
   else
     puts (dlerror ());
 
-    exit (status);
+  return status;
 }
-EOF
+_LT_EOF
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -10610,23 +11190,23 @@ rm -fr conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
 if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self_static=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 10629 "configure"
+  cat > conftest.$ac_ext <<_LT_EOF
+#line 11209 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10667,10 +11247,6 @@ else
 #  endif
 #endif
 
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
 void fnord() { int i=42;}
 int main ()
 {
@@ -10686,13 +11262,13 @@ int main ()
   else
     puts (dlerror ());
 
-    exit (status);
+  return status;
 }
-EOF
+_LT_EOF
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -10710,8 +11286,8 @@ rm -fr conftest*
 
 
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS="$save_CPPFLAGS"
@@ -10732,9304 +11308,103 @@ echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
 fi
 
 
-# Report which library types will actually be built
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
-
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix[4-9]*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-    ;;
-esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
-
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler \
-    CC \
-    LD \
-    lt_prog_compiler_wl \
-    lt_prog_compiler_pic \
-    lt_prog_compiler_static \
-    lt_prog_compiler_no_builtin_flag \
-    export_dynamic_flag_spec \
-    thread_safe_flag_spec \
-    whole_archive_flag_spec \
-    enable_shared_with_static_runtimes \
-    old_archive_cmds \
-    old_archive_from_new_cmds \
-    predep_objects \
-    postdep_objects \
-    predeps \
-    postdeps \
-    compiler_lib_search_path \
-    compiler_lib_search_dirs \
-    archive_cmds \
-    archive_expsym_cmds \
-    postinstall_cmds \
-    postuninstall_cmds \
-    old_archive_from_expsyms_cmds \
-    allow_undefined_flag \
-    no_undefined_flag \
-    export_symbols_cmds \
-    hardcode_libdir_flag_spec \
-    hardcode_libdir_flag_spec_ld \
-    hardcode_libdir_separator \
-    hardcode_automatic \
-    module_cmds \
-    module_expsym_cmds \
-    lt_cv_prog_compiler_c_o \
-    fix_srcfile_path \
-    exclude_expsyms \
-    include_expsyms; do
-
-    case $var in
-    old_archive_cmds | \
-    old_archive_from_new_cmds | \
-    archive_cmds | \
-    archive_expsym_cmds | \
-    module_cmds | \
-    module_expsym_cmds | \
-    old_archive_from_expsyms_cmds | \
-    export_symbols_cmds | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  { echo "$as_me:$LINENO: creating $ofile" >&5
-echo "$as_me: creating $ofile" >&6;}
-
-  cat <<__EOF__ >> "$cfgfile"
-#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e 1s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps
-
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# ### END LIBTOOL CONFIG
-
-__EOF__
-
-
-  case $host_os in
-  aix3*)
-    cat <<\EOF >> "$cfgfile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-    ;;
-  esac
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-
-# Check whether --with-tags was given.
-if test "${with_tags+set}" = set; then
-  withval=$with_tags; tagnames="$withval"
-fi
-
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
-    else
-      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
-    fi
-  fi
-  if test -z "$LTCFLAGS"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-  fi
-
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
-    IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
-    "") ;;
-    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-echo "$as_me: error: invalid tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
-	;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      case $tagname in
-      CXX)
-	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-	    (test "X$CXX" != "Xg++"))) ; then
-	  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
-
-archive_cmds_need_lc_CXX=no
-allow_undefined_flag_CXX=
-always_export_symbols_CXX=no
-archive_expsym_cmds_CXX=
-export_dynamic_flag_spec_CXX=
-hardcode_direct_CXX=no
-hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
-hardcode_libdir_separator_CXX=
-hardcode_minus_L_CXX=no
-hardcode_shlibpath_var_CXX=unsupported
-hardcode_automatic_CXX=no
-module_cmds_CXX=
-module_expsym_cmds_CXX=
-link_all_deplibs_CXX=unknown
-old_archive_cmds_CXX=$old_archive_cmds
-no_undefined_flag_CXX=
-whole_archive_flag_spec_CXX=
-enable_shared_with_static_runtimes_CXX=no
-
-# Dependencies to place before and after the object being linked:
-predep_objects_CXX=
-postdep_objects_CXX=
-predeps_CXX=
-postdeps_CXX=
-compiler_lib_search_path_CXX=
-compiler_lib_search_dirs_CXX=
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-objext_CXX=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
-  $as_unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
-  lt_cv_path_LD=$lt_cv_path_LDCXX
-else
-  $as_unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-compiler_CXX=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
-else
-  lt_prog_compiler_no_builtin_flag_CXX=
-fi
-
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
-else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
-fi
-if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if test "$with_gnu_ld" = yes; then
-    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-    #     investigate it a little bit more. (MM)
-    wlarc='${wl}'
-
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-	grep 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec_CXX=
-    fi
-  else
-    with_gnu_ld=no
-    wlarc=
-
-    # A generic and very simple default shared library creation
-    # command for GNU C++ for the case where it uses the native
-    # linker, instead of GNU ld.  If possible, this setting should
-    # overridden to take advantage of the native linker features on
-    # the platform it is being used on.
-    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
-
-  # Commands to make compiler produce verbose output that lists
-  # what "hidden" libraries, object files and flags are used when
-  # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-else
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-ld_shlibs_CXX=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  aix[4-9]*)
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
-
-      # Test if we are trying to use run time linking or normal
-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-      # need to do runtime linking.
-      case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	for ld_flag in $LDFLAGS; do
-	  case $ld_flag in
-	  *-brtl*)
-	    aix_use_runtimelinking=yes
-	    break
-	    ;;
-	  esac
-	done
-	;;
-      esac
-
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-    archive_cmds_CXX=''
-    hardcode_direct_CXX=yes
-    hardcode_libdir_separator_CXX=':'
-    link_all_deplibs_CXX=yes
-
-    if test "$GXX" = yes; then
-      case $host_os in aix4.[012]|aix4.[012].*)
-      # We only want to do this on AIX 4.2 and lower, the check
-      # below for broken collect2 doesn't work under 4.3+
-	collect2name=`${CC} -print-prog-name=collect2`
-	if test -f "$collect2name" && \
-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	then
-	  # We have reworked collect2
-	  :
-	else
-	  # We have old collect2
-	  hardcode_direct_CXX=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L_CXX=yes
-	  hardcode_libdir_flag_spec_CXX='-L$libdir'
-	  hardcode_libdir_separator_CXX=
-	fi
-	;;
-      esac
-      shared_flag='-shared'
-      if test "$aix_use_runtimelinking" = yes; then
-	shared_flag="$shared_flag "'${wl}-G'
-      fi
-    else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	shared_flag='-G'
-      else
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='${wl}-G'
-	else
-	  shared_flag='${wl}-bM:SRE'
-	fi
-      fi
-    fi
-
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    always_export_symbols_CXX=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      allow_undefined_flag_CXX='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-      if test "$host_cpu" = ia64; then
-	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-	allow_undefined_flag_CXX="-z nodefs"
-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-      else
-	# Determine the default libpath from the value encoded in an empty executable.
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-	# Warning - without using the other run time loading flags,
-	# -berok will link without error, but may produce a broken library.
-	no_undefined_flag_CXX=' ${wl}-bernotok'
-	allow_undefined_flag_CXX=' ${wl}-berok'
-	# Exported symbols can be pulled into shared objects from archives
-	whole_archive_flag_spec_CXX='$convenience'
-	archive_cmds_need_lc_CXX=yes
-	# This is similar to how AIX traditionally builds its shared libraries.
-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-      fi
-    fi
-    ;;
-
-  beos*)
-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-      allow_undefined_flag_CXX=unsupported
-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-      # support --undefined.  This deserves some investigation.  FIXME
-      archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    else
-      ld_shlibs_CXX=no
-    fi
-    ;;
-
-  chorus*)
-    case $cc_basename in
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-    # as there is no search path for DLLs.
-    hardcode_libdir_flag_spec_CXX='-L$libdir'
-    allow_undefined_flag_CXX=unsupported
-    always_export_symbols_CXX=no
-    enable_shared_with_static_runtimes_CXX=yes
-
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      # If the export-symbols file already is a .def file (1st line
-      # is EXPORTS), use it as is; otherwise, prepend...
-      archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	cp $export_symbols $output_objdir/$soname.def;
-      else
-	echo EXPORTS > $output_objdir/$soname.def;
-	cat $export_symbols >> $output_objdir/$soname.def;
-      fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-    else
-      ld_shlibs_CXX=no
-    fi
-  ;;
-      darwin* | rhapsody*)
-      archive_cmds_need_lc_CXX=no
-      hardcode_direct_CXX=no
-      hardcode_automatic_CXX=yes
-      hardcode_shlibpath_var_CXX=unsupported
-      whole_archive_flag_spec_CXX=''
-      link_all_deplibs_CXX=yes
-      allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
-      if test "$GXX" = yes ; then
-      output_verbose_link_cmd='echo'
-      archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-      module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-      module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-        archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-        archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-      fi
-      else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs_CXX=no
-          ;;
-      esac
-      fi
-        ;;
-
-  dgux*)
-    case $cc_basename in
-      ec++*)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      ghcx*)
-	# Green Hills C++ Compiler
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  freebsd[12]*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    ld_shlibs_CXX=no
-    ;;
-  freebsd-elf*)
-    archive_cmds_need_lc_CXX=no
-    ;;
-  freebsd* | dragonfly*)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    ld_shlibs_CXX=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-    hardcode_libdir_separator_CXX=:
-    export_dynamic_flag_spec_CXX='${wl}-E'
-    hardcode_direct_CXX=yes
-    hardcode_minus_L_CXX=yes # Not in the search PATH,
-				# but as the default
-				# location of the library.
-
-    case $cc_basename in
-    CC*)
-      # FIXME: insert proper C++ library support
-      ld_shlibs_CXX=no
-      ;;
-    aCC*)
-      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      #
-      # There doesn't appear to be a way to prevent this compiler from
-      # explicitly linking system object files so we need to strip them
-      # from the output so that they don't get included in the library
-      # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-      ;;
-    *)
-      if test "$GXX" = yes; then
-        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-      fi
-      ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_CXX=:
-
-      case $host_cpu in
-      hppa*64*|ia64*) ;;
-      *)
-	export_dynamic_flag_spec_CXX='${wl}-E'
-        ;;
-      esac
-    fi
-    case $host_cpu in
-    hppa*64*|ia64*)
-      hardcode_direct_CXX=no
-      hardcode_shlibpath_var_CXX=no
-      ;;
-    *)
-      hardcode_direct_CXX=yes
-      hardcode_minus_L_CXX=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    esac
-
-    case $cc_basename in
-      CC*)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      aCC*)
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	esac
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test $with_gnu_ld = no; then
-	    case $host_cpu in
-	    hppa*64*)
-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    ia64*)
-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    *)
-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    esac
-	  fi
-	else
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  interix[3-9]*)
-    hardcode_direct_CXX=no
-    hardcode_shlibpath_var_CXX=no
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-    export_dynamic_flag_spec_CXX='${wl}-E'
-    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-    # Instead, shared libraries are loaded at an image base (0x10000000 by
-    # default) and relocated if they conflict, which is a slow very memory
-    # consuming and fragmenting process.  To avoid this, we pick a random,
-    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-    archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC*)
-	# SGI C++
-	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	# Archives containing C++ object files must be created using
-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test "$with_gnu_ld" = no; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	  else
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-	  fi
-	fi
-	link_all_deplibs_CXX=yes
-	;;
-    esac
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator_CXX=:
-    ;;
-  linux* | k*bsd*-gnu)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-	;;
-      icpc*)
-	# Intel C++
-	with_gnu_ld=yes
-	# version 8.0 and above of icpc choke on multiply defined symbols
-	# if we add $predep_objects and $postdep_objects, however 7.1 and
-	# earlier do not add the objects themselves.
-	case `$CC -V 2>&1` in
-	*"Version 7."*)
-  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	*)  # Version 8.0 or newer
-	  tmp_idyn=
-	  case $host_cpu in
-	    ia64*) tmp_idyn=' -i_dynamic';;
-	  esac
-  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	esac
-	archive_cmds_need_lc_CXX=no
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	;;
-      pgCC* | pgcpp*)
-        # Portland Group C++ compiler
-	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-  	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-        ;;
-      cxx*)
-	# Compaq C++
-	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	runpath_var=LD_RUN_PATH
-	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C++ 5.9
-	  no_undefined_flag_CXX=' -zdefs'
-	  archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	  hardcode_libdir_flag_spec_CXX='-R$libdir'
-	  whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-
-	  # Not sure whether something based on
-	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	  # would be better.
-	  output_verbose_link_cmd='echo'
-
-	  # Archives containing C++ object files must be created using
-	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	  # necessary to make sure instantiated templates are included
-	  # in the archive.
-	  old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-	  ;;
-	esac
-	;;
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx*)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  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=
-      hardcode_libdir_flag_spec_CXX='-R$libdir'
-      hardcode_direct_CXX=yes
-      hardcode_shlibpath_var_CXX=no
-    fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-    ;;
-  openbsd2*)
-    # C++ shared libraries are fairly broken
-    ld_shlibs_CXX=no
-    ;;
-  openbsd*)
-    if test -f /usr/libexec/ld.so; then
-      hardcode_direct_CXX=yes
-      hardcode_shlibpath_var_CXX=no
-      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	export_dynamic_flag_spec_CXX='${wl}-E'
-	whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      fi
-      output_verbose_link_cmd='echo'
-    else
-      ld_shlibs_CXX=no
-    fi
-    ;;
-  osf3*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      cxx*)
-	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	  hardcode_libdir_separator_CXX=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  osf4* | osf5*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Archives containing C++ object files must be created using
-	# the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      cxx*)
-	allow_undefined_flag_CXX=' -expect_unresolved \*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
-	  $rm $lib.exp'
-
-	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	  hardcode_libdir_separator_CXX=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.x
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      lcc*)
-	# Lucid
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.2, 5.x and Centerline C++
-        archive_cmds_need_lc_CXX=yes
-	no_undefined_flag_CXX=' -zdefs'
-	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	hardcode_libdir_flag_spec_CXX='-R$libdir'
-	hardcode_shlibpath_var_CXX=no
-	case $host_os in
-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
-	  *)
-	    # The compiler driver will combine and reorder linker options,
-	    # but understands `-z linker_flag'.
-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
-	    ;;
-	esac
-	link_all_deplibs_CXX=yes
-
-	output_verbose_link_cmd='echo'
-
-	# Archives containing C++ object files must be created using
-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-	;;
-      gcx*)
-	# Green Hills C++ Compiler
-	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	# The C++ compiler must be used to create the archive.
-	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	;;
-      *)
-	# GNU C++ compiler with Solaris linker
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  else
-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	    # platform.
-	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  fi
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-	  case $host_os in
-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
-	  *)
-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	    ;;
-	  esac
-	fi
-	;;
-    esac
-    ;;
-  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-    no_undefined_flag_CXX='${wl}-z,text'
-    archive_cmds_need_lc_CXX=no
-    hardcode_shlibpath_var_CXX=no
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  sysv5* | sco3.2v5* | sco5v6*)
-    # Note: We can NOT use -z defs as we might desire, because we do not
-    # link with -lc, and that would cause any symbols used from libc to
-    # always be unresolved, which means just about no library would
-    # ever link correctly.  If we're not using GNU ld we use -z text
-    # though, which does catch some bad symbols but isn't as heavy-handed
-    # as -z defs.
-    # For security reasons, it is highly recommended that you always
-    # use absolute paths for naming shared libraries, and exclude the
-    # DT_RUNPATH tag from executables and libraries.  But doing so
-    # requires that you compile everything twice, which is a pain.
-    # So that behaviour is only enabled if SCOABSPATH is set to a
-    # non-empty value in the environment.  Most likely only useful for
-    # creating official distributions of packages.
-    # This is a hack until libtool officially supports absolute path
-    # names for shared libraries.
-    no_undefined_flag_CXX='${wl}-z,text'
-    allow_undefined_flag_CXX='${wl}-z,nodefs'
-    archive_cmds_need_lc_CXX=no
-    hardcode_shlibpath_var_CXX=no
-    hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-    hardcode_libdir_separator_CXX=':'
-    link_all_deplibs_CXX=yes
-    export_dynamic_flag_spec_CXX='${wl}-Bexport'
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC*)
-	# NonStop-UX NCC 3.20
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-esac
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
-
-GCC_CXX="$GXX"
-LD_CXX="$LD"
-
-cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-
-  for p in `eval $output_verbose_link_cmd`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" \
-	  || test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$compiler_lib_search_path_CXX"; then
-	     compiler_lib_search_path_CXX="${prev}${p}"
-	   else
-	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$postdeps_CXX"; then
-	   postdeps_CXX="${prev}${p}"
-	 else
-	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$predep_objects_CXX"; then
-	   predep_objects_CXX="$p"
-	 else
-	   predep_objects_CXX="$predep_objects_CXX $p"
-	 fi
-       else
-	 if test -z "$postdep_objects_CXX"; then
-	   postdep_objects_CXX="$p"
-	 else
-	   postdep_objects_CXX="$postdep_objects_CXX $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling CXX test program"
-fi
-
-$rm -f confest.$objext
-
-compiler_lib_search_dirs_CXX=
-if test -n "$compiler_lib_search_path_CXX"; then
-  compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-
-# PORTME: override above test on systems where it is broken
-case $host_os in
-interix[3-9]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  predep_objects_CXX=
-  postdep_objects_CXX=
-  postdeps_CXX=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-    #
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-    if test "$solaris_use_stlport4" != yes; then
-      postdeps_CXX='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      postdeps_CXX='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-
-case " $postdeps_CXX " in
-*" -lc "*) archive_cmds_need_lc_CXX=no ;;
-esac
-
-lt_prog_compiler_wl_CXX=
-lt_prog_compiler_pic_CXX=
-lt_prog_compiler_static_CXX=
-
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    lt_prog_compiler_wl_CXX='-Wl,'
-    lt_prog_compiler_static_CXX='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_CXX='-Bstatic'
-      fi
-      ;;
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
-      ;;
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_CXX='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      lt_prog_compiler_pic_CXX=
-      ;;
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_CXX=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	;;
-      *)
-	lt_prog_compiler_pic_CXX='-fPIC'
-	;;
-      esac
-      ;;
-    *)
-      lt_prog_compiler_pic_CXX='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[4-9]*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  lt_prog_compiler_static_CXX='-Bstatic'
-	else
-	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-       darwin*)
-         # PIC is the default on this platform
-         # Common symbols not allowed in MH_DYLIB files
-         case $cc_basename in
-           xlc*)
-           lt_prog_compiler_pic_CXX='-qnocommon'
-           lt_prog_compiler_wl_CXX='-Wl,'
-           ;;
-         esac
-       ;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      lt_prog_compiler_pic_CXX='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      lt_prog_compiler_pic_CXX='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    ;;
-	  icpc* | ecpc*)
-	    # Intel C++
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler.
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-fpic'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      lt_prog_compiler_pic_CXX='-KPIC'
-	      lt_prog_compiler_static_CXX='-Bstatic'
-	      lt_prog_compiler_wl_CXX='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    lt_prog_compiler_pic_CXX='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    lt_prog_compiler_wl_CXX='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    lt_prog_compiler_pic_CXX='-pic'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	lt_prog_compiler_can_build_shared_CXX=no
-	;;
-    esac
-  fi
-
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_CXX"; then
-
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_pic_works_CXX=no
-  ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -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:13030: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:13034: \$? = $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.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works_CXX=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-    case $lt_prog_compiler_pic_CXX in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-     esac
-else
-    lt_prog_compiler_pic_CXX=
-     lt_prog_compiler_can_build_shared_CXX=no
-fi
-
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_CXX=
-    ;;
-  *)
-    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_static_works_CXX=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works_CXX=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works_CXX=yes
-     fi
-   fi
-   $rm -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-    :
-else
-    lt_prog_compiler_static_CXX=
-fi
-
-
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o_CXX=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -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:13134: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:13138: \$? = $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
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_CXX=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-
-  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix[4-9]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-    else
-      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    export_symbols_cmds_CXX="$ltdll_cmds"
-  ;;
-  cygwin* | mingw*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-  ;;
-  *)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-
-{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_CXX" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_CXX=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_CXX in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-      $rm conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_CXX
-	pic_flag=$lt_prog_compiler_pic_CXX
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-        allow_undefined_flag_CXX=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_CXX=no
-        else
-	  archive_cmds_need_lc_CXX=yes
-        fi
-        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux
-  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'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  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
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[123]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-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
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix[3-9]*)
-  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'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-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'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  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=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  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=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  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
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-uts4*)
-  version_type=linux
-  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
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-fi
-
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-fi
-
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-hardcode_action_CXX=
-if test -n "$hardcode_libdir_flag_spec_CXX" || \
-   test -n "$runpath_var_CXX" || \
-   test "X$hardcode_automatic_CXX" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_CXX" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
-     test "$hardcode_minus_L_CXX" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_CXX=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_CXX=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_CXX=unsupported
-fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6; }
-
-if test "$hardcode_action_CXX" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_CXX \
-    CC_CXX \
-    LD_CXX \
-    lt_prog_compiler_wl_CXX \
-    lt_prog_compiler_pic_CXX \
-    lt_prog_compiler_static_CXX \
-    lt_prog_compiler_no_builtin_flag_CXX \
-    export_dynamic_flag_spec_CXX \
-    thread_safe_flag_spec_CXX \
-    whole_archive_flag_spec_CXX \
-    enable_shared_with_static_runtimes_CXX \
-    old_archive_cmds_CXX \
-    old_archive_from_new_cmds_CXX \
-    predep_objects_CXX \
-    postdep_objects_CXX \
-    predeps_CXX \
-    postdeps_CXX \
-    compiler_lib_search_path_CXX \
-    compiler_lib_search_dirs_CXX \
-    archive_cmds_CXX \
-    archive_expsym_cmds_CXX \
-    postinstall_cmds_CXX \
-    postuninstall_cmds_CXX \
-    old_archive_from_expsyms_cmds_CXX \
-    allow_undefined_flag_CXX \
-    no_undefined_flag_CXX \
-    export_symbols_cmds_CXX \
-    hardcode_libdir_flag_spec_CXX \
-    hardcode_libdir_flag_spec_ld_CXX \
-    hardcode_libdir_separator_CXX \
-    hardcode_automatic_CXX \
-    module_cmds_CXX \
-    module_expsym_cmds_CXX \
-    lt_cv_prog_compiler_c_o_CXX \
-    fix_srcfile_path_CXX \
-    exclude_expsyms_CXX \
-    include_expsyms_CXX; do
-
-    case $var in
-    old_archive_cmds_CXX | \
-    old_archive_from_new_cmds_CXX | \
-    archive_cmds_CXX | \
-    archive_expsym_cmds_CXX | \
-    module_cmds_CXX | \
-    module_expsym_cmds_CXX | \
-    old_archive_from_expsyms_cmds_CXX | \
-    export_symbols_cmds_CXX | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler_CXX
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_CXX
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_CXX
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_CXX
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_CXX
-
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_CXX
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_CXX
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_CXX
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_CXX
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_CXX
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_CXX
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_CXX
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_CXX
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_CXX
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-
-
-archive_cmds_need_lc_F77=no
-allow_undefined_flag_F77=
-always_export_symbols_F77=no
-archive_expsym_cmds_F77=
-export_dynamic_flag_spec_F77=
-hardcode_direct_F77=no
-hardcode_libdir_flag_spec_F77=
-hardcode_libdir_flag_spec_ld_F77=
-hardcode_libdir_separator_F77=
-hardcode_minus_L_F77=no
-hardcode_automatic_F77=no
-module_cmds_F77=
-module_expsym_cmds_F77=
-link_all_deplibs_F77=unknown
-old_archive_cmds_F77=$old_archive_cmds
-no_undefined_flag_F77=
-whole_archive_flag_spec_F77=
-enable_shared_with_static_runtimes_F77=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-objext_F77=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="\
-      program t
-      end
-"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-compiler_F77=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6; }
-
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-aix[4-9]*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-esac
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
-
-{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-{ echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6; }
-
-GCC_F77="$G77"
-LD_F77="$LD"
-
-lt_prog_compiler_wl_F77=
-lt_prog_compiler_pic_F77=
-lt_prog_compiler_static_F77=
-
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl_F77='-Wl,'
-    lt_prog_compiler_static_F77='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_F77='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_F77='-fno-common'
-      ;;
-
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared_F77=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_F77=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_F77='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic_F77='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_F77='-Bstatic'
-      else
-	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         lt_prog_compiler_pic_F77='-qnocommon'
-         lt_prog_compiler_wl_F77='-Wl,'
-         ;;
-       esac
-       ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_F77='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    linux* | k*bsd*-gnu)
-      case $cc_basename in
-      icc* | ecc*)
-	lt_prog_compiler_wl_F77='-Wl,'
-	lt_prog_compiler_pic_F77='-KPIC'
-	lt_prog_compiler_static_F77='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl_F77='-Wl,'
-	lt_prog_compiler_pic_F77='-fpic'
-	lt_prog_compiler_static_F77='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_F77='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_F77='-non_shared'
-        ;;
-      *)
-        case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic_F77='-KPIC'
-	  lt_prog_compiler_static_F77='-Bstatic'
-	  lt_prog_compiler_wl_F77='-Wl,'
-	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic_F77='-KPIC'
-	  lt_prog_compiler_static_F77='-Bstatic'
-	  lt_prog_compiler_wl_F77=''
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	lt_prog_compiler_wl_F77='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl_F77='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl_F77='-Qoption ld '
-      lt_prog_compiler_pic_F77='-PIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic_F77='-Kconform_pic'
-	lt_prog_compiler_static_F77='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_can_build_shared_F77=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic_F77='-pic'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared_F77=no
-      ;;
-    esac
-  fi
-
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_F77"; then
-
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_pic_works_F77=no
-  ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_F77"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -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:14717: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:14721: \$? = $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.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works_F77=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
-    case $lt_prog_compiler_pic_F77 in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-     esac
-else
-    lt_prog_compiler_pic_F77=
-     lt_prog_compiler_can_build_shared_F77=no
-fi
-
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_F77=
-    ;;
-  *)
-    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_static_works_F77=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works_F77=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works_F77=yes
-     fi
-   fi
-   $rm -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
-    :
-else
-    lt_prog_compiler_static_F77=
-fi
-
-
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o_F77=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -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:14821: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:14825: \$? = $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
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_F77=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; }
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-
-  runpath_var=
-  allow_undefined_flag_F77=
-  enable_shared_with_static_runtimes_F77=no
-  archive_cmds_F77=
-  archive_expsym_cmds_F77=
-  old_archive_From_new_cmds_F77=
-  old_archive_from_expsyms_cmds_F77=
-  export_dynamic_flag_spec_F77=
-  whole_archive_flag_spec_F77=
-  thread_safe_flag_spec_F77=
-  hardcode_libdir_flag_spec_F77=
-  hardcode_libdir_flag_spec_ld_F77=
-  hardcode_libdir_separator_F77=
-  hardcode_direct_F77=no
-  hardcode_minus_L_F77=no
-  hardcode_shlibpath_var_F77=unsupported
-  link_all_deplibs_F77=unknown
-  hardcode_automatic_F77=no
-  module_cmds_F77=
-  module_expsym_cmds_F77=
-  always_export_symbols_F77=no
-  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms_F77=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs_F77=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_F77=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs_F77=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs_F77=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag_F77=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      allow_undefined_flag_F77=unsupported
-      always_export_symbols_F77=no
-      enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct_F77=no
-      hardcode_shlibpath_var_F77=no
-      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec_F77='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | k*bsd*-gnu)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
-	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	*)
-	  tmp_sharedflag='-shared' ;;
-	esac
-	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-	if test $supports_anon_versioning = yes; then
-	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs_F77=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
 
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs_F77=no
-	cat <<_LT_EOF 1>&2
 
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
 
-_LT_EOF
-	;;
-	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-	  else
-	    ld_shlibs_F77=no
-	  fi
-	;;
-      esac
-      ;;
 
-    sunos4*)
-      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
 
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-    esac
 
-    if test "$ld_shlibs_F77" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec_F77=
-      export_dynamic_flag_spec_F77=
-      whole_archive_flag_spec_F77=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag_F77=unsupported
-      always_export_symbols_F77=yes
-      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L_F77=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct_F77=unsupported
-      fi
-      ;;
 
-    aix[4-9]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
 
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	  ;;
-	esac
 
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
 
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 
-      archive_cmds_F77=''
-      hardcode_direct_F77=yes
-      hardcode_libdir_separator_F77=':'
-      link_all_deplibs_F77=yes
 
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  :
-	  else
-  	  # We have old collect2
-  	  hardcode_direct_F77=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  hardcode_minus_L_F77=yes
-  	  hardcode_libdir_flag_spec_F77='-L$libdir'
-  	  hardcode_libdir_separator_F77=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
 
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols_F77=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag_F77='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-      program main
 
-      end
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_f77_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag_F77="-z nodefs"
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_f77_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+striplib=
+old_striplib=
+{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag_F77=' ${wl}-bernotok'
-	  allow_undefined_flag_F77=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_F77='$convenience'
-	  archive_cmds_need_lc_F77=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs_F77=no
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec_F77=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec_F77=' '
-      allow_undefined_flag_F77=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds_F77='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_F77=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      archive_cmds_need_lc_F77=no
-      hardcode_direct_F77=no
-      hardcode_automatic_F77=yes
-      hardcode_shlibpath_var_F77=unsupported
-      whole_archive_flag_spec_F77=''
-      link_all_deplibs_F77=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-        module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-        archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-        module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs_F77=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs_F77=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | 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
-      ;;
-
-    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'
-      else
-	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      hardcode_direct_F77=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_F77=yes
-      export_dynamic_flag_spec_F77='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_F77=:
-
-	hardcode_direct_F77=yes
-	export_dynamic_flag_spec_F77='${wl}-E'
-
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L_F77=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_F77=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-	  hardcode_direct_F77=no
-	  hardcode_shlibpath_var_F77=no
-	  ;;
-	*)
-	  hardcode_direct_F77=yes
-	  export_dynamic_flag_spec_F77='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_F77=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      link_all_deplibs_F77=yes
-      ;;
-
-    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
-	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    newsos6)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct_F77=yes
-	hardcode_shlibpath_var_F77=no
-	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec_F77='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec_F77='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-        fi
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-      allow_undefined_flag_F77=unsupported
-      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag_F77=' -expect_unresolved \*'
-	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag_F77=' -expect_unresolved \*'
-	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-      fi
-      hardcode_libdir_separator_F77=:
-      ;;
-
-    solaris*)
-      no_undefined_flag_F77=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	wlarc=''
-	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_shlibpath_var_F77=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs_F77=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_F77=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds_F77='$CC -r -o $output$reload_objs'
-	  hardcode_direct_F77=no
-        ;;
-	motorola)
-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_F77=no
-      export_dynamic_flag_spec_F77='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var_F77=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs_F77=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag_F77='${wl}-z,text'
-      archive_cmds_need_lc_F77=no
-      hardcode_shlibpath_var_F77=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag_F77='${wl}-z,text'
-      allow_undefined_flag_F77='${wl}-z,nodefs'
-      archive_cmds_need_lc_F77=no
-      hardcode_shlibpath_var_F77=no
-      hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      hardcode_libdir_separator_F77=':'
-      link_all_deplibs_F77=yes
-      export_dynamic_flag_spec_F77='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    *)
-      ld_shlibs_F77=no
-      ;;
-    esac
-  fi
-
-{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-echo "${ECHO_T}$ld_shlibs_F77" >&6; }
-test "$ld_shlibs_F77" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_F77" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_F77=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_F77 in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-      $rm conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_F77
-	pic_flag=$lt_prog_compiler_pic_F77
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
-        allow_undefined_flag_F77=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_F77=no
-        else
-	  archive_cmds_need_lc_F77=yes
-        fi
-        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux
-  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'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  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
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[123]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
+# FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-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
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
     else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
     fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix[3-9]*)
-  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'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
     ;;
   *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
     ;;
   esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-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'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  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=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  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=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  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
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-uts4*)
-  version_type=linux
-  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
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-fi
-
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-fi
-
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-hardcode_action_F77=
-if test -n "$hardcode_libdir_flag_spec_F77" || \
-   test -n "$runpath_var_F77" || \
-   test "X$hardcode_automatic_F77" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_F77" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
-     test "$hardcode_minus_L_F77" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_F77=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_F77=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_F77=unsupported
-fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6; }
-
-if test "$hardcode_action_F77" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_F77 \
-    CC_F77 \
-    LD_F77 \
-    lt_prog_compiler_wl_F77 \
-    lt_prog_compiler_pic_F77 \
-    lt_prog_compiler_static_F77 \
-    lt_prog_compiler_no_builtin_flag_F77 \
-    export_dynamic_flag_spec_F77 \
-    thread_safe_flag_spec_F77 \
-    whole_archive_flag_spec_F77 \
-    enable_shared_with_static_runtimes_F77 \
-    old_archive_cmds_F77 \
-    old_archive_from_new_cmds_F77 \
-    predep_objects_F77 \
-    postdep_objects_F77 \
-    predeps_F77 \
-    postdeps_F77 \
-    compiler_lib_search_path_F77 \
-    compiler_lib_search_dirs_F77 \
-    archive_cmds_F77 \
-    archive_expsym_cmds_F77 \
-    postinstall_cmds_F77 \
-    postuninstall_cmds_F77 \
-    old_archive_from_expsyms_cmds_F77 \
-    allow_undefined_flag_F77 \
-    no_undefined_flag_F77 \
-    export_symbols_cmds_F77 \
-    hardcode_libdir_flag_spec_F77 \
-    hardcode_libdir_flag_spec_ld_F77 \
-    hardcode_libdir_separator_F77 \
-    hardcode_automatic_F77 \
-    module_cmds_F77 \
-    module_expsym_cmds_F77 \
-    lt_cv_prog_compiler_c_o_F77 \
-    fix_srcfile_path_F77 \
-    exclude_expsyms_F77 \
-    include_expsyms_F77; do
-
-    case $var in
-    old_archive_cmds_F77 | \
-    old_archive_from_new_cmds_F77 | \
-    archive_cmds_F77 | \
-    archive_expsym_cmds_F77 | \
-    module_cmds_F77 | \
-    module_expsym_cmds_F77 | \
-    old_archive_from_expsyms_cmds_F77 | \
-    export_symbols_cmds_F77 | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_F77
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler_F77
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_F77
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_F77
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_F77
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_F77
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_F77
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_F77
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_F77
-archive_expsym_cmds=$lt_archive_expsym_cmds_F77
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_F77
-module_expsym_cmds=$lt_module_expsym_cmds_F77
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_F77
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_F77
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_F77
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_F77
-
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_F77
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_F77
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_F77
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_F77
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_F77
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_F77
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_F77
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_F77
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_F77
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_F77
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_F77
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      GCJ)
-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-objext_GCJ=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-compiler_GCJ=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-archive_cmds_need_lc_GCJ=no
-
-old_archive_cmds_GCJ=$old_archive_cmds
-
-
-lt_prog_compiler_no_builtin_flag_GCJ=
-
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-
-
-{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-  ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -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:17028: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:17032: \$? = $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.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $rm conftest*
-
 fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-lt_prog_compiler_wl_GCJ=
-lt_prog_compiler_pic_GCJ=
-lt_prog_compiler_static_GCJ=
-
-{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl_GCJ='-Wl,'
-    lt_prog_compiler_static_GCJ='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_GCJ='-fno-common'
-      ;;
-
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared_GCJ=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_GCJ=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_GCJ='-fPIC'
-	;;
-      esac
-      ;;
 
-    *)
-      lt_prog_compiler_pic_GCJ='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      else
-	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         lt_prog_compiler_pic_GCJ='-qnocommon'
-         lt_prog_compiler_wl_GCJ='-Wl,'
-         ;;
-       esac
-       ;;
-
-    mingw* | cygwin* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
 
-      ;;
 
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_GCJ='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
-      ;;
 
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
 
-    newsos6)
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
 
-    linux* | k*bsd*-gnu)
-      case $cc_basename in
-      icc* | ecc*)
-	lt_prog_compiler_wl_GCJ='-Wl,'
-	lt_prog_compiler_pic_GCJ='-KPIC'
-	lt_prog_compiler_static_GCJ='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl_GCJ='-Wl,'
-	lt_prog_compiler_pic_GCJ='-fpic'
-	lt_prog_compiler_static_GCJ='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_GCJ='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_GCJ='-non_shared'
-        ;;
-      *)
-        case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic_GCJ='-KPIC'
-	  lt_prog_compiler_static_GCJ='-Bstatic'
-	  lt_prog_compiler_wl_GCJ='-Wl,'
-	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic_GCJ='-KPIC'
-	  lt_prog_compiler_static_GCJ='-Bstatic'
-	  lt_prog_compiler_wl_GCJ=''
-	  ;;
-	esac
-	;;
-      esac
-      ;;
 
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
 
-    rdos*)
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
 
-    solaris*)
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl_GCJ='-Wl,';;
-      esac
-      ;;
 
-    sunos4*)
-      lt_prog_compiler_wl_GCJ='-Qoption ld '
-      lt_prog_compiler_pic_GCJ='-PIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
 
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
 
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic_GCJ='-Kconform_pic'
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      fi
-      ;;
+  # Report which library types will actually be built
+  { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+  { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
 
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_can_build_shared_GCJ=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic_GCJ='-pic'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared_GCJ=no
-      ;;
-    esac
-  fi
-
-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_GCJ"; then
-
-{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_pic_works_GCJ=no
-  ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -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:17318: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:17322: \$? = $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.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works_GCJ=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
-    case $lt_prog_compiler_pic_GCJ in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-     esac
-else
-    lt_prog_compiler_pic_GCJ=
-     lt_prog_compiler_can_build_shared_GCJ=no
-fi
-
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_GCJ=
-    ;;
-  *)
-    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_static_works_GCJ=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works_GCJ=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works_GCJ=yes
-     fi
-   fi
-   $rm -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
-    :
-else
-    lt_prog_compiler_static_GCJ=
-fi
-
-
-{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o_GCJ=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -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:17422: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:17426: \$? = $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
-     # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o_GCJ=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-
-  runpath_var=
-  allow_undefined_flag_GCJ=
-  enable_shared_with_static_runtimes_GCJ=no
-  archive_cmds_GCJ=
-  archive_expsym_cmds_GCJ=
-  old_archive_From_new_cmds_GCJ=
-  old_archive_from_expsyms_cmds_GCJ=
-  export_dynamic_flag_spec_GCJ=
-  whole_archive_flag_spec_GCJ=
-  thread_safe_flag_spec_GCJ=
-  hardcode_libdir_flag_spec_GCJ=
-  hardcode_libdir_flag_spec_ld_GCJ=
-  hardcode_libdir_separator_GCJ=
-  hardcode_direct_GCJ=no
-  hardcode_minus_L_GCJ=no
-  hardcode_shlibpath_var_GCJ=unsupported
-  link_all_deplibs_GCJ=unknown
-  hardcode_automatic_GCJ=no
-  module_cmds_GCJ=
-  module_expsym_cmds_GCJ=
-  always_export_symbols_GCJ=no
-  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms_GCJ=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+  { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+  test "$can_build_shared" = "no" && enable_shared=no
 
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
   case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs_GCJ=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_GCJ=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs_GCJ=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs_GCJ=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag_GCJ=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      allow_undefined_flag_GCJ=unsupported
-      always_export_symbols_GCJ=no
-      enable_shared_with_static_runtimes_GCJ=yes
-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec_GCJ='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | k*bsd*-gnu)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
-	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	*)
-	  tmp_sharedflag='-shared' ;;
-	esac
-	archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-	if test $supports_anon_versioning = yes; then
-	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs_GCJ=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs_GCJ=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-	  else
-	    ld_shlibs_GCJ=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs_GCJ" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec_GCJ=
-      export_dynamic_flag_spec_GCJ=
-      whole_archive_flag_spec_GCJ=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag_GCJ=unsupported
-      always_export_symbols_GCJ=yes
-      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L_GCJ=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct_GCJ=unsupported
-      fi
-      ;;
-
-    aix[4-9]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds_GCJ=''
-      hardcode_direct_GCJ=yes
-      hardcode_libdir_separator_GCJ=':'
-      link_all_deplibs_GCJ=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  :
-	  else
-  	  # We have old collect2
-  	  hardcode_direct_GCJ=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  hardcode_minus_L_GCJ=yes
-  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
-  	  hardcode_libdir_separator_GCJ=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols_GCJ=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag_GCJ='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag_GCJ="-z nodefs"
-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag_GCJ=' ${wl}-bernotok'
-	  allow_undefined_flag_GCJ=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_GCJ='$convenience'
-	  archive_cmds_need_lc_GCJ=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs_GCJ=no
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec_GCJ=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec_GCJ=' '
-      allow_undefined_flag_GCJ=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds_GCJ='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_GCJ=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      archive_cmds_need_lc_GCJ=no
-      hardcode_direct_GCJ=no
-      hardcode_automatic_GCJ=yes
-      hardcode_shlibpath_var_GCJ=unsupported
-      whole_archive_flag_spec_GCJ=''
-      link_all_deplibs_GCJ=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-        module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-        archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-        module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
-         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs_GCJ=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs_GCJ=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    # 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
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$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'
-      else
-	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      hardcode_direct_GCJ=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_GCJ=yes
-      export_dynamic_flag_spec_GCJ='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_GCJ=:
-
-	hardcode_direct_GCJ=yes
-	export_dynamic_flag_spec_GCJ='${wl}-E'
-
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L_GCJ=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_GCJ=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-	  hardcode_direct_GCJ=no
-	  hardcode_shlibpath_var_GCJ=no
-	  ;;
-	*)
-	  hardcode_direct_GCJ=yes
-	  export_dynamic_flag_spec_GCJ='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_GCJ=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      link_all_deplibs_GCJ=yes
-      ;;
-
-    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
-	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    newsos6)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct_GCJ=yes
-	hardcode_shlibpath_var_GCJ=no
-	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec_GCJ='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec_GCJ='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-        fi
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-      allow_undefined_flag_GCJ=unsupported
-      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-      fi
-      hardcode_libdir_separator_GCJ=:
-      ;;
-
-    solaris*)
-      no_undefined_flag_GCJ=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	wlarc=''
-	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs_GCJ=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_GCJ=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
-	  hardcode_direct_GCJ=no
-        ;;
-	motorola)
-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_GCJ=no
-      export_dynamic_flag_spec_GCJ='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var_GCJ=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs_GCJ=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag_GCJ='${wl}-z,text'
-      archive_cmds_need_lc_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag_GCJ='${wl}-z,text'
-      allow_undefined_flag_GCJ='${wl}-z,nodefs'
-      archive_cmds_need_lc_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      hardcode_libdir_separator_GCJ=':'
-      link_all_deplibs_GCJ=yes
-      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    *)
-      ld_shlibs_GCJ=no
-      ;;
-    esac
-  fi
-
-{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
-test "$ld_shlibs_GCJ" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_GCJ" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_GCJ=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_GCJ in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-      $rm conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_GCJ
-	pic_flag=$lt_prog_compiler_pic_GCJ
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
-        allow_undefined_flag_GCJ=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_GCJ=no
-        else
-	  archive_cmds_need_lc_GCJ=yes
-        fi
-        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
     fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux
-  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'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
     ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
 
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  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
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[123]*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-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
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+  aix[4-9]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
     fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-interix[3-9]*)
-  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'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux* | k*bsd*-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'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  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=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  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=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux
-  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
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-uts4*)
-  version_type=linux
-  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
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-fi
-
-sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-fi
-
-sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-hardcode_action_GCJ=
-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-   test -n "$runpath_var_GCJ" || \
-   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_GCJ" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
-     test "$hardcode_minus_L_GCJ" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_GCJ=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_GCJ=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_GCJ=unsupported
-fi
-{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
-
-if test "$hardcode_action_GCJ" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_GCJ \
-    CC_GCJ \
-    LD_GCJ \
-    lt_prog_compiler_wl_GCJ \
-    lt_prog_compiler_pic_GCJ \
-    lt_prog_compiler_static_GCJ \
-    lt_prog_compiler_no_builtin_flag_GCJ \
-    export_dynamic_flag_spec_GCJ \
-    thread_safe_flag_spec_GCJ \
-    whole_archive_flag_spec_GCJ \
-    enable_shared_with_static_runtimes_GCJ \
-    old_archive_cmds_GCJ \
-    old_archive_from_new_cmds_GCJ \
-    predep_objects_GCJ \
-    postdep_objects_GCJ \
-    predeps_GCJ \
-    postdeps_GCJ \
-    compiler_lib_search_path_GCJ \
-    compiler_lib_search_dirs_GCJ \
-    archive_cmds_GCJ \
-    archive_expsym_cmds_GCJ \
-    postinstall_cmds_GCJ \
-    postuninstall_cmds_GCJ \
-    old_archive_from_expsyms_cmds_GCJ \
-    allow_undefined_flag_GCJ \
-    no_undefined_flag_GCJ \
-    export_symbols_cmds_GCJ \
-    hardcode_libdir_flag_spec_GCJ \
-    hardcode_libdir_flag_spec_ld_GCJ \
-    hardcode_libdir_separator_GCJ \
-    hardcode_automatic_GCJ \
-    module_cmds_GCJ \
-    module_expsym_cmds_GCJ \
-    lt_cv_prog_compiler_c_o_GCJ \
-    fix_srcfile_path_GCJ \
-    exclude_expsyms_GCJ \
-    include_expsyms_GCJ; do
-
-    case $var in
-    old_archive_cmds_GCJ | \
-    old_archive_from_new_cmds_GCJ | \
-    archive_cmds_GCJ | \
-    archive_expsym_cmds_GCJ | \
-    module_cmds_GCJ | \
-    module_expsym_cmds_GCJ | \
-    old_archive_from_expsyms_cmds_GCJ | \
-    export_symbols_cmds_GCJ | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
     ;;
   esac
+  { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
-cfgfile="$ofile"
+  { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
 
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
 
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_GCJ
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler_GCJ
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_GCJ
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_GCJ
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_GCJ
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_GCJ
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_GCJ
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_GCJ
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_GCJ
-archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_GCJ
-module_expsym_cmds=$lt_module_expsym_cmds_GCJ
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_GCJ
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_GCJ
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_GCJ
-
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_GCJ
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_GCJ
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_GCJ
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_GCJ
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_GCJ
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_GCJ
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_GCJ
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_GCJ
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_GCJ
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_GCJ
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_GCJ
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      RC)
-
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-objext_RC=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-compiler_RC=$CC
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-lt_cv_prog_compiler_c_o_RC=yes
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_RC \
-    CC_RC \
-    LD_RC \
-    lt_prog_compiler_wl_RC \
-    lt_prog_compiler_pic_RC \
-    lt_prog_compiler_static_RC \
-    lt_prog_compiler_no_builtin_flag_RC \
-    export_dynamic_flag_spec_RC \
-    thread_safe_flag_spec_RC \
-    whole_archive_flag_spec_RC \
-    enable_shared_with_static_runtimes_RC \
-    old_archive_cmds_RC \
-    old_archive_from_new_cmds_RC \
-    predep_objects_RC \
-    postdep_objects_RC \
-    predeps_RC \
-    postdeps_RC \
-    compiler_lib_search_path_RC \
-    compiler_lib_search_dirs_RC \
-    archive_cmds_RC \
-    archive_expsym_cmds_RC \
-    postinstall_cmds_RC \
-    postuninstall_cmds_RC \
-    old_archive_from_expsyms_cmds_RC \
-    allow_undefined_flag_RC \
-    no_undefined_flag_RC \
-    export_symbols_cmds_RC \
-    hardcode_libdir_flag_spec_RC \
-    hardcode_libdir_flag_spec_ld_RC \
-    hardcode_libdir_separator_RC \
-    hardcode_automatic_RC \
-    module_cmds_RC \
-    module_expsym_cmds_RC \
-    lt_cv_prog_compiler_c_o_RC \
-    fix_srcfile_path_RC \
-    exclude_expsyms_RC \
-    include_expsyms_RC; do
-
-    case $var in
-    old_archive_cmds_RC | \
-    old_archive_from_new_cmds_RC | \
-    archive_cmds_RC | \
-    archive_expsym_cmds_RC | \
-    module_cmds_RC | \
-    module_expsym_cmds_RC | \
-    old_archive_from_expsyms_cmds_RC | \
-    export_symbols_cmds_RC | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_RC
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler_RC
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_RC
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_RC
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_RC
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_RC
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_RC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_RC
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_RC
-archive_expsym_cmds=$lt_archive_expsym_cmds_RC
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_RC
-module_expsym_cmds=$lt_module_expsym_cmds_RC
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_RC
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_RC
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_RC
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_RC
-
-# The directories searched by this compiler when creating a shared
-# library
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_RC
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_RC
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_RC
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_RC
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_RC
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_RC
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_RC
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_RC
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_RC
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_RC
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_RC
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
 fi
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20038,46 +11413,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 CC="$lt_save_CC"
 
-	;;
-
-      *)
-	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
-	;;
-      esac
-
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Prevent multiple expansion
-
-
 
 
 
@@ -20090,23 +11425,25 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
+        ac_config_commands="$ac_config_commands libtool"
 
 
 
 
+# Only expand once:
 
 
 
 if test "$ac_cv_prog_gnu_ld" = "yes" ; then
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_GNU_LD
+#define HAVE_GNU_LD /**/
 _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
@@ -20114,8 +11451,8 @@ else
   USE_MAINTAINER_MODE=no
 fi
 
-  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
    if test $USE_MAINTAINER_MODE = yes; then
   MAINTAINER_MODE_TRUE=
   MAINTAINER_MODE_FALSE='#'
@@ -20132,7 +11469,7 @@ if test x${USE_MAINTAINER_MODE} = xyes ; then
   BUILD_TEST="yes"
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_MAINTAINER_MODE
+#define HAVE_MAINTAINER_MODE /**/
 _ACEOF
 
 fi
@@ -20155,10 +11492,10 @@ _ACEOF
 
 # Extract the first word of "cups-config", so it can be a program name with args.
 set dummy cups-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $CUPS_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -20173,7 +11510,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -20185,11 +11522,11 @@ esac
 fi
 CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG
 if test -n "$CUPS_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5
-echo "${ECHO_T}$CUPS_CONFIG" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5
+$as_echo "$CUPS_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -20199,27 +11536,27 @@ else
   BUILD_CUPS="yes"
 fi
 # create custom command-line --with option
-{ echo "$as_me:$LINENO: checking whether to whether to build CUPS driver" >&5
-echo $ECHO_N "checking whether to whether to build CUPS driver... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to whether to build CUPS driver" >&5
+$as_echo_n "checking whether to whether to build CUPS driver... " >&6; }
 
 # Check whether --with-cups was given.
 if test "${with_cups+set}" = set; then
   withval=$with_cups; case "${withval}" in
 
-    yes) BUILD_CUPS="yes" ; { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; } ; cups_prefix="/usr" ;;
-    no) BUILD_CUPS="no" ; { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; } ; cups_prefix="/usr" ;;
+    yes) BUILD_CUPS="yes" ; { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; } ; cups_prefix="/usr" ;;
+    no) BUILD_CUPS="no" ; { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; } ; cups_prefix="/usr" ;;
     *) if test -d ${withval} ; then
          BUILD_CUPS="yes"
-	 { echo "$as_me:$LINENO: result: yes (using specified prefix)" >&5
-echo "${ECHO_T}yes (using specified prefix)" >&6; }
+	 { $as_echo "$as_me:$LINENO: result: yes (using specified prefix)" >&5
+$as_echo "yes (using specified prefix)" >&6; }
          cups_prefix="${withval}"
        else
-         { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-         { { echo "$as_me:$LINENO: error: ${withval}: no such directory for --with-cups" >&5
-echo "$as_me: error: ${withval}: no such directory for --with-cups" >&2;}
+         { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+         { { $as_echo "$as_me:$LINENO: error: ${withval}: no such directory for --with-cups" >&5
+$as_echo "$as_me: error: ${withval}: no such directory for --with-cups" >&2;}
    { (exit 1); exit 1; }; }
        fi ;;
 
@@ -20228,8 +11565,8 @@ else
   if test -z "${BUILD_CUPS}" ; then
                BUILD_CUPS="(automatic)"
              fi
-             { echo "$as_me:$LINENO: result: ${BUILD_CUPS}" >&5
-echo "${ECHO_T}${BUILD_CUPS}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${BUILD_CUPS}" >&5
+$as_echo "${BUILD_CUPS}" >&6; } ;
      cups_prefix="${prefix}"
 
 fi
@@ -20241,8 +11578,8 @@ fi
 
 
 
-  { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
     # Check whether --enable-nls was given.
 if test "${enable_nls+set}" = set; then
   enableval=$enable_nls; USE_NLS=$enableval
@@ -20250,8 +11587,8 @@ else
   USE_NLS=yes
 fi
 
-  { echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
 
 
 
@@ -20288,10 +11625,10 @@ rm -f conf$$.file
 
 # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_MSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case "$MSGFMT" in
   [\\/]* | ?:[\\/]*)
@@ -20320,19 +11657,19 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
   [\\/]* | ?:[\\/]*)
@@ -20347,7 +11684,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -20360,11 +11697,11 @@ esac
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 if test -n "$GMSGFMT"; then
-  { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -20411,10 +11748,10 @@ rm -f conf$$.file
 
 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case "$XGETTEXT" in
   [\\/]* | ?:[\\/]*)
@@ -20443,11 +11780,11 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
     rm -f messages.po
@@ -20489,10 +11826,10 @@ rm -f conf$$.file
 
 # Extract the first word of "msgmerge", so it can be a program name with args.
 set dummy msgmerge; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_MSGMERGE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case "$MSGMERGE" in
   [\\/]* | ?:[\\/]*)
@@ -20520,11 +11857,11 @@ esac
 fi
 MSGMERGE="$ac_cv_path_MSGMERGE"
 if test "$MSGMERGE" != ":"; then
-  { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-echo "${ECHO_T}$MSGMERGE" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+$as_echo "$MSGMERGE" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -20574,8 +11911,8 @@ fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { echo "$as_me:$LINENO: checking for ld used by GCC" >&5
-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for ld used by GCC" >&5
+$as_echo_n "checking for ld used by GCC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -20604,14 +11941,14 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
 if test "${acl_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
@@ -20638,19 +11975,19 @@ fi
 
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${acl_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 case `$LD -v 2>&1 </dev/null` in
@@ -20660,17 +11997,17 @@ case `$LD -v 2>&1 </dev/null` in
   acl_cv_prog_gnu_ld=no ;;
 esac
 fi
-{ echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
+$as_echo "$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
 
-                                                { echo "$as_me:$LINENO: checking for shared library run path origin" >&5
-echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; }
+                                                { $as_echo "$as_me:$LINENO: checking for shared library run path origin" >&5
+$as_echo_n "checking for shared library run path origin... " >&6; }
 if test "${acl_cv_rpath+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
@@ -20680,8 +12017,8 @@ else
     acl_cv_rpath=done
 
 fi
-{ echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
-echo "${ECHO_T}$acl_cv_rpath" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
+$as_echo "$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
   libext="$acl_cv_libext"
   shlibext="$acl_cv_shlibext"
@@ -21137,10 +12474,10 @@ fi
 
 
 
-    { echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
-echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
+$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
 if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   gt_save_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
@@ -21165,32 +12502,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   gt_cv_func_CFPreferencesCopyAppValue=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	gt_cv_func_CFPreferencesCopyAppValue=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
      LIBS="$gt_save_LIBS"
 fi
-{ echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -21198,10 +12539,10 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
   fi
-    { echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
-echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
+$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
 if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   gt_save_LIBS="$LIBS"
      LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
@@ -21226,32 +12567,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   gt_cv_func_CFLocaleCopyCurrent=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	gt_cv_func_CFLocaleCopyCurrent=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
      LIBS="$gt_save_LIBS"
 fi
-{ echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
-echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
+$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
   if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -21301,10 +12646,10 @@ typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
           gt_expression_test_code=
         fi
 
-        { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
-echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
+$as_echo_n "checking for GNU gettext in libc... " >&6; }
 if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -21331,32 +12676,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$gt_func_gnugettext_libc=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$gt_func_gnugettext_libc=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$gt_func_gnugettext_libc'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$gt_func_gnugettext_libc'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
 
@@ -21389,10 +12739,10 @@ echo "${ECHO_T}$ac_res" >&6; }
   done
 
 
-  { echo "$as_me:$LINENO: checking for iconv" >&5
-echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
 if test "${am_cv_func_iconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     am_cv_func_iconv="no, consider installing GNU libiconv"
@@ -21421,26 +12771,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   am_cv_func_iconv=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
@@ -21470,35 +12824,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
       LIBS="$am_save_LIBS"
     fi
 
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-echo "${ECHO_T}$am_cv_func_iconv" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
+$as_echo "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -21507,10 +12865,10 @@ _ACEOF
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { echo "$as_me:$LINENO: checking how to link with libiconv" >&5
-echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: $LIBICONV" >&5
-echo "${ECHO_T}$LIBICONV" >&6; }
+    { $as_echo "$as_me:$LINENO: checking how to link with libiconv" >&5
+$as_echo_n "checking how to link with libiconv... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: $LIBICONV" >&5
+$as_echo "$LIBICONV" >&6; }
   else
             CPPFLAGS="$am_save_CPPFLAGS"
     LIBICONV=
@@ -21913,10 +13271,10 @@ fi
     done
   fi
 
-          { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
-echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
+$as_echo_n "checking for GNU gettext in libintl... " >&6; }
 if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   gt_save_CPPFLAGS="$CPPFLAGS"
             CPPFLAGS="$CPPFLAGS $INCINTL"
@@ -21951,26 +13309,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$gt_func_gnugettext_libintl=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$gt_func_gnugettext_libintl=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
                         if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
@@ -22004,38 +13366,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
                 eval "$gt_func_gnugettext_libintl=yes"
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
             LIBS="$gt_save_LIBS"
 fi
-ac_res=`eval echo '${'$gt_func_gnugettext_libintl'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$gt_func_gnugettext_libintl'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
         fi
 
                                         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
@@ -22071,13 +13438,13 @@ _ACEOF
     fi
   fi
 
-  { echo "$as_me:$LINENO: checking whether to use NLS" >&5
-echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6; }
-  { echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether to use NLS" >&5
+$as_echo_n "checking whether to use NLS... " >&6; }
+  { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
   if test "$USE_NLS" = "yes"; then
-    { echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
-echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
+$as_echo_n "checking where the gettext function comes from... " >&6; }
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
         gt_source="external libintl"
@@ -22087,18 +13454,18 @@ echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6; }
     else
       gt_source="included intl directory"
     fi
-    { echo "$as_me:$LINENO: result: $gt_source" >&5
-echo "${ECHO_T}$gt_source" >&6; }
+    { $as_echo "$as_me:$LINENO: result: $gt_source" >&5
+$as_echo "$gt_source" >&6; }
   fi
 
   if test "$USE_NLS" = "yes"; then
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-        { echo "$as_me:$LINENO: checking how to link with libintl" >&5
-echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6; }
-        { echo "$as_me:$LINENO: result: $LIBINTL" >&5
-echo "${ECHO_T}$LIBINTL" >&6; }
+        { $as_echo "$as_me:$LINENO: checking how to link with libintl" >&5
+$as_echo_n "checking how to link with libintl... " >&6; }
+        { $as_echo "$as_me:$LINENO: result: $LIBINTL" >&5
+$as_echo "$LIBINTL" >&6; }
 
   for element in $INCINTL; do
     haveit=
@@ -22159,20 +13526,20 @@ fi
 
 
 # create custom command-line --enable option
-{ echo "$as_me:$LINENO: checking whether to build CUPS PPD files" >&5
-echo $ECHO_N "checking whether to build CUPS PPD files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build CUPS PPD files" >&5
+$as_echo_n "checking whether to build CUPS PPD files... " >&6; }
 # Check whether --enable-nls-macosx was given.
 if test "${enable_nls_macosx+set}" = set; then
   enableval=$enable_nls_macosx; case "${enableval}" in
 
-                yes) USE_NLS_OSX="yes" ; { echo "$as_me:$LINENO: result: ${USE_NLS_OSX}" >&5
-echo "${ECHO_T}${USE_NLS_OSX}" >&6; } ;;
-                no) USE_NLS_OSX="no" ; { echo "$as_me:$LINENO: result: ${USE_NLS_OSX}" >&5
-echo "${ECHO_T}${USE_NLS_OSX}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-nls-macosx" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-nls-macosx" >&2;}
+                yes) USE_NLS_OSX="yes" ; { $as_echo "$as_me:$LINENO: result: ${USE_NLS_OSX}" >&5
+$as_echo "${USE_NLS_OSX}" >&6; } ;;
+                no) USE_NLS_OSX="no" ; { $as_echo "$as_me:$LINENO: result: ${USE_NLS_OSX}" >&5
+$as_echo "${USE_NLS_OSX}" >&6; } ;;
+                *) { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-nls-macosx" >&5
+$as_echo "$as_me: error: bad value ${enableval} for --enable-nls-macosx" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -22180,8 +13547,8 @@ else
   if test -z "${USE_NLS_OSX}" ; then
                USE_NLS_OSX="(automatic)"
              fi
-             { echo "$as_me:$LINENO: result: ${USE_NLS_OSX}" >&5
-echo "${ECHO_T}${USE_NLS_OSX}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${USE_NLS_OSX}" >&5
+$as_echo "${USE_NLS_OSX}" >&6; } ;
 fi
 
 if test -z "${USE_NLS_OSX}" ; then
@@ -22208,20 +13575,20 @@ if test -n "${CUPS_CONFIG}" -a "${BUILD_CUPS}" = "yes" ; then
 fi
 
 # create custom command-line --enable option
-{ echo "$as_me:$LINENO: checking whether to build CUPS PPD files" >&5
-echo $ECHO_N "checking whether to build CUPS PPD files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build CUPS PPD files" >&5
+$as_echo_n "checking whether to build CUPS PPD files... " >&6; }
 # Check whether --enable-cups-ppds was given.
 if test "${enable_cups_ppds+set}" = set; then
   enableval=$enable_cups_ppds; case "${enableval}" in
 
-                yes) BUILD_CUPS_PPDS="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_CUPS_PPDS}" >&5
-echo "${ECHO_T}${BUILD_CUPS_PPDS}" >&6; } ;;
-                no) BUILD_CUPS_PPDS="no" ; { echo "$as_me:$LINENO: result: ${BUILD_CUPS_PPDS}" >&5
-echo "${ECHO_T}${BUILD_CUPS_PPDS}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-cups-ppds" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-cups-ppds" >&2;}
+                yes) BUILD_CUPS_PPDS="yes" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_CUPS_PPDS}" >&5
+$as_echo "${BUILD_CUPS_PPDS}" >&6; } ;;
+                no) BUILD_CUPS_PPDS="no" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_CUPS_PPDS}" >&5
+$as_echo "${BUILD_CUPS_PPDS}" >&6; } ;;
+                *) { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-cups-ppds" >&5
+$as_echo "$as_me: error: bad value ${enableval} for --enable-cups-ppds" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -22229,8 +13596,8 @@ else
   if test -z "${BUILD_CUPS_PPDS}" ; then
                BUILD_CUPS_PPDS="(automatic)"
              fi
-             { echo "$as_me:$LINENO: result: ${BUILD_CUPS_PPDS}" >&5
-echo "${ECHO_T}${BUILD_CUPS_PPDS}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${BUILD_CUPS_PPDS}" >&5
+$as_echo "${BUILD_CUPS_PPDS}" >&6; } ;
 fi
 
 if test -z "${BUILD_CUPS_PPDS}" ; then
@@ -22239,20 +13606,20 @@ fi
 
 
 # create custom command-line --enable option
-{ echo "$as_me:$LINENO: checking whether to build CUPS 1.2 enhancements" >&5
-echo $ECHO_N "checking whether to build CUPS 1.2 enhancements... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build CUPS 1.2 enhancements" >&5
+$as_echo_n "checking whether to build CUPS 1.2 enhancements... " >&6; }
 # Check whether --enable-cups-1_2-enhancements was given.
 if test "${enable_cups_1_2_enhancements+set}" = set; then
   enableval=$enable_cups_1_2_enhancements; case "${enableval}" in
 
-                yes) BUILD_CUPS_1_2="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_CUPS_1_2}" >&5
-echo "${ECHO_T}${BUILD_CUPS_1_2}" >&6; } ;;
-                no) BUILD_CUPS_1_2="no" ; { echo "$as_me:$LINENO: result: ${BUILD_CUPS_1_2}" >&5
-echo "${ECHO_T}${BUILD_CUPS_1_2}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-cups-1_2-enhancements" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-cups-1_2-enhancements" >&2;}
+                yes) BUILD_CUPS_1_2="yes" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_CUPS_1_2}" >&5
+$as_echo "${BUILD_CUPS_1_2}" >&6; } ;;
+                no) BUILD_CUPS_1_2="no" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_CUPS_1_2}" >&5
+$as_echo "${BUILD_CUPS_1_2}" >&6; } ;;
+                *) { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-cups-1_2-enhancements" >&5
+$as_echo "$as_me: error: bad value ${enableval} for --enable-cups-1_2-enhancements" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -22260,8 +13627,8 @@ else
   if test -z "${BUILD_CUPS_1_2}" ; then
                BUILD_CUPS_1_2="(automatic)"
              fi
-             { echo "$as_me:$LINENO: result: ${BUILD_CUPS_1_2}" >&5
-echo "${ECHO_T}${BUILD_CUPS_1_2}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${BUILD_CUPS_1_2}" >&5
+$as_echo "${BUILD_CUPS_1_2}" >&6; } ;
 fi
 
 if test -z "${BUILD_CUPS_1_2}" ; then
@@ -22274,20 +13641,20 @@ if test "$USE_NLS" != no -a "$BUILD_CUPS_PPDS" = yes ; then
 fi
 
 # create custom command-line --enable option
-{ echo "$as_me:$LINENO: checking whether to build translated CUPS PPD files" >&5
-echo $ECHO_N "checking whether to build translated CUPS PPD files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build translated CUPS PPD files" >&5
+$as_echo_n "checking whether to build translated CUPS PPD files... " >&6; }
 # Check whether --enable-translated-cups-ppds was given.
 if test "${enable_translated_cups_ppds+set}" = set; then
   enableval=$enable_translated_cups_ppds; case "${enableval}" in
 
-                yes) BUILD_TRANSLATED_CUPS_PPDS="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_TRANSLATED_CUPS_PPDS}" >&5
-echo "${ECHO_T}${BUILD_TRANSLATED_CUPS_PPDS}" >&6; } ;;
-                no) BUILD_TRANSLATED_CUPS_PPDS="no" ; { echo "$as_me:$LINENO: result: ${BUILD_TRANSLATED_CUPS_PPDS}" >&5
-echo "${ECHO_T}${BUILD_TRANSLATED_CUPS_PPDS}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-translated-cups-ppds" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-translated-cups-ppds" >&2;}
+                yes) BUILD_TRANSLATED_CUPS_PPDS="yes" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_TRANSLATED_CUPS_PPDS}" >&5
+$as_echo "${BUILD_TRANSLATED_CUPS_PPDS}" >&6; } ;;
+                no) BUILD_TRANSLATED_CUPS_PPDS="no" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_TRANSLATED_CUPS_PPDS}" >&5
+$as_echo "${BUILD_TRANSLATED_CUPS_PPDS}" >&6; } ;;
+                *) { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-translated-cups-ppds" >&5
+$as_echo "$as_me: error: bad value ${enableval} for --enable-translated-cups-ppds" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -22295,8 +13662,8 @@ else
   if test -z "${BUILD_TRANSLATED_CUPS_PPDS}" ; then
                BUILD_TRANSLATED_CUPS_PPDS="(automatic)"
              fi
-             { echo "$as_me:$LINENO: result: ${BUILD_TRANSLATED_CUPS_PPDS}" >&5
-echo "${ECHO_T}${BUILD_TRANSLATED_CUPS_PPDS}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${BUILD_TRANSLATED_CUPS_PPDS}" >&5
+$as_echo "${BUILD_TRANSLATED_CUPS_PPDS}" >&6; } ;
 fi
 
 if test -z "${BUILD_TRANSLATED_CUPS_PPDS}" ; then
@@ -22311,20 +13678,20 @@ else
 fi
 
 # create custom command-line --enable option
-{ echo "$as_me:$LINENO: checking whether to build globalized CUPS PPD files" >&5
-echo $ECHO_N "checking whether to build globalized CUPS PPD files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build globalized CUPS PPD files" >&5
+$as_echo_n "checking whether to build globalized CUPS PPD files... " >&6; }
 # Check whether --enable-globalized-cups-ppds was given.
 if test "${enable_globalized_cups_ppds+set}" = set; then
   enableval=$enable_globalized_cups_ppds; case "${enableval}" in
 
-                yes) BUILD_GLOBALIZED_CUPS_PPDS="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_GLOBALIZED_CUPS_PPDS}" >&5
-echo "${ECHO_T}${BUILD_GLOBALIZED_CUPS_PPDS}" >&6; } ;;
-                no) BUILD_GLOBALIZED_CUPS_PPDS="no" ; { echo "$as_me:$LINENO: result: ${BUILD_GLOBALIZED_CUPS_PPDS}" >&5
-echo "${ECHO_T}${BUILD_GLOBALIZED_CUPS_PPDS}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-globalized-cups-ppds" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-globalized-cups-ppds" >&2;}
+                yes) BUILD_GLOBALIZED_CUPS_PPDS="yes" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_GLOBALIZED_CUPS_PPDS}" >&5
+$as_echo "${BUILD_GLOBALIZED_CUPS_PPDS}" >&6; } ;;
+                no) BUILD_GLOBALIZED_CUPS_PPDS="no" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_GLOBALIZED_CUPS_PPDS}" >&5
+$as_echo "${BUILD_GLOBALIZED_CUPS_PPDS}" >&6; } ;;
+                *) { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-globalized-cups-ppds" >&5
+$as_echo "$as_me: error: bad value ${enableval} for --enable-globalized-cups-ppds" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -22332,8 +13699,8 @@ else
   if test -z "${BUILD_GLOBALIZED_CUPS_PPDS}" ; then
                BUILD_GLOBALIZED_CUPS_PPDS="(automatic)"
              fi
-             { echo "$as_me:$LINENO: result: ${BUILD_GLOBALIZED_CUPS_PPDS}" >&5
-echo "${ECHO_T}${BUILD_GLOBALIZED_CUPS_PPDS}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${BUILD_GLOBALIZED_CUPS_PPDS}" >&5
+$as_echo "${BUILD_GLOBALIZED_CUPS_PPDS}" >&6; } ;
 fi
 
 if test -z "${BUILD_GLOBALIZED_CUPS_PPDS}" ; then
@@ -22342,20 +13709,20 @@ 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; }
+{ $as_echo "$as_me:$LINENO: checking whether to build simplified CUPS PPD files" >&5
+$as_echo_n "checking whether to build simplified CUPS PPD files... " >&6; }
 # Check whether --enable-simplified-cups-ppds was given.
 if test "${enable_simplified_cups_ppds+set}" = set; then
   enableval=$enable_simplified_cups_ppds; case "${enableval}" in
 
-    yes) WHICH_PPDS="-a"; BUILD_SIMPLIFIED_CUPS_PPDS=yes; { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; } ;;
-    no) WHICH_PPDS=""; BUILD_SIMPLIFIED_CUPS_PPDS=no; { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; } ;;
-    only) WHICH_PPDS="-s"; BUILD_SIMPLIFIED_CUPS_PPDS=only; { echo "$as_me:$LINENO: result: only" >&5
-echo "${ECHO_T}only" >&6; } ;;
-    *) { { 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;}
+    yes) WHICH_PPDS="-a"; BUILD_SIMPLIFIED_CUPS_PPDS=yes; { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; } ;;
+    no) WHICH_PPDS=""; BUILD_SIMPLIFIED_CUPS_PPDS=no; { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; } ;;
+    only) WHICH_PPDS="-s"; BUILD_SIMPLIFIED_CUPS_PPDS=only; { $as_echo "$as_me:$LINENO: result: only" >&5
+$as_echo "only" >&6; } ;;
+    *) { { $as_echo "$as_me:$LINENO: error: ${enableval}: not a valid option ('yes', 'no', or 'only')" >&5
+$as_echo "$as_me: error: ${enableval}: not a valid option ('yes', 'no', or 'only')" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -22363,8 +13730,8 @@ 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; } ;
+             { $as_echo "$as_me:$LINENO: result: ${BUILD_SIMPLIFIED_CUPS_PPDS}" >&5
+$as_echo "${BUILD_SIMPLIFIED_CUPS_PPDS}" >&6; } ;
 fi
 
 if test -z "${BUILD_SIMPLIFIED_CUPS_PPDS}" ; then
@@ -22373,20 +13740,20 @@ fi
 
 
 # create custom command-line --enable option
-{ echo "$as_me:$LINENO: checking whether to place CUPS PPD files at top level" >&5
-echo $ECHO_N "checking whether to place CUPS PPD files at top level... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to place CUPS PPD files at top level" >&5
+$as_echo_n "checking whether to place CUPS PPD files at top level... " >&6; }
 # Check whether --enable-cups-ppds-at-top-level was given.
 if test "${enable_cups_ppds_at_top_level+set}" = set; then
   enableval=$enable_cups_ppds_at_top_level; case "${enableval}" in
 
-                yes) CUPS_PPDS_AT_TOP_LEVEL="yes" ; { echo "$as_me:$LINENO: result: ${CUPS_PPDS_AT_TOP_LEVEL}" >&5
-echo "${ECHO_T}${CUPS_PPDS_AT_TOP_LEVEL}" >&6; } ;;
-                no) CUPS_PPDS_AT_TOP_LEVEL="no" ; { echo "$as_me:$LINENO: result: ${CUPS_PPDS_AT_TOP_LEVEL}" >&5
-echo "${ECHO_T}${CUPS_PPDS_AT_TOP_LEVEL}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-cups-ppds-at-top-level" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-cups-ppds-at-top-level" >&2;}
+                yes) CUPS_PPDS_AT_TOP_LEVEL="yes" ; { $as_echo "$as_me:$LINENO: result: ${CUPS_PPDS_AT_TOP_LEVEL}" >&5
+$as_echo "${CUPS_PPDS_AT_TOP_LEVEL}" >&6; } ;;
+                no) CUPS_PPDS_AT_TOP_LEVEL="no" ; { $as_echo "$as_me:$LINENO: result: ${CUPS_PPDS_AT_TOP_LEVEL}" >&5
+$as_echo "${CUPS_PPDS_AT_TOP_LEVEL}" >&6; } ;;
+                *) { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-cups-ppds-at-top-level" >&5
+$as_echo "$as_me: error: bad value ${enableval} for --enable-cups-ppds-at-top-level" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -22394,8 +13761,8 @@ else
   if test -z "${CUPS_PPDS_AT_TOP_LEVEL}" ; then
                CUPS_PPDS_AT_TOP_LEVEL="no"
              fi
-             { echo "$as_me:$LINENO: result: ${CUPS_PPDS_AT_TOP_LEVEL}" >&5
-echo "${ECHO_T}${CUPS_PPDS_AT_TOP_LEVEL}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${CUPS_PPDS_AT_TOP_LEVEL}" >&5
+$as_echo "${CUPS_PPDS_AT_TOP_LEVEL}" >&6; } ;
 fi
 
 if test -z "${CUPS_PPDS_AT_TOP_LEVEL}" ; then
@@ -22404,20 +13771,20 @@ fi
 
 
 # create custom command-line --enable option
-{ echo "$as_me:$LINENO: checking whether to generate PostScript level 3 PPD files" >&5
-echo $ECHO_N "checking whether to generate PostScript level 3 PPD files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to generate PostScript level 3 PPD files" >&5
+$as_echo_n "checking whether to generate PostScript level 3 PPD files... " >&6; }
 # Check whether --enable-cups-level3-ppds was given.
 if test "${enable_cups_level3_ppds+set}" = set; then
   enableval=$enable_cups_level3_ppds; case "${enableval}" in
 
-                yes) USE_LEVEL3_PS="yes" ; { echo "$as_me:$LINENO: result: ${USE_LEVEL3_PS}" >&5
-echo "${ECHO_T}${USE_LEVEL3_PS}" >&6; } ;;
-                no) USE_LEVEL3_PS="no" ; { echo "$as_me:$LINENO: result: ${USE_LEVEL3_PS}" >&5
-echo "${ECHO_T}${USE_LEVEL3_PS}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-cups-level3-ppds" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-cups-level3-ppds" >&2;}
+                yes) USE_LEVEL3_PS="yes" ; { $as_echo "$as_me:$LINENO: result: ${USE_LEVEL3_PS}" >&5
+$as_echo "${USE_LEVEL3_PS}" >&6; } ;;
+                no) USE_LEVEL3_PS="no" ; { $as_echo "$as_me:$LINENO: result: ${USE_LEVEL3_PS}" >&5
+$as_echo "${USE_LEVEL3_PS}" >&6; } ;;
+                *) { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-cups-level3-ppds" >&5
+$as_echo "$as_me: error: bad value ${enableval} for --enable-cups-level3-ppds" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -22425,8 +13792,8 @@ else
   if test -z "${USE_LEVEL3_PS}" ; then
                USE_LEVEL3_PS="(automatic)"
              fi
-             { echo "$as_me:$LINENO: result: ${USE_LEVEL3_PS}" >&5
-echo "${ECHO_T}${USE_LEVEL3_PS}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${USE_LEVEL3_PS}" >&5
+$as_echo "${USE_LEVEL3_PS}" >&6; } ;
 fi
 
 if test -z "${USE_LEVEL3_PS}" ; then
@@ -22436,20 +13803,20 @@ fi
 
 STATIC_GENPPD="$enable_static"
 # create custom command-line --enable option
-{ echo "$as_me:$LINENO: checking whether to build a statically-linked cups-genppd and rastertogutenprint.  WARNING: Please read the README and NEWS (release notes) CAREFULLY before using --disable-static-genppd!" >&5
-echo $ECHO_N "checking whether to build a statically-linked cups-genppd and rastertogutenprint.  WARNING: Please read the README and NEWS (release notes) CAREFULLY before using --disable-static-genppd!... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build a statically-linked cups-genppd and rastertogutenprint.  WARNING: Please read the README and NEWS (release notes) CAREFULLY before using --disable-static-genppd!" >&5
+$as_echo_n "checking whether to build a statically-linked cups-genppd and rastertogutenprint.  WARNING: Please read the README and NEWS (release notes) CAREFULLY before using --disable-static-genppd!... " >&6; }
 # Check whether --enable-static-genppd was given.
 if test "${enable_static_genppd+set}" = set; then
   enableval=$enable_static_genppd; case "${enableval}" in
 
-                yes) STATIC_GENPPD="yes" ; { echo "$as_me:$LINENO: result: ${STATIC_GENPPD}" >&5
-echo "${ECHO_T}${STATIC_GENPPD}" >&6; } ;;
-                no) STATIC_GENPPD="no" ; { echo "$as_me:$LINENO: result: ${STATIC_GENPPD}" >&5
-echo "${ECHO_T}${STATIC_GENPPD}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-static-genppd" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-static-genppd" >&2;}
+                yes) STATIC_GENPPD="yes" ; { $as_echo "$as_me:$LINENO: result: ${STATIC_GENPPD}" >&5
+$as_echo "${STATIC_GENPPD}" >&6; } ;;
+                no) STATIC_GENPPD="no" ; { $as_echo "$as_me:$LINENO: result: ${STATIC_GENPPD}" >&5
+$as_echo "${STATIC_GENPPD}" >&6; } ;;
+                *) { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-static-genppd" >&5
+$as_echo "$as_me: error: bad value ${enableval} for --enable-static-genppd" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -22457,8 +13824,8 @@ else
   if test -z "${STATIC_GENPPD}" ; then
                STATIC_GENPPD="(automatic)"
              fi
-             { echo "$as_me:$LINENO: result: ${STATIC_GENPPD}" >&5
-echo "${ECHO_T}${STATIC_GENPPD}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${STATIC_GENPPD}" >&5
+$as_echo "${STATIC_GENPPD}" >&6; } ;
 fi
 
 if test -z "${STATIC_GENPPD}" ; then
@@ -22468,10 +13835,10 @@ fi
 
 # Extract the first word of "foomatic-configure", so it can be a program name with args.
 set dummy foomatic-configure; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_FOOMATIC_CONFIGURE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $FOOMATIC_CONFIGURE in
   [\\/]* | ?:[\\/]*)
@@ -22486,7 +13853,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_FOOMATIC_CONFIGURE="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -22498,11 +13865,11 @@ esac
 fi
 FOOMATIC_CONFIGURE=$ac_cv_path_FOOMATIC_CONFIGURE
 if test -n "$FOOMATIC_CONFIGURE"; then
-  { echo "$as_me:$LINENO: result: $FOOMATIC_CONFIGURE" >&5
-echo "${ECHO_T}$FOOMATIC_CONFIGURE" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $FOOMATIC_CONFIGURE" >&5
+$as_echo "$FOOMATIC_CONFIGURE" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -22512,21 +13879,21 @@ else
   BUILD_FOOMATIC="yes"
 fi
 # create custom command-line --with option
-{ echo "$as_me:$LINENO: checking whether to build foomatic data files" >&5
-echo $ECHO_N "checking whether to build foomatic data files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build foomatic data files" >&5
+$as_echo_n "checking whether to build foomatic data files... " >&6; }
 
 # Check whether --with-foomatic was given.
 if test "${with_foomatic+set}" = set; then
   withval=$with_foomatic; case "${withval}" in
 
-                yes) BUILD_FOOMATIC="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC}" >&5
-echo "${ECHO_T}${BUILD_FOOMATIC}" >&6; } ;;
-                no) BUILD_FOOMATIC="no" ; { echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC}" >&5
-echo "${ECHO_T}${BUILD_FOOMATIC}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-foomatic" >&5
-echo "$as_me: error: bad value ${withval} for --with-foomatic" >&2;}
+                yes) BUILD_FOOMATIC="yes" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC}" >&5
+$as_echo "${BUILD_FOOMATIC}" >&6; } ;;
+                no) BUILD_FOOMATIC="no" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC}" >&5
+$as_echo "${BUILD_FOOMATIC}" >&6; } ;;
+                *) { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   { { $as_echo "$as_me:$LINENO: error: bad value ${withval} for --with-foomatic" >&5
+$as_echo "$as_me: error: bad value ${withval} for --with-foomatic" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -22534,8 +13901,8 @@ else
   if test -z "${BUILD_FOOMATIC}" ; then
                BUILD_FOOMATIC="(automatic)"
              fi
-             { echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC}" >&5
-echo "${ECHO_T}${BUILD_FOOMATIC}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC}" >&5
+$as_echo "${BUILD_FOOMATIC}" >&6; } ;
 fi
 
 if test -z "${BUILD_FOOMATIC}" ; then
@@ -22546,10 +13913,10 @@ fi
 
 # Extract the first word of "foomatic-ppdfile", so it can be a program name with args.
 set dummy foomatic-ppdfile; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_FOOMATIC_PPDFILE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $FOOMATIC_PPDFILE in
   [\\/]* | ?:[\\/]*)
@@ -22564,7 +13931,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_FOOMATIC_PPDFILE="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -22576,11 +13943,11 @@ esac
 fi
 FOOMATIC_PPDFILE=$ac_cv_path_FOOMATIC_PPDFILE
 if test -n "$FOOMATIC_PPDFILE"; then
-  { echo "$as_me:$LINENO: result: $FOOMATIC_PPDFILE" >&5
-echo "${ECHO_T}$FOOMATIC_PPDFILE" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $FOOMATIC_PPDFILE" >&5
+$as_echo "$FOOMATIC_PPDFILE" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -22590,21 +13957,21 @@ else
   BUILD_FOOMATIC_3="yes"
 fi
 # create custom command-line --with option
-{ echo "$as_me:$LINENO: checking whether to make use of foomatic 3 extra features" >&5
-echo $ECHO_N "checking whether to make use of foomatic 3 extra features... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to make use of foomatic 3 extra features" >&5
+$as_echo_n "checking whether to make use of foomatic 3 extra features... " >&6; }
 
 # Check whether --with-foomatic3 was given.
 if test "${with_foomatic3+set}" = set; then
   withval=$with_foomatic3; case "${withval}" in
 
-                yes) BUILD_FOOMATIC_3="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC_3}" >&5
-echo "${ECHO_T}${BUILD_FOOMATIC_3}" >&6; } ;;
-                no) BUILD_FOOMATIC_3="no" ; { echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC_3}" >&5
-echo "${ECHO_T}${BUILD_FOOMATIC_3}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-foomatic3" >&5
-echo "$as_me: error: bad value ${withval} for --with-foomatic3" >&2;}
+                yes) BUILD_FOOMATIC_3="yes" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC_3}" >&5
+$as_echo "${BUILD_FOOMATIC_3}" >&6; } ;;
+                no) BUILD_FOOMATIC_3="no" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC_3}" >&5
+$as_echo "${BUILD_FOOMATIC_3}" >&6; } ;;
+                *) { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   { { $as_echo "$as_me:$LINENO: error: bad value ${withval} for --with-foomatic3" >&5
+$as_echo "$as_me: error: bad value ${withval} for --with-foomatic3" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -22612,8 +13979,8 @@ else
   if test -z "${BUILD_FOOMATIC_3}" ; then
                BUILD_FOOMATIC_3="(automatic)"
              fi
-             { echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC_3}" >&5
-echo "${ECHO_T}${BUILD_FOOMATIC_3}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${BUILD_FOOMATIC_3}" >&5
+$as_echo "${BUILD_FOOMATIC_3}" >&6; } ;
 fi
 
 if test -z "${BUILD_FOOMATIC_3}" ; then
@@ -22623,10 +13990,10 @@ fi
 
 # Extract the first word of "ijs-config", so it can be a program name with args.
 set dummy ijs-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_IJS_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $IJS_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -22641,7 +14008,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_IJS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -22653,11 +14020,11 @@ esac
 fi
 IJS_CONFIG=$ac_cv_path_IJS_CONFIG
 if test -n "$IJS_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $IJS_CONFIG" >&5
-echo "${ECHO_T}$IJS_CONFIG" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $IJS_CONFIG" >&5
+$as_echo "$IJS_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -22668,21 +14035,21 @@ else
   BUILD_GHOSTSCRIPT="yes"
 fi
 # create custom command-line --with option
-{ echo "$as_me:$LINENO: checking whether to build Ghostscript driver" >&5
-echo $ECHO_N "checking whether to build Ghostscript driver... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build Ghostscript driver" >&5
+$as_echo_n "checking whether to build Ghostscript driver... " >&6; }
 
 # Check whether --with-ghostscript was given.
 if test "${with_ghostscript+set}" = set; then
   withval=$with_ghostscript; case "${withval}" in
 
-                yes) BUILD_GHOSTSCRIPT="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_GHOSTSCRIPT}" >&5
-echo "${ECHO_T}${BUILD_GHOSTSCRIPT}" >&6; } ;;
-                no) BUILD_GHOSTSCRIPT="no" ; { echo "$as_me:$LINENO: result: ${BUILD_GHOSTSCRIPT}" >&5
-echo "${ECHO_T}${BUILD_GHOSTSCRIPT}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-ghostscript" >&5
-echo "$as_me: error: bad value ${withval} for --with-ghostscript" >&2;}
+                yes) BUILD_GHOSTSCRIPT="yes" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_GHOSTSCRIPT}" >&5
+$as_echo "${BUILD_GHOSTSCRIPT}" >&6; } ;;
+                no) BUILD_GHOSTSCRIPT="no" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_GHOSTSCRIPT}" >&5
+$as_echo "${BUILD_GHOSTSCRIPT}" >&6; } ;;
+                *) { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   { { $as_echo "$as_me:$LINENO: error: bad value ${withval} for --with-ghostscript" >&5
+$as_echo "$as_me: error: bad value ${withval} for --with-ghostscript" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -22690,8 +14057,8 @@ else
   if test -z "${BUILD_GHOSTSCRIPT}" ; then
                BUILD_GHOSTSCRIPT="(automatic)"
              fi
-             { echo "$as_me:$LINENO: result: ${BUILD_GHOSTSCRIPT}" >&5
-echo "${ECHO_T}${BUILD_GHOSTSCRIPT}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${BUILD_GHOSTSCRIPT}" >&5
+$as_echo "${BUILD_GHOSTSCRIPT}" >&6; } ;
 fi
 
 if test -z "${BUILD_GHOSTSCRIPT}" ; then
@@ -22700,25 +14067,25 @@ fi
 
 
 # create custom command-line --with option
-{ echo "$as_me:$LINENO: checking whether to enable loadable modules" >&5
-echo $ECHO_N "checking whether to enable loadable modules... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to enable loadable modules" >&5
+$as_echo_n "checking whether to enable loadable modules... " >&6; }
 
 # Check whether --with-modules was given.
 if test "${with_modules+set}" = set; then
   withval=$with_modules; case "${withval}" in
 
-    yes) WITH_MODULES="yes";  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; } ;;
-    no) WITH_MODULES="no";  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; } ;;
-    ltdl) WITH_MODULES="ltdl";  { echo "$as_me:$LINENO: result: ltdl" >&5
-echo "${ECHO_T}ltdl" >&6; } ;;
-    dlopen) WITH_MODULES="dlopen";  { echo "$as_me:$LINENO: result: dlopen" >&5
-echo "${ECHO_T}dlopen" >&6; } ;;
-    static) WITH_MODULES="static";  { echo "$as_me:$LINENO: result: static" >&5
-echo "${ECHO_T}static" >&6; } ;;
-    *) { { echo "$as_me:$LINENO: error: ${withval}: not a valid module loader" >&5
-echo "$as_me: error: ${withval}: not a valid module loader" >&2;}
+    yes) WITH_MODULES="yes";  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; } ;;
+    no) WITH_MODULES="no";  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; } ;;
+    ltdl) WITH_MODULES="ltdl";  { $as_echo "$as_me:$LINENO: result: ltdl" >&5
+$as_echo "ltdl" >&6; } ;;
+    dlopen) WITH_MODULES="dlopen";  { $as_echo "$as_me:$LINENO: result: dlopen" >&5
+$as_echo "dlopen" >&6; } ;;
+    static) WITH_MODULES="static";  { $as_echo "$as_me:$LINENO: result: static" >&5
+$as_echo "static" >&6; } ;;
+    *) { { $as_echo "$as_me:$LINENO: error: ${withval}: not a valid module loader" >&5
+$as_echo "$as_me: error: ${withval}: not a valid module loader" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -22726,8 +14093,8 @@ else
   if test -z "${WITH_MODULES}" ; then
                WITH_MODULES="(automatic)"
              fi
-             { echo "$as_me:$LINENO: result: ${WITH_MODULES}" >&5
-echo "${ECHO_T}${WITH_MODULES}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${WITH_MODULES}" >&5
+$as_echo "${WITH_MODULES}" >&6; } ;
     # if static libraries are enabled, modules must be static
     if test x$enable_static = xyes; then
       WITH_MODULES="static"
@@ -22748,27 +14115,27 @@ if test x$enable_static = xyes; then
   elif test $WITH_MODULES = static; then
     :
   else
-    { { echo "$as_me:$LINENO: error: --disable-static must be used with --with-modules" >&5
-echo "$as_me: error: --disable-static must be used with --with-modules" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: --disable-static must be used with --with-modules" >&5
+$as_echo "$as_me: error: --disable-static must be used with --with-modules" >&2;}
    { (exit 1); exit 1; }; }
   fi
 fi
 
 # create custom command-line --enable option
-{ echo "$as_me:$LINENO: checking whether to turn on debugging in build" >&5
-echo $ECHO_N "checking whether to turn on debugging in build... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to turn on debugging in build" >&5
+$as_echo_n "checking whether to turn on debugging in build... " >&6; }
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then
   enableval=$enable_debug; case "${enableval}" in
 
-                yes) ENABLE_DEBUG="yes" ; { echo "$as_me:$LINENO: result: ${ENABLE_DEBUG}" >&5
-echo "${ECHO_T}${ENABLE_DEBUG}" >&6; } ;;
-                no) ENABLE_DEBUG="no" ; { echo "$as_me:$LINENO: result: ${ENABLE_DEBUG}" >&5
-echo "${ECHO_T}${ENABLE_DEBUG}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-debug" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-debug" >&2;}
+                yes) ENABLE_DEBUG="yes" ; { $as_echo "$as_me:$LINENO: result: ${ENABLE_DEBUG}" >&5
+$as_echo "${ENABLE_DEBUG}" >&6; } ;;
+                no) ENABLE_DEBUG="no" ; { $as_echo "$as_me:$LINENO: result: ${ENABLE_DEBUG}" >&5
+$as_echo "${ENABLE_DEBUG}" >&6; } ;;
+                *) { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-debug" >&5
+$as_echo "$as_me: error: bad value ${enableval} for --enable-debug" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -22776,8 +14143,8 @@ else
   if test -z "${ENABLE_DEBUG}" ; then
                ENABLE_DEBUG="no"
              fi
-             { echo "$as_me:$LINENO: result: ${ENABLE_DEBUG}" >&5
-echo "${ECHO_T}${ENABLE_DEBUG}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${ENABLE_DEBUG}" >&5
+$as_echo "${ENABLE_DEBUG}" >&6; } ;
 fi
 
 if test -z "${ENABLE_DEBUG}" ; then
@@ -22786,20 +14153,20 @@ fi
 
 
 # create custom command-line --enable option
-{ echo "$as_me:$LINENO: checking whether to turn on profiling in build" >&5
-echo $ECHO_N "checking whether to turn on profiling in build... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to turn on profiling in build" >&5
+$as_echo_n "checking whether to turn on profiling in build... " >&6; }
 # Check whether --enable-profile was given.
 if test "${enable_profile+set}" = set; then
   enableval=$enable_profile; case "${enableval}" in
 
-                yes) ENABLE_PROFILE="yes" ; { echo "$as_me:$LINENO: result: ${ENABLE_PROFILE}" >&5
-echo "${ECHO_T}${ENABLE_PROFILE}" >&6; } ;;
-                no) ENABLE_PROFILE="no" ; { echo "$as_me:$LINENO: result: ${ENABLE_PROFILE}" >&5
-echo "${ECHO_T}${ENABLE_PROFILE}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-profile" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-profile" >&2;}
+                yes) ENABLE_PROFILE="yes" ; { $as_echo "$as_me:$LINENO: result: ${ENABLE_PROFILE}" >&5
+$as_echo "${ENABLE_PROFILE}" >&6; } ;;
+                no) ENABLE_PROFILE="no" ; { $as_echo "$as_me:$LINENO: result: ${ENABLE_PROFILE}" >&5
+$as_echo "${ENABLE_PROFILE}" >&6; } ;;
+                *) { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-profile" >&5
+$as_echo "$as_me: error: bad value ${enableval} for --enable-profile" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -22807,8 +14174,8 @@ else
   if test -z "${ENABLE_PROFILE}" ; then
                ENABLE_PROFILE="no"
              fi
-             { echo "$as_me:$LINENO: result: ${ENABLE_PROFILE}" >&5
-echo "${ECHO_T}${ENABLE_PROFILE}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${ENABLE_PROFILE}" >&5
+$as_echo "${ENABLE_PROFILE}" >&6; } ;
 fi
 
 if test -z "${ENABLE_PROFILE}" ; then
@@ -22817,33 +14184,33 @@ fi
 
 
 # create custom command-line --with option
-{ echo "$as_me:$LINENO: checking whether to use readline" >&5
-echo $ECHO_N "checking whether to use readline... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to use readline" >&5
+$as_echo_n "checking whether to use readline... " >&6; }
 
 # Check whether --with-readline was given.
 if test "${with_readline+set}" = set; then
   withval=$with_readline; case "${withval}" in
 
-    yes) USE_READLINE="yes" ; { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; } ;;
-    no) USE_READLINE="no" ; { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; } ;;
+    yes) USE_READLINE="yes" ; { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; } ;;
+    no) USE_READLINE="no" ; { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; } ;;
     only) USE_READLINE="yes"
           EXTRA_LIBREADLINE_DEPS=" "
-          { echo "$as_me:$LINENO: result: yes (using only readline)" >&5
-echo "${ECHO_T}yes (using only readline)" >&6; } ;;
+          { $as_echo "$as_me:$LINENO: result: yes (using only readline)" >&5
+$as_echo "yes (using only readline)" >&6; } ;;
     *) USE_READLINE="yes"
        EXTRA_LIBREADLINE_DEPS="${withval}"
-       { echo "$as_me:$LINENO: result: yes (using extra libraries ${withval})" >&5
-echo "${ECHO_T}yes (using extra libraries ${withval})" >&6; } ;;
+       { $as_echo "$as_me:$LINENO: result: yes (using extra libraries ${withval})" >&5
+$as_echo "yes (using extra libraries ${withval})" >&6; } ;;
 
 	    esac
 else
   if test -z "${USE_READLINE}" ; then
                USE_READLINE="yes"
              fi
-             { echo "$as_me:$LINENO: result: ${USE_READLINE}" >&5
-echo "${ECHO_T}${USE_READLINE}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${USE_READLINE}" >&5
+$as_echo "${USE_READLINE}" >&6; } ;
 fi
 
 if test -z "${USE_READLINE}" ; then
@@ -22855,10 +14222,10 @@ for ac_prog in gimptool-2.0 gimptool
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_GIMPTOOL2_CHECK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $GIMPTOOL2_CHECK in
   [\\/]* | ?:[\\/]*)
@@ -22873,7 +14240,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GIMPTOOL2_CHECK="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -22885,11 +14252,11 @@ esac
 fi
 GIMPTOOL2_CHECK=$ac_cv_path_GIMPTOOL2_CHECK
 if test -n "$GIMPTOOL2_CHECK"; then
-  { echo "$as_me:$LINENO: result: $GIMPTOOL2_CHECK" >&5
-echo "${ECHO_T}$GIMPTOOL2_CHECK" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $GIMPTOOL2_CHECK" >&5
+$as_echo "$GIMPTOOL2_CHECK" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -22922,10 +14289,10 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -22940,7 +14307,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -22952,11 +14319,11 @@ esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -22965,10 +14332,10 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -22983,7 +14350,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -22995,11 +14362,11 @@ esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -23007,12 +14374,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_pt_PKG_CONFIG
@@ -23024,31 +14387,31 @@ fi
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
+	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	else
-		{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+		{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
 
 fi
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for GTK2" >&5
-echo $ECHO_N "checking for GTK2... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for GTK2" >&5
+$as_echo_n "checking for GTK2... " >&6; }
 
 if test -n "$GTK2_CFLAGS"; then
     pkg_cv_GTK2_CFLAGS="$GTK2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
 else
@@ -23061,10 +14424,10 @@ if test -n "$GTK2_LIBS"; then
     pkg_cv_GTK2_LIBS="$GTK2_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
 else
@@ -23091,8 +14454,8 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTK2_PKG_ERRORS" >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
                 HAVE_GTK2=no
 	           BUILD_LIBGUTENPRINTUI2=no
 elif test $pkg_failed = untried; then
@@ -23101,8 +14464,8 @@ elif test $pkg_failed = untried; then
 else
 	GTK2_CFLAGS=$pkg_cv_GTK2_CFLAGS
 	GTK2_LIBS=$pkg_cv_GTK2_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	HAVE_GTK2=yes
                    BUILD_LIBGUTENPRINTUI2=yes
                    GUTENPRINTUI2_LIBDEPS="${GUTENPRINTUI2_LIBDEPS} ${GTK2_LIBS}"
@@ -23111,17 +14474,17 @@ fi
 if test x$BUILD_GIMP2 = xyes; then
 
 pkg_failed=no
-{ echo "$as_me:$LINENO: checking for GIMP2" >&5
-echo $ECHO_N "checking for GIMP2... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for GIMP2" >&5
+$as_echo_n "checking for GIMP2... " >&6; }
 
 if test -n "$GIMP2_CFLAGS"; then
     pkg_cv_GIMP2_CFLAGS="$GIMP2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gimpui-2.0\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gimpui-2.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "gimpui-2.0") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_GIMP2_CFLAGS=`$PKG_CONFIG --cflags "gimpui-2.0" 2>/dev/null`
 else
@@ -23134,10 +14497,10 @@ if test -n "$GIMP2_LIBS"; then
     pkg_cv_GIMP2_LIBS="$GIMP2_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gimpui-2.0\"") >&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gimpui-2.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "gimpui-2.0") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   pkg_cv_GIMP2_LIBS=`$PKG_CONFIG --libs "gimpui-2.0" 2>/dev/null`
 else
@@ -23164,36 +14527,36 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GIMP2_PKG_ERRORS" >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
                 BUILD_GIMP2=no
 elif test $pkg_failed = untried; then
 	BUILD_GIMP2=no
 else
 	GIMP2_CFLAGS=$pkg_cv_GIMP2_CFLAGS
 	GIMP2_LIBS=$pkg_cv_GIMP2_LIBS
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	BUILD_GIMP2=yes
 fi
 fi
 
 # create custom command-line --with option
-{ echo "$as_me:$LINENO: checking whether to build GIMP 2.x Print plugin" >&5
-echo $ECHO_N "checking whether to build GIMP 2.x Print plugin... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build GIMP 2.x Print plugin" >&5
+$as_echo_n "checking whether to build GIMP 2.x Print plugin... " >&6; }
 
 # Check whether --with-gimp2 was given.
 if test "${with_gimp2+set}" = set; then
   withval=$with_gimp2; case "${withval}" in
 
-                yes) BUILD_GIMP2="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_GIMP2}" >&5
-echo "${ECHO_T}${BUILD_GIMP2}" >&6; } ;;
-                no) BUILD_GIMP2="no" ; { echo "$as_me:$LINENO: result: ${BUILD_GIMP2}" >&5
-echo "${ECHO_T}${BUILD_GIMP2}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-gimp2" >&5
-echo "$as_me: error: bad value ${withval} for --with-gimp2" >&2;}
+                yes) BUILD_GIMP2="yes" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_GIMP2}" >&5
+$as_echo "${BUILD_GIMP2}" >&6; } ;;
+                no) BUILD_GIMP2="no" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_GIMP2}" >&5
+$as_echo "${BUILD_GIMP2}" >&6; } ;;
+                *) { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   { { $as_echo "$as_me:$LINENO: error: bad value ${withval} for --with-gimp2" >&5
+$as_echo "$as_me: error: bad value ${withval} for --with-gimp2" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -23201,8 +14564,8 @@ else
   if test -z "${BUILD_GIMP2}" ; then
                BUILD_GIMP2="(automatic)"
              fi
-             { echo "$as_me:$LINENO: result: ${BUILD_GIMP2}" >&5
-echo "${ECHO_T}${BUILD_GIMP2}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${BUILD_GIMP2}" >&5
+$as_echo "${BUILD_GIMP2}" >&6; } ;
 fi
 
 if test -z "${BUILD_GIMP2}" ; then
@@ -23211,21 +14574,21 @@ fi
 
 
 # create custom command-line --with option
-{ echo "$as_me:$LINENO: checking whether to name GIMP 2.x Print plugin gutenprint (requires GIMP 2.2; normally used with GIMP 2.4 or above)" >&5
-echo $ECHO_N "checking whether to name GIMP 2.x Print plugin gutenprint (requires GIMP 2.2; normally used with GIMP 2.4 or above)... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to name GIMP 2.x Print plugin gutenprint (requires GIMP 2.2; normally used with GIMP 2.4 or above)" >&5
+$as_echo_n "checking whether to name GIMP 2.x Print plugin gutenprint (requires GIMP 2.2; normally used with GIMP 2.4 or above)... " >&6; }
 
 # Check whether --with-gimp2-as-gutenprint was given.
 if test "${with_gimp2_as_gutenprint+set}" = set; then
   withval=$with_gimp2_as_gutenprint; case "${withval}" in
 
-                yes) BUILD_GIMP2_AS_GUTENPRINT="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_GIMP2_AS_GUTENPRINT}" >&5
-echo "${ECHO_T}${BUILD_GIMP2_AS_GUTENPRINT}" >&6; } ;;
-                no) BUILD_GIMP2_AS_GUTENPRINT="no" ; { echo "$as_me:$LINENO: result: ${BUILD_GIMP2_AS_GUTENPRINT}" >&5
-echo "${ECHO_T}${BUILD_GIMP2_AS_GUTENPRINT}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-gimp2-as-gutenprint" >&5
-echo "$as_me: error: bad value ${withval} for --with-gimp2-as-gutenprint" >&2;}
+                yes) BUILD_GIMP2_AS_GUTENPRINT="yes" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_GIMP2_AS_GUTENPRINT}" >&5
+$as_echo "${BUILD_GIMP2_AS_GUTENPRINT}" >&6; } ;;
+                no) BUILD_GIMP2_AS_GUTENPRINT="no" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_GIMP2_AS_GUTENPRINT}" >&5
+$as_echo "${BUILD_GIMP2_AS_GUTENPRINT}" >&6; } ;;
+                *) { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   { { $as_echo "$as_me:$LINENO: error: bad value ${withval} for --with-gimp2-as-gutenprint" >&5
+$as_echo "$as_me: error: bad value ${withval} for --with-gimp2-as-gutenprint" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -23233,8 +14596,8 @@ else
   if test -z "${BUILD_GIMP2_AS_GUTENPRINT}" ; then
                BUILD_GIMP2_AS_GUTENPRINT="(automatic)"
              fi
-             { echo "$as_me:$LINENO: result: ${BUILD_GIMP2_AS_GUTENPRINT}" >&5
-echo "${ECHO_T}${BUILD_GIMP2_AS_GUTENPRINT}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${BUILD_GIMP2_AS_GUTENPRINT}" >&5
+$as_echo "${BUILD_GIMP2_AS_GUTENPRINT}" >&6; } ;
 fi
 
 if test -z "${BUILD_GIMP2_AS_GUTENPRINT}" ; then
@@ -23243,20 +14606,20 @@ fi
 
 
 # create custom command-line --enable option
-{ echo "$as_me:$LINENO: checking whether to build Gutenprint GTK+-2.0 user interface library" >&5
-echo $ECHO_N "checking whether to build Gutenprint GTK+-2.0 user interface library... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build Gutenprint GTK+-2.0 user interface library" >&5
+$as_echo_n "checking whether to build Gutenprint GTK+-2.0 user interface library... " >&6; }
 # Check whether --enable-libgutenprintui2 was given.
 if test "${enable_libgutenprintui2+set}" = set; then
   enableval=$enable_libgutenprintui2; case "${enableval}" in
 
-                yes) BUILD_LIBGUTENPRINTUI2="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI2}" >&5
-echo "${ECHO_T}${BUILD_LIBGUTENPRINTUI2}" >&6; } ;;
-                no) BUILD_LIBGUTENPRINTUI2="no" ; { echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI2}" >&5
-echo "${ECHO_T}${BUILD_LIBGUTENPRINTUI2}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-libgutenprintui2" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-libgutenprintui2" >&2;}
+                yes) BUILD_LIBGUTENPRINTUI2="yes" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI2}" >&5
+$as_echo "${BUILD_LIBGUTENPRINTUI2}" >&6; } ;;
+                no) BUILD_LIBGUTENPRINTUI2="no" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI2}" >&5
+$as_echo "${BUILD_LIBGUTENPRINTUI2}" >&6; } ;;
+                *) { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-libgutenprintui2" >&5
+$as_echo "$as_me: error: bad value ${enableval} for --enable-libgutenprintui2" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -23264,8 +14627,8 @@ else
   if test -z "${BUILD_LIBGUTENPRINTUI2}" ; then
                BUILD_LIBGUTENPRINTUI2="(automatic)"
              fi
-             { echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI2}" >&5
-echo "${ECHO_T}${BUILD_LIBGUTENPRINTUI2}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${BUILD_LIBGUTENPRINTUI2}" >&5
+$as_echo "${BUILD_LIBGUTENPRINTUI2}" >&6; } ;
 fi
 
 if test -z "${BUILD_LIBGUTENPRINTUI2}" ; then
@@ -23274,20 +14637,20 @@ fi
 
 
 # create custom command-line --enable option
-{ echo "$as_me:$LINENO: checking whether to install sample images" >&5
-echo $ECHO_N "checking whether to install sample images... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to install sample images" >&5
+$as_echo_n "checking whether to install sample images... " >&6; }
 # Check whether --enable-samples was given.
 if test "${enable_samples+set}" = set; then
   enableval=$enable_samples; case "${enableval}" in
 
-                yes) INSTALL_SAMPLES="yes" ; { echo "$as_me:$LINENO: result: ${INSTALL_SAMPLES}" >&5
-echo "${ECHO_T}${INSTALL_SAMPLES}" >&6; } ;;
-                no) INSTALL_SAMPLES="no" ; { echo "$as_me:$LINENO: result: ${INSTALL_SAMPLES}" >&5
-echo "${ECHO_T}${INSTALL_SAMPLES}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-samples" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-samples" >&2;}
+                yes) INSTALL_SAMPLES="yes" ; { $as_echo "$as_me:$LINENO: result: ${INSTALL_SAMPLES}" >&5
+$as_echo "${INSTALL_SAMPLES}" >&6; } ;;
+                no) INSTALL_SAMPLES="no" ; { $as_echo "$as_me:$LINENO: result: ${INSTALL_SAMPLES}" >&5
+$as_echo "${INSTALL_SAMPLES}" >&6; } ;;
+                *) { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-samples" >&5
+$as_echo "$as_me: error: bad value ${enableval} for --enable-samples" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -23295,8 +14658,8 @@ else
   if test -z "${INSTALL_SAMPLES}" ; then
                INSTALL_SAMPLES="yes"
              fi
-             { echo "$as_me:$LINENO: result: ${INSTALL_SAMPLES}" >&5
-echo "${ECHO_T}${INSTALL_SAMPLES}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${INSTALL_SAMPLES}" >&5
+$as_echo "${INSTALL_SAMPLES}" >&6; } ;
 fi
 
 if test -z "${INSTALL_SAMPLES}" ; then
@@ -23305,20 +14668,20 @@ fi
 
 
 # create custom command-line --enable option
-{ echo "$as_me:$LINENO: checking whether to build escputil" >&5
-echo $ECHO_N "checking whether to build escputil... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build escputil" >&5
+$as_echo_n "checking whether to build escputil... " >&6; }
 # Check whether --enable-escputil was given.
 if test "${enable_escputil+set}" = set; then
   enableval=$enable_escputil; case "${enableval}" in
 
-                yes) BUILD_ESCPUTIL="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_ESCPUTIL}" >&5
-echo "${ECHO_T}${BUILD_ESCPUTIL}" >&6; } ;;
-                no) BUILD_ESCPUTIL="no" ; { echo "$as_me:$LINENO: result: ${BUILD_ESCPUTIL}" >&5
-echo "${ECHO_T}${BUILD_ESCPUTIL}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-escputil" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-escputil" >&2;}
+                yes) BUILD_ESCPUTIL="yes" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_ESCPUTIL}" >&5
+$as_echo "${BUILD_ESCPUTIL}" >&6; } ;;
+                no) BUILD_ESCPUTIL="no" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_ESCPUTIL}" >&5
+$as_echo "${BUILD_ESCPUTIL}" >&6; } ;;
+                *) { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-escputil" >&5
+$as_echo "$as_me: error: bad value ${enableval} for --enable-escputil" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -23326,8 +14689,8 @@ else
   if test -z "${BUILD_ESCPUTIL}" ; then
                BUILD_ESCPUTIL="yes"
              fi
-             { echo "$as_me:$LINENO: result: ${BUILD_ESCPUTIL}" >&5
-echo "${ECHO_T}${BUILD_ESCPUTIL}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${BUILD_ESCPUTIL}" >&5
+$as_echo "${BUILD_ESCPUTIL}" >&6; } ;
 fi
 
 if test -z "${BUILD_ESCPUTIL}" ; then
@@ -23336,20 +14699,20 @@ fi
 
 
 # create custom command-line --enable option
-{ echo "$as_me:$LINENO: checking whether to build test programs" >&5
-echo $ECHO_N "checking whether to build test programs... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build test programs" >&5
+$as_echo_n "checking whether to build test programs... " >&6; }
 # Check whether --enable-test was given.
 if test "${enable_test+set}" = set; then
   enableval=$enable_test; case "${enableval}" in
 
-                yes) BUILD_TEST="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_TEST}" >&5
-echo "${ECHO_T}${BUILD_TEST}" >&6; } ;;
-                no) BUILD_TEST="no" ; { echo "$as_me:$LINENO: result: ${BUILD_TEST}" >&5
-echo "${ECHO_T}${BUILD_TEST}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-test" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-test" >&2;}
+                yes) BUILD_TEST="yes" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_TEST}" >&5
+$as_echo "${BUILD_TEST}" >&6; } ;;
+                no) BUILD_TEST="no" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_TEST}" >&5
+$as_echo "${BUILD_TEST}" >&6; } ;;
+                *) { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-test" >&5
+$as_echo "$as_me: error: bad value ${enableval} for --enable-test" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -23357,8 +14720,8 @@ else
   if test -z "${BUILD_TEST}" ; then
                BUILD_TEST="yes"
              fi
-             { echo "$as_me:$LINENO: result: ${BUILD_TEST}" >&5
-echo "${ECHO_T}${BUILD_TEST}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${BUILD_TEST}" >&5
+$as_echo "${BUILD_TEST}" >&6; } ;
 fi
 
 if test -z "${BUILD_TEST}" ; then
@@ -23373,20 +14736,20 @@ else
 fi
 
 # create custom command-line --enable option
-{ echo "$as_me:$LINENO: checking whether to build testpattern generator" >&5
-echo $ECHO_N "checking whether to build testpattern generator... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build testpattern generator" >&5
+$as_echo_n "checking whether to build testpattern generator... " >&6; }
 # Check whether --enable-testpattern was given.
 if test "${enable_testpattern+set}" = set; then
   enableval=$enable_testpattern; case "${enableval}" in
 
-                yes) BUILD_TESTPATTERN="yes" ; { echo "$as_me:$LINENO: result: ${BUILD_TESTPATTERN}" >&5
-echo "${ECHO_T}${BUILD_TESTPATTERN}" >&6; } ;;
-                no) BUILD_TESTPATTERN="no" ; { echo "$as_me:$LINENO: result: ${BUILD_TESTPATTERN}" >&5
-echo "${ECHO_T}${BUILD_TESTPATTERN}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-testpattern" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-testpattern" >&2;}
+                yes) BUILD_TESTPATTERN="yes" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_TESTPATTERN}" >&5
+$as_echo "${BUILD_TESTPATTERN}" >&6; } ;;
+                no) BUILD_TESTPATTERN="no" ; { $as_echo "$as_me:$LINENO: result: ${BUILD_TESTPATTERN}" >&5
+$as_echo "${BUILD_TESTPATTERN}" >&6; } ;;
+                *) { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-testpattern" >&5
+$as_echo "$as_me: error: bad value ${enableval} for --enable-testpattern" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -23394,8 +14757,8 @@ else
   if test -z "${BUILD_TESTPATTERN}" ; then
                BUILD_TESTPATTERN="(automatic)"
              fi
-             { echo "$as_me:$LINENO: result: ${BUILD_TESTPATTERN}" >&5
-echo "${ECHO_T}${BUILD_TESTPATTERN}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${BUILD_TESTPATTERN}" >&5
+$as_echo "${BUILD_TESTPATTERN}" >&6; } ;
 fi
 
 if test -z "${BUILD_TESTPATTERN}" ; then
@@ -23404,20 +14767,20 @@ fi
 
 
 # create custom command-line --enable option
-{ echo "$as_me:$LINENO: checking whether to install GIMP plugin in home directory" >&5
-echo $ECHO_N "checking whether to install GIMP plugin in home directory... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to install GIMP plugin in home directory" >&5
+$as_echo_n "checking whether to install GIMP plugin in home directory... " >&6; }
 # Check whether --enable-user-install was given.
 if test "${enable_user_install+set}" = set; then
   enableval=$enable_user_install; case "${enableval}" in
 
-                yes) USER_INSTALL="yes" ; { echo "$as_me:$LINENO: result: ${USER_INSTALL}" >&5
-echo "${ECHO_T}${USER_INSTALL}" >&6; } ;;
-                no) USER_INSTALL="no" ; { echo "$as_me:$LINENO: result: ${USER_INSTALL}" >&5
-echo "${ECHO_T}${USER_INSTALL}" >&6; } ;;
-                *) { echo "$as_me:$LINENO: result: unknown" >&5
-echo "${ECHO_T}unknown" >&6; }
-                   { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-user-install" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-user-install" >&2;}
+                yes) USER_INSTALL="yes" ; { $as_echo "$as_me:$LINENO: result: ${USER_INSTALL}" >&5
+$as_echo "${USER_INSTALL}" >&6; } ;;
+                no) USER_INSTALL="no" ; { $as_echo "$as_me:$LINENO: result: ${USER_INSTALL}" >&5
+$as_echo "${USER_INSTALL}" >&6; } ;;
+                *) { $as_echo "$as_me:$LINENO: result: unknown" >&5
+$as_echo "unknown" >&6; }
+                   { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-user-install" >&5
+$as_echo "$as_me: error: bad value ${enableval} for --enable-user-install" >&2;}
    { (exit 1); exit 1; }; } ;;
 
 	    esac
@@ -23425,8 +14788,8 @@ else
   if test -z "${USER_INSTALL}" ; then
                USER_INSTALL="no"
              fi
-             { echo "$as_me:$LINENO: result: ${USER_INSTALL}" >&5
-echo "${ECHO_T}${USER_INSTALL}" >&6; } ;
+             { $as_echo "$as_me:$LINENO: result: ${USER_INSTALL}" >&5
+$as_echo "${USER_INSTALL}" >&6; } ;
 fi
 
 if test -z "${USER_INSTALL}" ; then
@@ -23469,10 +14832,10 @@ fi
   done
 
 
-  { echo "$as_me:$LINENO: checking for iconv" >&5
-echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
 if test "${am_cv_func_iconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     am_cv_func_iconv="no, consider installing GNU libiconv"
@@ -23501,26 +14864,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   am_cv_func_iconv=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
@@ -23550,35 +14917,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
       LIBS="$am_save_LIBS"
     fi
 
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-echo "${ECHO_T}$am_cv_func_iconv" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
+$as_echo "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -23587,10 +14958,10 @@ _ACEOF
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    { echo "$as_me:$LINENO: checking how to link with libiconv" >&5
-echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: $LIBICONV" >&5
-echo "${ECHO_T}$LIBICONV" >&6; }
+    { $as_echo "$as_me:$LINENO: checking how to link with libiconv" >&5
+$as_echo_n "checking how to link with libiconv... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: $LIBICONV" >&5
+$as_echo "$LIBICONV" >&6; }
   else
             CPPFLAGS="$am_save_CPPFLAGS"
     LIBICONV=
@@ -23600,10 +14971,10 @@ echo "${ECHO_T}$LIBICONV" >&6; }
 
 
 
-        { echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
-echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
+$as_echo_n "checking for strerror in -lcposix... " >&6; }
 if test "${ac_cv_lib_cposix_strerror+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcposix  $LIBS"
@@ -23635,33 +15006,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_cposix_strerror=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_cposix_strerror=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
-echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6; }
-if test $ac_cv_lib_cposix_strerror = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
+$as_echo "$ac_cv_lib_cposix_strerror" >&6; }
+if test "x$ac_cv_lib_cposix_strerror" = x""yes; then
   LIBS="$LIBS -lcposix"
 fi
 
@@ -23671,10 +15046,10 @@ for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -23687,7 +15062,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -23698,11 +15073,11 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -23717,10 +15092,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -23733,7 +15108,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -23744,11 +15119,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -23757,10 +15132,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -23773,7 +15148,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -23784,11 +15159,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -23796,12 +15171,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -23814,10 +15185,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -23830,7 +15201,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -23841,11 +15212,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -23854,10 +15225,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -23875,7 +15246,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -23898,11 +15269,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -23913,10 +15284,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -23929,7 +15300,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -23940,11 +15311,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -23957,10 +15328,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -23973,7 +15344,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -23984,11 +15355,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -24000,12 +15371,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -24015,50 +15382,56 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -24084,20 +15457,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -24107,15 +15481,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -24142,20 +15520,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -24180,20 +15559,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -24219,20 +15599,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -24247,8 +15628,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -24264,10 +15645,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -24338,20 +15719,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -24367,15 +15749,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -24387,10 +15769,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 depcc="$CC"   am_compiler_list=
 
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -24478,8 +15860,8 @@ else
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
  if
@@ -24501,10 +15883,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -24517,7 +15899,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -24528,11 +15910,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -24541,10 +15923,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -24557,7 +15939,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -24568,11 +15950,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -24580,12 +15962,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -24598,10 +15976,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -24614,7 +15992,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -24625,11 +16003,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -24638,10 +16016,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -24659,7 +16037,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -24682,11 +16060,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -24697,10 +16075,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -24713,7 +16091,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -24724,11 +16102,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -24741,10 +16119,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -24757,7 +16135,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -24768,11 +16146,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -24784,12 +16162,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -24799,50 +16173,56 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -24868,20 +16248,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -24891,15 +16272,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -24926,20 +16311,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -24964,20 +16350,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -25003,20 +16390,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -25031,8 +16419,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -25048,10 +16436,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -25122,20 +16510,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -25151,15 +16540,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -25171,10 +16560,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 depcc="$CC"   am_compiler_list=
 
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -25262,8 +16651,8 @@ else
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
  if
@@ -25281,16 +16670,16 @@ fi
 am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
 
 if test "x$CC" != xcc; then
-  { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
-echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
 else
-  { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
-echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
 fi
-set dummy $CC; ac_cc=`echo $2 |
+set dummy $CC; ac_cc=`$as_echo "$2" |
 		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
 if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -25316,19 +16705,21 @@ if { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
    test -f conftest2.$ac_objext && { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); };
 then
   eval ac_cv_prog_cc_${ac_cc}_c_o=yes
@@ -25339,10 +16730,11 @@ then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
       ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
       rm -f conftest2.*
@@ -25350,19 +16742,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
 	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); };
       then
 	# cc works too.
@@ -25380,11 +16774,11 @@ rm -f core conftest*
 
 fi
 if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 
 cat >>confdefs.h <<\_ACEOF
 #define NO_MINUS_C_MINUS_O 1
@@ -25419,11 +16813,12 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -25452,17 +16847,29 @@ case $as_dir/ in
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
+
 done
 IFS=$as_save_IFS
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
@@ -25475,8 +16882,8 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -25486,25 +16893,25 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
 for ac_prog in flex lex
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_LEX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$LEX"; then
   ac_cv_prog_LEX="$LEX" # Let the user override the test.
@@ -25517,7 +16924,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LEX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -25528,11 +16935,11 @@ fi
 fi
 LEX=$ac_cv_prog_LEX
 if test -n "$LEX"; then
-  { echo "$as_me:$LINENO: result: $LEX" >&5
-echo "${ECHO_T}$LEX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $LEX" >&5
+$as_echo "$LEX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -25565,15 +16972,16 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$LEX conftest.l") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ echo "$as_me:$LINENO: checking lex output file root" >&5
-echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking lex output file root" >&5
+$as_echo_n "checking lex output file root... " >&6; }
 if test "${ac_cv_prog_lex_root+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
 if test -f lex.yy.c; then
@@ -25581,20 +16989,20 @@ if test -f lex.yy.c; then
 elif test -f lexyy.c; then
   ac_cv_prog_lex_root=lexyy
 else
-  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
-echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
+$as_echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
    { (exit 1); exit 1; }; }
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
-echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
+$as_echo "$ac_cv_prog_lex_root" >&6; }
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
 if test -z "${LEXLIB+set}"; then
-  { echo "$as_me:$LINENO: checking lex library" >&5
-echo $ECHO_N "checking lex library... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking lex library" >&5
+$as_echo_n "checking lex library... " >&6; }
 if test "${ac_cv_lib_lex+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
 
     ac_save_LIBS=$LIBS
@@ -25610,26 +17018,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_lex=$ac_lib
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
       test "$ac_cv_lib_lex" != 'none needed' && break
@@ -25637,16 +17049,16 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
     LIBS=$ac_save_LIBS
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
-echo "${ECHO_T}$ac_cv_lib_lex" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
+$as_echo "$ac_cv_lib_lex" >&6; }
   test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
-echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
+$as_echo_n "checking whether yytext is a pointer... " >&6; }
 if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   # POSIX says lex can declare yytext either as a pointer or an array; the
 # default is implementation-dependent.  Figure out which it is, since
@@ -25664,33 +17076,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_prog_lex_yytext_pointer=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_save_LIBS
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
-echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
+$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
 if test $ac_cv_prog_lex_yytext_pointer = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -25708,10 +17124,10 @@ for ac_prog in 'bison -y' byacc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_YACC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -25724,7 +17140,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_YACC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -25735,11 +17151,11 @@ fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  { echo "$as_me:$LINENO: result: $YACC" >&5
-echo "${ECHO_T}$YACC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $YACC" >&5
+$as_echo "$YACC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -25749,10 +17165,10 @@ test -n "$YACC" || YACC="yacc"
 
 # Extract the first word of "test", so it can be a program name with args.
 set dummy test; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_TEST+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $TEST in
   [\\/]* | ?:[\\/]*)
@@ -25767,7 +17183,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_TEST="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -25779,20 +17195,20 @@ esac
 fi
 TEST=$ac_cv_path_TEST
 if test -n "$TEST"; then
-  { echo "$as_me:$LINENO: result: $TEST" >&5
-echo "${ECHO_T}$TEST" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $TEST" >&5
+$as_echo "$TEST" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "true", so it can be a program name with args.
 set dummy true; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_TRUE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $TRUE in
   [\\/]* | ?:[\\/]*)
@@ -25807,7 +17223,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_TRUE="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -25819,20 +17235,20 @@ esac
 fi
 TRUE=$ac_cv_path_TRUE
 if test -n "$TRUE"; then
-  { echo "$as_me:$LINENO: result: $TRUE" >&5
-echo "${ECHO_T}$TRUE" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $TRUE" >&5
+$as_echo "$TRUE" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "find", so it can be a program name with args.
 set dummy find; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_FIND+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $FIND in
   [\\/]* | ?:[\\/]*)
@@ -25847,7 +17263,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_FIND="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -25859,20 +17275,20 @@ esac
 fi
 FIND=$ac_cv_path_FIND
 if test -n "$FIND"; then
-  { echo "$as_me:$LINENO: result: $FIND" >&5
-echo "${ECHO_T}$FIND" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $FIND" >&5
+$as_echo "$FIND" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_PERL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $PERL in
   [\\/]* | ?:[\\/]*)
@@ -25887,7 +17303,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -25899,20 +17315,20 @@ esac
 fi
 PERL=$ac_cv_path_PERL
 if test -n "$PERL"; then
-  { echo "$as_me:$LINENO: result: $PERL" >&5
-echo "${ECHO_T}$PERL" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $PERL" >&5
+$as_echo "$PERL" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "glib-mkenums", so it can be a program name with args.
 set dummy glib-mkenums; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_GLIB_MKENUMS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $GLIB_MKENUMS in
   [\\/]* | ?:[\\/]*)
@@ -25927,7 +17343,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GLIB_MKENUMS="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -25939,20 +17355,20 @@ esac
 fi
 GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
 if test -n "$GLIB_MKENUMS"; then
-  { echo "$as_me:$LINENO: result: $GLIB_MKENUMS" >&5
-echo "${ECHO_T}$GLIB_MKENUMS" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $GLIB_MKENUMS" >&5
+$as_echo "$GLIB_MKENUMS" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "convert", so it can be a program name with args.
 set dummy convert; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_CONVERT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $CONVERT in
   [\\/]* | ?:[\\/]*)
@@ -25967,7 +17383,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CONVERT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -25979,26 +17395,26 @@ esac
 fi
 CONVERT=$ac_cv_path_CONVERT
 if test -n "$CONVERT"; then
-  { echo "$as_me:$LINENO: result: $CONVERT" >&5
-echo "${ECHO_T}$CONVERT" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CONVERT" >&5
+$as_echo "$CONVERT" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   if test x${CONVERT} = x ; then
-    { echo "$as_me:$LINENO: WARNING: PostScript developer's guide cannot be regenerated!" >&5
-echo "$as_me: WARNING: PostScript developer's guide cannot be regenerated!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: PostScript developer's guide cannot be regenerated!" >&5
+$as_echo "$as_me: WARNING: PostScript developer's guide cannot be regenerated!" >&2;}
   fi
 fi
 # Extract the first word of "texi2html", so it can be a program name with args.
 set dummy texi2html; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_TEXI2HTML+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $TEXI2HTML in
   [\\/]* | ?:[\\/]*)
@@ -26013,7 +17429,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_TEXI2HTML="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -26025,26 +17441,26 @@ esac
 fi
 TEXI2HTML=$ac_cv_path_TEXI2HTML
 if test -n "$TEXI2HTML"; then
-  { echo "$as_me:$LINENO: result: $TEXI2HTML" >&5
-echo "${ECHO_T}$TEXI2HTML" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $TEXI2HTML" >&5
+$as_echo "$TEXI2HTML" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   if test x${TEXI2HTML} = x ; then
-    { echo "$as_me:$LINENO: WARNING: HTML documentation cannot be regenerated!" >&5
-echo "$as_me: WARNING: HTML documentation cannot be regenerated!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: HTML documentation cannot be regenerated!" >&5
+$as_echo "$as_me: WARNING: HTML documentation cannot be regenerated!" >&2;}
   fi
 fi
 # Extract the first word of "dvips", so it can be a program name with args.
 set dummy dvips; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_DVIPS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $DVIPS in
   [\\/]* | ?:[\\/]*)
@@ -26059,7 +17475,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_DVIPS="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -26071,26 +17487,26 @@ esac
 fi
 DVIPS=$ac_cv_path_DVIPS
 if test -n "$DVIPS"; then
-  { echo "$as_me:$LINENO: result: $DVIPS" >&5
-echo "${ECHO_T}$DVIPS" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $DVIPS" >&5
+$as_echo "$DVIPS" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   if test x${DVIPS} = x ; then
-    { echo "$as_me:$LINENO: WARNING: PostScript documentation cannot be regenerated!" >&5
-echo "$as_me: WARNING: PostScript documentation cannot be regenerated!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: PostScript documentation cannot be regenerated!" >&5
+$as_echo "$as_me: WARNING: PostScript documentation cannot be regenerated!" >&2;}
   fi
 fi
 # Extract the first word of "db2pdf", so it can be a program name with args.
 set dummy db2pdf; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_DB2PDF+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $DB2PDF in
   [\\/]* | ?:[\\/]*)
@@ -26105,7 +17521,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_DB2PDF="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -26117,28 +17533,28 @@ esac
 fi
 DB2PDF=$ac_cv_path_DB2PDF
 if test -n "$DB2PDF"; then
-  { echo "$as_me:$LINENO: result: $DB2PDF" >&5
-echo "${ECHO_T}$DB2PDF" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $DB2PDF" >&5
+$as_echo "$DB2PDF" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   if test x${DB2PDF} = x ; then
-    { echo "$as_me:$LINENO: WARNING: PDF developer's guide cannot be regenerated!" >&5
-echo "$as_me: WARNING: PDF developer's guide cannot be regenerated!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: PDF developer's guide cannot be regenerated!" >&5
+$as_echo "$as_me: WARNING: PDF developer's guide cannot be regenerated!" >&2;}
   fi
 fi
 for ac_prog in dvipdf dvipdfm
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_DVIPDF+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $DVIPDF in
   [\\/]* | ?:[\\/]*)
@@ -26153,7 +17569,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_DVIPDF="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -26165,11 +17581,11 @@ esac
 fi
 DVIPDF=$ac_cv_path_DVIPDF
 if test -n "$DVIPDF"; then
-  { echo "$as_me:$LINENO: result: $DVIPDF" >&5
-echo "${ECHO_T}$DVIPDF" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $DVIPDF" >&5
+$as_echo "$DVIPDF" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -26178,16 +17594,16 @@ done
 
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   if test x${DVIPDF} = x ; then
-    { echo "$as_me:$LINENO: WARNING: PDF documentation cannot be regenerated!" >&5
-echo "$as_me: WARNING: PDF documentation cannot be regenerated!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: PDF documentation cannot be regenerated!" >&5
+$as_echo "$as_me: WARNING: PDF documentation cannot be regenerated!" >&2;}
   fi
 fi
 # Extract the first word of "db2ps", so it can be a program name with args.
 set dummy db2ps; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_DB2PS+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $DB2PS in
   [\\/]* | ?:[\\/]*)
@@ -26202,7 +17618,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_DB2PS="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -26214,26 +17630,26 @@ esac
 fi
 DB2PS=$ac_cv_path_DB2PS
 if test -n "$DB2PS"; then
-  { echo "$as_me:$LINENO: result: $DB2PS" >&5
-echo "${ECHO_T}$DB2PS" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $DB2PS" >&5
+$as_echo "$DB2PS" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   if test x${DB2PS} = x ; then
-    { echo "$as_me:$LINENO: WARNING: PostScript developer's guide cannot be regenerated!" >&5
-echo "$as_me: WARNING: PostScript developer's guide cannot be regenerated!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: PostScript developer's guide cannot be regenerated!" >&5
+$as_echo "$as_me: WARNING: PostScript developer's guide cannot be regenerated!" >&2;}
   fi
 fi
 # Extract the first word of "db2html", so it can be a program name with args.
 set dummy db2html; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_DB2HTML+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $DB2HTML in
   [\\/]* | ?:[\\/]*)
@@ -26248,7 +17664,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_DB2HTML="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -26260,26 +17676,26 @@ esac
 fi
 DB2HTML=$ac_cv_path_DB2HTML
 if test -n "$DB2HTML"; then
-  { echo "$as_me:$LINENO: result: $DB2HTML" >&5
-echo "${ECHO_T}$DB2HTML" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $DB2HTML" >&5
+$as_echo "$DB2HTML" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   if test x${DB2HTML} = x ; then
-    { echo "$as_me:$LINENO: WARNING: HTML developer's guide cannot be regenerated!" >&5
-echo "$as_me: WARNING: HTML developer's guide cannot be regenerated!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: HTML developer's guide cannot be regenerated!" >&5
+$as_echo "$as_me: WARNING: HTML developer's guide cannot be regenerated!" >&2;}
   fi
 fi
 # Extract the first word of "doxygen", so it can be a program name with args.
 set dummy doxygen; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_DOXYGEN+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $DOXYGEN in
   [\\/]* | ?:[\\/]*)
@@ -26294,7 +17710,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -26306,28 +17722,28 @@ esac
 fi
 DOXYGEN=$ac_cv_path_DOXYGEN
 if test -n "$DOXYGEN"; then
-  { echo "$as_me:$LINENO: result: $DOXYGEN" >&5
-echo "${ECHO_T}$DOXYGEN" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $DOXYGEN" >&5
+$as_echo "$DOXYGEN" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if test x${USE_MAINTAINER_MODE} = xyes ; then
   if test x${DOXYGEN} = x ; then
-    { echo "$as_me:$LINENO: WARNING: HTML developer's guide cannot be regenerated!" >&5
-echo "$as_me: WARNING: HTML developer's guide cannot be regenerated!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: HTML developer's guide cannot be regenerated!" >&5
+$as_echo "$as_me: WARNING: HTML developer's guide cannot be regenerated!" >&2;}
   fi
 fi
 
 if test x${BUILD_CUPS} = xyes; then
   # Extract the first word of "dialog", so it can be a program name with args.
 set dummy dialog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_DIALOG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $DIALOG in
   [\\/]* | ?:[\\/]*)
@@ -26342,7 +17758,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_DIALOG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -26354,11 +17770,11 @@ esac
 fi
 DIALOG=$ac_cv_path_DIALOG
 if test -n "$DIALOG"; then
-  { echo "$as_me:$LINENO: result: $DIALOG" >&5
-echo "${ECHO_T}$DIALOG" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $DIALOG" >&5
+$as_echo "$DIALOG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -26369,10 +17785,10 @@ if test x${BUILD_FOOMATIC} = xyes ; then
   PATH_SBIN=$PATH:/usr/sbin:/usr/local/sbin
   # Extract the first word of "foomatic-kitload", so it can be a program name with args.
 set dummy foomatic-kitload; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_FOOMATIC_KITLOAD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $FOOMATIC_KITLOAD in
   [\\/]* | ?:[\\/]*)
@@ -26387,7 +17803,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_FOOMATIC_KITLOAD="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -26399,24 +17815,24 @@ esac
 fi
 FOOMATIC_KITLOAD=$ac_cv_path_FOOMATIC_KITLOAD
 if test -n "$FOOMATIC_KITLOAD"; then
-  { echo "$as_me:$LINENO: result: $FOOMATIC_KITLOAD" >&5
-echo "${ECHO_T}$FOOMATIC_KITLOAD" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $FOOMATIC_KITLOAD" >&5
+$as_echo "$FOOMATIC_KITLOAD" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
   if test -z "$FOOMATIC_KITLOAD" ; then
-    { echo "$as_me:$LINENO: WARNING: Cannot find foomatic-kitload; attempt to install foomatic will fail" >&5
-echo "$as_me: WARNING: Cannot find foomatic-kitload; attempt to install foomatic will fail" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: Cannot find foomatic-kitload; attempt to install foomatic will fail" >&5
+$as_echo "$as_me: WARNING: Cannot find foomatic-kitload; attempt to install foomatic will fail" >&2;}
   fi
 fi
 
 if test x${BUILD_GHOSTSCRIPT} = xyes ; then
   if test -z "$IJS_CONFIG" ; then
-    { { echo "$as_me:$LINENO: error: Cannot find ijs-config; please ensure Ghostscript 6.53 or above is installed" >&5
-echo "$as_me: error: Cannot find ijs-config; please ensure Ghostscript 6.53 or above is installed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: Cannot find ijs-config; please ensure Ghostscript 6.53 or above is installed" >&5
+$as_echo "$as_me: error: Cannot find ijs-config; please ensure Ghostscript 6.53 or above is installed" >&2;}
    { (exit 1); exit 1; }; };
   fi
   IJS_CFLAGS=`$IJS_CONFIG --cflags`
@@ -26513,8 +17929,8 @@ if test x$ac_compiler_gnu = "xyes"; then
 
   for stp_ac_arg in -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=131072 ; do
 
-  { echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
-echo $ECHO_N "checking if ${CC} supports ${stp_ac_arg}... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
+$as_echo_n "checking if ${CC} supports ${stp_ac_arg}... " >&6; }
   stp_acOLDCFLAGS="${CFLAGS}"
   CFLAGS="${GNUCFLAGS} ${stp_ac_arg}"
   cat >conftest.$ac_ext <<_ACEOF
@@ -26538,26 +17954,27 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-   { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; };
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; };
         stp_newCFLAGS="$CFLAGS"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	 { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; };
+	 { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; };
 	stp_newCFLAGS="$stp_acOLDCFLAGS"
 fi
 
@@ -26571,8 +17988,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
   for stp_ac_arg in -pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls ; do
 
-  { echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
-echo $ECHO_N "checking if ${CC} supports ${stp_ac_arg}... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
+$as_echo_n "checking if ${CC} supports ${stp_ac_arg}... " >&6; }
   stp_acOLDCFLAGS="${CFLAGS}"
   CFLAGS="${GNUCFLAGS} ${stp_ac_arg}"
   cat >conftest.$ac_ext <<_ACEOF
@@ -26596,26 +18013,27 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-   { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; };
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; };
         stp_newCFLAGS="$CFLAGS"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	 { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; };
+	 { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; };
 	stp_newCFLAGS="$stp_acOLDCFLAGS"
 fi
 
@@ -26628,8 +18046,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   fi
   if test x$ENABLE_DEBUG = xyes ; then
 
-  { echo "$as_me:$LINENO: checking if ${CC} supports -g" >&5
-echo $ECHO_N "checking if ${CC} supports -g... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if ${CC} supports -g" >&5
+$as_echo_n "checking if ${CC} supports -g... " >&6; }
   stp_acOLDCFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} -g"
   cat >conftest.$ac_ext <<_ACEOF
@@ -26653,26 +18071,27 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-   { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; };
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; };
         stp_newCFLAGS="$CFLAGS"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	 { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; };
+	 { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; };
 	stp_newCFLAGS="$stp_acOLDCFLAGS"
 fi
 
@@ -26685,8 +18104,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   for stp_ac_arg in -O6 -O3 -O2 -O1 -O ; do
     stp_ac_save_CFLAGS="${CFLAGS}"
 
-  { echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
-echo $ECHO_N "checking if ${CC} supports ${stp_ac_arg}... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
+$as_echo_n "checking if ${CC} supports ${stp_ac_arg}... " >&6; }
   stp_acOLDCFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${stp_ac_arg}"
   cat >conftest.$ac_ext <<_ACEOF
@@ -26710,26 +18129,27 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-   { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; };
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; };
         stp_newCFLAGS="$CFLAGS"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	 { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; };
+	 { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; };
 	stp_newCFLAGS="$stp_acOLDCFLAGS"
 fi
 
@@ -26744,8 +18164,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   if test x$ENABLE_DEBUG = xyes ; then
 
-  { echo "$as_me:$LINENO: checking if ${CC} supports -g" >&5
-echo $ECHO_N "checking if ${CC} supports -g... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if ${CC} supports -g" >&5
+$as_echo_n "checking if ${CC} supports -g... " >&6; }
   stp_acOLDCFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} -g"
   cat >conftest.$ac_ext <<_ACEOF
@@ -26769,26 +18189,27 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-   { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; };
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; };
         stp_newCFLAGS="$CFLAGS"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	 { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; };
+	 { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; };
 	stp_newCFLAGS="$stp_acOLDCFLAGS"
 fi
 
@@ -26801,8 +18222,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   for stp_ac_arg in -O ; do
     stp_ac_save_CFLAGS="${CFLAGS}"
 
-  { echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
-echo $ECHO_N "checking if ${CC} supports ${stp_ac_arg}... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
+$as_echo_n "checking if ${CC} supports ${stp_ac_arg}... " >&6; }
   stp_acOLDCFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${stp_ac_arg}"
   cat >conftest.$ac_ext <<_ACEOF
@@ -26826,26 +18247,27 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-   { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; };
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; };
         stp_newCFLAGS="$CFLAGS"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	 { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; };
+	 { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; };
 	stp_newCFLAGS="$stp_acOLDCFLAGS"
 fi
 
@@ -26860,8 +18282,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 if test x$ENABLE_PROFILE = xyes ; then
 
-  { echo "$as_me:$LINENO: checking if ${CC} supports -pg" >&5
-echo $ECHO_N "checking if ${CC} supports -pg... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking if ${CC} supports -pg" >&5
+$as_echo_n "checking if ${CC} supports -pg... " >&6; }
   stp_acOLDCFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} -pg"
   cat >conftest.$ac_ext <<_ACEOF
@@ -26885,26 +18307,27 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-   { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; };
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; };
         stp_newCFLAGS="$CFLAGS"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	 { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; };
+	 { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; };
 	stp_newCFLAGS="$stp_acOLDCFLAGS"
 fi
 
@@ -26917,8 +18340,8 @@ fi
 
 
 
-{ echo "$as_me:$LINENO: checking if $CC supports __attribute__ syntax" >&5
-echo $ECHO_N "checking if $CC supports __attribute__ syntax... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking if $CC supports __attribute__ syntax" >&5
+$as_echo_n "checking if $CC supports __attribute__ syntax... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -26944,29 +18367,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
                    cat >>confdefs.h <<\_ACEOF
 #define HAVE_GCC_ATTRIBUTES 1
 _ACEOF
 
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -26979,10 +18403,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 if test "$USE_READLINE" = yes ; then
   if test "$EXTRA_LIBREADLINE_DEPS" = "" ; then
     unset ac_cv_lib_readline_readline
-    { echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
-echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
+$as_echo_n "checking for readline in -lreadline... " >&6; }
 if test "${ac_cv_lib_readline_readline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline -lncurses $LIBS"
@@ -27014,33 +18438,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_readline_readline=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_readline_readline=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6; }
-if test $ac_cv_lib_readline_readline = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
+$as_echo "$ac_cv_lib_readline_readline" >&6; }
+if test "x$ac_cv_lib_readline_readline" = x""yes; then
   HAVE_LIBREADLINE=true
 else
   HAVE_LIBREADLINE=false
@@ -27055,10 +18483,10 @@ _ACEOF
 
     else
       unset ac_cv_lib_readline_readline
-      { echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
-echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; }
+      { $as_echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
+$as_echo_n "checking for readline in -lreadline... " >&6; }
 if test "${ac_cv_lib_readline_readline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline -lcurses $LIBS"
@@ -27090,33 +18518,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_readline_readline=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_readline_readline=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6; }
-if test $ac_cv_lib_readline_readline = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
+$as_echo "$ac_cv_lib_readline_readline" >&6; }
+if test "x$ac_cv_lib_readline_readline" = x""yes; then
   HAVE_LIBREADLINE=true
 else
   HAVE_LIBREADLINE=false
@@ -27131,10 +18563,10 @@ _ACEOF
 
       else
 	unset ac_cv_lib_readline_readline
-	{ echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
-echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; }
+	{ $as_echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
+$as_echo_n "checking for readline in -lreadline... " >&6; }
 if test "${ac_cv_lib_readline_readline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline -ltermcap $LIBS"
@@ -27166,33 +18598,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_readline_readline=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_readline_readline=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6; }
-if test $ac_cv_lib_readline_readline = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
+$as_echo "$ac_cv_lib_readline_readline" >&6; }
+if test "x$ac_cv_lib_readline_readline" = x""yes; then
   HAVE_LIBREADLINE=true
 else
   HAVE_LIBREADLINE=false
@@ -27207,10 +18643,10 @@ _ACEOF
 
 	else
 	  unset ac_cv_lib_readline_readline
-	  { echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
-echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; }
+	  { $as_echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
+$as_echo_n "checking for readline in -lreadline... " >&6; }
 if test "${ac_cv_lib_readline_readline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $LIBS"
@@ -27242,33 +18678,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_readline_readline=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_readline_readline=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6; }
-if test $ac_cv_lib_readline_readline = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
+$as_echo "$ac_cv_lib_readline_readline" >&6; }
+if test "x$ac_cv_lib_readline_readline" = x""yes; then
   HAVE_LIBREADLINE=true
 else
   HAVE_LIBREADLINE=false
@@ -27290,10 +18730,10 @@ _ACEOF
     fi
   else
     unset ac_cv_lib_readline_readline
-    { echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
-echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for readline in -lreadline" >&5
+$as_echo_n "checking for readline in -lreadline... " >&6; }
 if test "${ac_cv_lib_readline_readline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline ${EXTRA_LIBREADLINE_DEPS} $LIBS"
@@ -27325,33 +18765,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_readline_readline=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_readline_readline=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6; }
-if test $ac_cv_lib_readline_readline = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5
+$as_echo "$ac_cv_lib_readline_readline" >&6; }
+if test "x$ac_cv_lib_readline_readline" = x""yes; then
   HAVE_LIBREADLINE=true
 else
   HAVE_LIBREADLINE=false
@@ -27378,10 +18822,10 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for lt_dlopen in -lltdl" >&5
-echo $ECHO_N "checking for lt_dlopen in -lltdl... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for lt_dlopen in -lltdl" >&5
+$as_echo_n "checking for lt_dlopen in -lltdl... " >&6; }
 if test "${ac_cv_lib_ltdl_lt_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lltdl  $LIBS"
@@ -27413,41 +18857,45 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ltdl_lt_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_ltdl_lt_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dlopen" >&6; }
-if test $ac_cv_lib_ltdl_lt_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dlopen" >&5
+$as_echo "$ac_cv_lib_ltdl_lt_dlopen" >&6; }
+if test "x$ac_cv_lib_ltdl_lt_dlopen" = x""yes; then
   LTDL_LIBS="-lltdl"
 fi
 
 
-{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
@@ -27479,41 +18927,45 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_dl_dlopen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
   DLOPEN_LIBS="-ldl"
 fi
 
 
-{ echo "$as_me:$LINENO: checking for pow in -lm" >&5
-echo $ECHO_N "checking for pow in -lm... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for pow in -lm" >&5
+$as_echo_n "checking for pow in -lm... " >&6; }
 if test "${ac_cv_lib_m_pow+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
@@ -27545,42 +18997,46 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_m_pow=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_m_pow=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
-echo "${ECHO_T}$ac_cv_lib_m_pow" >&6; }
-if test $ac_cv_lib_m_pow = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
+$as_echo "$ac_cv_lib_m_pow" >&6; }
+if test "x$ac_cv_lib_m_pow" = x""yes; then
   GUTENPRINT_LIBDEPS="${GUTENPRINT_LIBDEPS} -lm"
              gutenprint_libdeps="${gutenprint_libdeps} -lm"
 fi
 
 
-{ echo "$as_me:$LINENO: checking for pow in -lm" >&5
-echo $ECHO_N "checking for pow in -lm... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for pow in -lm" >&5
+$as_echo_n "checking for pow in -lm... " >&6; }
 if test "${ac_cv_lib_m_pow+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
@@ -27612,41 +19068,45 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_m_pow=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_m_pow=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
-echo "${ECHO_T}$ac_cv_lib_m_pow" >&6; }
-if test $ac_cv_lib_m_pow = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
+$as_echo "$ac_cv_lib_m_pow" >&6; }
+if test "x$ac_cv_lib_m_pow" = x""yes; then
   CUPS_LIBS="${CUPS_LIBS} -lm"
 fi
 
 if test x${BUILD_CUPS} = xyes ; then
-  { echo "$as_me:$LINENO: checking for gzgets in -lz" >&5
-echo $ECHO_N "checking for gzgets in -lz... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for gzgets in -lz" >&5
+$as_echo_n "checking for gzgets in -lz... " >&6; }
 if test "${ac_cv_lib_z_gzgets+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lz  $LIBS"
@@ -27678,33 +19138,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_z_gzgets=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_z_gzgets=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzgets" >&5
-echo "${ECHO_T}$ac_cv_lib_z_gzgets" >&6; }
-if test $ac_cv_lib_z_gzgets = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzgets" >&5
+$as_echo "$ac_cv_lib_z_gzgets" >&6; }
+if test "x$ac_cv_lib_z_gzgets" = x""yes; then
   HAVE_LIBZ=true
 else
   HAVE_LIBZ=false
@@ -27714,16 +19178,16 @@ fi
     GENPPD_LIBS="-lz"
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBZ
+#define HAVE_LIBZ /**/
 _ACEOF
 
   fi
   # Extract the first word of "cups-config", so it can be a program name with args.
 set dummy cups-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $CUPS_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -27738,7 +19202,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_CUPS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -27750,11 +19214,11 @@ esac
 fi
 CUPS_CONFIG=$ac_cv_path_CUPS_CONFIG
 if test -n "$CUPS_CONFIG"; then
-  { echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5
-echo "${ECHO_T}$CUPS_CONFIG" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CUPS_CONFIG" >&5
+$as_echo "$CUPS_CONFIG" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -27764,10 +19228,10 @@ fi
   else
         SAVELIBS="$LIBS"
     LIBS="$LIBS ${CUPS_LIBS}"
-    { echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
-echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
+$as_echo_n "checking for socket in -lsocket... " >&6; }
 if test "${ac_cv_lib_socket_socket+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
@@ -27799,43 +19263,47 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_socket_socket=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_socket_socket=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6; }
-if test $ac_cv_lib_socket_socket = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
+$as_echo "$ac_cv_lib_socket_socket" >&6; }
+if test "x$ac_cv_lib_socket_socket" = x""yes; then
   if test x${OSTYPE} != xirix ; then
       CUPS_LIBS="${CUPS_LIBS} -lsocket"
       LIBS="$LIBS -lsocket"
     fi
 fi
 
-    { echo "$as_me:$LINENO: checking for gethostbyaddr in -lnsl" >&5
-echo $ECHO_N "checking for gethostbyaddr in -lnsl... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for gethostbyaddr in -lnsl" >&5
+$as_echo_n "checking for gethostbyaddr in -lnsl... " >&6; }
 if test "${ac_cv_lib_nsl_gethostbyaddr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
@@ -27867,33 +19335,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_nsl_gethostbyaddr=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_nsl_gethostbyaddr=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyaddr" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyaddr" >&6; }
-if test $ac_cv_lib_nsl_gethostbyaddr = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyaddr" >&5
+$as_echo "$ac_cv_lib_nsl_gethostbyaddr" >&6; }
+if test "x$ac_cv_lib_nsl_gethostbyaddr" = x""yes; then
   if test x${OSTYPE} != xirix ; then
       CUPS_LIBS="${CUPS_LIBS} -lnsl"
       LIBS="$LIBS -lnsl"
@@ -27902,17 +19374,17 @@ fi
 
 
             if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
-echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
+$as_echo_n "checking for openssl/ssl.h... " >&6; }
 if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
-echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
+$as_echo "$ac_cv_header_openssl_ssl_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking openssl/ssl.h usability" >&5
-echo $ECHO_N "checking openssl/ssl.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking openssl/ssl.h usability" >&5
+$as_echo_n "checking openssl/ssl.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27928,32 +19400,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking openssl/ssl.h presence" >&5
-echo $ECHO_N "checking openssl/ssl.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking openssl/ssl.h presence" >&5
+$as_echo_n "checking openssl/ssl.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -27967,51 +19440,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: openssl/ssl.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/ssl.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: openssl/ssl.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: openssl/ssl.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/ssl.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: openssl/ssl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/ssl.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: openssl/ssl.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/ssl.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: openssl/ssl.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/ssl.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: openssl/ssl.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/ssl.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: openssl/ssl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
@@ -28020,18 +19494,18 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
-echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
+$as_echo_n "checking for openssl/ssl.h... " >&6; }
 if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_openssl_ssl_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
-echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
+$as_echo "$ac_cv_header_openssl_ssl_h" >&6; }
 
 fi
-if test $ac_cv_header_openssl_ssl_h = yes; then
+if test "x$ac_cv_header_openssl_ssl_h" = x""yes; then
 
       SSL="no"
 
@@ -28040,10 +19514,10 @@ if test $ac_cv_header_openssl_ssl_h = yes; then
 	  "-lcrypto -lrsaref" \
 	  "-lcrypto -lRSAglue -lrsaref"
       do
-	  { echo "$as_me:$LINENO: checking for SSL_new in -lssl" >&5
-echo $ECHO_N "checking for SSL_new in -lssl... $ECHO_C" >&6; }
+	  { $as_echo "$as_me:$LINENO: checking for SSL_new in -lssl" >&5
+$as_echo_n "checking for SSL_new in -lssl... " >&6; }
 if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lssl $libcrypto $LIBS"
@@ -28075,33 +19549,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_ssl_SSL_new=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_ssl_SSL_new=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_new" >&5
-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_new" >&6; }
-if test $ac_cv_lib_ssl_SSL_new = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_new" >&5
+$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
+if test "x$ac_cv_lib_ssl_SSL_new" = x""yes; then
   CUPS_LIBS="${CUPS_LIBS} -lssl $libcrypto"
 	       SSL="yes"
 fi
@@ -28115,10 +19593,10 @@ fi
 
 
 
-        { echo "$as_me:$LINENO: checking for cupsPrintFiles in -lcups" >&5
-echo $ECHO_N "checking for cupsPrintFiles in -lcups... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for cupsPrintFiles in -lcups" >&5
+$as_echo_n "checking for cupsPrintFiles in -lcups... " >&6; }
 if test "${ac_cv_lib_cups_cupsPrintFiles+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcups  $LIBS"
@@ -28150,45 +19628,49 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_cups_cupsPrintFiles=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_cups_cupsPrintFiles=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_cups_cupsPrintFiles" >&5
-echo "${ECHO_T}$ac_cv_lib_cups_cupsPrintFiles" >&6; }
-if test $ac_cv_lib_cups_cupsPrintFiles = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cups_cupsPrintFiles" >&5
+$as_echo "$ac_cv_lib_cups_cupsPrintFiles" >&6; }
+if test "x$ac_cv_lib_cups_cupsPrintFiles" = x""yes; then
   CUPS_LIBS="${CUPS_LIBS} -lcups"
 else
   LIBS="$LIBS -lcups"
-      { { echo "$as_me:$LINENO: error: Cannot find CUPS libraries (libcups)" >&5
-echo "$as_me: error: Cannot find CUPS libraries (libcups)" >&2;}
+      { { $as_echo "$as_me:$LINENO: error: Cannot find CUPS libraries (libcups)" >&5
+$as_echo "$as_me: error: Cannot find CUPS libraries (libcups)" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-    { echo "$as_me:$LINENO: checking for cupsRasterOpen in -lcupsimage" >&5
-echo $ECHO_N "checking for cupsRasterOpen in -lcupsimage... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for cupsRasterOpen in -lcupsimage" >&5
+$as_echo_n "checking for cupsRasterOpen in -lcupsimage... " >&6; }
 if test "${ac_cv_lib_cupsimage_cupsRasterOpen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcupsimage -lcups $LIBS"
@@ -28220,37 +19702,41 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_cupsimage_cupsRasterOpen=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_cupsimage_cupsRasterOpen=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_cupsimage_cupsRasterOpen" >&5
-echo "${ECHO_T}$ac_cv_lib_cupsimage_cupsRasterOpen" >&6; }
-if test $ac_cv_lib_cupsimage_cupsRasterOpen = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_cupsimage_cupsRasterOpen" >&5
+$as_echo "$ac_cv_lib_cupsimage_cupsRasterOpen" >&6; }
+if test "x$ac_cv_lib_cupsimage_cupsRasterOpen" = x""yes; then
   CUPS_LIBS="${CUPS_LIBS} -lcupsimage"
 else
-  { { echo "$as_me:$LINENO: error: Cannot find CUPS libraries (libcupsimage)" >&5
-echo "$as_me: error: Cannot find CUPS libraries (libcupsimage)" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: Cannot find CUPS libraries (libcupsimage)" >&5
+$as_echo "$as_me: error: Cannot find CUPS libraries (libcupsimage)" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -28272,10 +19758,10 @@ if test x${BUILD_GIMP2} = xyes ; then
 fi
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -28302,20 +19788,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -28407,37 +19894,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -28449,20 +19939,21 @@ fi
 
 for ac_header in getopt.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28478,32 +19969,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28517,51 +20009,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
@@ -28570,21 +20063,24 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -28592,17 +20088,17 @@ fi
 done
 
 if test "${ac_cv_header_readline_readline_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for readline/readline.h" >&5
-echo $ECHO_N "checking for readline/readline.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for readline/readline.h" >&5
+$as_echo_n "checking for readline/readline.h... " >&6; }
 if test "${ac_cv_header_readline_readline_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5
-echo "${ECHO_T}$ac_cv_header_readline_readline_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5
+$as_echo "$ac_cv_header_readline_readline_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking readline/readline.h usability" >&5
-echo $ECHO_N "checking readline/readline.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking readline/readline.h usability" >&5
+$as_echo_n "checking readline/readline.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28618,32 +20114,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking readline/readline.h presence" >&5
-echo $ECHO_N "checking readline/readline.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking readline/readline.h presence" >&5
+$as_echo_n "checking readline/readline.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28657,51 +20154,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: readline/readline.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: readline/readline.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: readline/readline.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: readline/readline.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: readline/readline.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: readline/readline.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: readline/readline.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: readline/readline.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: readline/readline.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: readline/readline.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: readline/readline.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: readline/readline.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: readline/readline.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: readline/readline.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
@@ -28710,18 +20208,18 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for readline/readline.h" >&5
-echo $ECHO_N "checking for readline/readline.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for readline/readline.h" >&5
+$as_echo_n "checking for readline/readline.h... " >&6; }
 if test "${ac_cv_header_readline_readline_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_readline_readline_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5
-echo "${ECHO_T}$ac_cv_header_readline_readline_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5
+$as_echo "$ac_cv_header_readline_readline_h" >&6; }
 
 fi
-if test $ac_cv_header_readline_readline_h = yes; then
+if test "x$ac_cv_header_readline_readline_h" = x""yes; then
   HAVE_READLINE_READLINE_H=true
 else
   HAVE_READLINE_READLINE_H=false
@@ -28731,7 +20229,7 @@ fi
 if test x${HAVE_READLINE_READLINE_H} = xtrue ; then
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_READLINE_READLINE_H
+#define HAVE_READLINE_READLINE_H /**/
 _ACEOF
 
   if test x${HAVE_LIBREADLINE} = xtrue ; then
@@ -28741,20 +20239,21 @@ fi
 
 for ac_header in dlfcn.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28770,32 +20269,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28809,51 +20309,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
@@ -28862,21 +20363,24 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
  HAVE_DLFCN_H=true
 fi
@@ -28886,20 +20390,21 @@ done
 
 for ac_header in fcntl.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28915,32 +20420,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -28954,51 +20460,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
@@ -29007,21 +20514,24 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -29031,20 +20541,21 @@ done
 
 for ac_header in limits.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29060,32 +20571,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29099,51 +20611,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
@@ -29152,21 +20665,24 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -29176,20 +20692,21 @@ done
 
 for ac_header in locale.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29205,32 +20722,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29244,51 +20762,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
@@ -29297,21 +20816,24 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -29321,20 +20843,21 @@ done
 
 for ac_header in ltdl.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29350,32 +20873,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29389,51 +20913,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
@@ -29442,21 +20967,24 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
  HAVE_LTDL_H=true
 fi
@@ -29468,20 +20996,21 @@ done
 
 for ac_header in stdarg.h stdlib.h string.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29497,32 +21026,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29536,51 +21066,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
@@ -29589,21 +21120,24 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -29614,20 +21148,21 @@ done
 
 for ac_header in sys/time.h sys/types.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29643,32 +21178,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29682,51 +21218,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
@@ -29735,21 +21272,24 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -29759,20 +21299,21 @@ done
 
 for ac_header in time.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29788,32 +21329,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29827,51 +21369,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
@@ -29880,21 +21423,24 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -29904,20 +21450,21 @@ done
 
 for ac_header in unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29933,32 +21480,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -29972,51 +21520,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------------------------- ##
 ## Report this to gimp-print-devel@lists.sourceforge.net ##
@@ -30025,21 +21574,24 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -30047,10 +21599,10 @@ fi
 done
 
 
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -30122,20 +21674,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_const=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_const=no
@@ -30143,20 +21696,20 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
 cat >>confdefs.h <<\_ACEOF
-#define const
+#define const /**/
 _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
 if test "${ac_cv_c_inline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
@@ -30179,20 +21732,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_inline=$ac_kw
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -30203,8 +21757,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
 
 
 case $ac_cv_c_inline in
@@ -30222,26 +21776,58 @@ _ACEOF
     ;;
 esac
 
-{ echo "$as_me:$LINENO: checking for off_t" >&5
-echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
+$as_echo_n "checking for off_t... " >&6; }
 if test "${ac_cv_type_off_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_off_t=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef off_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (off_t))
+       return 0;
+  ;
   return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((off_t)))
+	  return 0;
   ;
   return 0;
 }
@@ -30252,30 +21838,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_off_t=yes
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_off_t=no
+	ac_cv_type_off_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
-if test $ac_cv_type_off_t = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+$as_echo "$ac_cv_type_off_t" >&6; }
+if test "x$ac_cv_type_off_t" = x""yes; then
   :
 else
 
@@ -30285,26 +21880,58 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
+$as_echo_n "checking for size_t... " >&6; }
 if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_size_t=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef size_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
+if (sizeof (size_t))
+       return 0;
+  ;
   return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((size_t)))
+	  return 0;
   ;
   return 0;
 }
@@ -30315,30 +21942,39 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_size_t=yes
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_size_t=no
+	ac_cv_type_size_t=yes
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-if test $ac_cv_type_size_t = yes; then
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+$as_echo "$ac_cv_type_size_t" >&6; }
+if test "x$ac_cv_type_size_t" = x""yes; then
   :
 else
 
@@ -30348,10 +21984,10 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5
+$as_echo_n "checking return type of signal handlers... " >&6; }
 if test "${ac_cv_type_signal+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -30376,20 +22012,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_type_signal=int
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_type_signal=void
@@ -30397,8 +22034,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
+$as_echo "$ac_cv_type_signal" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define RETSIGTYPE $ac_cv_type_signal
@@ -30411,11 +22048,11 @@ _ACEOF
 
 for ac_func in nanosleep poll usleep
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -30468,35 +22105,42 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -30505,11 +22149,11 @@ done
 
 for ac_func in getopt_long
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -30562,45 +22206,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
-{ echo "$as_me:$LINENO: checking for library containing finite" >&5
-echo $ECHO_N "checking for library containing finite... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for library containing finite" >&5
+$as_echo_n "checking for library containing finite... " >&6; }
 if test "${ac_cv_search_finite+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -30638,26 +22289,30 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_finite=$ac_res
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext
   if test "${ac_cv_search_finite+set}" = set; then
@@ -30672,8 +22327,8 @@ fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_finite" >&5
-echo "${ECHO_T}$ac_cv_search_finite" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_finite" >&5
+$as_echo "$ac_cv_search_finite" >&6; }
 ac_res=$ac_cv_search_finite
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
@@ -30941,8 +22596,8 @@ elif test x$WITH_MODULES = xdlopen; then
   fi
 fi
 # define what module system is to be used
-{ echo "$as_me:$LINENO: checking which module system will be used" >&5
-echo $ECHO_N "checking which module system will be used... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking which module system will be used" >&5
+$as_echo_n "checking which module system will be used... " >&6; }
 if test x$USE_LTDL = xtrue; then
   MODULE="true"
 
@@ -30957,8 +22612,8 @@ _ACEOF
 
   GUTENPRINT_LIBDEPS="${GUTENPRINT_LIBDEPS} ${LTDL_LIBS}"
   gutenprint_libdeps="${gutenprint_libdeps} ${LTDL_LIBS}"
-  { echo "$as_me:$LINENO: result: ltdl" >&5
-echo "${ECHO_T}ltdl" >&6; }
+  { $as_echo "$as_me:$LINENO: result: ltdl" >&5
+$as_echo "ltdl" >&6; }
 elif test x$USE_DLOPEN = xtrue; then
   MODULE="true"
 
@@ -30973,12 +22628,12 @@ _ACEOF
 
   GUTENPRINT_LIBDEPS="${GUTENPRINT_LIBDEPS} ${DLOPEN_LIBS}"
   gutenprint_libdeps="${gutenprint_libdeps} ${DLOPEN_LIBS}"
-  { echo "$as_me:$LINENO: result: dlopen" >&5
-echo "${ECHO_T}dlopen" >&6; }
+  { $as_echo "$as_me:$LINENO: result: dlopen" >&5
+$as_echo "dlopen" >&6; }
 else
   MODULE="false"
-  { echo "$as_me:$LINENO: result: static" >&5
-echo "${ECHO_T}static" >&6; }
+  { $as_echo "$as_me:$LINENO: result: static" >&5
+$as_echo "static" >&6; }
 fi
  if test x$MODULE = xtrue; then
   BUILD_MODULES_TRUE=
@@ -31042,7 +22697,7 @@ cat >>confdefs.h <<_ACEOF
 #define CUPS_PPD_PS_LEVEL ${CUPS_PPD_PS_LEVEL}
 _ACEOF
 
-RELEASE_DATE="21 Dec 2008"
+RELEASE_DATE="26 Jul 2009"
 
 cat >>confdefs.h <<_ACEOF
 #define RELEASE_DATE "${RELEASE_DATE}"
@@ -31221,11 +22876,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -31258,12 +22914,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -31279,7 +22935,7 @@ ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -31291,198 +22947,191 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_NLS_TRUE}" && test -z "${USE_NLS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_NLS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_NLS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_NLS\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_NLS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${BUILD_FOOMATIC_TRUE}" && test -z "${BUILD_FOOMATIC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"BUILD_FOOMATIC\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_FOOMATIC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_FOOMATIC\" was never defined.
+$as_echo "$as_me: error: conditional \"BUILD_FOOMATIC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${BUILD_FOOMATIC_3_TRUE}" && test -z "${BUILD_FOOMATIC_3_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"BUILD_FOOMATIC_3\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_FOOMATIC_3\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_FOOMATIC_3\" was never defined.
+$as_echo "$as_me: error: conditional \"BUILD_FOOMATIC_3\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${BUILD_GHOSTSCRIPT_TRUE}" && test -z "${BUILD_GHOSTSCRIPT_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"BUILD_GHOSTSCRIPT\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GHOSTSCRIPT\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_GHOSTSCRIPT\" was never defined.
+$as_echo "$as_me: error: conditional \"BUILD_GHOSTSCRIPT\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${BUILD_CUPS_TRUE}" && test -z "${BUILD_CUPS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"BUILD_CUPS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_CUPS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_CUPS\" was never defined.
+$as_echo "$as_me: error: conditional \"BUILD_CUPS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${BUILD_CUPS_1_2_TRUE}" && test -z "${BUILD_CUPS_1_2_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"BUILD_CUPS_1_2\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_CUPS_1_2\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_CUPS_1_2\" was never defined.
+$as_echo "$as_me: error: conditional \"BUILD_CUPS_1_2\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${BUILD_CUPS_PPDS_TRUE}" && test -z "${BUILD_CUPS_PPDS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"BUILD_CUPS_PPDS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_CUPS_PPDS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_CUPS_PPDS\" was never defined.
+$as_echo "$as_me: error: conditional \"BUILD_CUPS_PPDS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${CUPS_PPDS_AT_TOP_LEVEL_TRUE}" && test -z "${CUPS_PPDS_AT_TOP_LEVEL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"CUPS_PPDS_AT_TOP_LEVEL\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"CUPS_PPDS_AT_TOP_LEVEL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"CUPS_PPDS_AT_TOP_LEVEL\" was never defined.
+$as_echo "$as_me: error: conditional \"CUPS_PPDS_AT_TOP_LEVEL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${BUILD_TRANSLATED_CUPS_PPDS_TRUE}" && test -z "${BUILD_TRANSLATED_CUPS_PPDS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"BUILD_TRANSLATED_CUPS_PPDS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_TRANSLATED_CUPS_PPDS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_TRANSLATED_CUPS_PPDS\" was never defined.
+$as_echo "$as_me: error: conditional \"BUILD_TRANSLATED_CUPS_PPDS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${BUILD_GLOBALIZED_CUPS_PPDS_TRUE}" && test -z "${BUILD_GLOBALIZED_CUPS_PPDS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"BUILD_GLOBALIZED_CUPS_PPDS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GLOBALIZED_CUPS_PPDS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_GLOBALIZED_CUPS_PPDS\" was never defined.
+$as_echo "$as_me: error: conditional \"BUILD_GLOBALIZED_CUPS_PPDS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${BUILD_SIMPLIFIED_CUPS_PPDS_TRUE}" && test -z "${BUILD_SIMPLIFIED_CUPS_PPDS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"BUILD_SIMPLIFIED_CUPS_PPDS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_SIMPLIFIED_CUPS_PPDS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_SIMPLIFIED_CUPS_PPDS\" was never defined.
+$as_echo "$as_me: error: conditional \"BUILD_SIMPLIFIED_CUPS_PPDS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${USE_LEVEL3_PS_TRUE}" && test -z "${USE_LEVEL3_PS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"USE_LEVEL3_PS\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_LEVEL3_PS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"USE_LEVEL3_PS\" was never defined.
+$as_echo "$as_me: error: conditional \"USE_LEVEL3_PS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${BUILD_ESCPUTIL_TRUE}" && test -z "${BUILD_ESCPUTIL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"BUILD_ESCPUTIL\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_ESCPUTIL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_ESCPUTIL\" was never defined.
+$as_echo "$as_me: error: conditional \"BUILD_ESCPUTIL\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${BUILD_TEST_TRUE}" && test -z "${BUILD_TEST_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"BUILD_TEST\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_TEST\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_TEST\" was never defined.
+$as_echo "$as_me: error: conditional \"BUILD_TEST\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${BUILD_TESTPATTERN_TRUE}" && test -z "${BUILD_TESTPATTERN_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"BUILD_TESTPATTERN\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_TESTPATTERN\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_TESTPATTERN\" was never defined.
+$as_echo "$as_me: error: conditional \"BUILD_TESTPATTERN\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${BUILD_LIBGUTENPRINTUI2_TRUE}" && test -z "${BUILD_LIBGUTENPRINTUI2_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"BUILD_LIBGUTENPRINTUI2\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_LIBGUTENPRINTUI2\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_LIBGUTENPRINTUI2\" was never defined.
+$as_echo "$as_me: error: conditional \"BUILD_LIBGUTENPRINTUI2\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${BUILD_GIMP2_TRUE}" && test -z "${BUILD_GIMP2_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"BUILD_GIMP2\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GIMP2\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_GIMP2\" was never defined.
+$as_echo "$as_me: error: conditional \"BUILD_GIMP2\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${BUILD_GIMP2_AS_GUTENPRINT_TRUE}" && test -z "${BUILD_GIMP2_AS_GUTENPRINT_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"BUILD_GIMP2_AS_GUTENPRINT\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GIMP2_AS_GUTENPRINT\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_GIMP2_AS_GUTENPRINT\" was never defined.
+$as_echo "$as_me: error: conditional \"BUILD_GIMP2_AS_GUTENPRINT\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${INSTALL_SAMPLES_TRUE}" && test -z "${INSTALL_SAMPLES_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"INSTALL_SAMPLES\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"INSTALL_SAMPLES\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"INSTALL_SAMPLES\" was never defined.
+$as_echo "$as_me: error: conditional \"INSTALL_SAMPLES\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${INSTALL_USER_GUIDE_TRUE}" && test -z "${INSTALL_USER_GUIDE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"INSTALL_USER_GUIDE\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"INSTALL_USER_GUIDE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"INSTALL_USER_GUIDE\" was never defined.
+$as_echo "$as_me: error: conditional \"INSTALL_USER_GUIDE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${BUILD_MODULES_TRUE}" && test -z "${BUILD_MODULES_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"BUILD_MODULES\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_MODULES\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_MODULES\" was never defined.
+$as_echo "$as_me: error: conditional \"BUILD_MODULES\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${BUILD_GENPPD_STATIC_TRUE}" && test -z "${BUILD_GENPPD_STATIC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"BUILD_GENPPD_STATIC\" was never defined.
+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_GENPPD_STATIC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_GENPPD_STATIC\" was never defined.
+$as_echo "$as_me: error: conditional \"BUILD_GENPPD_STATIC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -31492,11 +23141,12 @@ LTALLOCA=`echo "$ALLOCA" | sed 's/\.o/.lo/g'`
 
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -31509,7 +23159,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -31519,7 +23169,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -31541,17 +23191,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -31567,8 +23245,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -31591,7 +23267,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -31604,17 +23280,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -31636,7 +23305,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -31687,7 +23356,7 @@ $as_unset CDPATH
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -31715,7 +23384,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -31728,19 +23396,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -31765,10 +23436,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -31790,8 +23461,8 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gutenprint $as_me 5.2.3, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+This file was extended by gutenprint $as_me 5.2.4, which was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -31804,7 +23475,16 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
@@ -31812,22 +23492,23 @@ config_commands="$ac_config_commands"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -31841,13 +23522,13 @@ $config_commands
 Report bugs to <bug-autoconf@gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-gutenprint config.status 5.2.3
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+gutenprint config.status 5.2.4
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -31855,11 +23536,12 @@ ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
 MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -31881,30 +23563,36 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
+    { $as_echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; };;
   --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -31923,31 +23611,288 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# Quote evaled strings.
+for var in SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+OBJDUMP \
+deplibs_check_method \
+file_magic_cmd \
+AR \
+AR_FLAGS \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+SHELL \
+ECHO \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_wl \
+lt_prog_compiler_pic \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_flag_spec_ld \
+hardcode_libdir_separator \
+fix_srcfile_path \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+finish_eval \
+old_striplib \
+striplib; do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+sys_lib_dlsearch_path_spec; do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
+  ;;
+esac
+
+ac_aux_dir='$ac_aux_dir'
+xsi_shell='$xsi_shell'
+lt_shell_append='$lt_shell_append'
+
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'
+
+
+
 # Capture the value of obsolete ALL_LINGUAS because we need it to compute
     # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
     # from automake < 1.5.
@@ -31960,7 +23905,7 @@ GUTENPRINT_RELEASE_VERSION=${GUTENPRINT_RELEASE_VERSION}
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -31968,6 +23913,7 @@ do
   case $ac_config_target in
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
@@ -32016,8 +23962,8 @@ do
     "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -32058,393 +24004,144 @@ $debug ||
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
-_ACEOF
-
-
 
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-GUTENPRINT_MAJOR_VERSION!$GUTENPRINT_MAJOR_VERSION$ac_delim
-GUTENPRINT_MINOR_VERSION!$GUTENPRINT_MINOR_VERSION$ac_delim
-GUTENPRINT_MICRO_VERSION!$GUTENPRINT_MICRO_VERSION$ac_delim
-GUTENPRINT_CURRENT_INTERFACE!$GUTENPRINT_CURRENT_INTERFACE$ac_delim
-GUTENPRINT_INTERFACE_AGE!$GUTENPRINT_INTERFACE_AGE$ac_delim
-GUTENPRINT_BINARY_AGE!$GUTENPRINT_BINARY_AGE$ac_delim
-GUTENPRINT_VERSION!$GUTENPRINT_VERSION$ac_delim
-GUTENPRINTUI2_CURRENT_INTERFACE!$GUTENPRINTUI2_CURRENT_INTERFACE$ac_delim
-GUTENPRINTUI2_INTERFACE_AGE!$GUTENPRINTUI2_INTERFACE_AGE$ac_delim
-GUTENPRINTUI2_BINARY_AGE!$GUTENPRINTUI2_BINARY_AGE$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-am__isrc!$am__isrc$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-ALL_LINGUAS!$ALL_LINGUAS$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-SED!$SED$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
 fi
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-LN_S!$LN_S$ac_delim
-ECHO!$ECHO$ac_delim
-AR!$AR$ac_delim
-RANLIB!$RANLIB$ac_delim
-DSYMUTIL!$DSYMUTIL$ac_delim
-NMEDIT!$NMEDIT$ac_delim
-CPP!$CPP$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-CXXDEPMODE!$CXXDEPMODE$ac_delim
-am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
-am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-CXXCPP!$CXXCPP$ac_delim
-F77!$F77$ac_delim
-FFLAGS!$FFLAGS$ac_delim
-ac_ct_F77!$ac_ct_F77$ac_delim
-LIBTOOL!$LIBTOOL$ac_delim
-LIBTOOL_DEPS!$LIBTOOL_DEPS$ac_delim
-MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
-MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
-MAINT!$MAINT$ac_delim
-CUPS_CONFIG!$CUPS_CONFIG$ac_delim
-USE_NLS!$USE_NLS$ac_delim
-MSGFMT!$MSGFMT$ac_delim
-GMSGFMT!$GMSGFMT$ac_delim
-MSGFMT_015!$MSGFMT_015$ac_delim
-GMSGFMT_015!$GMSGFMT_015$ac_delim
-XGETTEXT!$XGETTEXT$ac_delim
-XGETTEXT_015!$XGETTEXT_015$ac_delim
-MSGMERGE!$MSGMERGE$ac_delim
-INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
-LIBICONV!$LIBICONV$ac_delim
-LTLIBICONV!$LTLIBICONV$ac_delim
-INTLLIBS!$INTLLIBS$ac_delim
-LIBINTL!$LIBINTL$ac_delim
-LTLIBINTL!$LTLIBINTL$ac_delim
-POSUB!$POSUB$ac_delim
-USE_NLS_TRUE!$USE_NLS_TRUE$ac_delim
-USE_NLS_FALSE!$USE_NLS_FALSE$ac_delim
-FOOMATIC_CONFIGURE!$FOOMATIC_CONFIGURE$ac_delim
-FOOMATIC_PPDFILE!$FOOMATIC_PPDFILE$ac_delim
-IJS_CONFIG!$IJS_CONFIG$ac_delim
-GIMPTOOL2_CHECK!$GIMPTOOL2_CHECK$ac_delim
-PKG_CONFIG!$PKG_CONFIG$ac_delim
-GTK2_CFLAGS!$GTK2_CFLAGS$ac_delim
-GTK2_LIBS!$GTK2_LIBS$ac_delim
-GIMP2_CFLAGS!$GIMP2_CFLAGS$ac_delim
-GIMP2_LIBS!$GIMP2_LIBS$ac_delim
-LEX!$LEX$ac_delim
-LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
-LEXLIB!$LEXLIB$ac_delim
-YACC!$YACC$ac_delim
-YFLAGS!$YFLAGS$ac_delim
-TEST!$TEST$ac_delim
-TRUE!$TRUE$ac_delim
-FIND!$FIND$ac_delim
-PERL!$PERL$ac_delim
-GLIB_MKENUMS!$GLIB_MKENUMS$ac_delim
-CONVERT!$CONVERT$ac_delim
-TEXI2HTML!$TEXI2HTML$ac_delim
-DVIPS!$DVIPS$ac_delim
-DB2PDF!$DB2PDF$ac_delim
-DVIPDF!$DVIPDF$ac_delim
-DB2PS!$DB2PS$ac_delim
-DB2HTML!$DB2HTML$ac_delim
-DOXYGEN!$DOXYGEN$ac_delim
-DIALOG!$DIALOG$ac_delim
-FOOMATIC_KITLOAD!$FOOMATIC_KITLOAD$ac_delim
-GNUCFLAGS!$GNUCFLAGS$ac_delim
-BUILD_FOOMATIC_TRUE!$BUILD_FOOMATIC_TRUE$ac_delim
-BUILD_FOOMATIC_FALSE!$BUILD_FOOMATIC_FALSE$ac_delim
-BUILD_FOOMATIC_3_TRUE!$BUILD_FOOMATIC_3_TRUE$ac_delim
-BUILD_FOOMATIC_3_FALSE!$BUILD_FOOMATIC_3_FALSE$ac_delim
-BUILD_GHOSTSCRIPT_TRUE!$BUILD_GHOSTSCRIPT_TRUE$ac_delim
-BUILD_GHOSTSCRIPT_FALSE!$BUILD_GHOSTSCRIPT_FALSE$ac_delim
-BUILD_CUPS_TRUE!$BUILD_CUPS_TRUE$ac_delim
-BUILD_CUPS_FALSE!$BUILD_CUPS_FALSE$ac_delim
-BUILD_CUPS_1_2_TRUE!$BUILD_CUPS_1_2_TRUE$ac_delim
-BUILD_CUPS_1_2_FALSE!$BUILD_CUPS_1_2_FALSE$ac_delim
-BUILD_CUPS_PPDS_TRUE!$BUILD_CUPS_PPDS_TRUE$ac_delim
-BUILD_CUPS_PPDS_FALSE!$BUILD_CUPS_PPDS_FALSE$ac_delim
-CUPS_PPDS_AT_TOP_LEVEL_TRUE!$CUPS_PPDS_AT_TOP_LEVEL_TRUE$ac_delim
-CUPS_PPDS_AT_TOP_LEVEL_FALSE!$CUPS_PPDS_AT_TOP_LEVEL_FALSE$ac_delim
-BUILD_TRANSLATED_CUPS_PPDS_TRUE!$BUILD_TRANSLATED_CUPS_PPDS_TRUE$ac_delim
-BUILD_TRANSLATED_CUPS_PPDS_FALSE!$BUILD_TRANSLATED_CUPS_PPDS_FALSE$ac_delim
-BUILD_GLOBALIZED_CUPS_PPDS_TRUE!$BUILD_GLOBALIZED_CUPS_PPDS_TRUE$ac_delim
-BUILD_GLOBALIZED_CUPS_PPDS_FALSE!$BUILD_GLOBALIZED_CUPS_PPDS_FALSE$ac_delim
-BUILD_SIMPLIFIED_CUPS_PPDS_TRUE!$BUILD_SIMPLIFIED_CUPS_PPDS_TRUE$ac_delim
-BUILD_SIMPLIFIED_CUPS_PPDS_FALSE!$BUILD_SIMPLIFIED_CUPS_PPDS_FALSE$ac_delim
-USE_LEVEL3_PS_TRUE!$USE_LEVEL3_PS_TRUE$ac_delim
-USE_LEVEL3_PS_FALSE!$USE_LEVEL3_PS_FALSE$ac_delim
-BUILD_ESCPUTIL_TRUE!$BUILD_ESCPUTIL_TRUE$ac_delim
-BUILD_ESCPUTIL_FALSE!$BUILD_ESCPUTIL_FALSE$ac_delim
-BUILD_TEST_TRUE!$BUILD_TEST_TRUE$ac_delim
-BUILD_TEST_FALSE!$BUILD_TEST_FALSE$ac_delim
-BUILD_TESTPATTERN_TRUE!$BUILD_TESTPATTERN_TRUE$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
-_ACEOF
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-BUILD_TESTPATTERN_FALSE!$BUILD_TESTPATTERN_FALSE$ac_delim
-BUILD_LIBGUTENPRINTUI2_TRUE!$BUILD_LIBGUTENPRINTUI2_TRUE$ac_delim
-BUILD_LIBGUTENPRINTUI2_FALSE!$BUILD_LIBGUTENPRINTUI2_FALSE$ac_delim
-BUILD_GIMP2_TRUE!$BUILD_GIMP2_TRUE$ac_delim
-BUILD_GIMP2_FALSE!$BUILD_GIMP2_FALSE$ac_delim
-BUILD_GIMP2_AS_GUTENPRINT_TRUE!$BUILD_GIMP2_AS_GUTENPRINT_TRUE$ac_delim
-BUILD_GIMP2_AS_GUTENPRINT_FALSE!$BUILD_GIMP2_AS_GUTENPRINT_FALSE$ac_delim
-INSTALL_SAMPLES_TRUE!$INSTALL_SAMPLES_TRUE$ac_delim
-INSTALL_SAMPLES_FALSE!$INSTALL_SAMPLES_FALSE$ac_delim
-INSTALL_USER_GUIDE_TRUE!$INSTALL_USER_GUIDE_TRUE$ac_delim
-INSTALL_USER_GUIDE_FALSE!$INSTALL_USER_GUIDE_FALSE$ac_delim
-BUILD_MODULES_TRUE!$BUILD_MODULES_TRUE$ac_delim
-BUILD_MODULES_FALSE!$BUILD_MODULES_FALSE$ac_delim
-BUILD_GENPPD_STATIC_TRUE!$BUILD_GENPPD_STATIC_TRUE$ac_delim
-BUILD_GENPPD_STATIC_FALSE!$BUILD_GENPPD_STATIC_FALSE$ac_delim
-RELEASE_DATE!$RELEASE_DATE$ac_delim
-cups_prefix!$cups_prefix$ac_delim
-cups_exec_prefix!$cups_exec_prefix$ac_delim
-cups_bindir!$cups_bindir$ac_delim
-cups_sbindir!$cups_sbindir$ac_delim
-cups_conf_datadir!$cups_conf_datadir$ac_delim
-cups_conf_serverbin!$cups_conf_serverbin$ac_delim
-cups_conf_serverroot!$cups_conf_serverroot$ac_delim
-CUPS_CFLAGS!$CUPS_CFLAGS$ac_delim
-CUPS_LIBS!$CUPS_LIBS$ac_delim
-CUPS_PPD_PS_LEVEL!$CUPS_PPD_PS_LEVEL$ac_delim
-GENPPD_LIBS!$GENPPD_LIBS$ac_delim
-IJS_CFLAGS!$IJS_CFLAGS$ac_delim
-IJS_LIBS!$IJS_LIBS$ac_delim
-RM!$RM$ac_delim
-gimp2_plug_indir!$gimp2_plug_indir$ac_delim
-GUTENPRINT_CFLAGS!$GUTENPRINT_CFLAGS$ac_delim
-GUTENPRINT_LIBS!$GUTENPRINT_LIBS$ac_delim
-GUTENPRINT_LIBDEPS!$GUTENPRINT_LIBDEPS$ac_delim
-GUTENPRINTUI2_CFLAGS!$GUTENPRINTUI2_CFLAGS$ac_delim
-GUTENPRINTUI2_LIBS!$GUTENPRINTUI2_LIBS$ac_delim
-GUTENPRINTUI2_LIBDEPS!$GUTENPRINTUI2_LIBDEPS$ac_delim
-GUTENPRINTUI2_VERSION!$GUTENPRINTUI2_VERSION$ac_delim
-gutenprint_cflags!$gutenprint_cflags$ac_delim
-gutenprint_libs!$gutenprint_libs$ac_delim
-gutenprint_libdeps!$gutenprint_libdeps$ac_delim
-gutenprintui2_cflags!$gutenprintui2_cflags$ac_delim
-gutenprintui2_libs!$gutenprintui2_libs$ac_delim
-gutenprintui2_libdeps!$gutenprintui2_libdeps$ac_delim
-LIBREADLINE_DEPS!$LIBREADLINE_DEPS$ac_delim
-MAINTAINER_CFLAGS!$MAINTAINER_CFLAGS$ac_delim
-PLUG_IN_PATH!$PLUG_IN_PATH$ac_delim
-WHICH_PPDS!$WHICH_PPDS$ac_delim
-BUILD_CUPS_PPDS!$BUILD_CUPS_PPDS$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-LTALLOCA!$LTALLOCA$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
 
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+_ACAWK
 _ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
 _ACEOF
 
-
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
@@ -32460,19 +24157,133 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
 
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+   { (exit 1); exit 1; }; }
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -32501,26 +24312,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -32530,7 +24353,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -32556,7 +24379,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -32565,7 +24388,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -32586,17 +24409,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -32641,12 +24464,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
   esac
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -32655,13 +24479,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -32675,15 +24500,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -32694,121 +24520,60 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
     fi
   else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+   { (exit 1); exit 1; }; }
   fi
-  rm -f "$tmp/out12"
-# Compute $ac_file's index in $config_headers.
-_am_arg=$ac_file
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
@@ -32823,7 +24588,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$_am_arg" : 'X\(//\)[^/]' \| \
 	 X"$_am_arg" : 'X\(//\)$' \| \
 	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$_am_arg" |
+$as_echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -32843,8 +24608,8 @@ echo X"$_am_arg" |
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -32866,7 +24631,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
 	 X"$mf" : 'X\(//\)$' \| \
 	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
+$as_echo X"$mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -32910,7 +24675,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$file" : 'X\(//\)[^/]' \| \
 	 X"$file" : 'X\(//\)$' \| \
 	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
+$as_echo X"$file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -32936,7 +24701,7 @@ echo X"$file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -32945,7 +24710,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -32966,14 +24731,649 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
     # echo "creating $dirpart/$file"
     echo '# dummy' > "$dirpart/$file"
   done
 done
  ;;
+    "libtool":C)
+
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool 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.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+# The names of the tagged configurations supported by this script.
+available_tags=""
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+
+# A grep program that handles long lines.
+GREP=$lt_GREP
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+
+# Object file suffix (normally "o").
+objext=$ac_objext
+
+# Executable file suffix (normally "").
+exeext=$exeext
+
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# An object symbol dumper.
+OBJDUMP=$lt_OBJDUMP
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method == "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+
+# The archiver.
+AR=$lt_AR
+AR_FLAGS=$lt_AR_FLAGS
+
+# A symbol stripping program.
+STRIP=$lt_STRIP
+
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# A C compiler.
+LTCC=$lt_CC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that does not interpret backslashes.
+ECHO=$lt_ECHO
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Library versioning type.
+version_type=$version_type
+
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+
+# A language specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking.  This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Fix the shell variable \$srcfile for the compiler.
+fix_srcfile_path=$lt_fix_srcfile_path
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  case $xsi_shell in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result="${1##*/}"
+}
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+  func_basename_result="${1##*/}"
+}
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+  # positional parameters, so assign one to ordinary parameter first.
+  func_stripname_result=${3}
+  func_stripname_result=${func_stripname_result#"${1}"}
+  func_stripname_result=${func_stripname_result%"${2}"}
+}
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=${1%%=*}
+  func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  case ${1} in
+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+    *)    func_lo2o_result=${1} ;;
+  esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=${1%.*}.lo
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=$(( $* ))
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=${#1}
+}
+
+_LT_EOF
+    ;;
+  *) # Bourne compatible functions.
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+  case ${2} in
+    .*) func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+    *)  func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+  esac
+}
+
+# sed scripts:
+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[^=]*=//'
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=`expr "$@"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
+esac
+
+case $lt_shell_append in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$1+=\$2"
+}
+_LT_EOF
+    ;;
+  *)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$1=\$$1\$2"
+}
+
+_LT_EOF
+    ;;
+  esac
+
+
+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
+ ;;
     "po-directories":C)
     for ac_file in $CONFIG_FILES; do
       # Support "outfile[:infile[:infile...]]"
@@ -33105,6 +25505,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -33126,6 +25531,10 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
 
 warnings_emitted=0
@@ -33219,6 +25628,18 @@ if test $warnings_emitted -ne 0 ; then
     echo '*** NOTE: Please review the warnings shown above carefully!'
 fi
 echo
-echo "Finished configuring.  Please review the configuration summary above."
+if test "$BUILD_GIMP2" = "no" -o "$BUILD_CUPS" = "no" ; then
+    echo "VERY IMPORTANT:"
+    echo "If you expect to build the CUPS driver or the enhanced Print plugin for"
+    echo "GIMP, but the output above indicates that that component will not be built,"
+    echo "it almost certainly indicates that development packages required to build"
+    echo "that component are not installed on your system.  Please read the README"
+    echo "file and install the necessary development packages before reporting any"
+    echo "error to the development team.  Depending upon your operating system version,"
+    echo "you may have to install packages from the installation medium or over"
+    echo "the network."
+    echo
+fi
+echo "Finished configuring.  Please review CAREFULLY the configuration summary above."
 echo "Type 'make clean' followed by 'make' to build the package"
 echo "then 'make install' to install it."
diff --git a/configure.ac b/configure.ac
index 3e2f4a9..add2fea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac,v 1.209 2008/12/21 00:04:24 rlk Exp $
+dnl $Id: configure.ac,v 1.214 2009/07/26 20:36:15 rlk Exp $
 dnl Copyright (C) 2001-2004 Roger Leigh
 dnl 
 dnl This program is free software; you can redistribute it and/or modify
@@ -37,10 +37,10 @@ dnl
 pushdef([GUTENPRINT_NAME],              [gutenprint])
 pushdef([GUTENPRINT_MAJOR_VERSION],     [5])
 pushdef([GUTENPRINT_MINOR_VERSION],     [2])
-pushdef([GUTENPRINT_MICRO_VERSION],     [3])
+pushdef([GUTENPRINT_MICRO_VERSION],     [4])
 pushdef([GUTENPRINT_EXTRA_VERSION],     [])
 pushdef([GUTENPRINT_CURRENT_INTERFACE], [2])
-pushdef([GUTENPRINT_INTERFACE_AGE],     [3])
+pushdef([GUTENPRINT_INTERFACE_AGE],     [5])
 pushdef([GUTENPRINT_BINARY_AGE],        [0])
 pushdef([GUTENPRINTUI2_CURRENT_INTERFACE], [1])
 pushdef([GUTENPRINTUI2_INTERFACE_AGE],     [0])
@@ -49,7 +49,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.209 $)
+AC_REVISION($Revision: 1.214 $)
 AC_CONFIG_SRCDIR(src/main/print-vars.c)
 AC_CONFIG_AUX_DIR(scripts)
 STP_INIT
@@ -139,7 +139,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 hu it ja nb nl pl pt sk sv zh_TW"
+ALL_LINGUAS="cs da de el en_GB es fr hu it ja nb nl pl pt ru sk sv zh_TW"
 AC_SUBST(ALL_LINGUAS)
 
 dnl Set up libtool scripts.
@@ -1105,6 +1105,18 @@ if test $warnings_emitted -ne 0 ; then
     echo '*** NOTE: Please review the warnings shown above carefully!'
 fi
 echo
-echo "Finished configuring.  Please review the configuration summary above."
+if test "$BUILD_GIMP2" = "no" -o "$BUILD_CUPS" = "no" ; then
+    echo "VERY IMPORTANT:"
+    echo "If you expect to build the CUPS driver or the enhanced Print plugin for"
+    echo "GIMP, but the output above indicates that that component will not be built,"
+    echo "it almost certainly indicates that development packages required to build"
+    echo "that component are not installed on your system.  Please read the README"
+    echo "file and install the necessary development packages before reporting any"
+    echo "error to the development team.  Depending upon your operating system version,"
+    echo "you may have to install packages from the installation medium or over"
+    echo "the network."
+    echo
+fi
+echo "Finished configuring.  Please review CAREFULLY the configuration summary above."
 echo "Type 'make clean' followed by 'make' to build the package"
 echo "then 'make install' to install it."
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e69de29..0000000
--- a/debian/patches/series
+++ /dev/null
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 78fcc67..30c954e 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -44,11 +44,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -88,10 +91,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -101,16 +100,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -155,6 +153,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -166,6 +165,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -178,8 +178,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -213,8 +217,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -259,6 +262,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -271,6 +275,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = developer
diff --git a/doc/developer/Makefile.in b/doc/developer/Makefile.in
index c0c8852..019ca41 100644
--- a/doc/developer/Makefile.in
+++ b/doc/developer/Makefile.in
@@ -43,11 +43,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
+	$(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
+	$(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
@@ -75,10 +78,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -88,16 +87,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -142,6 +140,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -153,6 +152,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -165,8 +165,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -200,8 +204,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -246,6 +249,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -258,6 +262,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
diff --git a/doc/gutenprint/gutenprint.tag b/doc/gutenprint/gutenprint.tag
index 9fe9656..0245b70 100644
--- a/doc/gutenprint/gutenprint.tag
+++ b/doc/gutenprint/gutenprint.tag
@@ -124,6 +124,13 @@
     </member>
     <member kind="function">
       <type>void</type>
+      <name>stp_split</name>
+      <anchorfile>bit-ops_8h.html</anchorfile>
+      <anchor>8509200fc0bff8d1f5928f04bf1edd2b</anchor>
+      <arglist>(int height, int bits, int n, const unsigned char *in, int stride, unsigned char **outs)</arglist>
+    </member>
+    <member kind="function">
+      <type>void</type>
       <name>stp_split_2</name>
       <anchorfile>bit-ops_8h.html</anchorfile>
       <anchor>260a00a6551c9e27e56ea1fab9444d80</anchor>
@@ -138,6 +145,13 @@
     </member>
     <member kind="function">
       <type>void</type>
+      <name>stp_unpack</name>
+      <anchorfile>bit-ops_8h.html</anchorfile>
+      <anchor>6512fc112307407fa2f30468b80ef69d</anchor>
+      <arglist>(int height, int bits, int n, const unsigned char *in, unsigned char **outs)</arglist>
+    </member>
+    <member kind="function">
+      <type>void</type>
       <name>stp_unpack_2</name>
       <anchorfile>bit-ops_8h.html</anchorfile>
       <anchor>e04e96586931b37257f4547eca77b116</anchor>
diff --git a/doc/gutenprint/html/annotated.html b/doc/gutenprint/html/annotated.html
index b15163d..d295a53 100644
--- a/doc/gutenprint/html/annotated.html
+++ b/doc/gutenprint/html/annotated.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -60,8 +60,8 @@
   <tr><td class="indexkey"><a class="el" href="structstp__weave__t.html">stp_weave_t</a></td><td class="indexvalue"></td></tr>
 </table>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/array_8h.html b/doc/gutenprint/html/array_8h.html
index 6bdf424..8f897a1 100644
--- a/doc/gutenprint/html/array_8h.html
+++ b/doc/gutenprint/html/array_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -65,8 +65,8 @@
 Array functions. 
 <p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/bit-ops_8h.html b/doc/gutenprint/html/bit-ops_8h.html
index 5fb1ebb..5b9594a 100644
--- a/doc/gutenprint/html/bit-ops_8h.html
+++ b/doc/gutenprint/html/bit-ops_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -24,24 +24,40 @@
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#1a36a9f23f967528df8fffbd71b5e96c">stp_fold</a> (const unsigned char *line, int single_length, unsigned char *outbuf)</td></tr>
 
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Interleave a buffer consisting of two bit strings of length single_length into one string of packed two-bit ints.  <a href="#1a36a9f23f967528df8fffbd71b5e96c"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#0ee5e547d025f7113f275dbb4614230c">stp_fold_3bit</a> (const unsigned char *line, int single_length, unsigned char *outbuf)</td></tr>
 
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Interleave a buffer consisting of three bit strings of length single_length into one string of packed three-bit ints.  <a href="#0ee5e547d025f7113f275dbb4614230c"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#fe47834318158a214ca693f1433996f1">stp_fold_3bit_323</a> (const unsigned char *line, int single_length, unsigned char *outbuf)</td></tr>
 
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Interleave a buffer consisting of three bit strings of length single_length into one string of packed three-bit ints.  <a href="#fe47834318158a214ca693f1433996f1"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#62ac3ec2651afff5fbe6c63544a13c66">stp_fold_4bit</a> (const unsigned char *line, int single_length, unsigned char *outbuf)</td></tr>
 
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Interleave a buffer consisting of four bit strings of length single_length into one string of packed four-bit ints.  <a href="#62ac3ec2651afff5fbe6c63544a13c66"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#8509200fc0bff8d1f5928f04bf1edd2b">stp_split</a> (int height, int bits, int n, const unsigned char *in, int stride, unsigned char **outs)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Split an input sequence of packed 1 or 2 bit integers into two or more outputs of equal length, distributing non-zero integers round robin into each output.  <a href="#8509200fc0bff8d1f5928f04bf1edd2b"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#260a00a6551c9e27e56ea1fab9444d80">stp_split_2</a> (int height, int bits, const unsigned char *in, unsigned char *outhi, unsigned char *outlo)</td></tr>
 
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Deprecated -- use stp_split.  <a href="#260a00a6551c9e27e56ea1fab9444d80"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#6d93a70fcc820df08fcf8d380b9743f5">stp_split_4</a> (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)</td></tr>
 
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Deprecated -- use stp_split.  <a href="#6d93a70fcc820df08fcf8d380b9743f5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#6512fc112307407fa2f30468b80ef69d">stp_unpack</a> (int height, int bits, int n, const unsigned char *in, unsigned char **outs)</td></tr>
+
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Unpack an input sequence of packed 1 or 2 bit integers into two or more outputs of equal length.  <a href="#6512fc112307407fa2f30468b80ef69d"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#e04e96586931b37257f4547eca77b116">stp_unpack_2</a> (int height, int bits, const unsigned char *in, unsigned char *outlo, unsigned char *outhi)</td></tr>
 
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Deprecated -- use stp_unpack.  <a href="#e04e96586931b37257f4547eca77b116"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#c5bb5a178b5c6275e7e7c2f6b5064342">stp_unpack_4</a> (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)</td></tr>
 
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Deprecated -- use stp_unpack.  <a href="#c5bb5a178b5c6275e7e7c2f6b5064342"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#958196e6b7349e883a450e52cae83d93">stp_unpack_8</a> (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7)</td></tr>
 
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Deprecated -- use stp_unpack.  <a href="#958196e6b7349e883a450e52cae83d93"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#8ddfbe4f60566d4111b4c4d88a956d1b">stp_unpack_16</a> (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7, unsigned char *out8, unsigned char *out9, unsigned char *out10, unsigned char *out11, unsigned char *out12, unsigned char *out13, unsigned char *out14, unsigned char *out15)</td></tr>
 
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Deprecated -- use stp_unpack.  <a href="#8ddfbe4f60566d4111b4c4d88a956d1b"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Bit operations. 
@@ -72,13 +88,22 @@ Bit operations.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
 <div class="memdoc">
 
 <p>
+Interleave a buffer consisting of two bit strings of length single_length into one string of packed two-bit ints. 
+<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>line</em>&nbsp;</td><td>the input bit string </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>single_length</em>&nbsp;</td><td>the length (in bytes) of the input </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>outbuf</em>&nbsp;</td><td>the output. </td></tr>
+  </table>
+</dl>
 
 </div>
 </div><p>
@@ -107,13 +132,22 @@ Bit operations.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
 <div class="memdoc">
 
 <p>
+Interleave a buffer consisting of three bit strings of length single_length into one string of packed three-bit ints. 
+<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>line</em>&nbsp;</td><td>the input bit string </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>single_length</em>&nbsp;</td><td>the length (in bytes) of the input </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>outbuf</em>&nbsp;</td><td>the output. </td></tr>
+  </table>
+</dl>
 
 </div>
 </div><p>
@@ -142,13 +176,22 @@ Bit operations.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
 <div class="memdoc">
 
 <p>
+Interleave a buffer consisting of three bit strings of length single_length into one string of packed three-bit ints. 
+<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>line</em>&nbsp;</td><td>the input bit string </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>single_length</em>&nbsp;</td><td>the length (in bytes) of the input </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>outbuf</em>&nbsp;</td><td>the output. </td></tr>
+  </table>
+</dl>
 
 </div>
 </div><p>
@@ -177,13 +220,88 @@ Bit operations.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
 <div class="memdoc">
 
 <p>
+Interleave a buffer consisting of four bit strings of length single_length into one string of packed four-bit ints. 
+<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>line</em>&nbsp;</td><td>the input bit string </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>single_length</em>&nbsp;</td><td>the length (in bytes) of the input </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>outbuf</em>&nbsp;</td><td>the output. </td></tr>
+  </table>
+</dl>
+
+</div>
+</div><p>
+<a class="anchor" name="8509200fc0bff8d1f5928f04bf1edd2b"></a><!-- doxytag: member="bit-ops.h::stp_split" ref="8509200fc0bff8d1f5928f04bf1edd2b" args="(int height, int bits, int n, const unsigned char *in, int stride, unsigned char **outs)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_split           </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>height</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>bits</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>n</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>in</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>stride</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char **&nbsp;</td>
+          <td class="paramname"> <em>outs</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+Split an input sequence of packed 1 or 2 bit integers into two or more outputs of equal length, distributing non-zero integers round robin into each output. 
+<p>
+Used in "high quality" modes when extra passes are made, to ensure that each pass gets an equal number of ink drops. Each output is as long as the input.<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>height</em>&nbsp;</td><td>the number of integers in the input divided by 8 </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>bits</em>&nbsp;</td><td>the bit depth (1 or 2) </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>n</em>&nbsp;</td><td>the number of outputs into which the input should be distributed </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>in</em>&nbsp;</td><td>the input bit string </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>stride</em>&nbsp;</td><td>the stride across the outputs (if it's necessary to distribute the input over non-contiguous members of the array of outputs) </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>outs</em>&nbsp;</td><td>the array of output bit strings </td></tr>
+  </table>
+</dl>
 
 </div>
 </div><p>
@@ -224,13 +342,15 @@ Bit operations.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
 <div class="memdoc">
 
 <p>
+Deprecated -- use stp_split. 
+<p>
 
 </div>
 </div><p>
@@ -283,13 +403,74 @@ Bit operations.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+Deprecated -- use stp_split. 
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="6512fc112307407fa2f30468b80ef69d"></a><!-- doxytag: member="bit-ops.h::stp_unpack" ref="6512fc112307407fa2f30468b80ef69d" args="(int height, int bits, int n, const unsigned char *in, unsigned char **outs)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stp_unpack           </td>
+          <td>(</td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>height</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>bits</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">int&nbsp;</td>
+          <td class="paramname"> <em>n</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">const unsigned char *&nbsp;</td>
+          <td class="paramname"> <em>in</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned char **&nbsp;</td>
+          <td class="paramname"> <em>outs</em></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
 <div class="memdoc">
 
 <p>
+Unpack an input sequence of packed 1 or 2 bit integers into two or more outputs of equal length. 
+<p>
+The input is round robined into the outputs. Each output is 1/n as long as the input.<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>height</em>&nbsp;</td><td>the number of integers in the input divided by 8 </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>bits</em>&nbsp;</td><td>the bit depth (1 or 2) </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>n</em>&nbsp;</td><td>the number of outputs into which the input should be distributed </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>in</em>&nbsp;</td><td>the input bit string </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>outs</em>&nbsp;</td><td>the array of output bit strings </td></tr>
+  </table>
+</dl>
 
 </div>
 </div><p>
@@ -414,13 +595,15 @@ Bit operations.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
 <div class="memdoc">
 
 <p>
+Deprecated -- use stp_unpack. 
+<p>
 
 </div>
 </div><p>
@@ -461,13 +644,15 @@ Bit operations.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
 <div class="memdoc">
 
 <p>
+Deprecated -- use stp_unpack. 
+<p>
 
 </div>
 </div><p>
@@ -520,13 +705,15 @@ Bit operations.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
 <div class="memdoc">
 
 <p>
+Deprecated -- use stp_unpack. 
+<p>
 
 </div>
 </div><p>
@@ -603,19 +790,21 @@ Bit operations.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
 <div class="memdoc">
 
 <p>
+Deprecated -- use stp_unpack. 
+<p>
 
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/channel_8h.html b/doc/gutenprint/html/channel_8h.html
index 1ec7e45..3ac28cb 100644
--- a/doc/gutenprint/html/channel_8h.html
+++ b/doc/gutenprint/html/channel_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -106,7 +106,7 @@ Channel functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -135,7 +135,7 @@ Channel functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -155,7 +155,7 @@ Channel functions.
           <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -184,7 +184,7 @@ Channel functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -219,7 +219,7 @@ Channel functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -254,7 +254,7 @@ Channel functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -274,7 +274,7 @@ Channel functions.
           <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -294,7 +294,7 @@ Channel functions.
           <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -314,7 +314,7 @@ Channel functions.
           <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -334,7 +334,7 @@ Channel functions.
           <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -354,7 +354,7 @@ Channel functions.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -374,7 +374,7 @@ Channel functions.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -409,7 +409,7 @@ Channel functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -444,7 +444,7 @@ Channel functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -464,7 +464,7 @@ Channel functions.
           <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -493,7 +493,7 @@ Channel functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -522,7 +522,7 @@ Channel functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -557,7 +557,7 @@ Channel functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -598,7 +598,7 @@ Channel functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -639,7 +639,7 @@ Channel functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -668,7 +668,7 @@ Channel functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -697,7 +697,7 @@ Channel functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -726,7 +726,7 @@ Channel functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -755,7 +755,7 @@ Channel functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -766,8 +766,8 @@ Channel functions.
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/classes.html b/doc/gutenprint/html/classes.html
index 53035ce..f272f83 100644
--- a/doc/gutenprint/html/classes.html
+++ b/doc/gutenprint/html/classes.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -30,8 +30,8 @@
 </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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/color_8h.html b/doc/gutenprint/html/color_8h.html
index 261f0ad..4f0ee0f 100644
--- a/doc/gutenprint/html/color_8h.html
+++ b/doc/gutenprint/html/color_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -64,8 +64,8 @@
 Color functions. 
 <p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/curve-cache_8h.html b/doc/gutenprint/html/curve-cache_8h.html
index c6f110f..b0a3d8e 100644
--- a/doc/gutenprint/html/curve-cache_8h.html
+++ b/doc/gutenprint/html/curve-cache_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -68,7 +68,7 @@ Curve caching functions.
           <td class="paramtype">cache&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;((cache)-&gt;count)</td>
+          <td>&nbsp;&nbsp;&nbsp;((cache)-&gt;count)</td>
         </tr>
       </table>
 </div>
@@ -88,7 +88,7 @@ Curve caching functions.
           <td class="paramtype">cache&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;((cache)-&gt;d_cache)</td>
+          <td>&nbsp;&nbsp;&nbsp;((cache)-&gt;d_cache)</td>
         </tr>
       </table>
 </div>
@@ -108,7 +108,7 @@ Curve caching functions.
           <td class="paramtype">cache&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;((cache)-&gt;s_cache)</td>
+          <td>&nbsp;&nbsp;&nbsp;((cache)-&gt;s_cache)</td>
         </tr>
       </table>
 </div>
@@ -138,7 +138,7 @@ Curve caching functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -158,7 +158,7 @@ Curve caching functions.
           <td class="paramtype"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
           <td class="paramname"> <em>cache</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -178,7 +178,7 @@ Curve caching functions.
           <td class="paramtype"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
           <td class="paramname"> <em>cache</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -198,7 +198,7 @@ Curve caching functions.
           <td class="paramtype"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
           <td class="paramname"> <em>cache</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -218,7 +218,7 @@ Curve caching functions.
           <td class="paramtype"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
           <td class="paramname"> <em>cache</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -238,7 +238,7 @@ Curve caching functions.
           <td class="paramtype"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
           <td class="paramname"> <em>cache</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -258,7 +258,7 @@ Curve caching functions.
           <td class="paramtype"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
           <td class="paramname"> <em>cache</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -287,7 +287,7 @@ Curve caching functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -316,7 +316,7 @@ Curve caching functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -336,7 +336,7 @@ Curve caching functions.
           <td class="paramtype"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
           <td class="paramname"> <em>cache</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -347,8 +347,8 @@ Curve caching functions.
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/curve_8h.html b/doc/gutenprint/html/curve_8h.html
index 29435be..c6fe1a2 100644
--- a/doc/gutenprint/html/curve_8h.html
+++ b/doc/gutenprint/html/curve_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -203,8 +203,8 @@
 Curve functions. 
 <p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/deprecated.html b/doc/gutenprint/html/deprecated.html
index 4fefdd7..edaf153 100644
--- a/doc/gutenprint/html/deprecated.html
+++ b/doc/gutenprint/html/deprecated.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -27,8 +27,8 @@
 <dd>This is likely to go away. </dd>
 </dl>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/dither_8h.html b/doc/gutenprint/html/dither_8h.html
index 31c8d46..20049e8 100644
--- a/doc/gutenprint/html/dither_8h.html
+++ b/doc/gutenprint/html/dither_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -333,7 +333,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -374,7 +374,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -409,7 +409,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -444,7 +444,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -479,7 +479,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -514,7 +514,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -561,7 +561,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -614,7 +614,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -634,7 +634,7 @@ Dither functions.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -675,7 +675,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -704,7 +704,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -724,7 +724,7 @@ Dither functions.
           <td class="paramtype"><a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *&nbsp;</td>
           <td class="paramname"> <em>mat</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -777,7 +777,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -812,7 +812,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -865,7 +865,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -906,7 +906,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -935,7 +935,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -964,7 +964,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -999,7 +999,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1019,7 +1019,7 @@ Dither functions.
           <td class="paramtype">const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
           <td class="paramname"> <em>array</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -1048,7 +1048,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1077,7 +1077,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1142,7 +1142,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1195,7 +1195,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1248,7 +1248,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1307,7 +1307,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1354,7 +1354,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1389,7 +1389,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1424,7 +1424,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1453,7 +1453,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1482,7 +1482,7 @@ Dither functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1493,8 +1493,8 @@ Dither functions.
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/doxygen.css b/doc/gutenprint/html/doxygen.css
index 74c22a2..22c4843 100644
--- a/doc/gutenprint/html/doxygen.css
+++ b/doc/gutenprint/html/doxygen.css
@@ -407,6 +407,7 @@ HR {
 	font-family: sans-serif;
 	margin:0.5em;
 }
+/* these are for tree view when used as main index */
 .directory { 
 	font-size: 9pt; 
 	font-weight: bold; 
@@ -416,6 +417,21 @@ HR {
 	margin-top: 1em; 
 	font-size: 11pt; 
 }
+
+/* The following two styles can be used to replace the root node title */
+/* with an image of your choice.  Simply uncomment the next two styles, */
+/* specify the name of your image and be sure to set 'height' to the */
+/* proper pixel height of your image. */
+
+/* .directory h3.swap { */
+/* 	height: 61px; */
+/* 	background-repeat: no-repeat; */
+/* 	background-image: url("yourimage.gif"); */
+/* } */
+/* .directory h3.swap span { */
+/* 	display: none; */
+/* } */
+
 .directory > h3 { 
 	margin-top: 0; 
 }
@@ -430,4 +446,28 @@ HR {
 .directory img { 
 	vertical-align: -30%; 
 }
+/* these are for tree view when not used as main index */
+.directory-alt { 
+	font-size: 100%; 
+	font-weight: bold; 
+}
+.directory-alt h3 { 
+	margin: 0px; 
+	margin-top: 1em; 
+	font-size: 11pt; 
+}
+.directory-alt > h3 { 
+	margin-top: 0; 
+}
+.directory-alt p { 
+	margin: 0px; 
+	white-space: nowrap; 
+}
+.directory-alt div { 
+	display: none; 
+	margin: 0px; 
+}
+.directory-alt img { 
+	vertical-align: -30%; 
+}
 
diff --git a/doc/gutenprint/html/files.html b/doc/gutenprint/html/files.html
index 725bb50..933b4ca 100644
--- a/doc/gutenprint/html/files.html
+++ b/doc/gutenprint/html/files.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -51,8 +51,8 @@
   <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/functions.html b/doc/gutenprint/html/functions.html
index bd2a40e..1ad2da0 100644
--- a/doc/gutenprint/html/functions.html
+++ b/doc/gutenprint/html/functions.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -55,8 +55,6 @@
       <li><a href="#index_y"><span>y</span></a></li>
     </ul>
   </div>
-
-<p>
 </div>
 <div class="contents">
 Here is a list of all struct and union fields with links to the structures/unions they belong to:
@@ -96,15 +94,15 @@ Here is a list of all struct and union fields with links to the structures/union
 <li>colorfuncs
 : <a class="el" href="structstp__color.html#4442d36d0bcf746130f82ffe6f90147f">stp_color</a>
 <li>comment
-: <a class="el" href="structstp__module.html#b60ac536d9ec7b3a306cddf4c06e18bb">stp_module</a>
-, <a class="el" href="structstp__papersize__t.html#5cdc973122b8cc2e612d2dee306cbf1d">stp_papersize_t</a>
+: <a class="el" href="structstp__papersize__t.html#5cdc973122b8cc2e612d2dee306cbf1d">stp_papersize_t</a>
+, <a class="el" href="structstp__module.html#b60ac536d9ec7b3a306cddf4c06e18bb">stp_module</a>
 <li>conclude
 : <a class="el" href="structstp__image.html#5d2385711b303e055258c28f42ab7f4c">stp_image</a>
 <li>count
 : <a class="el" href="structstp__cached__curve__t.html#99b772c3f4db71d58a4ee2315e712f04">stp_cached_curve_t</a>
 <li>curve
-: <a class="el" href="structstp__parameter__t.html#d64f0c31d200d3d413725621b3ef9133">stp_parameter_t</a>
-, <a class="el" href="structstp__cached__curve__t.html#e9b4170bfafe7d85b36689cbd8eea41e">stp_cached_curve_t</a>
+: <a class="el" href="structstp__cached__curve__t.html#e9b4170bfafe7d85b36689cbd8eea41e">stp_cached_curve_t</a>
+, <a class="el" href="structstp__parameter__t.html#d64f0c31d200d3d413725621b3ef9133">stp_parameter_t</a>
 </ul>
 <h3><a class="anchor" name="index_d">- d -</a></h3><ul>
 <li>d_cache
@@ -388,8 +386,8 @@ Here is a list of all struct and union fields with links to the structures/union
 : <a class="el" href="structdither__matrix__impl.html#33370af30d4c6cb0e441744c8d1c3686">dither_matrix_impl</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/functions_vars.html b/doc/gutenprint/html/functions_vars.html
index 53783f2..f27907e 100644
--- a/doc/gutenprint/html/functions_vars.html
+++ b/doc/gutenprint/html/functions_vars.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -55,8 +55,6 @@
       <li><a href="#index_y"><span>y</span></a></li>
     </ul>
   </div>
-
-<p>
 </div>
 <div class="contents">
 &nbsp;
@@ -96,15 +94,15 @@
 <li>colorfuncs
 : <a class="el" href="structstp__color.html#4442d36d0bcf746130f82ffe6f90147f">stp_color</a>
 <li>comment
-: <a class="el" href="structstp__module.html#b60ac536d9ec7b3a306cddf4c06e18bb">stp_module</a>
-, <a class="el" href="structstp__papersize__t.html#5cdc973122b8cc2e612d2dee306cbf1d">stp_papersize_t</a>
+: <a class="el" href="structstp__papersize__t.html#5cdc973122b8cc2e612d2dee306cbf1d">stp_papersize_t</a>
+, <a class="el" href="structstp__module.html#b60ac536d9ec7b3a306cddf4c06e18bb">stp_module</a>
 <li>conclude
 : <a class="el" href="structstp__image.html#5d2385711b303e055258c28f42ab7f4c">stp_image</a>
 <li>count
 : <a class="el" href="structstp__cached__curve__t.html#99b772c3f4db71d58a4ee2315e712f04">stp_cached_curve_t</a>
 <li>curve
-: <a class="el" href="structstp__parameter__t.html#d64f0c31d200d3d413725621b3ef9133">stp_parameter_t</a>
-, <a class="el" href="structstp__cached__curve__t.html#e9b4170bfafe7d85b36689cbd8eea41e">stp_cached_curve_t</a>
+: <a class="el" href="structstp__cached__curve__t.html#e9b4170bfafe7d85b36689cbd8eea41e">stp_cached_curve_t</a>
+, <a class="el" href="structstp__parameter__t.html#d64f0c31d200d3d413725621b3ef9133">stp_parameter_t</a>
 </ul>
 <h3><a class="anchor" name="index_d">- d -</a></h3><ul>
 <li>d_cache
@@ -388,8 +386,8 @@
 : <a class="el" href="structdither__matrix__impl.html#33370af30d4c6cb0e441744c8d1c3686">dither_matrix_impl</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals.html b/doc/gutenprint/html/globals.html
index 7fa6213..08802a7 100644
--- a/doc/gutenprint/html/globals.html
+++ b/doc/gutenprint/html/globals.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -45,8 +45,6 @@
       <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
     </ul>
   </div>
-
-<p>
 </div>
 <div class="contents">
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
@@ -59,8 +57,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="util_8h.html#9d373a9b65ff25b2db84c07394e1c212">util.h</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x62.html b/doc/gutenprint/html/globals_0x62.html
index 2647719..817e308 100644
--- a/doc/gutenprint/html/globals_0x62.html
+++ b/doc/gutenprint/html/globals_0x62.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -45,8 +45,6 @@
       <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
     </ul>
   </div>
-
-<p>
 </div>
 <div class="contents">
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
@@ -57,8 +55,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 , <a class="el" href="group__intl.html#gdd6dfc1077058ff26d79cdb18099d58a">gutenprint-intl.h</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x63.html b/doc/gutenprint/html/globals_0x63.html
index ad6093a..fde624d 100644
--- a/doc/gutenprint/html/globals_0x63.html
+++ b/doc/gutenprint/html/globals_0x63.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -45,8 +45,6 @@
       <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
     </ul>
   </div>
-
-<p>
 </div>
 <div class="contents">
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
@@ -62,8 +60,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="curve-cache_8h.html#4b278e86a2f914893307fb20cf218e7c">curve-cache.h</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x64.html b/doc/gutenprint/html/globals_0x64.html
index 40f63ad..0368c63 100644
--- a/doc/gutenprint/html/globals_0x64.html
+++ b/doc/gutenprint/html/globals_0x64.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -45,8 +45,6 @@
       <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
     </ul>
   </div>
-
-<p>
 </div>
 <div class="contents">
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
@@ -60,8 +58,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 , <a class="el" href="group__intl.html#gd24abc7110e1bdf384dc2ef2b63e5d07">gutenprint-intl.h</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x67.html b/doc/gutenprint/html/globals_0x67.html
index ee6b392..38ab8dd 100644
--- a/doc/gutenprint/html/globals_0x67.html
+++ b/doc/gutenprint/html/globals_0x67.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -45,8 +45,6 @@
       <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
     </ul>
   </div>
-
-<p>
 </div>
 <div class="contents">
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
@@ -57,8 +55,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 , <a class="el" href="group__intl.html#g83b8be0887dede025766d25e2bb884c6">gutenprint-intl.h</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x6e.html b/doc/gutenprint/html/globals_0x6e.html
index bfa2cde..a2f7b84 100644
--- a/doc/gutenprint/html/globals_0x6e.html
+++ b/doc/gutenprint/html/globals_0x6e.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -45,8 +45,6 @@
       <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
     </ul>
   </div>
-
-<p>
 </div>
 <div class="contents">
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
@@ -57,8 +55,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 , <a class="el" href="group__intl.html#g75278405e7f034d2b1af80bfd94675fe">gutenprint-intl.h</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x70.html b/doc/gutenprint/html/globals_0x70.html
index 921b88f..81caafc 100644
--- a/doc/gutenprint/html/globals_0x70.html
+++ b/doc/gutenprint/html/globals_0x70.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -45,8 +45,6 @@
       <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
     </ul>
   </div>
-
-<p>
 </div>
 <div class="contents">
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
@@ -72,8 +70,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__vars.html#ggc061852de3627383cd415cd80a979e022df363618282a9164433c0f212b18616">vars.h</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x73.html b/doc/gutenprint/html/globals_0x73.html
index 1646cd6..a294403 100644
--- a/doc/gutenprint/html/globals_0x73.html
+++ b/doc/gutenprint/html/globals_0x73.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -45,8 +45,6 @@
       <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
     </ul>
   </div>
-
-<p>
 </div>
 <div class="contents">
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
@@ -1260,6 +1258,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__vars.html#g3a852ce7e42d7f8e0cef6c7d399e0491">vars.h</a>
 <li>stp_shade_t
 : <a class="el" href="dither_8h.html#5baefb325bf92b7ca10c2d057c04b835">dither.h</a>
+<li>stp_split()
+: <a class="el" href="bit-ops_8h.html#8509200fc0bff8d1f5928f04bf1edd2b">bit-ops.h</a>
 <li>stp_split_2()
 : <a class="el" href="bit-ops_8h.html#260a00a6551c9e27e56ea1fab9444d80">bit-ops.h</a>
 <li>stp_split_4()
@@ -1296,6 +1296,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="group__util.html#gb026f7022963acd694a8b89e4decbde5">util.h</a>
 <li>stp_strtoxmlstr()
 : <a class="el" href="xml_8h.html#6bdda178f51ef17e02b0c662e0b06a8b">xml.h</a>
+<li>stp_unpack()
+: <a class="el" href="bit-ops_8h.html#6512fc112307407fa2f30468b80ef69d">bit-ops.h</a>
 <li>stp_unpack_16()
 : <a class="el" href="bit-ops_8h.html#8ddfbe4f60566d4111b4c4d88a956d1b">bit-ops.h</a>
 <li>stp_unpack_2()
@@ -1398,8 +1400,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="path_8h.html#17eca69c41eb6cca959ab47e3c1a3aa2">path.h</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x74.html b/doc/gutenprint/html/globals_0x74.html
index 0316f27..d3f0d99 100644
--- a/doc/gutenprint/html/globals_0x74.html
+++ b/doc/gutenprint/html/globals_0x74.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -45,8 +45,6 @@
       <li class="current"><a href="globals_0x74.html#index_t"><span>t</span></a></li>
     </ul>
   </div>
-
-<p>
 </div>
 <div class="contents">
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
@@ -57,8 +55,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 , <a class="el" href="group__intl.html#g5f80e8482ab93869489531a8c7ce7006">gutenprint-intl.h</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_defs.html b/doc/gutenprint/html/globals_defs.html
index fed39ef..92279df 100644
--- a/doc/gutenprint/html/globals_defs.html
+++ b/doc/gutenprint/html/globals_defs.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -44,8 +44,6 @@
       <li><a href="#index_t"><span>t</span></a></li>
     </ul>
   </div>
-
-<p>
 </div>
 <div class="contents">
 &nbsp;
@@ -208,8 +206,8 @@
 , <a class="el" href="group__intl.html#g5f80e8482ab93869489531a8c7ce7006">gutenprint-intl.h</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_enum.html b/doc/gutenprint/html/globals_enum.html
index e689b08..2eb89b9 100644
--- a/doc/gutenprint/html/globals_enum.html
+++ b/doc/gutenprint/html/globals_enum.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -69,8 +69,8 @@
 : <a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf38580991">weave.h</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_eval.html b/doc/gutenprint/html/globals_eval.html
index 4cc0986..f3e53ce 100644
--- a/doc/gutenprint/html/globals_eval.html
+++ b/doc/gutenprint/html/globals_eval.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -38,8 +38,6 @@
       <li><a href="#index_s"><span>s</span></a></li>
     </ul>
   </div>
-
-<p>
 </div>
 <div class="contents">
 &nbsp;
@@ -175,8 +173,8 @@
 : <a class="el" href="weave_8h.html#059ef2763c95a5cc47d51dcf385809916077c1fbd3cc6c79a1ac5f23d31bd2b3">weave.h</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_func.html b/doc/gutenprint/html/globals_func.html
index c92a2cd..f115522 100644
--- a/doc/gutenprint/html/globals_func.html
+++ b/doc/gutenprint/html/globals_func.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -37,8 +37,6 @@
       <li class="current"><a href="globals_func.html#index_s"><span>s</span></a></li>
     </ul>
   </div>
-
-<p>
 </div>
 <div class="contents">
 &nbsp;
@@ -920,6 +918,8 @@
 : <a class="el" href="group__vars.html#g1023ad18d2c97763137909b6191b0940">vars.h</a>
 <li>stp_set_width()
 : <a class="el" href="group__vars.html#g3a852ce7e42d7f8e0cef6c7d399e0491">vars.h</a>
+<li>stp_split()
+: <a class="el" href="bit-ops_8h.html#8509200fc0bff8d1f5928f04bf1edd2b">bit-ops.h</a>
 <li>stp_split_2()
 : <a class="el" href="bit-ops_8h.html#260a00a6551c9e27e56ea1fab9444d80">bit-ops.h</a>
 <li>stp_split_4()
@@ -954,6 +954,8 @@
 : <a class="el" href="group__util.html#gb026f7022963acd694a8b89e4decbde5">util.h</a>
 <li>stp_strtoxmlstr()
 : <a class="el" href="xml_8h.html#6bdda178f51ef17e02b0c662e0b06a8b">xml.h</a>
+<li>stp_unpack()
+: <a class="el" href="bit-ops_8h.html#6512fc112307407fa2f30468b80ef69d">bit-ops.h</a>
 <li>stp_unpack_16()
 : <a class="el" href="bit-ops_8h.html#8ddfbe4f60566d4111b4c4d88a956d1b">bit-ops.h</a>
 <li>stp_unpack_2()
@@ -1038,8 +1040,8 @@
 : <a class="el" href="path_8h.html#17eca69c41eb6cca959ab47e3c1a3aa2">path.h</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_type.html b/doc/gutenprint/html/globals_type.html
index c4753be..a9e1aa5 100644
--- a/doc/gutenprint/html/globals_type.html
+++ b/doc/gutenprint/html/globals_type.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -38,8 +38,6 @@
       <li><a href="#index_s"><span>s</span></a></li>
     </ul>
   </div>
-
-<p>
 </div>
 <div class="contents">
 &nbsp;
@@ -129,8 +127,8 @@
 : <a class="el" href="xml_8h.html#fad8ff906c4248935a93794f1b6f8c1a">xml.h</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_vars.html b/doc/gutenprint/html/globals_vars.html
index 49ee527..1710085 100644
--- a/doc/gutenprint/html/globals_vars.html
+++ b/doc/gutenprint/html/globals_vars.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -63,8 +63,8 @@
 : <a class="el" href="weave_8h.html#561a5fd614c279fdc9ea9c14c7a5b540">weave.h</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__array.html b/doc/gutenprint/html/group__array.html
index 67a4fc0..f7732c4 100644
--- a/doc/gutenprint/html/group__array.html
+++ b/doc/gutenprint/html/group__array.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -100,7 +100,7 @@ The array opaque data type.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -137,7 +137,7 @@ Both dest and source must be valid arrays previously created with <a class="el"
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -166,7 +166,7 @@ The total size of the array will be (x_size * y_size). <dl compact><dt><b>Parame
           <td class="paramtype">const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
           <td class="paramname"> <em>array</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -194,7 +194,7 @@ dest will be created, and then the contents of source will be copied into it. de
           <td class="paramtype"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
           <td class="paramname"> <em>array</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -236,7 +236,7 @@ It is an error to destroy the array more than once. <dl compact><dt><b>Parameter
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -290,7 +290,7 @@ Get the data in an array.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -321,7 +321,7 @@ Get the data at a single point in the array.
           <td class="paramtype">const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
           <td class="paramname"> <em>array</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -364,7 +364,7 @@ Get the underlying stp_sequence_t.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -402,7 +402,7 @@ The current x and y sizes are stored in the integers pointed to by x_size and y_
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -451,7 +451,7 @@ Set the data in an array.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -497,7 +497,7 @@ Set the data at a single point in the array.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -517,8 +517,8 @@ Resizing an array will destroy all data stored in the array. <dl compact><dt><b>
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__color.html b/doc/gutenprint/html/group__color.html
index 9fc9745..35141c8 100644
--- a/doc/gutenprint/html/group__color.html
+++ b/doc/gutenprint/html/group__color.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -89,7 +89,7 @@ Color modules provide the actual functionality, so different colour management m
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -127,7 +127,7 @@ Get the number of available color modules.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -147,7 +147,7 @@ Get the number of available color modules.
           <td class="paramtype">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td>
           <td class="paramname"> <em>c</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -175,7 +175,7 @@ Get the long (translated) name of a color module.
           <td class="paramtype">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td>
           <td class="paramname"> <em>c</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -224,7 +224,7 @@ Get the short (untranslated) name of a color module.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -259,7 +259,7 @@ Get the short (untranslated) name of a color module.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -279,7 +279,7 @@ Get the short (untranslated) name of a color module.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -299,7 +299,7 @@ Get the short (untranslated) name of a color module.
           <td class="paramtype">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td>
           <td class="paramname"> <em>color</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -319,7 +319,7 @@ Get the short (untranslated) name of a color module.
           <td class="paramtype">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td>
           <td class="paramname"> <em>color</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -339,7 +339,7 @@ Get the short (untranslated) name of a color module.
           <td class="paramtype"><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *&nbsp;</td>
           <td class="paramname"> <em>colorfuncs</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -359,7 +359,7 @@ Get the short (untranslated) name of a color module.
           <td class="paramtype">int&nbsp;</td>
           <td class="paramname"> <em>idx</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -387,7 +387,7 @@ Get a color module by its index number.
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>name</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -406,8 +406,8 @@ Get a color module by its name.
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__curve.html b/doc/gutenprint/html/group__curve.html
index ccf4c21..05a2a4b 100644
--- a/doc/gutenprint/html/group__curve.html
+++ b/doc/gutenprint/html/group__curve.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -378,7 +378,7 @@ The curve wraps to its starting point.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -419,7 +419,7 @@ Only add and multiply composition is currently supported. If both curves are gam
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -447,7 +447,7 @@ Both dest and source must be valid curves previously created with <a class="el"
           <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
           <td class="paramname"> <em>curve</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -475,7 +475,7 @@ Get the number of allocated points in the curve.
           <td class="paramtype"><a class="el" href="group__curve.html#g3ae3af552b490b0ca8b02e442ac9547a">stp_curve_wrap_mode_t</a>&nbsp;</td>
           <td class="paramname"> <em>wrap</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -504,7 +504,7 @@ A wrapped curve has the same value at x=0 and x=1. The wrap mode of a curve cann
           <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
           <td class="paramname"> <em>curve</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -532,7 +532,7 @@ dest will be created, and then the contents of source will be copied into it. de
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>file</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -561,7 +561,7 @@ Create a curve from a stream.
           <td class="paramtype">FILE *&nbsp;</td>
           <td class="paramname"> <em>fp</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -590,7 +590,7 @@ Create a curve from a stream.
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>string</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -619,7 +619,7 @@ Create a curve from a string.
           <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
           <td class="paramname"> <em>curve</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -647,7 +647,7 @@ dest will be created, and then the contents of source will be copied into it. de
           <td class="paramtype"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
           <td class="paramname"> <em>curve</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -689,7 +689,7 @@ It is an error to destroy the curve more than once. <dl compact><dt><b>Parameter
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -727,7 +727,7 @@ Get the lower and upper bounds on a curve.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -765,7 +765,7 @@ Get a pointer to the curve's raw data.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -803,7 +803,7 @@ Get a pointer to the curve's raw data as points.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -832,7 +832,7 @@ Get pointer to the curve's raw data as floats.
           <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
           <td class="paramname"> <em>curve</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -864,7 +864,7 @@ Get the gamma value of the curve.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -893,7 +893,7 @@ Get pointer to the curve's raw data as integers.
           <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
           <td class="paramname"> <em>curve</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -930,7 +930,7 @@ Get the curve interpolation type.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -974,7 +974,7 @@ Get pointer to the curve's raw data as longs.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1019,7 +1019,7 @@ Get a point along the curve.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1039,7 +1039,7 @@ Get a point along the curve.
           <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
           <td class="paramname"> <em>curve</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -1076,7 +1076,7 @@ This can be used for fast access to the raw data. <dl compact><dt><b>Parameters:
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1120,7 +1120,7 @@ Get pointer to the curve's raw data as shorts.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1159,7 +1159,7 @@ If the start or count is invalid, the returned curve will compare equal to NULL
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1197,7 +1197,7 @@ Get pointer to the curve's raw data as unsigned integers.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1235,7 +1235,7 @@ Get pointer to the curve's raw data as unsigned longs.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1264,7 +1264,7 @@ Get pointer to the curve's raw data as unsigned shorts.
           <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
           <td class="paramname"> <em>curve</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -1307,7 +1307,7 @@ Get the wrapping mode.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1337,7 +1337,7 @@ Interpolate a point along the curve.
           <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
           <td class="paramname"> <em>curve</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -1374,7 +1374,7 @@ Determine whether the curve is piecewise.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1424,7 +1424,7 @@ This does not destroy the gamma value of a curve. Points are interpolated as req
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1464,7 +1464,7 @@ This also rescales the bounds. Note that this currently destroys the gamma prope
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1507,7 +1507,7 @@ Both dest and source must be valid curves previously created with <a class="el"
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1552,7 +1552,7 @@ To change the bounds adjusting data as required, use stp_curve_rescale instead.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1597,7 +1597,7 @@ If any of the data points fall outside the bounds, the operation is not performe
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1642,7 +1642,7 @@ If any of the data points fall outside the bounds, the operation is not performe
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1681,7 +1681,7 @@ If any of the data points fall outside the bounds, the operation is not performe
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1725,7 +1725,7 @@ This replaces all existing points along the curve. The bounds are set to 0..1. I
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1764,7 +1764,7 @@ If any of the data points fall outside the bounds, the operation is not performe
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1808,7 +1808,7 @@ Set the curve interpolation type.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1853,7 +1853,7 @@ If any of the data points fall outside the bounds, the operation is not performe
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1898,7 +1898,7 @@ This call destroys any gamma value assigned to the curve. <dl compact><dt><b>Par
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1943,7 +1943,7 @@ If any of the data points fall outside the bounds, the operation is not performe
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1978,7 +1978,7 @@ If any of the data points fall outside the bounds, the operation is not performe
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2023,7 +2023,7 @@ If any of the data points fall outside the bounds, the operation is not performe
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2068,7 +2068,7 @@ If any of the data points fall outside the bounds, the operation is not performe
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2107,7 +2107,7 @@ If any of the data points fall outside the bounds, the operation is not performe
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2137,7 +2137,7 @@ The printable representation is guaranteed to contain only 7-bit printable ASCII
           <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
           <td class="paramname"> <em>curve</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -2157,8 +2157,8 @@ The printable representation is guaranteed to contain only 7-bit printable ASCII
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__image.html b/doc/gutenprint/html/group__image.html
index f7a1b0a..e7b2b3b 100644
--- a/doc/gutenprint/html/group__image.html
+++ b/doc/gutenprint/html/group__image.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -30,6 +30,7 @@
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="structstp__image.html">stp_image</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a></td></tr>
 
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="#gae0b5ef92b619849a51cb75d376a90fb"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a> { <a class="el" href="group__image.html#gg58672e1989d582c14328048b207657c8b5574da151b93391a337f29b2a7c96cf">STP_IMAGE_STATUS_OK</a>, 
 <a class="el" href="group__image.html#gg58672e1989d582c14328048b207657c8224b8ac15cf785b24b2f3f53b4fdc274">STP_IMAGE_STATUS_ABORT</a>
@@ -84,7 +85,9 @@ The maximum number of channels.
 <div class="memdoc">
 
 <p>
-
+The image type is an abstract data type for interfacing with the image creation program. 
+<p>
+It provides callbacks to functions defined within the client application which are called while printing the image. 
 </div>
 </div><p>
 <hr><h2>Enumeration Type Documentation</h2>
@@ -124,7 +127,7 @@ An error occured, or the job was aborted. </td></tr>
           <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -144,7 +147,7 @@ An error occured, or the job was aborted. </td></tr>
           <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -185,7 +188,7 @@ An error occured, or the job was aborted. </td></tr>
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -205,7 +208,7 @@ An error occured, or the job was aborted. </td></tr>
           <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -225,7 +228,7 @@ An error occured, or the job was aborted. </td></tr>
           <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -245,7 +248,7 @@ An error occured, or the job was aborted. </td></tr>
           <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -265,7 +268,7 @@ An error occured, or the job was aborted. </td></tr>
           <td class="paramtype"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
           <td class="paramname"> <em>image</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -276,8 +279,8 @@ An error occured, or the job was aborted. </td></tr>
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__intl.html b/doc/gutenprint/html/group__intl.html
index 41a7df8..4cc82f3 100644
--- a/doc/gutenprint/html/group__intl.html
+++ b/doc/gutenprint/html/group__intl.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -50,7 +50,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
           <td class="paramtype">String&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(String)</td>
+          <td>&nbsp;&nbsp;&nbsp;(String)</td>
         </tr>
       </table>
 </div>
@@ -73,7 +73,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
           <td class="paramtype">Directory&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(Domain)</td>
+          <td>&nbsp;&nbsp;&nbsp;(Domain)</td>
         </tr>
       </table>
 </div>
@@ -99,7 +99,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
           <td class="paramtype">Type&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(Message)</td>
+          <td>&nbsp;&nbsp;&nbsp;(Message)</td>
         </tr>
       </table>
 </div>
@@ -122,7 +122,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
           <td class="paramtype">Message&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(Message)</td>
+          <td>&nbsp;&nbsp;&nbsp;(Message)</td>
         </tr>
       </table>
 </div>
@@ -142,7 +142,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
           <td class="paramtype">String&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(String)</td>
+          <td>&nbsp;&nbsp;&nbsp;(String)</td>
         </tr>
       </table>
 </div>
@@ -162,7 +162,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
           <td class="paramtype">String&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(String)</td>
+          <td>&nbsp;&nbsp;&nbsp;(String)</td>
         </tr>
       </table>
 </div>
@@ -182,7 +182,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
           <td class="paramtype">String&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(String)</td>
+          <td>&nbsp;&nbsp;&nbsp;(String)</td>
         </tr>
       </table>
 </div>
@@ -193,8 +193,8 @@ The macros defined in this header are convenience wrappers around the gettext fu
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__intl__internal.html b/doc/gutenprint/html/group__intl__internal.html
index b4a702c..a49e517 100644
--- a/doc/gutenprint/html/group__intl__internal.html
+++ b/doc/gutenprint/html/group__intl__internal.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -50,7 +50,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
           <td class="paramtype">String&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(String)</td>
+          <td>&nbsp;&nbsp;&nbsp;(String)</td>
         </tr>
       </table>
 </div>
@@ -73,7 +73,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
           <td class="paramtype">Directory&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(Domain)</td>
+          <td>&nbsp;&nbsp;&nbsp;(Domain)</td>
         </tr>
       </table>
 </div>
@@ -99,7 +99,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
           <td class="paramtype">Type&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(Message)</td>
+          <td>&nbsp;&nbsp;&nbsp;(Message)</td>
         </tr>
       </table>
 </div>
@@ -122,7 +122,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
           <td class="paramtype">Message&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(Message)</td>
+          <td>&nbsp;&nbsp;&nbsp;(Message)</td>
         </tr>
       </table>
 </div>
@@ -142,7 +142,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
           <td class="paramtype">String&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(String)</td>
+          <td>&nbsp;&nbsp;&nbsp;(String)</td>
         </tr>
       </table>
 </div>
@@ -162,7 +162,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
           <td class="paramtype">String&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(String)</td>
+          <td>&nbsp;&nbsp;&nbsp;(String)</td>
         </tr>
       </table>
 </div>
@@ -182,7 +182,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
           <td class="paramtype">String&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(String)</td>
+          <td>&nbsp;&nbsp;&nbsp;(String)</td>
         </tr>
       </table>
 </div>
@@ -193,8 +193,8 @@ The macros defined in this header are convenience wrappers around the gettext fu
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__list.html b/doc/gutenprint/html/group__list.html
index 1820177..b8eecfa 100644
--- a/doc/gutenprint/html/group__list.html
+++ b/doc/gutenprint/html/group__list.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -236,7 +236,7 @@ The two parameters are pointers to node data. The return value is &lt;0 if the f
           <td class="paramtype">const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
           <td class="paramname"> <em>list</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -264,7 +264,7 @@ list must be a valid list object previously created with <a class="el" href="gro
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -287,7 +287,7 @@ Create a new list object.
           <td class="paramtype"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
           <td class="paramname"> <em>list</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -315,7 +315,7 @@ It is an error to destroy the list more than once. <dl compact><dt><b>Parameters
           <td class="paramtype">const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
           <td class="paramname"> <em>list</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -343,7 +343,7 @@ Get a list node copy function.
           <td class="paramtype">const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
           <td class="paramname"> <em>list</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -371,7 +371,7 @@ Find the last item in a list.
           <td class="paramtype">const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
           <td class="paramname"> <em>list</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -408,7 +408,7 @@ Get a list node free function.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -446,7 +446,7 @@ Find an item in a list by its index.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -484,7 +484,7 @@ Find an item in a list by its long name.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -513,7 +513,7 @@ Find an item in a list by its name.
           <td class="paramtype">const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
           <td class="paramname"> <em>list</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -541,7 +541,7 @@ Get the length of a list.
           <td class="paramtype">const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
           <td class="paramname"> <em>list</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -569,7 +569,7 @@ Get a list node long name function.
           <td class="paramtype">const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
           <td class="paramname"> <em>list</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -597,7 +597,7 @@ Get a list node name function.
           <td class="paramtype">const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
           <td class="paramname"> <em>list</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -625,7 +625,7 @@ Get a list node sort function.
           <td class="paramtype">const <a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
           <td class="paramname"> <em>list</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -668,7 +668,7 @@ Find the first item in a list.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -707,7 +707,7 @@ Create a new list item.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -736,7 +736,7 @@ Destroy a list item.
           <td class="paramtype">const <a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td>
           <td class="paramname"> <em>item</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -764,7 +764,7 @@ Get the data associated with a list item.
           <td class="paramtype">const <a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td>
           <td class="paramname"> <em>item</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -792,7 +792,7 @@ Get the next item in the list.
           <td class="paramtype">const <a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td>
           <td class="paramname"> <em>item</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -829,7 +829,7 @@ Get the previous item in the list.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -859,7 +859,7 @@ Set the data associated with a list item.
           <td class="paramtype">void *&nbsp;</td>
           <td class="paramname"> <em>item</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -895,7 +895,7 @@ This function is indended for use as an stp_node_freefunc, which uses stp_free t
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -932,7 +932,7 @@ This callback function will be called whenever a list item is copied. Its intend
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -969,7 +969,7 @@ This callback function will be called whenever a list item is destroyed. Its int
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1006,7 +1006,7 @@ This callback function will be called whenever the long name of a list item need
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1043,7 +1043,7 @@ This callback function will be called whenever the name of a list item needs to
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1062,8 +1062,8 @@ This callback function will be called to determine the sort order for list items
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__papersize.html b/doc/gutenprint/html/group__papersize.html
index 78f4b81..8974997 100644
--- a/doc/gutenprint/html/group__papersize.html
+++ b/doc/gutenprint/html/group__papersize.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -146,7 +146,7 @@ Metric units (optional paper, not displayed by default).
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -175,7 +175,7 @@ The default is derived from the PageSize parameter if set, otherwise the default
           <td class="paramtype">int&nbsp;</td>
           <td class="paramname"> <em>idx</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -203,7 +203,7 @@ Get a papersize by its index number.
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>name</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -240,7 +240,7 @@ Get a papersize by name.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -278,7 +278,7 @@ The nearest available size to the size requested will be found. Only paper sizes
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -307,7 +307,7 @@ Get a papersize by size if an exact match is found.
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -321,8 +321,8 @@ Get the number of available papersizes.
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__printer.html b/doc/gutenprint/html/group__printer.html
index bf9b6e1..365f8cd 100644
--- a/doc/gutenprint/html/group__printer.html
+++ b/doc/gutenprint/html/group__printer.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -150,7 +150,7 @@ The printer opaque data type (representation of printer model).
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -179,7 +179,7 @@ The printer opaque data type (representation of printer model).
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -208,7 +208,7 @@ End a print job.
           <td class="paramtype"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
           <td class="paramname"> <em>family</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -228,7 +228,7 @@ End a print job.
           <td class="paramtype"><a class="el" href="group__list.html#g53cf4f01ab7d712f771cb5fb479d2ba7">stp_list_t</a> *&nbsp;</td>
           <td class="paramname"> <em>family</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -248,7 +248,7 @@ End a print job.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -276,7 +276,7 @@ Retrieve options that need to be passed to the underlying print system.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -296,7 +296,7 @@ Retrieve options that need to be passed to the underlying print system.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -324,7 +324,7 @@ Get the printer model from a vars object.
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>driver</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -352,7 +352,7 @@ Get a printer model by its short name.
           <td class="paramtype">int&nbsp;</td>
           <td class="paramname"> <em>idx</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -380,7 +380,7 @@ Get a printer model by its index number.
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>long_name</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -408,7 +408,7 @@ Get a printer model by its long (translated) name.
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>driver</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -437,7 +437,7 @@ Get the printer index number from the printer model short (driver) name.
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -466,7 +466,7 @@ Get the printer index number from the printer model short (driver) name.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -511,7 +511,7 @@ Print the image.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -531,7 +531,7 @@ Print the image.
           <td class="paramtype">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td>
           <td class="paramname"> <em>p</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -559,7 +559,7 @@ The default vars should be copied to a new vars object and customised prior to p
           <td class="paramtype">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td>
           <td class="paramname"> <em>p</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -587,7 +587,7 @@ Get a printer model's short (driver) name.
           <td class="paramtype">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td>
           <td class="paramname"> <em>p</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -615,7 +615,7 @@ The family name is the name of the modular "family" driver this model uses. <dl
           <td class="paramtype">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td>
           <td class="paramname"> <em>p</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -643,7 +643,7 @@ Get a printer model's long (translated) name.
           <td class="paramtype">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td>
           <td class="paramname"> <em>p</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -671,7 +671,7 @@ Get a printer model's manufacturer's name.
           <td class="paramtype">const <a class="el" href="group__printer.html#gcddc2ce7fa4e0a68fcc30c123503738f">stp_printer_t</a> *&nbsp;</td>
           <td class="paramname"> <em>p</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -699,7 +699,7 @@ The model number is used internally by the "family" driver module, and has no me
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -719,7 +719,7 @@ The model number is used internally by the "family" driver module, and has no me
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -751,7 +751,7 @@ Get the number of available printer models.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -788,7 +788,7 @@ Set a vars object to use a particular driver, and set the parameters to their de
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -825,7 +825,7 @@ Set a vars object to use a particular driver, and set any unset parameters to th
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -855,7 +855,7 @@ Start a print job.
           <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -866,8 +866,8 @@ Start a print job.
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__sequence.html b/doc/gutenprint/html/group__sequence.html
index c77326a..c809f5f 100644
--- a/doc/gutenprint/html/group__sequence.html
+++ b/doc/gutenprint/html/group__sequence.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -157,7 +157,7 @@ The sequence opaque data type.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -185,7 +185,7 @@ Both dest and source must be valid sequences previously created with <a class="e
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -208,7 +208,7 @@ Create a new sequence.
           <td class="paramtype">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
           <td class="paramname"> <em>sequence</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -236,7 +236,7 @@ A new sequence will be created, and then the contents of source will be copied i
           <td class="paramtype">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
           <td class="paramname"> <em>sequence</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -264,7 +264,7 @@ A new sequence will be created, and then the contents of source will be copied i
           <td class="paramtype"><a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
           <td class="paramname"> <em>sequence</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -306,7 +306,7 @@ It is an error to destroy the sequence more than once. <dl compact><dt><b>Parame
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -350,7 +350,7 @@ The values are stored in the variables pointed to by low and high. <dl compact><
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -392,7 +392,7 @@ Get the data in a sequence.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -430,7 +430,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -468,7 +468,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -512,7 +512,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -557,7 +557,7 @@ Get the data at a single point in a sequence.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -595,7 +595,7 @@ The values are stored in the variables pointed to by low and high. <dl compact><
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -624,7 +624,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
           <td class="paramtype">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
           <td class="paramname"> <em>sequence</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -656,7 +656,7 @@ Get the sequence size.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -694,7 +694,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -732,7 +732,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -770,7 +770,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -813,7 +813,7 @@ Both dest and source must be valid sequences previously created with <a class="e
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -858,7 +858,7 @@ The lower and upper bounds set the minimum and maximum values that a point in th
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -903,7 +903,7 @@ Set the data in a sequence.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -948,7 +948,7 @@ Set the data in a sequence from float values.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -993,7 +993,7 @@ Set the data in a sequence from int values.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1038,7 +1038,7 @@ Set the data in a sequence from long values.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1083,7 +1083,7 @@ Set the data at a single point in a sequence.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1122,7 +1122,7 @@ Set the data in a sequence from short values.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1172,7 +1172,7 @@ The size is the number of elements the sequence contains. Note that resizing wil
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1218,7 +1218,7 @@ Set the data in a subrange of a sequence.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1263,7 +1263,7 @@ Set the data in a sequence from unsigned int values.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1308,7 +1308,7 @@ Set the data in a sequence from unsigned long values.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1329,8 +1329,8 @@ Set the data in a sequence from unsigned short values.
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__util.html b/doc/gutenprint/html/group__util.html
index dd3c39f..77b217e 100644
--- a/doc/gutenprint/html/group__util.html
+++ b/doc/gutenprint/html/group__util.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -502,7 +502,7 @@ Utility functions.
           <td class="paramtype">x&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -529,7 +529,7 @@ Utility functions.
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -564,7 +564,7 @@ Utility functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -599,7 +599,7 @@ Utility functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -634,7 +634,7 @@ Utility functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -675,7 +675,7 @@ Utility functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -710,7 +710,7 @@ Utility functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -739,7 +739,7 @@ Utility functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -759,7 +759,7 @@ Utility functions.
           <td class="paramtype">int&nbsp;</td>
           <td class="paramname"> <em>ch</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -779,7 +779,7 @@ Utility functions.
           <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -799,7 +799,7 @@ Utility functions.
           <td class="paramtype">void *&nbsp;</td>
           <td class="paramname"> <em>ptr</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -819,7 +819,7 @@ Utility functions.
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -839,7 +839,7 @@ Utility functions.
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -862,7 +862,7 @@ Get the library release version string (x.y).
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -885,7 +885,7 @@ Get the library version string (x.y.z).
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -908,7 +908,7 @@ This function must be called prior to any other use of the library. It is respon
           <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -928,7 +928,7 @@ This function must be called prior to any other use of the library. It is respon
           <td class="paramtype">size_t&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -948,7 +948,7 @@ This function must be called prior to any other use of the library. It is respon
           <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -977,7 +977,7 @@ This function must be called prior to any other use of the library. It is respon
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1006,7 +1006,7 @@ This function must be called prior to any other use of the library. It is respon
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1035,7 +1035,7 @@ This function must be called prior to any other use of the library. It is respon
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1064,7 +1064,7 @@ This function must be called prior to any other use of the library. It is respon
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1093,7 +1093,7 @@ This function must be called prior to any other use of the library. It is respon
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1122,7 +1122,7 @@ This function must be called prior to any other use of the library. It is respon
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1151,7 +1151,7 @@ This function must be called prior to any other use of the library. It is respon
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1192,7 +1192,7 @@ This function must be called prior to any other use of the library. It is respon
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1221,7 +1221,7 @@ This function must be called prior to any other use of the library. It is respon
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1262,7 +1262,7 @@ This function must be called prior to any other use of the library. It is respon
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1282,7 +1282,7 @@ This function must be called prior to any other use of the library. It is respon
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>codeset</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -1310,7 +1310,7 @@ This function sets the encoding that all strings translated by gettext are outpu
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>s</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -1330,7 +1330,7 @@ This function sets the encoding that all strings translated by gettext are outpu
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>s</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -1359,7 +1359,7 @@ This function sets the encoding that all strings translated by gettext are outpu
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1379,7 +1379,7 @@ This function sets the encoding that all strings translated by gettext are outpu
           <td class="paramtype">size_t&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -1420,7 +1420,7 @@ This function sets the encoding that all strings translated by gettext are outpu
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1455,7 +1455,7 @@ This function sets the encoding that all strings translated by gettext are outpu
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1466,8 +1466,8 @@ This function sets the encoding that all strings translated by gettext are outpu
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__vars.html b/doc/gutenprint/html/group__vars.html
index 14695c9..a5df7fb 100644
--- a/doc/gutenprint/html/group__vars.html
+++ b/doc/gutenprint/html/group__vars.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -555,7 +555,7 @@ The representation of printer settings has changed dramatically from 4.2. All (w
           <td class="paramtype">x&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;{ sizeof((x)), (x) }</td>
+          <td>&nbsp;&nbsp;&nbsp;{ sizeof((x)), (x) }</td>
         </tr>
       </table>
 </div>
@@ -575,7 +575,7 @@ The representation of printer settings has changed dramatically from 4.2. All (w
           <td class="paramtype">x&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;{ sizeof((x)) - 1, (x) }</td>
+          <td>&nbsp;&nbsp;&nbsp;{ sizeof((x)) - 1, (x) }</td>
         </tr>
       </table>
 </div>
@@ -906,7 +906,7 @@ Invalid type (should never be used). </td></tr>
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -941,7 +941,7 @@ Invalid type (should never be used). </td></tr>
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -985,7 +985,7 @@ Check if an array parameter is set.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1029,7 +1029,7 @@ Check if a boolean parameter is set.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1073,7 +1073,7 @@ Check if a curve parameter is set.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1117,7 +1117,7 @@ Check if a dimension parameter is set.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1161,7 +1161,7 @@ Check if a file parameter is set.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1205,7 +1205,7 @@ Check if a float parameter is set.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1255,7 +1255,7 @@ Check if an integer parameter is set.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1300,7 +1300,7 @@ Check if a parameter is set.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1344,7 +1344,7 @@ Check if a raw parameter is set.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1382,7 +1382,7 @@ Check if a string parameter is set.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1419,7 +1419,7 @@ The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1456,7 +1456,7 @@ Clear (remove) a boolean parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1493,7 +1493,7 @@ The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1530,7 +1530,7 @@ Clear (remove) a dimension parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1567,7 +1567,7 @@ The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1604,7 +1604,7 @@ Clear (remove) a float parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1647,7 +1647,7 @@ Clear (remove) an integer parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1685,7 +1685,7 @@ Clear a parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1722,7 +1722,7 @@ The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1759,7 +1759,7 @@ The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1779,7 +1779,7 @@ The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -1817,7 +1817,7 @@ The main use of this is to provide a usable stp_vars_t for purposes of parameter
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1861,7 +1861,7 @@ All of the parameter fields will be populated. <dl compact><dt><b>Parameters:</b
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1899,7 +1899,7 @@ If the resolution is invalid, -1 will be returned in both x and y. <dl compact><
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1928,7 +1928,7 @@ If the resolution is invalid, -1 will be returned in both x and y. <dl compact><
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1957,7 +1957,7 @@ If the resolution is invalid, -1 will be returned in both x and y. <dl compact><
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1995,7 +1995,7 @@ Get an array parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2033,7 +2033,7 @@ Get the activity status of an array parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2071,7 +2071,7 @@ Get a boolean parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2100,7 +2100,7 @@ Get the activity status of a boolean parameter.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -2132,7 +2132,7 @@ Get the name of the color conversion routine.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2161,7 +2161,7 @@ Get the name of the color conversion routine.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2199,7 +2199,7 @@ Get a curve parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2237,7 +2237,7 @@ Get the activity status of a curve parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2275,7 +2275,7 @@ Get a dimension parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2304,7 +2304,7 @@ Get the activity status of a dimension parameter.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -2327,7 +2327,7 @@ Get the name of the printer driver.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -2355,7 +2355,7 @@ Get the error data.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -2392,7 +2392,7 @@ Get the function used to print output information.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2430,7 +2430,7 @@ Get a file parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2468,7 +2468,7 @@ Get the activity status of a file parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2506,7 +2506,7 @@ Get a float parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2535,7 +2535,7 @@ Get the activity status of a float parameter.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -2585,7 +2585,7 @@ Get the height of the image.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2628,7 +2628,7 @@ If the media size stored in V is invalid, the return values will be indeterminat
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2666,7 +2666,7 @@ Get an integer parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2695,7 +2695,7 @@ Get the activity status of an integer parameter.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -2745,7 +2745,7 @@ Get the left edge of the image.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2794,7 +2794,7 @@ If the media size stored in V is invalid, the return values will be indeterminat
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2823,7 +2823,7 @@ Retrieve the media size of the media type set in V, expressed in units of 1/72".
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -2851,7 +2851,7 @@ Get the output data.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -2879,7 +2879,7 @@ Get the function used to print output information.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -2902,7 +2902,7 @@ Get the page height.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -2940,7 +2940,7 @@ Get the page width.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -2969,7 +2969,7 @@ Get the activity status of a parameter.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -3006,7 +3006,7 @@ This does not fill in the bounds and defaults; it merely provides a list of sett
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -3044,7 +3044,7 @@ Get a raw parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -3100,7 +3100,7 @@ Get the activity status of a raw parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -3140,7 +3140,7 @@ Retrieve the minimum and maximum size limits for custom media sizes with the cur
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -3178,7 +3178,7 @@ Get a string parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -3207,7 +3207,7 @@ Get the activity status of a string parameter.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -3230,7 +3230,7 @@ Get the top edge of the image.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -3250,7 +3250,7 @@ Get the top edge of the image.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -3273,7 +3273,7 @@ Get the width edge of the image.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -3300,7 +3300,7 @@ The return value must be freed after use. <dl compact><dt><b>Parameters:</b></dt
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -3327,7 +3327,7 @@ The return value must be freed after use. <dl compact><dt><b>Parameters:</b></dt
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -3354,7 +3354,7 @@ The return value must be freed after use. <dl compact><dt><b>Parameters:</b></dt
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -3381,7 +3381,7 @@ The return value must be freed after use. <dl compact><dt><b>Parameters:</b></dt
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -3408,7 +3408,7 @@ The return value must be freed after use. <dl compact><dt><b>Parameters:</b></dt
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -3435,7 +3435,7 @@ The return value must be freed after use. <dl compact><dt><b>Parameters:</b></dt
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -3471,7 +3471,7 @@ The return value must be freed after use. <dl compact><dt><b>Parameters:</b></dt
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -3499,7 +3499,7 @@ The return value must be freed after use. <dl compact><dt><b>Parameters:</b></dt
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -3526,7 +3526,7 @@ The return value must be freed after use. <dl compact><dt><b>Parameters:</b></dt
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -3562,7 +3562,7 @@ The return value must be freed after use. <dl compact><dt><b>Parameters:</b></dt
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -3591,7 +3591,7 @@ Merge defaults for a printer with user-chosen settings.
           <td class="paramtype"><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td>
           <td class="paramname"> <em>description</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -3627,7 +3627,7 @@ This must be called even if the <a class="el" href="structstp__parameter__t.html
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -3665,7 +3665,7 @@ Find a parameter by its name.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -3703,7 +3703,7 @@ Find a parameter by its name from a vars object.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -3740,7 +3740,7 @@ Add a parameter to a parameter_list.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -3768,7 +3768,7 @@ Append one parameter_list to another.
           <td class="paramtype"><a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a>&nbsp;</td>
           <td class="paramname"> <em>list</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -3796,7 +3796,7 @@ A new parameter_list will be created, and then the contents of source will be co
           <td class="paramtype"><a class="el" href="group__vars.html#g53c035a67629ae3b3eb86b3c09df7774">stp_const_parameter_list_t</a>&nbsp;</td>
           <td class="paramname"> <em>list</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -3824,7 +3824,7 @@ List the number of available parameters for the currently chosen settings.
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -3847,7 +3847,7 @@ Create a parameter_list.
           <td class="paramtype"><a class="el" href="group__vars.html#g40c1035f88ac38d77eddb65195b28595">stp_parameter_list_t</a>&nbsp;</td>
           <td class="paramname"> <em>list</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -3883,7 +3883,7 @@ It is an error to destroy the parameter_list more than once. <dl compact><dt><b>
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -3927,7 +3927,7 @@ Find a parameter by its index number.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -3971,7 +3971,7 @@ Multiply the value of a float parameter by a scaling factor.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4015,7 +4015,7 @@ Set an array parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4059,7 +4059,7 @@ Set the activity of an array parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4103,7 +4103,7 @@ Set a boolean parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4141,7 +4141,7 @@ Set the activity of a boolean parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4184,7 +4184,7 @@ Set the name of the color conversion routine, if not the default.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4228,7 +4228,7 @@ Set the name of the color conversion routine, if not the default.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4272,7 +4272,7 @@ Set a curve parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4316,7 +4316,7 @@ Set the activity of a curveparameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4360,7 +4360,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4404,7 +4404,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4448,7 +4448,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4492,7 +4492,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4542,7 +4542,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4587,7 +4587,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4631,7 +4631,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4681,7 +4681,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4726,7 +4726,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4776,7 +4776,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4821,7 +4821,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4865,7 +4865,7 @@ Set a dimension parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4903,7 +4903,7 @@ Set the activity of a dimension parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4946,7 +4946,7 @@ Set the name of the printer driver.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -4984,7 +4984,7 @@ Set the name of the printer driver.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5021,7 +5021,7 @@ Set the error data.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5064,7 +5064,7 @@ These must be supplied by the caller. errdata is passed as an arguments to errfu
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5108,7 +5108,7 @@ Set a file parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5158,7 +5158,7 @@ Set the activity of a file parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5203,7 +5203,7 @@ Set a file parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5247,7 +5247,7 @@ Set a float parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5285,7 +5285,7 @@ Set the activity of a float parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5328,7 +5328,7 @@ Set the height of the image.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5372,7 +5372,7 @@ Set an integer parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5410,7 +5410,7 @@ Set the activity of an integer parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5447,7 +5447,7 @@ Set the left edge of the image.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5484,7 +5484,7 @@ Set the output data.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5521,7 +5521,7 @@ These must be supplied by the caller. outdata is passed as an arguments to outfu
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5558,7 +5558,7 @@ Set the page height.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5607,7 +5607,7 @@ Set the page width.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5658,7 +5658,7 @@ Set the activity of a parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5703,7 +5703,7 @@ Set a raw parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5747,7 +5747,7 @@ Set the activity of a raw parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5791,7 +5791,7 @@ Set a string parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5841,7 +5841,7 @@ Set the activity of a string parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5880,7 +5880,7 @@ Set a string parameter.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5917,7 +5917,7 @@ Set the top edge of the image.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5946,7 +5946,7 @@ Set the top edge of the image.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -5983,7 +5983,7 @@ Set the width of the image.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -6011,7 +6011,7 @@ Both dest and source must be valid vars objects previously created with <a class
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -6034,7 +6034,7 @@ Create a new vars object.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>source</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -6062,7 +6062,7 @@ source must be a valid vars object previously created with <a class="el" href="g
           <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -6089,7 +6089,7 @@ It is an error to destroy the vars more than once. <dl compact><dt><b>Parameters
           <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -6132,7 +6132,7 @@ Verify that the parameters selected are consistent with those allowed by the dri
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -6143,8 +6143,8 @@ Verify that the parameters selected are consistent with those allowed by the dri
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__version.html b/doc/gutenprint/html/group__version.html
index ec027f4..26b12df 100644
--- a/doc/gutenprint/html/group__version.html
+++ b/doc/gutenprint/html/group__version.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -25,13 +25,13 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g87507431ad6b7504b129eafad863cb1f">STP_MINOR_VERSION</a>&nbsp;&nbsp;&nbsp;(2)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gb860ee8cb0b05ea1385e01d130d7358e">STP_MICRO_VERSION</a>&nbsp;&nbsp;&nbsp;(3)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gb860ee8cb0b05ea1385e01d130d7358e">STP_MICRO_VERSION</a>&nbsp;&nbsp;&nbsp;(4)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g1969d8a5a74a5c70a978f99aa68d9f4b">STP_CURRENT_INTERFACE</a>&nbsp;&nbsp;&nbsp;(2)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g509ecd9be5329eef0f8d49e0b25f63da">STP_BINARY_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g6485cd073e75e01f9df68ecd67b14372">STP_INTERFACE_AGE</a>&nbsp;&nbsp;&nbsp;(3)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g6485cd073e75e01f9df68ecd67b14372">STP_INTERFACE_AGE</a>&nbsp;&nbsp;&nbsp;(5)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gf20320940416f43ed7735137296fa12b">STP_CHECK_VERSION</a>(major, minor, micro)</td></tr>
 
@@ -94,7 +94,7 @@ Version information may be used to check the library version at compile-time, us
           <td class="paramtype">micro&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -130,7 +130,7 @@ Version information may be used to check the library version at compile-time, us
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_INTERFACE_AGE&nbsp;&nbsp;&nbsp;(3)          </td>
+          <td class="memname">#define STP_INTERFACE_AGE&nbsp;&nbsp;&nbsp;(5)          </td>
         </tr>
       </table>
 </div>
@@ -160,7 +160,7 @@ Version information may be used to check the library version at compile-time, us
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">#define STP_MICRO_VERSION&nbsp;&nbsp;&nbsp;(3)          </td>
+          <td class="memname">#define STP_MICRO_VERSION&nbsp;&nbsp;&nbsp;(4)          </td>
         </tr>
       </table>
 </div>
@@ -211,7 +211,7 @@ Version information may be used to check the library version at compile-time, us
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -335,8 +335,8 @@ The library minor version number.
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-intl-internal_8h.html b/doc/gutenprint/html/gutenprint-intl-internal_8h.html
index 0576fde..a6ff177 100644
--- a/doc/gutenprint/html/gutenprint-intl-internal_8h.html
+++ b/doc/gutenprint/html/gutenprint-intl-internal_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -42,8 +42,8 @@
 Internationalisation functions. 
 <p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-intl_8h.html b/doc/gutenprint/html/gutenprint-intl_8h.html
index e56a0e8..9129620 100644
--- a/doc/gutenprint/html/gutenprint-intl_8h.html
+++ b/doc/gutenprint/html/gutenprint-intl_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -42,8 +42,8 @@
 Internationalisation functions. 
 <p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-module_8h.html b/doc/gutenprint/html/gutenprint-module_8h.html
index f3e208a..de0b35e 100644
--- a/doc/gutenprint/html/gutenprint-module_8h.html
+++ b/doc/gutenprint/html/gutenprint-module_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -55,8 +55,8 @@ This header includes all of the public headers used by modules. <hr><h2>Define D
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-version_8h.html b/doc/gutenprint/html/gutenprint-version_8h.html
index fc8029f..1c590d3 100644
--- a/doc/gutenprint/html/gutenprint-version_8h.html
+++ b/doc/gutenprint/html/gutenprint-version_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -26,13 +26,13 @@
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g87507431ad6b7504b129eafad863cb1f">STP_MINOR_VERSION</a>&nbsp;&nbsp;&nbsp;(2)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gb860ee8cb0b05ea1385e01d130d7358e">STP_MICRO_VERSION</a>&nbsp;&nbsp;&nbsp;(3)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gb860ee8cb0b05ea1385e01d130d7358e">STP_MICRO_VERSION</a>&nbsp;&nbsp;&nbsp;(4)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g1969d8a5a74a5c70a978f99aa68d9f4b">STP_CURRENT_INTERFACE</a>&nbsp;&nbsp;&nbsp;(2)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g509ecd9be5329eef0f8d49e0b25f63da">STP_BINARY_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g6485cd073e75e01f9df68ecd67b14372">STP_INTERFACE_AGE</a>&nbsp;&nbsp;&nbsp;(3)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g6485cd073e75e01f9df68ecd67b14372">STP_INTERFACE_AGE</a>&nbsp;&nbsp;&nbsp;(5)</td></tr>
 
 <tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gf20320940416f43ed7735137296fa12b">STP_CHECK_VERSION</a>(major, minor, micro)</td></tr>
 
@@ -64,8 +64,8 @@
 Version functions. 
 <p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint_8h.html b/doc/gutenprint/html/gutenprint_8h.html
index 3eb8b12..de2fb66 100644
--- a/doc/gutenprint/html/gutenprint_8h.html
+++ b/doc/gutenprint/html/gutenprint_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -38,8 +38,8 @@
 Gutenprint master header. 
 <p>
 This header includes all of the public headers. </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/image_8h.html b/doc/gutenprint/html/image_8h.html
index 75d28d8..3910f60 100644
--- a/doc/gutenprint/html/image_8h.html
+++ b/doc/gutenprint/html/image_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -31,6 +31,7 @@
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">typedef struct <a class="el" href="structstp__image.html">stp_image</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gae0b5ef92b619849a51cb75d376a90fb">stp_image_t</a></td></tr>
 
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="group__image.html#gae0b5ef92b619849a51cb75d376a90fb"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g58672e1989d582c14328048b207657c8">stp_image_status_t</a> { <a class="el" href="group__image.html#gg58672e1989d582c14328048b207657c8b5574da151b93391a337f29b2a7c96cf">STP_IMAGE_STATUS_OK</a>, 
 <a class="el" href="group__image.html#gg58672e1989d582c14328048b207657c8224b8ac15cf785b24b2f3f53b4fdc274">STP_IMAGE_STATUS_ABORT</a>
@@ -57,8 +58,8 @@
 Image functions. 
 <p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/index.html b/doc/gutenprint/html/index.html
index c48c224..9e623a5 100644
--- a/doc/gutenprint/html/index.html
+++ b/doc/gutenprint/html/index.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -19,9 +19,9 @@
 <div class="contents">
 <h1>libgutenprint API Reference Documentation</h1>
 <p>
-<h3 align="center">5.2.3 </h3></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<h3 align="center">5.2.4 </h3></div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/list_8h.html b/doc/gutenprint/html/list_8h.html
index d53473a..1a660e4 100644
--- a/doc/gutenprint/html/list_8h.html
+++ b/doc/gutenprint/html/list_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -124,8 +124,8 @@
 Generic list functions. 
 <p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/module_8h.html b/doc/gutenprint/html/module_8h.html
index 47332b9..c63f157 100644
--- a/doc/gutenprint/html/module_8h.html
+++ b/doc/gutenprint/html/module_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -132,7 +132,7 @@ Module functions.
           <td class="paramtype"><a class="el" href="group__list.html#g67b4fafe1ab6ead5be7500f88874bdb0">stp_list_item_t</a> *&nbsp;</td>
           <td class="paramname"> <em>module</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -152,7 +152,7 @@ Module functions.
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -172,7 +172,7 @@ Module functions.
           <td class="paramtype"><a class="el" href="module_8h.html#b3da7c3525c26e1d63d7fe1f95da5a42">stp_module_class_t</a>&nbsp;</td>
           <td class="paramname"> <em>class</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -192,7 +192,7 @@ Module functions.
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -212,7 +212,7 @@ Module functions.
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -232,7 +232,7 @@ Module functions.
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>modulename</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -243,8 +243,8 @@ Module functions.
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/modules.html b/doc/gutenprint/html/modules.html
index e6c787a..73a3a0a 100644
--- a/doc/gutenprint/html/modules.html
+++ b/doc/gutenprint/html/modules.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -33,8 +33,8 @@
 <li><a class="el" href="group__vars.html">vars</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/mxml_8h.html b/doc/gutenprint/html/mxml_8h.html
index 8b43b0e..f8df782 100644
--- a/doc/gutenprint/html/mxml_8h.html
+++ b/doc/gutenprint/html/mxml_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -499,7 +499,7 @@ Mini-XML XML parsing functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -519,7 +519,7 @@ Mini-XML XML parsing functions.
           <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
           <td class="paramname"> <em>node</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -548,7 +548,7 @@ Mini-XML XML parsing functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -583,7 +583,7 @@ Mini-XML XML parsing functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -636,7 +636,7 @@ Mini-XML XML parsing functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -671,7 +671,7 @@ Mini-XML XML parsing functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -706,7 +706,7 @@ Mini-XML XML parsing functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -741,7 +741,7 @@ Mini-XML XML parsing functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -770,7 +770,7 @@ Mini-XML XML parsing functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -799,7 +799,7 @@ Mini-XML XML parsing functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -828,7 +828,7 @@ Mini-XML XML parsing functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -857,7 +857,7 @@ Mini-XML XML parsing functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -892,7 +892,7 @@ Mini-XML XML parsing functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -912,7 +912,7 @@ Mini-XML XML parsing functions.
           <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
           <td class="paramname"> <em>node</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -941,7 +941,7 @@ Mini-XML XML parsing functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -976,7 +976,7 @@ Mini-XML XML parsing functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1017,7 +1017,7 @@ Mini-XML XML parsing functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1052,7 +1052,7 @@ Mini-XML XML parsing functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1087,7 +1087,7 @@ Mini-XML XML parsing functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1122,7 +1122,7 @@ Mini-XML XML parsing functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1133,8 +1133,8 @@ Mini-XML XML parsing functions.
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/pages.html b/doc/gutenprint/html/pages.html
index 2717789..e811032 100644
--- a/doc/gutenprint/html/pages.html
+++ b/doc/gutenprint/html/pages.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -22,8 +22,8 @@
 
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/paper_8h.html b/doc/gutenprint/html/paper_8h.html
index bf2c150..016487a 100644
--- a/doc/gutenprint/html/paper_8h.html
+++ b/doc/gutenprint/html/paper_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -62,8 +62,8 @@
 Paper size functions. 
 <p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/path_8h.html b/doc/gutenprint/html/path_8h.html
index 7426112..76e9732 100644
--- a/doc/gutenprint/html/path_8h.html
+++ b/doc/gutenprint/html/path_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -56,7 +56,7 @@ Simple directory path functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -85,7 +85,7 @@ Simple directory path functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -105,7 +105,7 @@ Simple directory path functions.
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -125,7 +125,7 @@ Simple directory path functions.
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>name</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -154,7 +154,7 @@ Simple directory path functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -165,8 +165,8 @@ Simple directory path functions.
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/printers_8h.html b/doc/gutenprint/html/printers_8h.html
index 6913368..44249a8 100644
--- a/doc/gutenprint/html/printers_8h.html
+++ b/doc/gutenprint/html/printers_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -111,8 +111,8 @@
 Printer functions. 
 <p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/sequence_8h.html b/doc/gutenprint/html/sequence_8h.html
index 764fcf7..1f28bb8 100644
--- a/doc/gutenprint/html/sequence_8h.html
+++ b/doc/gutenprint/html/sequence_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -121,8 +121,8 @@
 Sequence functions. 
 <p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/string-list_8h.html b/doc/gutenprint/html/string-list_8h.html
index 1dca920..084ac5a 100644
--- a/doc/gutenprint/html/string-list_8h.html
+++ b/doc/gutenprint/html/string-list_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -98,7 +98,7 @@ The string_list opaque data type.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -118,7 +118,7 @@ The string_list opaque data type.
           <td class="paramtype">const <a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td>
           <td class="paramname"> <em>list</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -138,7 +138,7 @@ The string_list opaque data type.
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -158,7 +158,7 @@ The string_list opaque data type.
           <td class="paramtype">const <a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td>
           <td class="paramname"> <em>list</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -187,7 +187,7 @@ The string_list opaque data type.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -207,7 +207,7 @@ The string_list opaque data type.
           <td class="paramtype"><a class="el" href="string-list_8h.html#5e3b69c7c2eca2523184cce51ca26543">stp_string_list_t</a> *&nbsp;</td>
           <td class="paramname"> <em>list</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -236,7 +236,7 @@ The string_list opaque data type.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -265,7 +265,7 @@ The string_list opaque data type.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -294,7 +294,7 @@ The string_list opaque data type.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -323,7 +323,7 @@ The string_list opaque data type.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -334,8 +334,8 @@ The string_list opaque data type.
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structdither__matrix__impl.html b/doc/gutenprint/html/structdither__matrix__impl.html
index 5b28a29..2f86d60 100644
--- a/doc/gutenprint/html/structdither__matrix__impl.html
+++ b/doc/gutenprint/html/structdither__matrix__impl.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -289,8 +289,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__cached__curve__t.html b/doc/gutenprint/html/structstp__cached__curve__t.html
index 4db9d67..dcb54f9 100644
--- a/doc/gutenprint/html/structstp__cached__curve__t.html
+++ b/doc/gutenprint/html/structstp__cached__curve__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -102,8 +102,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__color.html b/doc/gutenprint/html/structstp__color.html
index 8047ef8..638fc39 100644
--- a/doc/gutenprint/html/structstp__color.html
+++ b/doc/gutenprint/html/structstp__color.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -88,8 +88,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__colorfuncs__t.html b/doc/gutenprint/html/structstp__colorfuncs__t.html
index c967e73..cf73674 100644
--- a/doc/gutenprint/html/structstp__colorfuncs__t.html
+++ b/doc/gutenprint/html/structstp__colorfuncs__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -105,8 +105,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__curve__point__t.html b/doc/gutenprint/html/structstp__curve__point__t.html
index d4b4650..5c25b30 100644
--- a/doc/gutenprint/html/structstp__curve__point__t.html
+++ b/doc/gutenprint/html/structstp__curve__point__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -83,8 +83,8 @@ Vertical position.
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__generic.html b/doc/gutenprint/html/structstp__dither__matrix__generic.html
index f623502..0d86d7b 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__generic.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__generic.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -119,8 +119,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__normal.html b/doc/gutenprint/html/structstp__dither__matrix__normal.html
index 98cb628..a9b8a2e 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__normal.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__normal.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -119,8 +119,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__short.html b/doc/gutenprint/html/structstp__dither__matrix__short.html
index 0a130ba..d60bedb 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__short.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__short.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -119,8 +119,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__dotsize.html b/doc/gutenprint/html/structstp__dotsize.html
index 480e09f..bb34239 100644
--- a/doc/gutenprint/html/structstp__dotsize.html
+++ b/doc/gutenprint/html/structstp__dotsize.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -68,8 +68,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__double__bound__t.html b/doc/gutenprint/html/structstp__double__bound__t.html
index a952a3a..faad065 100644
--- a/doc/gutenprint/html/structstp__double__bound__t.html
+++ b/doc/gutenprint/html/structstp__double__bound__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -77,8 +77,8 @@ Upper bound.
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__family.html b/doc/gutenprint/html/structstp__family.html
index 0f6436a..e9e64cb 100644
--- a/doc/gutenprint/html/structstp__family.html
+++ b/doc/gutenprint/html/structstp__family.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -71,8 +71,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__image.html b/doc/gutenprint/html/structstp__image.html
index 90799c8..b597e31 100644
--- a/doc/gutenprint/html/structstp__image.html
+++ b/doc/gutenprint/html/structstp__image.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -232,8 +232,8 @@ A pointer to an application-specific state information that might need to be ass
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__int__bound__t.html b/doc/gutenprint/html/structstp__int__bound__t.html
index 8b74848..4602f0f 100644
--- a/doc/gutenprint/html/structstp__int__bound__t.html
+++ b/doc/gutenprint/html/structstp__int__bound__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -77,8 +77,8 @@ Upper bound.
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__lineactive__t.html b/doc/gutenprint/html/structstp__lineactive__t.html
index 66fc9a0..29c093f 100644
--- a/doc/gutenprint/html/structstp__lineactive__t.html
+++ b/doc/gutenprint/html/structstp__lineactive__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -68,8 +68,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__linebounds__t.html b/doc/gutenprint/html/structstp__linebounds__t.html
index 12bc11e..5cbc7cb 100644
--- a/doc/gutenprint/html/structstp__linebounds__t.html
+++ b/doc/gutenprint/html/structstp__linebounds__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -85,8 +85,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__linebufs__t.html b/doc/gutenprint/html/structstp__linebufs__t.html
index 19557f3..6e98771 100644
--- a/doc/gutenprint/html/structstp__linebufs__t.html
+++ b/doc/gutenprint/html/structstp__linebufs__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -68,8 +68,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__linecount__t.html b/doc/gutenprint/html/structstp__linecount__t.html
index 5f86a27..b347963 100644
--- a/doc/gutenprint/html/structstp__linecount__t.html
+++ b/doc/gutenprint/html/structstp__linecount__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -68,8 +68,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__lineoff__t.html b/doc/gutenprint/html/structstp__lineoff__t.html
index 814b6fd..1e642c3 100644
--- a/doc/gutenprint/html/structstp__lineoff__t.html
+++ b/doc/gutenprint/html/structstp__lineoff__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -68,8 +68,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__module.html b/doc/gutenprint/html/structstp__module.html
index 5d0ea07..d9c8ba9 100644
--- a/doc/gutenprint/html/structstp__module.html
+++ b/doc/gutenprint/html/structstp__module.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -170,8 +170,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__module__version.html b/doc/gutenprint/html/structstp__module__version.html
index 79a1f09..baacbfc 100644
--- a/doc/gutenprint/html/structstp__module__version.html
+++ b/doc/gutenprint/html/structstp__module__version.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -68,8 +68,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__mxml__attr__s.html b/doc/gutenprint/html/structstp__mxml__attr__s.html
index 71a3169..2762607 100644
--- a/doc/gutenprint/html/structstp__mxml__attr__s.html
+++ b/doc/gutenprint/html/structstp__mxml__attr__s.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -68,8 +68,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__mxml__node__s.html b/doc/gutenprint/html/structstp__mxml__node__s.html
index 450491a..7f0f559 100644
--- a/doc/gutenprint/html/structstp__mxml__node__s.html
+++ b/doc/gutenprint/html/structstp__mxml__node__s.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -153,8 +153,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__mxml__text__s.html b/doc/gutenprint/html/structstp__mxml__text__s.html
index 0317c09..0948fd4 100644
--- a/doc/gutenprint/html/structstp__mxml__text__s.html
+++ b/doc/gutenprint/html/structstp__mxml__text__s.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -68,8 +68,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__mxml__value__s.html b/doc/gutenprint/html/structstp__mxml__value__s.html
index 88fd680..0be7858 100644
--- a/doc/gutenprint/html/structstp__mxml__value__s.html
+++ b/doc/gutenprint/html/structstp__mxml__value__s.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -85,8 +85,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__papersize__t.html b/doc/gutenprint/html/structstp__papersize__t.html
index ce57fd2..36a3752 100644
--- a/doc/gutenprint/html/structstp__papersize__t.html
+++ b/doc/gutenprint/html/structstp__papersize__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -263,8 +263,8 @@ Paper size type.
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__param__string__t.html b/doc/gutenprint/html/structstp__param__string__t.html
index 1703592..bcb3155 100644
--- a/doc/gutenprint/html/structstp__param__string__t.html
+++ b/doc/gutenprint/html/structstp__param__string__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -74,8 +74,8 @@ Human-readable (translated) text.
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__parameter__t.html b/doc/gutenprint/html/structstp__parameter__t.html
index 9d68cfb..87baaae 100644
--- a/doc/gutenprint/html/structstp__parameter__t.html
+++ b/doc/gutenprint/html/structstp__parameter__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -290,7 +290,8 @@ Should the verify system check this parameter?
 <div class="memdoc">
 
 <p>
-curve parameter value. 
+curve parameter value.<p>
+Default curve parameter value. 
 </div>
 </div><p>
 <a class="anchor" name="12fc8869d3056687e576af63c6fbd675"></a><!-- doxytag: member="stp_parameter_t::dbl" ref="12fc8869d3056687e576af63c6fbd675" args="" -->
@@ -365,7 +366,8 @@ string_list parameter value.
 <div class="memdoc">
 
 <p>
-array parameter value. 
+array parameter value.<p>
+Default array parameter value. 
 </div>
 </div><p>
 <a class="anchor" name="bb297424036e868212f5086d5c5235fe"></a><!-- doxytag: member="stp_parameter_t::bounds" ref="bb297424036e868212f5086d5c5235fe" args="" -->
@@ -383,21 +385,6 @@ array parameter value.
 Limits on the values the parameter may take. 
 </div>
 </div><p>
-<a class="anchor" name="d64f0c31d200d3d413725621b3ef9133"></a><!-- doxytag: member="stp_parameter_t::curve" ref="d64f0c31d200d3d413725621b3ef9133" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a>* <a class="el" href="structstp__parameter__t.html#d64f0c31d200d3d413725621b3ef9133">stp_parameter_t::curve</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Default curve parameter value. 
-</div>
-</div><p>
 <a class="anchor" name="222137e14dadb05adfbdde061679ce61"></a><!-- doxytag: member="stp_parameter_t::dbl" ref="222137e14dadb05adfbdde061679ce61" args="" -->
 <div class="memitem">
 <div class="memproto">
@@ -473,21 +460,6 @@ Default boolean parameter value.
 Default string parameter value. 
 </div>
 </div><p>
-<a class="anchor" name="28aef58241d3a500968ca65df099ee3a"></a><!-- doxytag: member="stp_parameter_t::array" ref="28aef58241d3a500968ca65df099ee3a" args="" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname"><a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a>* <a class="el" href="structstp__parameter__t.html#28aef58241d3a500968ca65df099ee3a">stp_parameter_t::array</a>          </td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>
-Default array parameter value. 
-</div>
-</div><p>
 <a class="anchor" name="79042d88fa0ab284a8e3e4ad7b969f90"></a><!-- doxytag: member="stp_parameter_t::deflt" ref="79042d88fa0ab284a8e3e4ad7b969f90" args="" -->
 <div class="memitem">
 <div class="memproto">
@@ -506,8 +478,8 @@ Default value of the parameter.
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__pass__t.html b/doc/gutenprint/html/structstp__pass__t.html
index f296df9..0c20cd8 100644
--- a/doc/gutenprint/html/structstp__pass__t.html
+++ b/doc/gutenprint/html/structstp__pass__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -136,8 +136,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__printfuncs__t.html b/doc/gutenprint/html/structstp__printfuncs__t.html
index 1da5c8b..dcc1525 100644
--- a/doc/gutenprint/html/structstp__printfuncs__t.html
+++ b/doc/gutenprint/html/structstp__printfuncs__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -258,8 +258,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__raw__t.html b/doc/gutenprint/html/structstp__raw__t.html
index af3a704..c1b9846 100644
--- a/doc/gutenprint/html/structstp__raw__t.html
+++ b/doc/gutenprint/html/structstp__raw__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -77,8 +77,8 @@ Raw data.
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__shade.html b/doc/gutenprint/html/structstp__shade.html
index 060c161..9829196 100644
--- a/doc/gutenprint/html/structstp__shade.html
+++ b/doc/gutenprint/html/structstp__shade.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -85,8 +85,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__weave__t.html b/doc/gutenprint/html/structstp__weave__t.html
index d529ffe..d7633eb 100644
--- a/doc/gutenprint/html/structstp__weave__t.html
+++ b/doc/gutenprint/html/structstp__weave__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -153,8 +153,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/unionstp__mxml__value__u.html b/doc/gutenprint/html/unionstp__mxml__value__u.html
index b52f5a7..a3e8d4b 100644
--- a/doc/gutenprint/html/unionstp__mxml__value__u.html
+++ b/doc/gutenprint/html/unionstp__mxml__value__u.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -119,8 +119,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:29 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/util_8h.html b/doc/gutenprint/html/util_8h.html
index 3b8ab79..c555ec5 100644
--- a/doc/gutenprint/html/util_8h.html
+++ b/doc/gutenprint/html/util_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -162,7 +162,7 @@ Utility functions.
           <td class="paramtype">x&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -173,8 +173,8 @@ Utility functions.
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/vars_8h.html b/doc/gutenprint/html/vars_8h.html
index 4fab205..e892ee7 100644
--- a/doc/gutenprint/html/vars_8h.html
+++ b/doc/gutenprint/html/vars_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -533,8 +533,8 @@
 Print job functions. 
 <p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/weave_8h.html b/doc/gutenprint/html/weave_8h.html
index ca68cb8..55f99ce 100644
--- a/doc/gutenprint/html/weave_8h.html
+++ b/doc/gutenprint/html/weave_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -216,7 +216,7 @@ Softweave functions.
           <td class="paramtype"><a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -245,7 +245,7 @@ Softweave functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -274,7 +274,7 @@ Softweave functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -303,7 +303,7 @@ Softweave functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -332,7 +332,7 @@ Softweave functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -361,7 +361,7 @@ Softweave functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -486,7 +486,7 @@ Softweave functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -527,7 +527,7 @@ Softweave functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -556,7 +556,7 @@ Softweave functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -658,8 +658,8 @@ Softweave functions.
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/xml_8h.html b/doc/gutenprint/html/xml_8h.html
index f3baa17..ce05180 100644
--- a/doc/gutenprint/html/xml_8h.html
+++ b/doc/gutenprint/html/xml_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -117,7 +117,7 @@ XML tree functions.
           <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
           <td class="paramname"> <em>array</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -137,7 +137,7 @@ XML tree functions.
           <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
           <td class="paramname"> <em>da</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -166,7 +166,7 @@ XML tree functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -186,7 +186,7 @@ XML tree functions.
           <td class="paramtype">const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *&nbsp;</td>
           <td class="paramname"> <em>raw</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -215,7 +215,7 @@ XML tree functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -235,7 +235,7 @@ XML tree functions.
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>filename</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -255,7 +255,7 @@ XML tree functions.
           <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
           <td class="paramname"> <em>da</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -275,7 +275,7 @@ XML tree functions.
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>raw</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -295,7 +295,7 @@ XML tree functions.
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>name</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -315,7 +315,7 @@ XML tree functions.
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>filename</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -335,7 +335,7 @@ XML tree functions.
           <td class="paramtype"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
           <td class="paramname"> <em>da</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -364,7 +364,7 @@ XML tree functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -393,7 +393,7 @@ XML tree functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -428,7 +428,7 @@ XML tree functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -448,7 +448,7 @@ XML tree functions.
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -477,7 +477,7 @@ XML tree functions.
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -497,7 +497,7 @@ XML tree functions.
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -517,7 +517,7 @@ XML tree functions.
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -537,7 +537,7 @@ XML tree functions.
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>file</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -557,7 +557,7 @@ XML tree functions.
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>name</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -577,7 +577,7 @@ XML tree functions.
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -597,7 +597,7 @@ XML tree functions.
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -617,7 +617,7 @@ XML tree functions.
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>textval</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -637,7 +637,7 @@ XML tree functions.
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>value</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -657,7 +657,7 @@ XML tree functions.
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>textval</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -677,7 +677,7 @@ XML tree functions.
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>value</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -697,7 +697,7 @@ XML tree functions.
           <td class="paramtype">const <a class="el" href="group__array.html#g26a474575a39c1c36ad520b95aa813b0">stp_array_t</a> *&nbsp;</td>
           <td class="paramname"> <em>array</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -717,7 +717,7 @@ XML tree functions.
           <td class="paramtype">const <a class="el" href="group__curve.html#g375a2b23705fb0698ae1d823243c8524">stp_curve_t</a> *&nbsp;</td>
           <td class="paramname"> <em>curve</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -737,7 +737,7 @@ XML tree functions.
           <td class="paramtype">const <a class="el" href="group__sequence.html#g327a46aa1d782a4cd53abf306068e272">stp_sequence_t</a> *&nbsp;</td>
           <td class="paramname"> <em>seq</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -757,7 +757,7 @@ XML tree functions.
           <td class="paramtype">const <a class="el" href="group__vars.html#g2d49c94847d18d8b62a214995b14680f">stp_vars_t</a> *&nbsp;</td>
           <td class="paramname"> <em>v</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -768,8 +768,8 @@ XML tree functions.
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/gutenprintui2.tag b/doc/gutenprintui2/gutenprintui2.tag
index 6919c28..c0bdd16 100644
--- a/doc/gutenprintui2/gutenprintui2.tag
+++ b/doc/gutenprintui2/gutenprintui2.tag
@@ -669,6 +669,53 @@
     </member>
   </compound>
   <compound kind="file">
+    <name>t.h</name>
+    <path>/home/rlk/sandbox/print-5.1/include/gutenprintui2/</path>
+    <filename>t_8h</filename>
+    <member kind="define">
+      <type>#define</type>
+      <name>STPUI_TYPE_ORIENT_T</name>
+      <anchorfile>t_8h.html</anchorfile>
+      <anchor>7c68a632b60b65d497e2933fa1b78a77</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
+      <name>STPUI_TYPE_COMMAND_T</name>
+      <anchorfile>t_8h.html</anchorfile>
+      <anchor>b213314f887b8b4f48f9aa1531673a9c</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
+      <name>STPUI_TYPE_CURVE_TYPE</name>
+      <anchorfile>t_8h.html</anchorfile>
+      <anchor>f0561b03a3bfb203b40c37f9bb373ffb</anchor>
+      <arglist></arglist>
+    </member>
+    <member kind="function">
+      <type>G_BEGIN_DECLS GType</type>
+      <name>orient_t_orient_t_get_type</name>
+      <anchorfile>t_8h.html</anchorfile>
+      <anchor>b05fb37a6c79f2b6b417ff107d9bb881</anchor>
+      <arglist>(void)</arglist>
+    </member>
+    <member kind="function">
+      <type>GType</type>
+      <name>command_t_command_t_get_type</name>
+      <anchorfile>t_8h.html</anchorfile>
+      <anchor>5e6b50173b88263be23734e76f4a39f2</anchor>
+      <arglist>(void)</arglist>
+    </member>
+    <member kind="function">
+      <type>GType</type>
+      <name>stpui_curve_type_get_type</name>
+      <anchorfile>t_8h.html</anchorfile>
+      <anchor>1252245c3967f9e655de3d62c3999230</anchor>
+      <arglist>(void)</arglist>
+    </member>
+  </compound>
+  <compound kind="file">
     <name>typebuiltins.h</name>
     <path>/home/rlk/sandbox/print-5.1/include/gutenprintui2/</path>
     <filename>typebuiltins_8h</filename>
diff --git a/doc/gutenprintui2/html/annotated.html b/doc/gutenprintui2/html/annotated.html
index 688e851..5dfb978 100644
--- a/doc/gutenprintui2/html/annotated.html
+++ b/doc/gutenprintui2/html/annotated.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -31,8 +31,8 @@
   <tr><td class="indexkey"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a></td><td class="indexvalue"></td></tr>
 </table>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/classes.html b/doc/gutenprintui2/html/classes.html
index 19edc24..8c1e22b 100644
--- a/doc/gutenprintui2/html/classes.html
+++ b/doc/gutenprintui2/html/classes.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -28,8 +28,8 @@
 </td><td><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstpui__image.html">stpui_image</a>&nbsp;&nbsp;&nbsp;</td><td><a name="letter__"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;_&nbsp;&nbsp;</div></td></tr></table>
 </td><td><a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a>&nbsp;&nbsp;&nbsp;</td></tr></table><p><div class="qindex"><a class="qindex" href="#letter_S">S</a>&nbsp;|&nbsp;<a class="qindex" href="#letter__">_</a></div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/curve_8h.html b/doc/gutenprintui2/html/curve_8h.html
index 47ad45b..a3d99a4 100644
--- a/doc/gutenprintui2/html/curve_8h.html
+++ b/doc/gutenprintui2/html/curve_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -77,7 +77,7 @@
           <td class="paramtype">obj&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurve.html">StpuiCurve</a>))</td>
+          <td>&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurve.html">StpuiCurve</a>))</td>
         </tr>
       </table>
 </div>
@@ -97,7 +97,7 @@
           <td class="paramtype">klass&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>))</td>
+          <td>&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>))</td>
         </tr>
       </table>
 </div>
@@ -117,7 +117,7 @@
           <td class="paramtype">obj&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>))</td>
+          <td>&nbsp;&nbsp;&nbsp;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>))</td>
         </tr>
       </table>
 </div>
@@ -137,7 +137,7 @@
           <td class="paramtype">obj&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_CURVE))</td>
+          <td>&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_CURVE))</td>
         </tr>
       </table>
 </div>
@@ -157,7 +157,7 @@
           <td class="paramtype">klass&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_CURVE))</td>
+          <td>&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_CURVE))</td>
         </tr>
       </table>
 </div>
@@ -250,7 +250,7 @@
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -285,7 +285,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -305,7 +305,7 @@
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -325,7 +325,7 @@
           <td class="paramtype"><a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *&nbsp;</td>
           <td class="paramname"> <em>curve</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -354,7 +354,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -383,7 +383,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -430,7 +430,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -465,7 +465,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -476,8 +476,8 @@
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/doxygen.css b/doc/gutenprintui2/html/doxygen.css
index 74c22a2..22c4843 100644
--- a/doc/gutenprintui2/html/doxygen.css
+++ b/doc/gutenprintui2/html/doxygen.css
@@ -407,6 +407,7 @@ HR {
 	font-family: sans-serif;
 	margin:0.5em;
 }
+/* these are for tree view when used as main index */
 .directory { 
 	font-size: 9pt; 
 	font-weight: bold; 
@@ -416,6 +417,21 @@ HR {
 	margin-top: 1em; 
 	font-size: 11pt; 
 }
+
+/* The following two styles can be used to replace the root node title */
+/* with an image of your choice.  Simply uncomment the next two styles, */
+/* specify the name of your image and be sure to set 'height' to the */
+/* proper pixel height of your image. */
+
+/* .directory h3.swap { */
+/* 	height: 61px; */
+/* 	background-repeat: no-repeat; */
+/* 	background-image: url("yourimage.gif"); */
+/* } */
+/* .directory h3.swap span { */
+/* 	display: none; */
+/* } */
+
 .directory > h3 { 
 	margin-top: 0; 
 }
@@ -430,4 +446,28 @@ HR {
 .directory img { 
 	vertical-align: -30%; 
 }
+/* these are for tree view when not used as main index */
+.directory-alt { 
+	font-size: 100%; 
+	font-weight: bold; 
+}
+.directory-alt h3 { 
+	margin: 0px; 
+	margin-top: 1em; 
+	font-size: 11pt; 
+}
+.directory-alt > h3 { 
+	margin-top: 0; 
+}
+.directory-alt p { 
+	margin: 0px; 
+	white-space: nowrap; 
+}
+.directory-alt div { 
+	display: none; 
+	margin: 0px; 
+}
+.directory-alt img { 
+	vertical-align: -30%; 
+}
 
diff --git a/doc/gutenprintui2/html/files.html b/doc/gutenprintui2/html/files.html
index 63cadc5..e10b2e1 100644
--- a/doc/gutenprintui2/html/files.html
+++ b/doc/gutenprintui2/html/files.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -25,11 +25,12 @@
   <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="curve_8h.html">curve.h</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="gammacurve_8h.html">gammacurve.h</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="gutenprintui_8h.html">gutenprintui.h</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="t_8h.html">t.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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/functions.html b/doc/gutenprintui2/html/functions.html
index 9124be8..54d6648 100644
--- a/doc/gutenprintui2/html/functions.html
+++ b/doc/gutenprintui2/html/functions.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -49,8 +49,6 @@
       <li><a href="#index_v"><span>v</span></a></li>
     </ul>
   </div>
-
-<p>
 </div>
 <div class="contents">
 Here is a list of all struct and union fields with links to the structures/unions they belong to:
@@ -197,8 +195,8 @@ Here is a list of all struct and union fields with links to the structures/union
 : <a class="el" href="structstpui__image.html#c378339fe87fa21d5f117fc11b3f5b6c">stpui_image</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/functions_vars.html b/doc/gutenprintui2/html/functions_vars.html
index 8c0d9b9..0929bdb 100644
--- a/doc/gutenprintui2/html/functions_vars.html
+++ b/doc/gutenprintui2/html/functions_vars.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -49,8 +49,6 @@
       <li><a href="#index_v"><span>v</span></a></li>
     </ul>
   </div>
-
-<p>
 </div>
 <div class="contents">
 &nbsp;
@@ -197,8 +195,8 @@
 : <a class="el" href="structstpui__image.html#c378339fe87fa21d5f117fc11b3f5b6c">stpui_image</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/gammacurve_8h.html b/doc/gutenprintui2/html/gammacurve_8h.html
index 6462e45..1d1e380 100644
--- a/doc/gutenprintui2/html/gammacurve_8h.html
+++ b/doc/gutenprintui2/html/gammacurve_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -60,7 +60,7 @@
           <td class="paramtype">obj&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurve.html">StpuiGammaCurve</a>))</td>
+          <td>&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurve.html">StpuiGammaCurve</a>))</td>
         </tr>
       </table>
 </div>
@@ -80,7 +80,7 @@
           <td class="paramtype">klass&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>))</td>
+          <td>&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>))</td>
         </tr>
       </table>
 </div>
@@ -100,7 +100,7 @@
           <td class="paramtype">obj&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>))</td>
+          <td>&nbsp;&nbsp;&nbsp;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>))</td>
         </tr>
       </table>
 </div>
@@ -120,7 +120,7 @@
           <td class="paramtype">obj&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_GAMMA_CURVE))</td>
+          <td>&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_GAMMA_CURVE))</td>
         </tr>
       </table>
 </div>
@@ -140,7 +140,7 @@
           <td class="paramtype">klass&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%">&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_GAMMA_CURVE))</td>
+          <td>&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_GAMMA_CURVE))</td>
         </tr>
       </table>
 </div>
@@ -207,7 +207,7 @@
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -227,7 +227,7 @@
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -238,8 +238,8 @@
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals.html b/doc/gutenprintui2/html/globals.html
index 98f85b9..5f741dd 100644
--- a/doc/gutenprintui2/html/globals.html
+++ b/doc/gutenprintui2/html/globals.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -37,8 +37,6 @@
       <li><a href="#index_s"><span>s</span></a></li>
     </ul>
   </div>
-
-<p>
 </div>
 <div class="contents">
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
@@ -47,7 +45,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <li>command_t
 : <a class="el" href="gutenprintui_8h.html#b31350eb38b009cbd282027630a1ee10">gutenprintui.h</a>
 <li>command_t_command_t_get_type()
-: <a class="el" href="typebuiltins_8h.html#5e6b50173b88263be23734e76f4a39f2">typebuiltins.h</a>
+: <a class="el" href="t_8h.html#5e6b50173b88263be23734e76f4a39f2">t.h</a>
+, <a class="el" href="typebuiltins_8h.html#5e6b50173b88263be23734e76f4a39f2">typebuiltins.h</a>
 <li>COMMAND_TYPE_CUSTOM
 : <a class="el" href="gutenprintui_8h.html#b31350eb38b009cbd282027630a1ee10cb7cf14821d9fcbaa983ee33d7b8e926">gutenprintui.h</a>
 <li>COMMAND_TYPE_DEFAULT
@@ -71,7 +70,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 <li>orient_t
 : <a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a0">gutenprintui.h</a>
 <li>orient_t_orient_t_get_type()
-: <a class="el" href="typebuiltins_8h.html#b05fb37a6c79f2b6b417ff107d9bb881">typebuiltins.h</a>
+: <a class="el" href="t_8h.html#b05fb37a6c79f2b6b417ff107d9bb881">t.h</a>
+, <a class="el" href="typebuiltins_8h.html#b05fb37a6c79f2b6b417ff107d9bb881">typebuiltins.h</a>
 <li>ORIENT_UPSIDEDOWN
 : <a class="el" href="gutenprintui_8h.html#c33232f845969eb04b32e1006c8240a03ca76babc9953cc92305856ac00a2350">gutenprintui.h</a>
 </ul>
@@ -106,6 +106,7 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b1a204ef2d450d762415a1c0c1c77db89">curve.h</a>
 <li>stpui_curve_type_get_type()
 : <a class="el" href="typebuiltins_8h.html#1252245c3967f9e655de3d62c3999230">typebuiltins.h</a>
+, <a class="el" href="t_8h.html#1252245c3967f9e655de3d62c3999230">t.h</a>
 <li>STPUI_CURVE_TYPE_LINEAR
 : <a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b741f86dc6dfb50a67dd621a287014de1">curve.h</a>
 <li>STPUI_CURVE_TYPE_SPLINE
@@ -232,14 +233,17 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="gutenprintui_8h.html#fcaf0ce6ff01c073cdfb2d2f80ede234">gutenprintui.h</a>
 <li>STPUI_TYPE_COMMAND_T
 : <a class="el" href="typebuiltins_8h.html#b213314f887b8b4f48f9aa1531673a9c">typebuiltins.h</a>
+, <a class="el" href="t_8h.html#b213314f887b8b4f48f9aa1531673a9c">t.h</a>
 <li>STPUI_TYPE_CURVE
 : <a class="el" href="curve_8h.html#887bee281f88accbe674790e5e5b28e3">curve.h</a>
 <li>STPUI_TYPE_CURVE_TYPE
-: <a class="el" href="typebuiltins_8h.html#f0561b03a3bfb203b40c37f9bb373ffb">typebuiltins.h</a>
+: <a class="el" href="t_8h.html#f0561b03a3bfb203b40c37f9bb373ffb">t.h</a>
+, <a class="el" href="typebuiltins_8h.html#f0561b03a3bfb203b40c37f9bb373ffb">typebuiltins.h</a>
 <li>STPUI_TYPE_GAMMA_CURVE
 : <a class="el" href="gammacurve_8h.html#9c72ddb3a35cadb3cc00b316cbb8e601">gammacurve.h</a>
 <li>STPUI_TYPE_ORIENT_T
 : <a class="el" href="typebuiltins_8h.html#7c68a632b60b65d497e2933fa1b78a77">typebuiltins.h</a>
+, <a class="el" href="t_8h.html#7c68a632b60b65d497e2933fa1b78a77">t.h</a>
 <li>StpuiCurve
 : <a class="el" href="curve_8h.html#5c0213fede0b7d8a91b66e4679cc899a">curve.h</a>
 <li>StpuiCurveClass
@@ -252,8 +256,8 @@ Here is a list of all functions, variables, defines, enums, and typedefs with li
 : <a class="el" href="gammacurve_8h.html#ec66cf466c32b2ead30a56c3fb1a3e09">gammacurve.h</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_defs.html b/doc/gutenprintui2/html/globals_defs.html
index a7c1238..7087b0e 100644
--- a/doc/gutenprintui2/html/globals_defs.html
+++ b/doc/gutenprintui2/html/globals_defs.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -55,19 +55,22 @@
 <li>STPUI_IS_GAMMA_CURVE_CLASS
 : <a class="el" href="gammacurve_8h.html#d5a762ee6059464c4d4d2f175d716c16">gammacurve.h</a>
 <li>STPUI_TYPE_COMMAND_T
-: <a class="el" href="typebuiltins_8h.html#b213314f887b8b4f48f9aa1531673a9c">typebuiltins.h</a>
+: <a class="el" href="t_8h.html#b213314f887b8b4f48f9aa1531673a9c">t.h</a>
+, <a class="el" href="typebuiltins_8h.html#b213314f887b8b4f48f9aa1531673a9c">typebuiltins.h</a>
 <li>STPUI_TYPE_CURVE
 : <a class="el" href="curve_8h.html#887bee281f88accbe674790e5e5b28e3">curve.h</a>
 <li>STPUI_TYPE_CURVE_TYPE
 : <a class="el" href="typebuiltins_8h.html#f0561b03a3bfb203b40c37f9bb373ffb">typebuiltins.h</a>
+, <a class="el" href="t_8h.html#f0561b03a3bfb203b40c37f9bb373ffb">t.h</a>
 <li>STPUI_TYPE_GAMMA_CURVE
 : <a class="el" href="gammacurve_8h.html#9c72ddb3a35cadb3cc00b316cbb8e601">gammacurve.h</a>
 <li>STPUI_TYPE_ORIENT_T
 : <a class="el" href="typebuiltins_8h.html#7c68a632b60b65d497e2933fa1b78a77">typebuiltins.h</a>
+, <a class="el" href="t_8h.html#7c68a632b60b65d497e2933fa1b78a77">t.h</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_enum.html b/doc/gutenprintui2/html/globals_enum.html
index 855a11f..b0096b0 100644
--- a/doc/gutenprintui2/html/globals_enum.html
+++ b/doc/gutenprintui2/html/globals_enum.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -42,8 +42,8 @@
 : <a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b">curve.h</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_eval.html b/doc/gutenprintui2/html/globals_eval.html
index 10962a7..046621f 100644
--- a/doc/gutenprintui2/html/globals_eval.html
+++ b/doc/gutenprintui2/html/globals_eval.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -58,8 +58,8 @@
 : <a class="el" href="curve_8h.html#59cb8817385039367325d6dbb4a0996b6cef8a118ee2829db63f812874a412c1">curve.h</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_func.html b/doc/gutenprintui2/html/globals_func.html
index ab1a373..817a7ec 100644
--- a/doc/gutenprintui2/html/globals_func.html
+++ b/doc/gutenprintui2/html/globals_func.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -36,19 +36,19 @@
       <li><a href="#index_s"><span>s</span></a></li>
     </ul>
   </div>
-
-<p>
 </div>
 <div class="contents">
 &nbsp;
 <p>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>command_t_command_t_get_type()
-: <a class="el" href="typebuiltins_8h.html#5e6b50173b88263be23734e76f4a39f2">typebuiltins.h</a>
+: <a class="el" href="t_8h.html#5e6b50173b88263be23734e76f4a39f2">t.h</a>
+, <a class="el" href="typebuiltins_8h.html#5e6b50173b88263be23734e76f4a39f2">typebuiltins.h</a>
 </ul>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>orient_t_orient_t_get_type()
-: <a class="el" href="typebuiltins_8h.html#b05fb37a6c79f2b6b417ff107d9bb881">typebuiltins.h</a>
+: <a class="el" href="t_8h.html#b05fb37a6c79f2b6b417ff107d9bb881">t.h</a>
+, <a class="el" href="typebuiltins_8h.html#b05fb37a6c79f2b6b417ff107d9bb881">typebuiltins.h</a>
 </ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>stpui_build_standard_print_command()
@@ -72,7 +72,8 @@
 <li>stpui_curve_set_vector()
 : <a class="el" href="curve_8h.html#be1c943341872697e6219d7053db2804">curve.h</a>
 <li>stpui_curve_type_get_type()
-: <a class="el" href="typebuiltins_8h.html#1252245c3967f9e655de3d62c3999230">typebuiltins.h</a>
+: <a class="el" href="t_8h.html#1252245c3967f9e655de3d62c3999230">t.h</a>
+, <a class="el" href="typebuiltins_8h.html#1252245c3967f9e655de3d62c3999230">typebuiltins.h</a>
 <li>stpui_do_print_dialog()
 : <a class="el" href="gutenprintui_8h.html#ac1066fa59dc8a04b90415994587ec1a">gutenprintui.h</a>
 <li>stpui_gamma_curve_get_type()
@@ -179,8 +180,8 @@
 : <a class="el" href="gutenprintui_8h.html#fcaf0ce6ff01c073cdfb2d2f80ede234">gutenprintui.h</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_type.html b/doc/gutenprintui2/html/globals_type.html
index 9a0f874..f71823a 100644
--- a/doc/gutenprintui2/html/globals_type.html
+++ b/doc/gutenprintui2/html/globals_type.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -48,8 +48,8 @@
 : <a class="el" href="gammacurve_8h.html#ec66cf466c32b2ead30a56c3fb1a3e09">gammacurve.h</a>
 </ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/gutenprintui_8h.html b/doc/gutenprintui2/html/gutenprintui_8h.html
index 82e8076..f6b93da 100644
--- a/doc/gutenprintui2/html/gutenprintui_8h.html
+++ b/doc/gutenprintui2/html/gutenprintui_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -260,7 +260,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -280,7 +280,7 @@
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -300,7 +300,7 @@
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -320,7 +320,7 @@
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -340,7 +340,7 @@
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -360,7 +360,7 @@
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -380,7 +380,7 @@
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>param</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -400,7 +400,7 @@
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -420,7 +420,7 @@
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -440,7 +440,7 @@
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -460,7 +460,7 @@
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -480,7 +480,7 @@
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -509,7 +509,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -538,7 +538,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -558,7 +558,7 @@
           <td class="paramtype">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
           <td class="paramname"> <em>p</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -578,7 +578,7 @@
           <td class="paramtype">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
           <td class="paramname"> <em>p</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -598,7 +598,7 @@
           <td class="paramtype">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
           <td class="paramname"> <em>p</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -618,7 +618,7 @@
           <td class="paramtype">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
           <td class="paramname"> <em>p</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -638,7 +638,7 @@
           <td class="paramtype">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
           <td class="paramname"> <em>p</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -658,7 +658,7 @@
           <td class="paramtype">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
           <td class="paramname"> <em>p</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -678,7 +678,7 @@
           <td class="paramtype">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
           <td class="paramname"> <em>p</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -698,7 +698,7 @@
           <td class="paramtype">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
           <td class="paramname"> <em>p</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -727,7 +727,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -756,7 +756,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -785,7 +785,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -820,7 +820,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -849,7 +849,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -884,7 +884,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -913,7 +913,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -948,7 +948,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -977,7 +977,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1012,7 +1012,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1041,7 +1041,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1076,7 +1076,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1105,7 +1105,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1140,7 +1140,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1169,7 +1169,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1189,7 +1189,7 @@
           <td class="paramtype"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
           <td class="paramname"> <em>printer</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -1209,7 +1209,7 @@
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -1229,7 +1229,7 @@
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -1249,7 +1249,7 @@
           <td class="paramtype">void *&nbsp;</td>
           <td class="paramname"> <em>errdata</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -1269,7 +1269,7 @@
           <td class="paramtype">stp_outfunc_t&nbsp;</td>
           <td class="paramname"> <em>wfunc</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -1298,7 +1298,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1318,7 +1318,7 @@
           <td class="paramtype">gint&nbsp;</td>
           <td class="paramname"> <em>bit_depth</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -1347,7 +1347,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1367,7 +1367,7 @@
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -1387,7 +1387,7 @@
           <td class="paramtype">gint&nbsp;</td>
           <td class="paramname"> <em>channels</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -1416,7 +1416,7 @@
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td width="100%"></td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
@@ -1436,7 +1436,7 @@
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>image_type</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -1456,7 +1456,7 @@
           <td class="paramtype">const char *&nbsp;</td>
           <td class="paramname"> <em>name</em>          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -1476,7 +1476,7 @@
           <td class="paramtype">void *&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -1496,7 +1496,7 @@
           <td class="paramtype"><a class="el" href="gutenprintui_8h.html#9b59c94766b4713803ec6e1daaa84e70">get_thumbnail_func_t</a>&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -1507,8 +1507,8 @@
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/index.html b/doc/gutenprintui2/html/index.html
index 83638c8..2fcdc48 100644
--- a/doc/gutenprintui2/html/index.html
+++ b/doc/gutenprintui2/html/index.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -17,9 +17,9 @@
 <div class="contents">
 <h1>libgutenprintui2 API Reference Documentation</h1>
 <p>
-<h3 align="center">5.2.3 </h3></div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<h3 align="center">5.2.4 </h3></div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiCurve.html b/doc/gutenprintui2/html/struct__StpuiCurve.html
index b9df149..2c59bb0 100644
--- a/doc/gutenprintui2/html/struct__StpuiCurve.html
+++ b/doc/gutenprintui2/html/struct__StpuiCurve.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -287,8 +287,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiCurveClass.html b/doc/gutenprintui2/html/struct__StpuiCurveClass.html
index 0f235e3..3093e94 100644
--- a/doc/gutenprintui2/html/struct__StpuiCurveClass.html
+++ b/doc/gutenprintui2/html/struct__StpuiCurveClass.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -134,8 +134,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
index 558c780..3f0266d 100644
--- a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
+++ b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -151,8 +151,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
index 6f7be5f..3c0af04 100644
--- a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
+++ b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -117,8 +117,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/structstpui__image.html b/doc/gutenprintui2/html/structstpui__image.html
index ea43949..3ec47d4 100644
--- a/doc/gutenprintui2/html/structstpui__image.html
+++ b/doc/gutenprintui2/html/structstpui__image.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -168,8 +168,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/structstpui__plist__t.html b/doc/gutenprintui2/html/structstpui__plist__t.html
index c5d7c21..993103d 100644
--- a/doc/gutenprintui2/html/structstpui__plist__t.html
+++ b/doc/gutenprintui2/html/structstpui__plist__t.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -253,8 +253,8 @@
 <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>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/t_8h.html b/doc/gutenprintui2/html/t_8h.html
new file mode 100644
index 0000000..4d32527
--- /dev/null
+++ b/doc/gutenprintui2/html/t_8h.html
@@ -0,0 +1,148 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<title>libgutenprintui2 API Reference: include/gutenprintui2/t.h File Reference</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.5.6 -->
+<div class="navigation" id="top">
+  <div class="tabs">
+    <ul>
+      <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+      <li><a href="classes.html"><span>Data&nbsp;Structures</span></a></li>
+      <li class="current"><a href="files.html"><span>Files</span></a></li>
+    </ul>
+  </div>
+</div>
+<div class="contents">
+<h1>include/gutenprintui2/t.h File Reference</h1><code>#include &lt;glib-object.h&gt;</code><br>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td></td></tr>
+<tr><td colspan="2"><br><h2>Defines</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="t_8h.html#7c68a632b60b65d497e2933fa1b78a77">STPUI_TYPE_ORIENT_T</a>&nbsp;&nbsp;&nbsp;(orient_t_orient_t_get_type())</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="t_8h.html#b213314f887b8b4f48f9aa1531673a9c">STPUI_TYPE_COMMAND_T</a>&nbsp;&nbsp;&nbsp;(command_t_command_t_get_type())</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="t_8h.html#f0561b03a3bfb203b40c37f9bb373ffb">STPUI_TYPE_CURVE_TYPE</a>&nbsp;&nbsp;&nbsp;(stpui_curve_type_get_type())</td></tr>
+
+<tr><td colspan="2"><br><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">G_BEGIN_DECLS GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="t_8h.html#b05fb37a6c79f2b6b417ff107d9bb881">orient_t_orient_t_get_type</a> (void)</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="t_8h.html#5e6b50173b88263be23734e76f4a39f2">command_t_command_t_get_type</a> (void)</td></tr>
+
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="t_8h.html#1252245c3967f9e655de3d62c3999230">stpui_curve_type_get_type</a> (void)</td></tr>
+
+</table>
+<hr><h2>Define Documentation</h2>
+<a class="anchor" name="b213314f887b8b4f48f9aa1531673a9c"></a><!-- doxytag: member="t.h::STPUI_TYPE_COMMAND_T" ref="b213314f887b8b4f48f9aa1531673a9c" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define STPUI_TYPE_COMMAND_T&nbsp;&nbsp;&nbsp;(command_t_command_t_get_type())          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="f0561b03a3bfb203b40c37f9bb373ffb"></a><!-- doxytag: member="t.h::STPUI_TYPE_CURVE_TYPE" ref="f0561b03a3bfb203b40c37f9bb373ffb" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define STPUI_TYPE_CURVE_TYPE&nbsp;&nbsp;&nbsp;(stpui_curve_type_get_type())          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="7c68a632b60b65d497e2933fa1b78a77"></a><!-- doxytag: member="t.h::STPUI_TYPE_ORIENT_T" ref="7c68a632b60b65d497e2933fa1b78a77" args="" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">#define STPUI_TYPE_ORIENT_T&nbsp;&nbsp;&nbsp;(orient_t_orient_t_get_type())          </td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<hr><h2>Function Documentation</h2>
+<a class="anchor" name="5e6b50173b88263be23734e76f4a39f2"></a><!-- doxytag: member="t.h::command_t_command_t_get_type" ref="5e6b50173b88263be23734e76f4a39f2" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">GType command_t_command_t_get_type           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="b05fb37a6c79f2b6b417ff107d9bb881"></a><!-- doxytag: member="t.h::orient_t_orient_t_get_type" ref="b05fb37a6c79f2b6b417ff107d9bb881" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">G_BEGIN_DECLS GType orient_t_orient_t_get_type           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+<a class="anchor" name="1252245c3967f9e655de3d62c3999230"></a><!-- doxytag: member="t.h::stpui_curve_type_get_type" ref="1252245c3967f9e655de3d62c3999230" args="(void)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">GType stpui_curve_type_get_type           </td>
+          <td>(</td>
+          <td class="paramtype">void&nbsp;</td>
+          <td class="paramname">          </td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>
+
+</div>
+</div><p>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
+</body>
+</html>
diff --git a/doc/gutenprintui2/html/typebuiltins_8h.html b/doc/gutenprintui2/html/typebuiltins_8h.html
index 64c8d9c..690baec 100644
--- a/doc/gutenprintui2/html/typebuiltins_8h.html
+++ b/doc/gutenprintui2/html/typebuiltins_8h.html
@@ -4,7 +4,7 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 <link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.5 -->
+<!-- Generated by Doxygen 1.5.6 -->
 <div class="navigation" id="top">
   <div class="tabs">
     <ul>
@@ -90,7 +90,7 @@
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -110,7 +110,7 @@
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -130,7 +130,7 @@
           <td class="paramtype">void&nbsp;</td>
           <td class="paramname">          </td>
           <td>&nbsp;)&nbsp;</td>
-          <td width="100%"></td>
+          <td></td>
         </tr>
       </table>
 </div>
@@ -141,8 +141,8 @@
 </div>
 </div><p>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun Dec 21 21:57:33 2008 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="text-align: right;"><small>Generated on Sun Jul 26 16:37:28 2009 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.5 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.6 </small></address>
 </body>
 </html>
diff --git a/include/Makefile.in b/include/Makefile.in
index 7914876..da9e279 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -43,11 +43,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -87,10 +90,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -100,16 +99,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -154,6 +152,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -165,6 +164,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -177,8 +177,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -212,8 +216,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -258,6 +261,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -270,6 +274,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = gutenprint gutenprintui2
diff --git a/include/gutenprint/Makefile.in b/include/gutenprint/Makefile.in
index 6a8e1b2..a6aebfc 100644
--- a/include/gutenprint/Makefile.in
+++ b/include/gutenprint/Makefile.in
@@ -46,11 +46,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -92,10 +95,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -105,16 +104,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -159,6 +157,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -170,6 +169,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -182,8 +182,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -217,8 +221,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -263,6 +266,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -275,6 +279,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
diff --git a/include/gutenprint/bit-ops.h b/include/gutenprint/bit-ops.h
index b1a67e1..9e0fcc5 100644
--- a/include/gutenprint/bit-ops.h
+++ b/include/gutenprint/bit-ops.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: bit-ops.h,v 1.3 2007/03/08 13:34:27 faust3 Exp $"
+ * "$Id: bit-ops.h,v 1.4 2009/05/17 19:25:36 rlk Exp $"
  *
  *   Softweave calculator for gimp-print.
  *
@@ -32,38 +32,121 @@
 extern "C" {
 #endif
 
+/**
+ * Interleave a buffer consisting of two bit strings of length single_length
+ * into one string of packed two-bit ints.
+ *
+ * @param line the input bit string
+ * @param single_length the length (in bytes) of the input
+ * @param outbuf the output.
+ */
 extern void	stp_fold(const unsigned char *line, int single_length,
 			 unsigned char *outbuf);
 
+/**
+ * Interleave a buffer consisting of three bit strings of length single_length
+ * into one string of packed three-bit ints.
+ *
+ * @param line the input bit string
+ * @param single_length the length (in bytes) of the input
+ * @param outbuf the output.
+ */
 extern void	stp_fold_3bit(const unsigned char *line, int single_length,
 			 unsigned char *outbuf);
 
+/**
+ * Interleave a buffer consisting of three bit strings of length single_length
+ * into one string of packed three-bit ints.
+ *
+ * @param line the input bit string
+ * @param single_length the length (in bytes) of the input
+ * @param outbuf the output.
+ */
 extern void	stp_fold_3bit_323(const unsigned char *line, int single_length,
 			 unsigned char *outbuf);
 
+/**
+ * Interleave a buffer consisting of four bit strings of length single_length
+ * into one string of packed four-bit ints.
+ *
+ * @param line the input bit string
+ * @param single_length the length (in bytes) of the input
+ * @param outbuf the output.
+ */
 extern void	stp_fold_4bit(const unsigned char *line, int single_length,
 			 unsigned char *outbuf);
 
+/**
+ * Split an input sequence of packed 1 or 2 bit integers into two or more
+ * outputs of equal length, distributing non-zero integers round robin
+ * into each output.  Used in "high quality" modes when extra passes are
+ * made, to ensure that each pass gets an equal number of ink drops.
+ * Each output is as long as the input.
+ *
+ * @param height the number of integers in the input divided by 8
+ * @param bits the bit depth (1 or 2)
+ * @param n the number of outputs into which the input should be distributed
+ * @param in the input bit string
+ * @param stride the stride across the outputs (if it's necessary to
+ * distribute the input over non-contiguous members of the array of outputs)
+ * @param outs the array of output bit strings
+ */
+extern void	stp_split(int height, int bits, int n, const unsigned char *in,
+			  int stride, unsigned char **outs);
+
+/**
+ * Deprecated -- use stp_split
+ */
 extern void	stp_split_2(int height, int bits, const unsigned char *in,
 			    unsigned char *outhi, unsigned char *outlo);
 
+/**
+ * Deprecated -- use stp_split
+ */
 extern void	stp_split_4(int height, int bits, const unsigned char *in,
 			    unsigned char *out0, unsigned char *out1,
 			    unsigned char *out2, unsigned char *out3);
 
+/**
+ * Unpack an input sequence of packed 1 or 2 bit integers into two or more
+ * outputs of equal length.  The input is round robined into the outputs.
+ * Each output is 1/n as long as the input.
+ *
+ * @param height the number of integers in the input divided by 8
+ * @param bits the bit depth (1 or 2)
+ * @param n the number of outputs into which the input should be distributed
+ * @param in the input bit string
+ * @param outs the array of output bit strings
+ * 
+ */
+extern void	stp_unpack(int height, int bits, int n, const unsigned char *in,
+			   unsigned char **outs);
+
+/**
+ * Deprecated -- use stp_unpack
+ */
 extern void	stp_unpack_2(int height, int bits, const unsigned char *in,
 			     unsigned char *outlo, unsigned char *outhi);
 
+/**
+ * Deprecated -- use stp_unpack
+ */
 extern void	stp_unpack_4(int height, int bits, const unsigned char *in,
 			     unsigned char *out0, unsigned char *out1,
 			     unsigned char *out2, unsigned char *out3);
 
+/**
+ * Deprecated -- use stp_unpack
+ */
 extern void	stp_unpack_8(int height, int bits, const unsigned char *in,
 			     unsigned char *out0, unsigned char *out1,
 			     unsigned char *out2, unsigned char *out3,
 			     unsigned char *out4, unsigned char *out5,
 			     unsigned char *out6, unsigned char *out7);
 
+/**
+ * Deprecated -- use stp_unpack
+ */
 extern void	stp_unpack_16(int height, int bits, const unsigned char *in,
 			      unsigned char *out0, unsigned char *out1,
 			      unsigned char *out2, unsigned char *out3,
diff --git a/include/gutenprintui2/Makefile.in b/include/gutenprintui2/Makefile.in
index 139edb7..f9d8ca3 100644
--- a/include/gutenprintui2/Makefile.in
+++ b/include/gutenprintui2/Makefile.in
@@ -43,11 +43,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -89,10 +92,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -102,16 +101,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -156,6 +154,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -167,6 +166,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -179,8 +179,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -214,8 +218,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -260,6 +263,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -272,6 +276,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
diff --git a/m4/libtool.m4 b/m4/libtool.m4
new file mode 100644
index 0000000..39ba996
--- /dev/null
+++ b/m4/libtool.m4
@@ -0,0 +1,7357 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool 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.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
+
+# serial 56 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+m4_defun([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+_LT_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from `configure', and `config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain="$ac_aux_dir/ltmain.sh"
+])# _LT_PROG_LTMAIN
+
+
+## ------------------------------------- ##
+## Accumulate code for creating libtool. ##
+## ------------------------------------- ##
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the `libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+## ------------------------ ##
+## FIXME: Eliminate VARNAME ##
+## ------------------------ ##
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to `config.status' so that its
+# declaration there will have the same value as in `configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags="_LT_TAGS"dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into `config.status', and then the shell code to quote escape them in
+# for loops in `config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\[$]0 --fallback-echo"')dnl "
+  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
+  ;;
+esac
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+cat >"$CONFIG_LT" <<_LTEOF
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate a libtool stub with the current configuration.
+
+lt_cl_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AS_SHELL_SANITIZE
+_AS_PREPARE
+
+exec AS_MESSAGE_FD>&1
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+\`$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2008 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test $[#] != 0
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try \`$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try \`$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+if test "$no_create" != yes; then
+  lt_cl_success=:
+  test "$silent" = yes &&
+    lt_config_lt_args="$lt_config_lt_args --quiet"
+  exec AS_MESSAGE_LOG_FD>/dev/null
+  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+  exec AS_MESSAGE_LOG_FD>>config.log
+  $lt_cl_success || AS_EXIT(1)
+fi
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  _LT_PROG_XSI_SHELLFNS
+
+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+    || (rm -f "$cfgfile"; exit 1)
+
+  mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS="$save_LDFLAGS"
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[[012]]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES
+# --------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=echo
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    m4_if([$1], [CXX],
+[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX
+# -----------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+lt_aix_libpath_sed='
+    /Import File Strings/,/^$/ {
+	/^0/ {
+	    s/^0  *\(.*\)$/\1/
+	    p
+	}
+    }'
+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+# Check for a 64-bit object if we didn't find anything.
+if test -z "$aix_libpath"; then
+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+fi],[])
+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[ifdef([AC_DIVERSION_NOTICE],
+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+	 [AC_DIVERT_PUSH(NOTICE)])
+$1
+AC_DIVERT_POP
+])# _LT_SHELL_INIT
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Add some code to the start of the generated configure script which
+# will find an echo command which doesn't interpret backslashes.
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[_LT_SHELL_INIT([
+# Check that we are running under the correct shell.
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+case X$lt_ECHO in
+X*--fallback-echo)
+  # Remove one level of quotation (which was required for Make).
+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+  ;;
+esac
+
+ECHO=${lt_ECHO-echo}
+if test "X[$]1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X[$]1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+  # Yippee, $ECHO works!
+  :
+else
+  # Restart under the correct shell.
+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+fi
+
+if test "X[$]1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<_LT_EOF
+[$]*
+_LT_EOF
+  exit 0
+fi
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test -z "$lt_ECHO"; then
+  if test "X${echo_test_string+set}" != Xset; then
+    # find a string as large as possible, as long as the shell can cope with it
+    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+      then
+        break
+      fi
+    done
+  fi
+
+  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+     test "X$echo_testing_string" = "X$echo_test_string"; then
+    :
+  else
+    # The Solaris, AIX, and Digital Unix default echo programs unquote
+    # backslashes.  This makes it impossible to quote backslashes using
+    #   echo "$something" | sed 's/\\/\\\\/g'
+    #
+    # So, first we look for a working echo in the user's PATH.
+
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for dir in $PATH /usr/ucb; do
+      IFS="$lt_save_ifs"
+      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        ECHO="$dir/echo"
+        break
+      fi
+    done
+    IFS="$lt_save_ifs"
+
+    if test "X$ECHO" = Xecho; then
+      # We didn't find a better echo, so look for alternatives.
+      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
+         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
+         test "X$echo_testing_string" = "X$echo_test_string"; then
+        # This shell has a builtin print -r that does the trick.
+        ECHO='print -r'
+      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
+	   test "X$CONFIG_SHELL" != X/bin/ksh; then
+        # If we have ksh, try running configure again with it.
+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+        export ORIGINAL_CONFIG_SHELL
+        CONFIG_SHELL=/bin/ksh
+        export CONFIG_SHELL
+        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+      else
+        # Try using printf.
+        ECHO='printf %s\n'
+        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+	   test "X$echo_testing_string" = "X$echo_test_string"; then
+	  # Cool, printf works
+	  :
+        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+	  export CONFIG_SHELL
+	  SHELL="$CONFIG_SHELL"
+	  export SHELL
+	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+	     test "X$echo_testing_string" = 'X\t' &&
+	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+	     test "X$echo_testing_string" = "X$echo_test_string"; then
+	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
+        else
+	  # maybe with a smaller string...
+	  prev=:
+
+	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
+	    then
+	      break
+	    fi
+	    prev="$cmd"
+	  done
+
+	  if test "$prev" != 'sed 50q "[$]0"'; then
+	    echo_test_string=`eval $prev`
+	    export echo_test_string
+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+	  else
+	    # Oops.  We lost completely, so just stick with echo.
+	    ECHO=echo
+	  fi
+        fi
+      fi
+    fi
+  fi
+fi
+
+# Copy echo and quote the copy suitably for passing to libtool from
+# the Makefile, instead of quoting the original, which is used later.
+lt_ECHO=$ECHO
+if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+fi
+
+AC_SUBST(lt_ECHO)
+])
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1],
+    [An echo program that does not interpret backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  ppc64-*linux*|powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  ppc*-*linux*|powerpc*-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+sparc*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+])# _LT_ENABLE_LOCK
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[AC_CHECK_TOOL(AR, ar, false)
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1])
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   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.
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
+	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line __oline__ "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+void fnord() { int i=42;}
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links="nottested"
+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
+  [Define to the sub-directory in which libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
+   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
+  else
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+  fi
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux
+  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'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$host_os in
+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH printed by
+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+        # path with ; separators, and with drive letters. We can handle the
+        # drive letters (cygwin fileutils understands them), so leave them,
+        # especially as we might pass files found there to a mingw objdump,
+        # which wouldn't understand a cygwinified path. Ahh.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    ;;
+
+  *)
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    ;;
+  esac
+  dynamic_linker='Win32 ld.exe'
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  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
+  ;;
+
+freebsd1*)
+  dynamic_linker=no
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[123]]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+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
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  postinstall_cmds='chmod 555 $lib'
+  ;;
+
+interix[[3-9]]*)
+  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'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-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'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # Some binutils ld are patched to set DT_RUNPATH
+  save_LDFLAGS=$LDFLAGS
+  save_libdir=$libdir
+  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+       [shlibpath_overrides_runpath=yes])])
+  LDFLAGS=$save_LDFLAGS
+  libdir=$save_libdir
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  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='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  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=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux
+  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
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  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}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux
+  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
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
+    [Run-time system search path for libraries])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program which can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program which can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_DECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+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
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method == "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+  AC_SUBST([DUMPBIN])
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+const struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_save_LIBS="$LIBS"
+	  lt_save_CFLAGS="$CFLAGS"
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS="$lt_save_LIBS"
+	  CFLAGS="$lt_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+AC_MSG_CHECKING([for $compiler option to produce PIC])
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC*)
+	    # IBM XL 8.0 on PPC
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl*)
+	# IBM XL C 8.0/Fortran 10.1 on PPC
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+	*Sun\ F*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+  ;;
+  cygwin* | mingw* | cegcc*)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  esac
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+  if test "$with_gnu_ld" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to modify your PATH
+*** so that a non-GNU linker is found, and then restart.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	  tmp_sharedflag='--shared' ;;
+	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  # Exported symbols can be pulled into shared objects from archives
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      # Tell ltmain to make .lib files, not .a files.
+      libext=lib
+      # Tell ltmain to make .dll files, not .so files.
+      shrext_cmds=".dll"
+      # FIXME: Setting linknames here is a bad hack.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      # The linker will automatically build a .lib file if we build a DLL.
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+      # FIXME: Should let the user specify the lib program.
+      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    freebsd1*)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$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'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+        save_LDFLAGS="$LDFLAGS"
+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+        AC_LINK_IFELSE(int foo(void) {},
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+        )
+        LDFLAGS="$save_LDFLAGS"
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+      $RM conftest*
+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+        soname=conftest
+        lib=conftest
+        libobjs=conftest.$ac_objext
+        deplibs=
+        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+        compiler_flags=-v
+        linker_flags=-v
+        verstring=
+        output_objdir=.
+        libname=conftest
+        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+        _LT_TAGVAR(allow_undefined_flag, $1)=
+        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+        then
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        else
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+        fi
+        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+      else
+        cat conftest.err 1>&5
+      fi
+      $RM conftest*
+      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
+    [[If ld is used when linking, flag to hardcode $libdir into a binary
+    during linking.  This must work even if $libdir does not exist]])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [fix_srcfile_path], [1],
+    [Fix the shell variable $srcfile for the compiler])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report which library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC="$lt_save_CC"
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_PROG_CXX
+# ------------
+# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
+# compiler, we have our own version here.
+m4_defun([_LT_PROG_CXX],
+[
+pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
+AC_PROG_CXX
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_CXX
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_CXX], [])
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[AC_REQUIRE([_LT_PROG_CXX])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+        # as there is no search path for DLLs.
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+        _LT_TAGVAR(always_export_symbols, $1)=no
+        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+          # If the export-symbols file already is a .def file (1st line
+          # is EXPORTS), use it as is; otherwise, prepend...
+          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    cp $export_symbols $output_objdir/$soname.def;
+          else
+	    echo EXPORTS > $output_objdir/$soname.def;
+	    cat $export_symbols >> $output_objdir/$soname.def;
+          fi~
+          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+        else
+          _LT_TAGVAR(ld_shlibs, $1)=no
+        fi
+        ;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd[[12]]*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      gnu*)
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+		$RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 will use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    ;;
+	  xl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='echo'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=echo
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='echo'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)="$GXX"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+])
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case $p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+	 prev=$p
+	 continue
+       else
+	 prev=
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 case $p in
+	 -L* | -R*)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       ;;
+
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_PROG_F77
+# ------------
+# Since AC_PROG_F77 is broken, in that it returns the empty string
+# if there is no fortran compiler, we have our own version here.
+m4_defun([_LT_PROG_F77],
+[
+pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
+AC_PROG_F77
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_F77
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_F77], [])
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_REQUIRE([_LT_PROG_F77])dnl
+AC_LANG_PUSH(Fortran 77)
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_F77" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  CC=${F77-"f77"}
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$G77"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+fi # test "$_lt_disable_F77" != yes
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_PROG_FC
+# -----------
+# Since AC_PROG_FC is broken, in that it returns the empty string
+# if there is no fortran compiler, we have our own version here.
+m4_defun([_LT_PROG_FC],
+[
+pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
+AC_PROG_FC
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
+popdef([AC_MSG_ERROR])
+])# _LT_PROG_FC
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([_LT_PROG_FC], [])
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_REQUIRE([_LT_PROG_FC])dnl
+AC_LANG_PUSH(Fortran)
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_FC" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  CC=${FC-"f95"}
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+fi # test "$_lt_disable_FC" != yes
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC="$lt_save_CC"
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC="$lt_save_CC"
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+AC_MSG_RESULT([$xsi_shell])
+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
+
+AC_MSG_CHECKING([whether the shell understands "+="])
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+AC_MSG_RESULT([$lt_shell_append])
+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PROG_XSI_SHELLFNS
+# ---------------------
+# Bourne and XSI compatible variants of some useful shell functions.
+m4_defun([_LT_PROG_XSI_SHELLFNS],
+[case $xsi_shell in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result="${1##*/}"
+}
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  case ${1} in
+    */*) func_dirname_result="${1%/*}${2}" ;;
+    *  ) func_dirname_result="${3}" ;;
+  esac
+  func_basename_result="${1##*/}"
+}
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+func_stripname ()
+{
+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+  # positional parameters, so assign one to ordinary parameter first.
+  func_stripname_result=${3}
+  func_stripname_result=${func_stripname_result#"${1}"}
+  func_stripname_result=${func_stripname_result%"${2}"}
+}
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=${1%%=*}
+  func_opt_split_arg=${1#*=}
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  case ${1} in
+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+    *)    func_lo2o_result=${1} ;;
+  esac
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=${1%.*}.lo
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=$(( $[*] ))
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=${#1}
+}
+
+_LT_EOF
+    ;;
+  *) # Bourne compatible functions.
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+}
+
+# func_basename file
+func_basename ()
+{
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
+
+dnl func_dirname_and_basename
+dnl A portable version of this function is already defined in general.m4sh
+dnl so there is no need for it here.
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+  case ${2} in
+    .*) func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
+    *)  func_stripname_result=`$ECHO "X${3}" \
+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+  esac
+}
+
+# sed scripts:
+my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
+my_sed_long_arg='1s/^-[[^=]]*=//'
+
+# func_opt_split
+func_opt_split ()
+{
+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+}
+
+# func_lo2o object
+func_lo2o ()
+{
+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+}
+
+# func_xform libobj-or-source
+func_xform ()
+{
+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
+}
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+  func_arith_result=`expr "$[@]"`
+}
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
+}
+
+_LT_EOF
+esac
+
+case $lt_shell_append in
+  yes)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$[1]+=\$[2]"
+}
+_LT_EOF
+    ;;
+  *)
+    cat << \_LT_EOF >> "$cfgfile"
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+  eval "$[1]=\$$[1]\$[2]"
+}
+
+_LT_EOF
+    ;;
+  esac
+])
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
new file mode 100644
index 0000000..34151a3
--- /dev/null
+++ b/m4/ltoptions.m4
@@ -0,0 +1,368 @@
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option `$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+  		   [_LT_ENABLE_FAST_INSTALL])
+  ])
+])# _LT_SET_OPTIONS
+
+
+## --------------------------------- ##
+## Macros to handle LT_INIT options. ##
+## --------------------------------- ##
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [0], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the `shared' and
+# `disable-shared' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the `static' and
+# `disable-static' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the `fast-install'
+# and `disable-fast-install' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# LT_INIT options.
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [pic_mode="$withval"],
+    [pic_mode=default])
+
+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+## ----------------- ##
+## LTDL_INIT Options ##
+## ----------------- ##
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
new file mode 100644
index 0000000..9000a05
--- /dev/null
+++ b/m4/ltsugar.m4
@@ -0,0 +1,123 @@
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59 which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
new file mode 100644
index 0000000..b8e154f
--- /dev/null
+++ b/m4/ltversion.m4
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# Generated from ltversion.in.
+
+# serial 3012 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.2.6])
+m4_define([LT_PACKAGE_REVISION], [1.3012])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.2.6'
+macro_revision='1.3012'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
new file mode 100644
index 0000000..637bb20
--- /dev/null
+++ b/m4/lt~obsolete.m4
@@ -0,0 +1,92 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 4 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
diff --git a/m4/stp_release.m4 b/m4/stp_release.m4
index 298f33d..3e82d51 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="21 Dec 2008"
+RELEASE_DATE="26 Jul 2009"
 AC_DEFINE_UNQUOTED(RELEASE_DATE, "${RELEASE_DATE}", [Package release date.])
 AC_SUBST(RELEASE_DATE)])
diff --git a/man/Makefile.in b/man/Makefile.in
index 38aa854..45a54f7 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -45,11 +45,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -83,10 +86,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -96,16 +95,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -150,6 +148,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -161,6 +160,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -173,8 +173,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -208,8 +212,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -254,6 +257,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -266,6 +270,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
diff --git a/po/cs.gmo b/po/cs.gmo
index f99d597..aa4a716 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index ab23d97..3e542e2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 4.2.6-pre1\n"
 "Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-21 22:25-0500\n"
+"POT-Creation-Date: 2009-07-26 19:14-0400\n"
 "PO-Revision-Date: 2003-05-03 19:43+0200\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -18,7 +18,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2109 src/main/print-pcl.c:1779
+#: src/main/print-escp2.c:2314 src/main/print-pcl.c:1779
 #, fuzzy
 msgid "Default"
 msgstr "Nastavit implicitní"
@@ -97,15 +97,15 @@ msgstr "Hustota:"
 
 #: src/main/dither-main.c:91 src/main/print-canon.c:300
 #: src/main/print-canon.c:308 src/main/print-canon.c:316
-#: src/main/print-canon.c:324 src/main/print-escp2.c:439
-#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
-#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-canon.c:324 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: 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-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:1769
-#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
-#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1935
+#: src/main/print-olympus.c:1943 src/main/print-olympus.c:1951
+#: src/main/print-olympus.c:1959 src/main/print-pcl.c:1324
 #: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
 #: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
@@ -159,7 +159,7 @@ msgid "Dither algorithm"
 msgstr "Algoritmus rozkladu barev"
 
 #: src/main/print-canon.c:199 src/main/print-escp2.c:165
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1866
 #: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
@@ -177,8 +177,8 @@ msgstr "Velikost"
 #: src/main/print-escp2.c:254 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:1704 src/main/print-olympus.c:1710
-#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-olympus.c:1866 src/main/print-olympus.c:1872
+#: src/main/print-olympus.c:1878 src/main/print-olympus.c:1884
 #: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
 #: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
 #: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
@@ -188,32 +188,32 @@ msgid "Basic Printer Setup"
 msgstr "Název tiskárny:"
 
 #: src/main/print-canon.c:200 src/main/print-escp2.c:166
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1867
 #: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Velikost papíru, na který chcete tisknout"
 
 #: src/main/print-canon.c:205 src/main/print-escp2.c:171
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1259 src/cups/genppd.c:1339 src/cups/genppd.c:2001
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1872
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1372 src/cups/genppd.c:2035
 msgid "Media Type"
 msgstr "Typ média"
 
 #: src/main/print-canon.c:206 src/main/print-escp2.c:172
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1873
 #: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
 #: src/main/print-canon.c:211 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
-#: src/main/print-pcl.c:1265 src/cups/genppd.c:1368 src/cups/genppd.c:2020
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1878
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1401 src/cups/genppd.c:2054
 msgid "Media Source"
 msgstr "Zdroj média"
 
 #: src/main/print-canon.c:212 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1879
 #: src/main/print-pcl.c:1266
 #, fuzzy
 msgid "Source (input slot) of the media"
@@ -251,8 +251,8 @@ msgstr ""
 #: src/main/print-canon.c:235 src/main/print-canon.c:241
 #: src/main/print-canon.c:253 src/main/print-escp2.c:207
 #: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1906
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
@@ -267,25 +267,25 @@ msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:247 src/main/print-escp2.c:219
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
-#: src/main/print-pcl.c:1277 src/cups/genppd.c:1446 src/cups/genppd.c:2056
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1884
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1479 src/cups/genppd.c:2090
 msgid "Resolution"
 msgstr "Rozlišení"
 
 #: src/main/print-canon.c:248 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1723
+#: src/main/print-olympus.c:1885
 msgid "Resolution and quality of the print"
 msgstr "Rozlišení a kvalita tisku"
 
 #: src/main/print-canon.c:253 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Typ inkoustu"
 
 #: src/main/print-canon.c:254 src/main/print-escp2.c:231
 #: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
+#: src/main/print-olympus.c:1891 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Typ inkoustu v tiskárně"
@@ -303,17 +303,18 @@ msgstr ""
 #: 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-escp2.c:320 src/main/print-escp2.c:767
-#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
-#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
-#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
-#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:893 src/main/print-escp2.c:901
+#: src/main/print-escp2.c:909 src/main/print-escp2.c:925
+#: src/main/print-escp2.c:933 src/main/print-escp2.c:941
+#: src/main/print-escp2.c:949 src/main/print-escp2.c:957
+#: src/main/print-escp2.c:965 src/main/print-escp2.c:973
 #: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:265 src/main/print-escp2.c:326
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-canon.c:265 src/main/print-escp2.c:332
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1912
 #: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
@@ -321,16 +322,16 @@ msgstr "Model tiskárny:"
 
 #: src/main/print-canon.c:265 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:326
-#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-color.c:208 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1912 src/main/print-pcl.c:1295
 #: src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Papír ColorLife"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:327
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-canon.c:266 src/main/print-escp2.c:333
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1913
 #: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
@@ -359,56 +360,56 @@ msgstr "720 DPI Nejvyšší kvalita"
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:300 src/main/print-escp2.c:439
+#: src/main/print-canon.c:300 src/main/print-escp2.c:445
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:301 src/main/print-escp2.c:446
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-canon.c:308 src/main/print-escp2.c:447
+#: src/main/print-canon.c:308 src/main/print-escp2.c:453
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Fialová"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:309 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-canon.c:316 src/main/print-escp2.c:455
+#: src/main/print-canon.c:316 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:317 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-canon.c:324 src/main/print-escp2.c:463
+#: src/main/print-canon.c:324 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 #, fuzzy
 msgid "Black Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:325 src/main/print-escp2.c:464
+#: src/main/print-canon.c:325 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:333
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:541 src/main/print-escp2.c:542
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 #, fuzzy
@@ -416,29 +417,36 @@ msgid "Light Cyan Transition"
 msgstr "Světle modrozelená"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:340
-#: src/main/print-canon.c:348 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
-#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
-#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
-#: src/main/print-pcl.c:1364
+#: src/main/print-canon.c:348 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:541
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:557
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:573
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:589
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:605
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:621
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:637
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:653
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:669
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:685
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:701
+#: src/main/print-escp2.c:709 src/main/print-escp2.c:717
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:733
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:749
+#: src/main/print-escp2.c:757 src/main/print-escp2.c:765
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:781
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:797
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:813
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:829
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:845
+#: src/main/print-escp2.c:853 src/main/print-escp2.c:861
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:340 src/main/print-canon.c:341
-#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
+#: src/main/print-escp2.c:573 src/main/print-escp2.c:574
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #, fuzzy
@@ -450,14 +458,14 @@ msgstr "Světle fialová"
 msgid "Light Yellow Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-canon.c:368 src/main/print-escp2.c:2283
-#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3609
-#: src/xml/xmli18n-tmp.h:3614 src/xml/xmli18n-tmp.h:3620
-#: src/xml/xmli18n-tmp.h:3627
+#: src/main/print-canon.c:368 src/main/print-escp2.c:2488
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5851 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5864
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:369 src/main/print-escp2.c:2285
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2490
 #: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
@@ -466,67 +474,68 @@ msgstr ""
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:646 src/main/print-escp2.c:2005
-#: src/xml/xmli18n-tmp.h:3676
+#: src/main/print-canon.c:646 src/main/print-escp2.c:2210
+#: src/xml/xmli18n-tmp.h:5913
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:648 src/main/print-escp2.c:2007
-#: src/xml/xmli18n-tmp.h:3677
+#: src/main/print-canon.c:648 src/main/print-escp2.c:2212
+#: src/xml/xmli18n-tmp.h:5914
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:650 src/main/print-escp2.c:2009
-#: src/xml/xmli18n-tmp.h:3678
+#: src/main/print-canon.c:650 src/main/print-escp2.c:2214
+#: src/xml/xmli18n-tmp.h:5915
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Vlastní"
 
-#: src/main/print-canon.c:673 src/main/print-escp2.c:2034
-#: src/cups/genppd.c:1323 src/cups/genppd.c:1572 src/cups/genppd.c:1988
-#: src/cups/genppd.c:2079
+#: src/main/print-canon.c:673 src/main/print-escp2.c:2239
+#: src/cups/genppd.c:1356 src/cups/genppd.c:1605 src/cups/genppd.c:2022
+#: src/cups/genppd.c:2113
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:675 src/main/print-escp2.c:2036
+#: src/main/print-canon.c:675 src/main/print-escp2.c:2241
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Tisknout do souboru?"
 
-#: src/main/print-canon.c:790 src/main/print-escp2.c:2447
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-canon.c:790 src/main/print-escp2.c:2652
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2167
 #: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
 #: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Barva"
 
-#: src/main/print-canon.c:792 src/main/print-escp2.c:2449
+#: src/main/print-canon.c:792 src/main/print-escp2.c:2654
 #: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
 #: src/main/print-ps.c:331 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
 msgstr "Černobíle"
 
-#: src/main/print-canon.c:831 src/main/print-escp2.c:2089
+#: src/main/print-canon.c:831 src/main/print-escp2.c:2294
 #: src/main/print-pcl.c:1797 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Ru�ní"
 
-#: src/main/print-canon.c:833 src/main/print-escp2.c:2131
-#: src/main/print-escp2.c:2229 src/main/print-escp2.c:2241
+#: src/main/print-canon.c:833 src/main/print-escp2.c:2336
+#: src/main/print-escp2.c:2434 src/main/print-escp2.c:2446
 #: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
 #: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
-#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1215
-#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1219
-#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
-#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3170
-#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3177
-#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3461
-#: src/xml/xmli18n-tmp.h:3464 src/xml/xmli18n-tmp.h:3632
-#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3648
-#: src/xml/xmli18n-tmp.h:3657 src/xml/xmli18n-tmp.h:3665
+#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1627 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3713 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3722 src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5902
 msgid "Standard"
 msgstr "Standardní"
 
@@ -565,7 +574,7 @@ msgid "Pre-Dithered"
 msgstr "Vytisknout"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1268 src/cups/genppd.c:1971
+#: src/cups/genppd.c:1301 src/cups/genppd.c:2005
 msgid "Grayscale"
 msgstr "Odstíny šedi"
 
@@ -582,11 +591,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1299 src/cups/genppd.c:1978
+#: src/main/print-color.c:129 src/cups/genppd.c:1332 src/cups/genppd.c:2012
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1306 src/cups/genppd.c:1979
+#: src/main/print-color.c:131 src/cups/genppd.c:1339 src/cups/genppd.c:2013
 msgid "KCMY"
 msgstr ""
 
@@ -652,7 +661,7 @@ msgid "Output image type"
 msgstr "Typ výstupu:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338
 msgid "Raw Channels"
 msgstr ""
 
@@ -722,56 +731,208 @@ msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
 #: src/escputil/escputil.c:997 src/escputil/escputil.c:1017
-#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:1812
-#: src/xml/xmli18n-tmp.h:1823 src/xml/xmli18n-tmp.h:1836
-#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1863
-#: src/xml/xmli18n-tmp.h:1876 src/xml/xmli18n-tmp.h:1889
-#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1918
-#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1949
-#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1975
-#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:1999
-#: src/xml/xmli18n-tmp.h:2013 src/xml/xmli18n-tmp.h:2027
-#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2051
-#: src/xml/xmli18n-tmp.h:2064 src/xml/xmli18n-tmp.h:2076
-#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2102
-#: src/xml/xmli18n-tmp.h:2116 src/xml/xmli18n-tmp.h:2130
-#: src/xml/xmli18n-tmp.h:2143 src/xml/xmli18n-tmp.h:2156
-#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2184
-#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2210
-#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2236
-#: src/xml/xmli18n-tmp.h:2249 src/xml/xmli18n-tmp.h:2262
-#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2290
-#: src/xml/xmli18n-tmp.h:2305 src/xml/xmli18n-tmp.h:2320
-#: src/xml/xmli18n-tmp.h:2332 src/xml/xmli18n-tmp.h:2343
-#: src/xml/xmli18n-tmp.h:2356 src/xml/xmli18n-tmp.h:2369
-#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2392
-#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2415
-#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2442
-#: src/xml/xmli18n-tmp.h:2454 src/xml/xmli18n-tmp.h:2466
-#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2496
-#: src/xml/xmli18n-tmp.h:2509 src/xml/xmli18n-tmp.h:2522
-#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
-#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2574
-#: src/xml/xmli18n-tmp.h:2586 src/xml/xmli18n-tmp.h:2598
-#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2623
-#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2653
-#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2683
-#: src/xml/xmli18n-tmp.h:2697 src/xml/xmli18n-tmp.h:2715
-#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2745
-#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
-#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2803
-#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2828
-#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2854
-#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2881
-#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2915
-#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2943
-#: src/xml/xmli18n-tmp.h:2959 src/xml/xmli18n-tmp.h:2976
-#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:3004
-#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3032
-#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3062
-#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3093
-#: src/xml/xmli18n-tmp.h:3107 src/xml/xmli18n-tmp.h:3125
-#: src/xml/xmli18n-tmp.h:3141
+#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2387
+#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2413
+#: src/xml/xmli18n-tmp.h:2426 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2499
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2551
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2575
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2708
+#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2786
+#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2814
+#: src/xml/xmli18n-tmp.h:2829 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2893
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2966
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3005 src/xml/xmli18n-tmp.h:3020
+#: src/xml/xmli18n-tmp.h:3033 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3061 src/xml/xmli18n-tmp.h:3073
+#: src/xml/xmli18n-tmp.h:3085 src/xml/xmli18n-tmp.h:3098
+#: src/xml/xmli18n-tmp.h:3110 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3377
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3616
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3648
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3766 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3775 src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:3794 src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:3805 src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3869 src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:3880 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3902 src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:3913 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:3948 src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:3970 src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:3983 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4023 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4064 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4075 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4088 src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:4103 src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:4118 src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:4143 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:4203 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4275 src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4309 src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4356 src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4421
+#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4449
+#: src/xml/xmli18n-tmp.h:4456 src/xml/xmli18n-tmp.h:4462
+#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4485 src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:4551 src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:4694 src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4717 src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:4818 src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:4829 src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4885 src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4935
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:5041 src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:5052 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:5121 src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5165
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5182 src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:5193 src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:5271 src/xml/xmli18n-tmp.h:5299
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5327 src/xml/xmli18n-tmp.h:5331
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5347
+#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5367 src/xml/xmli18n-tmp.h:5371
+#: src/xml/xmli18n-tmp.h:5383 src/xml/xmli18n-tmp.h:5388
+#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5440
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5461 src/xml/xmli18n-tmp.h:5468
+#: src/xml/xmli18n-tmp.h:5476 src/xml/xmli18n-tmp.h:5486
+#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5514
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5525
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5543
+#: src/xml/xmli18n-tmp.h:5550 src/xml/xmli18n-tmp.h:5556
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5574 src/xml/xmli18n-tmp.h:5582
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5592
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5625
+#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5649
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5662
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5690
+#: src/xml/xmli18n-tmp.h:5694 src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5731
+#: src/xml/xmli18n-tmp.h:5738 src/xml/xmli18n-tmp.h:5742
+#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5759
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5770
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5807
+#: src/xml/xmli18n-tmp.h:5811 src/xml/xmli18n-tmp.h:5817
+#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5828
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5843
 msgid "Cyan"
 msgstr "Modrozelená"
 
@@ -782,56 +943,208 @@ msgstr "Upravit vyrovnání modrozelené tisku"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
 #: src/escputil/escputil.c:998 src/escputil/escputil.c:1018
-#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:1813
-#: src/xml/xmli18n-tmp.h:1824 src/xml/xmli18n-tmp.h:1837
-#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1864
-#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1890
-#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1919
-#: src/xml/xmli18n-tmp.h:1935 src/xml/xmli18n-tmp.h:1950
-#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1976
-#: src/xml/xmli18n-tmp.h:1988 src/xml/xmli18n-tmp.h:2000
-#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2028
-#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2052
-#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2077
-#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2103
-#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2131
-#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2157
-#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2185
-#: src/xml/xmli18n-tmp.h:2198 src/xml/xmli18n-tmp.h:2211
-#: src/xml/xmli18n-tmp.h:2224 src/xml/xmli18n-tmp.h:2237
-#: src/xml/xmli18n-tmp.h:2250 src/xml/xmli18n-tmp.h:2263
-#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2291
-#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2321
-#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2344
-#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2370
-#: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2393
-#: src/xml/xmli18n-tmp.h:2405 src/xml/xmli18n-tmp.h:2416
-#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2443
-#: src/xml/xmli18n-tmp.h:2455 src/xml/xmli18n-tmp.h:2467
-#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2497
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2523
-#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2575
-#: src/xml/xmli18n-tmp.h:2587 src/xml/xmli18n-tmp.h:2599
-#: src/xml/xmli18n-tmp.h:2611 src/xml/xmli18n-tmp.h:2624
-#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
-#: src/xml/xmli18n-tmp.h:2670 src/xml/xmli18n-tmp.h:2684
-#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2714
-#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2747
-#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2780
-#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
-#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2829
-#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2855
-#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2882
-#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2914
-#: src/xml/xmli18n-tmp.h:2931 src/xml/xmli18n-tmp.h:2944
-#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2975
-#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:3005
-#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3033
-#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3060
-#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3094
-#: src/xml/xmli18n-tmp.h:3108 src/xml/xmli18n-tmp.h:3124
-#: src/xml/xmli18n-tmp.h:3140
+#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2361
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2388
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2414
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2459 src/xml/xmli18n-tmp.h:2474
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2512 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2552
+#: src/xml/xmli18n-tmp.h:2564 src/xml/xmli18n-tmp.h:2576
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2787
+#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2815
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2868
+#: src/xml/xmli18n-tmp.h:2881 src/xml/xmli18n-tmp.h:2894
+#: src/xml/xmli18n-tmp.h:2905 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:2967
+#: src/xml/xmli18n-tmp.h:2979 src/xml/xmli18n-tmp.h:2991
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3062 src/xml/xmli18n-tmp.h:3074
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3099
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3135 src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:3163 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3353
+#: src/xml/xmli18n-tmp.h:3365 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
+#: src/xml/xmli18n-tmp.h:3420 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3542 src/xml/xmli18n-tmp.h:3556
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3600 src/xml/xmli18n-tmp.h:3617
+#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3647
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3751 src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:3784 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3795 src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:3806 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3837 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3903 src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3939 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3960 src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:3972 src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:3984 src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:3999 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:4039 src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:4104 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:4170 src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4194 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:4230 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:4276 src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4311 src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4338 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:4401 src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:4427 src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:4442 src/xml/xmli18n-tmp.h:4451
+#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4464
+#: src/xml/xmli18n-tmp.h:4470 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4486 src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:4511 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:4809 src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4909 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:5007 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5018 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5111 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5123 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5148 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:5240 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5250 src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:5261 src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5301
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5313
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5349
+#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5401
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5441
+#: src/xml/xmli18n-tmp.h:5453 src/xml/xmli18n-tmp.h:5458
+#: src/xml/xmli18n-tmp.h:5463 src/xml/xmli18n-tmp.h:5470
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5496 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5527
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5552 src/xml/xmli18n-tmp.h:5558
+#: src/xml/xmli18n-tmp.h:5564 src/xml/xmli18n-tmp.h:5568
+#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5593
+#: src/xml/xmli18n-tmp.h:5598 src/xml/xmli18n-tmp.h:5616
+#: src/xml/xmli18n-tmp.h:5620 src/xml/xmli18n-tmp.h:5626
+#: src/xml/xmli18n-tmp.h:5631 src/xml/xmli18n-tmp.h:5651
+#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
+#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5674
+#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5720
+#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5733
+#: src/xml/xmli18n-tmp.h:5739 src/xml/xmli18n-tmp.h:5743
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5818
+#: src/xml/xmli18n-tmp.h:5823 src/xml/xmli18n-tmp.h:5829
+#: src/xml/xmli18n-tmp.h:5833 src/xml/xmli18n-tmp.h:5839
+#: src/xml/xmli18n-tmp.h:5844
 msgid "Magenta"
 msgstr "Fialová"
 
@@ -842,56 +1155,208 @@ msgstr "Upravit vyrovnání fialové tisku"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
 #: src/escputil/escputil.c:999 src/escputil/escputil.c:1019
-#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:1814
-#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
-#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1865
-#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1891
-#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1920
-#: src/xml/xmli18n-tmp.h:1936 src/xml/xmli18n-tmp.h:1951
-#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1977
-#: src/xml/xmli18n-tmp.h:1989 src/xml/xmli18n-tmp.h:2001
-#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2029
-#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2053
-#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2078
-#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2104
-#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
-#: src/xml/xmli18n-tmp.h:2145 src/xml/xmli18n-tmp.h:2158
-#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2186
-#: src/xml/xmli18n-tmp.h:2199 src/xml/xmli18n-tmp.h:2212
-#: src/xml/xmli18n-tmp.h:2225 src/xml/xmli18n-tmp.h:2238
-#: src/xml/xmli18n-tmp.h:2251 src/xml/xmli18n-tmp.h:2264
-#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2292
-#: src/xml/xmli18n-tmp.h:2307 src/xml/xmli18n-tmp.h:2322
-#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
-#: src/xml/xmli18n-tmp.h:2358 src/xml/xmli18n-tmp.h:2371
-#: src/xml/xmli18n-tmp.h:2382 src/xml/xmli18n-tmp.h:2394
-#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2417
-#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2444
-#: src/xml/xmli18n-tmp.h:2456 src/xml/xmli18n-tmp.h:2468
-#: src/xml/xmli18n-tmp.h:2483 src/xml/xmli18n-tmp.h:2498
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2524
-#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2551
-#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2576
-#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
-#: src/xml/xmli18n-tmp.h:2612 src/xml/xmli18n-tmp.h:2625
-#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2651
-#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2685
-#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2713
-#: src/xml/xmli18n-tmp.h:2734 src/xml/xmli18n-tmp.h:2749
-#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2779
-#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2805
-#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2830
-#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2856
-#: src/xml/xmli18n-tmp.h:2871 src/xml/xmli18n-tmp.h:2883
-#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2910
-#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2945
-#: src/xml/xmli18n-tmp.h:2960 src/xml/xmli18n-tmp.h:2974
-#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3006
-#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3034
-#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3061
-#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3095
-#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3120
-#: src/xml/xmli18n-tmp.h:3136
+#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2389
+#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2444
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2475
+#: src/xml/xmli18n-tmp.h:2488 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2513 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2565 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2602
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2762
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2788
+#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2816
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2846
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2906 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3022
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3048
+#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3075
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3124
+#: src/xml/xmli18n-tmp.h:3136 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3175
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3315 src/xml/xmli18n-tmp.h:3329
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3433
+#: src/xml/xmli18n-tmp.h:3455 src/xml/xmli18n-tmp.h:3468
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3497
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3601 src/xml/xmli18n-tmp.h:3618
+#: src/xml/xmli18n-tmp.h:3632 src/xml/xmli18n-tmp.h:3643
+#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3747 src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3834 src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:3844 src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:3867 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:3900 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3910 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3935 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:3967 src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:3979 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4005 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4062 src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4110 src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:4124 src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4167 src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:4272 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:4321 src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:4334 src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4367 src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4471
+#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4505 src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4549 src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:4562 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4580 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4602 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:4678 src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:4691 src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4770 src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4893 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4904 src/xml/xmli18n-tmp.h:4911
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:4971 src/xml/xmli18n-tmp.h:4978
+#: src/xml/xmli18n-tmp.h:5004 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5050 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5071 src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:5097 src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:5142 src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:5169 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5184
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5257 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5318
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5358
+#: src/xml/xmli18n-tmp.h:5364 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5385
+#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5438
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5454
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5465
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5511
+#: src/xml/xmli18n-tmp.h:5516 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5547 src/xml/xmli18n-tmp.h:5554
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5584 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5617 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5632
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5687
+#: src/xml/xmli18n-tmp.h:5692 src/xml/xmli18n-tmp.h:5698
+#: src/xml/xmli18n-tmp.h:5705 src/xml/xmli18n-tmp.h:5713
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5729
+#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
+#: src/xml/xmli18n-tmp.h:5744 src/xml/xmli18n-tmp.h:5756
+#: src/xml/xmli18n-tmp.h:5761 src/xml/xmli18n-tmp.h:5767
+#: src/xml/xmli18n-tmp.h:5774 src/xml/xmli18n-tmp.h:5782
+#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5792
+#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5803
+#: src/xml/xmli18n-tmp.h:5809 src/xml/xmli18n-tmp.h:5813
+#: src/xml/xmli18n-tmp.h:5819 src/xml/xmli18n-tmp.h:5824
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5845
 msgid "Yellow"
 msgstr "Žlutá"
 
@@ -902,9 +1367,17 @@ msgstr "Upravit vyrovnání žluté tisku"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
 #: src/escputil/escputil.c:1006 src/escputil/escputil.c:1025
-#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2700
-#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2795
-#: src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:4041 src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:4056 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4091 src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:4155 src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5155
 msgid "Red"
 msgstr ""
 
@@ -924,8 +1397,13 @@ msgstr "Upravit vyrovnání fialové tisku"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
 #: src/escputil/escputil.c:1007 src/escputil/escputil.c:1026
-#: src/xml/xmli18n-tmp.h:2657 src/xml/xmli18n-tmp.h:2701
-#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4051 src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:4084 src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:5156
 msgid "Blue"
 msgstr ""
 
@@ -937,53 +1415,183 @@ msgstr "Upravit vyrovnání žluté tisku"
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
 #: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1016 src/escputil/escputil.c:1285
-#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
-#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
-#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1875
-#: src/xml/xmli18n-tmp.h:1888 src/xml/xmli18n-tmp.h:1901
-#: src/xml/xmli18n-tmp.h:1917 src/xml/xmli18n-tmp.h:1933
-#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1961
-#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1986
-#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2012
-#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2038
-#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2063
-#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2090
-#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2115
-#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2142
-#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2169
-#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
-#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
-#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2248
-#: src/xml/xmli18n-tmp.h:2261 src/xml/xmli18n-tmp.h:2274
-#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2304
-#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2331
-#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
-#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
-#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2403
-#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2420
-#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2441
-#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2465
-#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2495
-#: src/xml/xmli18n-tmp.h:2508 src/xml/xmli18n-tmp.h:2521
-#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
-#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2573
-#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2597
-#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2622
-#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2672
-#: src/xml/xmli18n-tmp.h:2682 src/xml/xmli18n-tmp.h:2731
-#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2764
-#: src/xml/xmli18n-tmp.h:2781 src/xml/xmli18n-tmp.h:2794
-#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2815
-#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2839
-#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2868
-#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2894
-#: src/xml/xmli18n-tmp.h:2911 src/xml/xmli18n-tmp.h:2929
-#: src/xml/xmli18n-tmp.h:2942 src/xml/xmli18n-tmp.h:2977
-#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:3003
-#: src/xml/xmli18n-tmp.h:3017 src/xml/xmli18n-tmp.h:3031
-#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3079
-#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3110
-#: src/xml/xmli18n-tmp.h:3121 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2372
+#: src/xml/xmli18n-tmp.h:2386 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2457
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2510
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2536
+#: src/xml/xmli18n-tmp.h:2550 src/xml/xmli18n-tmp.h:2562
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2599 src/xml/xmli18n-tmp.h:2614
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2639
+#: src/xml/xmli18n-tmp.h:2653 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2965
+#: src/xml/xmli18n-tmp.h:2977 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3019
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3060 src/xml/xmli18n-tmp.h:3072
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3133 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3196
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3526
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3680 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3755 src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:3804 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3819 src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:3831 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3846 src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3873 src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:3924 src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:3943 src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:4022 src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4059 src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:4142 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4164 src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:4179 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:4255 src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4289 src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:4308 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4413 src/xml/xmli18n-tmp.h:4420
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4455
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4507 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:4565 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:4604 src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:4702 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:4733 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:4786 src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4920 src/xml/xmli18n-tmp.h:4926
+#: src/xml/xmli18n-tmp.h:4934 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:4973 src/xml/xmli18n-tmp.h:4981
+#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:4993
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:5047 src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5151
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5186
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5223 src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5270
+#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5284
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5320
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5337
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5375
+#: src/xml/xmli18n-tmp.h:5378 src/xml/xmli18n-tmp.h:5380
+#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5435
+#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5447
+#: src/xml/xmli18n-tmp.h:5449 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5474
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5492
+#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5571
+#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5590
+#: src/xml/xmli18n-tmp.h:5596 src/xml/xmli18n-tmp.h:5602
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5614
+#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5629
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5655
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5680 src/xml/xmli18n-tmp.h:5682
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5700
+#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5716
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5749
+#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5769 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5794
+#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5806
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5836
+#: src/xml/xmli18n-tmp.h:5842
 msgid "Black"
 msgstr "Černá"
 
@@ -992,7 +1600,7 @@ msgstr "Černá"
 msgid "Adjust the black gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1769
+#: src/main/print-color.c:322 src/main/print-olympus.c:1935
 msgid "Cyan Balance"
 msgstr ""
 
@@ -1007,7 +1615,7 @@ msgstr "Odstíny šedi"
 msgid "Adjust the cyan gray balance"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1777
+#: src/main/print-color.c:330 src/main/print-olympus.c:1943
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Fialová"
@@ -1017,7 +1625,7 @@ msgstr "Fialová"
 msgid "Adjust the magenta gray balance"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1785
+#: src/main/print-color.c:338 src/main/print-olympus.c:1951
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Žlutá"
@@ -1049,11 +1657,11 @@ msgstr "Typ inkoustu"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
-#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
-#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
-#: src/main/print-escp2.c:759
+#: src/main/print-escp2.c:344 src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356 src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368 src/main/print-escp2.c:374
+#: src/main/print-escp2.c:869 src/main/print-escp2.c:877
+#: src/main/print-escp2.c:885
 msgid "Advanced Output Control"
 msgstr ""
 
@@ -1061,27 +1669,27 @@ msgstr ""
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:743
+#: src/main/print-color.c:365 src/main/print-escp2.c:869
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:744
+#: src/main/print-color.c:366 src/main/print-escp2.c:870
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:751
+#: src/main/print-color.c:373 src/main/print-escp2.c:877
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:752
+#: src/main/print-color.c:374 src/main/print-escp2.c:878
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:759
+#: src/main/print-color.c:381 src/main/print-escp2.c:885
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:760
+#: src/main/print-color.c:382 src/main/print-escp2.c:886
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -1352,11 +1960,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1906
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1907
 msgid "Print without borders"
 msgstr ""
 
@@ -1369,7 +1977,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:266 src/main/print-escp2.c:267
-#: src/cups/genppd.c:1567 src/cups/genppd.c:2078
+#: src/cups/genppd.c:1600 src/cups/genppd.c:2112
 #, fuzzy
 msgid "Output Order"
 msgstr "Typ výstupu:"
@@ -1414,380 +2022,496 @@ msgstr ""
 
 #: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 #, fuzzy
+msgid "Raw Channel Names"
+msgstr "Zrušit"
+
+#: src/main/print-escp2.c:326 src/main/print-escp2.c:327
+#, fuzzy
 msgid "Channel Names"
 msgstr "Zrušit"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:339
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:344
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Modrozelená"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:345
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Fialová"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:351
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Žlutá"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:357
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362
 #, fuzzy
 msgid "Blue Map"
 msgstr "Černobíle"
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:363
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368
 #, fuzzy
 msgid "Orange Map"
 msgstr "Modrozelená"
 
-#: src/main/print-escp2.c:363
+#: src/main/print-escp2.c:369
 #, fuzzy
 msgid "Adjust the orange map"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:374
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:369
+#: src/main/print-escp2.c:375
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:471
+#: src/main/print-escp2.c:477
 #, fuzzy
 msgid "Red Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:478
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:485
 #, fuzzy
 msgid "Blue Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:486
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:493
 #, fuzzy
 msgid "Orange Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:488
+#: src/main/print-escp2.c:494
 #, fuzzy
 msgid "Adjust the orange density"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:501
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Lesklý potah"
 
-#: src/main/print-escp2.c:496
+#: src/main/print-escp2.c:502
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:509
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:504
+#: src/main/print-escp2.c:510
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:517
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:512
+#: src/main/print-escp2.c:518
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:525
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:520
+#: src/main/print-escp2.c:526
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:534
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:550
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
+#: src/main/print-escp2.c:557 src/main/print-escp2.c:558
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "Světle fialová"
 
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:566
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "Světle fialová"
 
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:582
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "Černá/tmavá žlutá"
 
-#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
+#: src/main/print-escp2.c:589 src/main/print-escp2.c:590
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:598
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "Černá/tmavá žlutá"
 
-#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
+#: src/main/print-escp2.c:605 src/main/print-escp2.c:606
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:630
 #, fuzzy
 msgid "Gray Value"
 msgstr "Odstíny šedi"
 
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
-#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:614
+#: src/main/print-escp2.c:637 src/main/print-escp2.c:638
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
+#: src/main/print-escp2.c:621 src/main/print-escp2.c:622
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:646
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "Odstíny šedi"
 
-#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
+#: src/main/print-escp2.c:653 src/main/print-escp2.c:654
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:726
 #, fuzzy
 msgid "Light Gray Value"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
-#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:662
+#: src/main/print-escp2.c:733 src/main/print-escp2.c:734
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
-#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
+#: src/main/print-escp2.c:669 src/main/print-escp2.c:670
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:742
 #, fuzzy
 msgid "Light Gray Density Scale"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:678
 #, fuzzy
 msgid "Dark Gray Value"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
+#: src/main/print-escp2.c:685 src/main/print-escp2.c:686
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:694
 #, fuzzy
 msgid "Dark Gray Density Scale"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:701
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "Odstíny šedi"
 
-#: src/main/print-escp2.c:696
+#: src/main/print-escp2.c:702
 #, fuzzy
 msgid "Medium Gray Value"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:709
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:704
+#: src/main/print-escp2.c:710
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:717
 #, fuzzy
 msgid "Mid Gray Density Scale"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:712
+#: src/main/print-escp2.c:718
 #, fuzzy
 msgid "Medium Gray Density Scale"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:767
+#: src/main/print-escp2.c:749
+#, fuzzy
+msgid "Hextone Gray 5 Value"
+msgstr "Odstíny šedi"
+
+#: src/main/print-escp2.c:750
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:757
+#, fuzzy
+msgid "Hextone Gray 5 Transition"
+msgstr "Světle modrozelená"
+
+#: src/main/print-escp2.c:758
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr "Světle modrozelená"
+
+#: src/main/print-escp2.c:765
+#, fuzzy
+msgid "Hextone Gray 5 Density Scale"
+msgstr "Odstíny šedi"
+
+#: src/main/print-escp2.c:766
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr "Světle modrozelená"
+
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:774
+#, fuzzy
+msgid "Hextone Gray 4 Value"
+msgstr "Odstíny šedi"
+
+#: src/main/print-escp2.c:781 src/main/print-escp2.c:782
+#, fuzzy
+msgid "Hextone Gray 4 Transition"
+msgstr "Světle modrozelená"
+
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:790
+#, fuzzy
+msgid "Hextone Gray 4 Density Scale"
+msgstr "Odstíny šedi"
+
+#: src/main/print-escp2.c:797 src/main/print-escp2.c:798
+#, fuzzy
+msgid "Hextone Gray 3 Value"
+msgstr "Odstíny šedi"
+
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:806
+#, fuzzy
+msgid "Hextone Gray 3 Transition"
+msgstr "Světle modrozelená"
+
+#: src/main/print-escp2.c:813 src/main/print-escp2.c:814
+#, fuzzy
+msgid "Hextone Gray 3 Density Scale"
+msgstr "Odstíny šedi"
+
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:822
+#, fuzzy
+msgid "Hextone Gray 2 Value"
+msgstr "Odstíny šedi"
+
+#: src/main/print-escp2.c:829 src/main/print-escp2.c:830
+#, fuzzy
+msgid "Hextone Gray 2 Transition"
+msgstr "Světle modrozelená"
+
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:838
+#, fuzzy
+msgid "Hextone Gray 2 Density Scale"
+msgstr "Odstíny šedi"
+
+#: src/main/print-escp2.c:845
+#, fuzzy
+msgid "Hextone Gray 1 Value"
+msgstr "Odstíny šedi"
+
+#: src/main/print-escp2.c:846
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:853
+#, fuzzy
+msgid "Hextone Gray 1 Transition"
+msgstr "Světle modrozelená"
+
+#: src/main/print-escp2.c:854
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr "Světle fialová"
+
+#: src/main/print-escp2.c:861
+#, fuzzy
+msgid "Hextone Gray 1 Density Scale"
+msgstr "Odstíny šedi"
+
+#: src/main/print-escp2.c:862
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr "Světle fialová"
+
+#: src/main/print-escp2.c:893
 msgid "Drying Time Per Page"
 msgstr ""
 
-#: src/main/print-escp2.c:768
+#: src/main/print-escp2.c:894
 msgid "Set drying time per page"
 msgstr ""
 
-#: src/main/print-escp2.c:775
+#: src/main/print-escp2.c:901
 msgid "Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:776
+#: src/main/print-escp2.c:902
 msgid "Set drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:783
+#: src/main/print-escp2.c:909
 msgid "Minimum Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:784
+#: src/main/print-escp2.c:910
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:799
+#: src/main/print-escp2.c:925
+msgid "Quality Enhancement"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Enhance print quality by additional passes"
+msgstr ""
+
+#: src/main/print-escp2.c:933
 msgid "Paper Thickness"
 msgstr ""
 
-#: src/main/print-escp2.c:800
+#: src/main/print-escp2.c:934
 #, fuzzy
 msgid "Set printer paper thickness"
 msgstr "Nastavit implicitní"
 
-#: src/main/print-escp2.c:807
+#: src/main/print-escp2.c:941
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:808
+#: src/main/print-escp2.c:942
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:815
+#: src/main/print-escp2.c:949
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:816
+#: src/main/print-escp2.c:950
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:823
+#: src/main/print-escp2.c:957
 #, fuzzy
 msgid "Print Method"
 msgstr "Model tiskárny:"
 
-#: src/main/print-escp2.c:824
+#: src/main/print-escp2.c:958
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:831
+#: src/main/print-escp2.c:965
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Normální papír"
 
-#: src/main/print-escp2.c:832
+#: src/main/print-escp2.c:966
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:839
+#: src/main/print-escp2.c:973
 msgid "Feed Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:840
-#, c-format
+#: src/main/print-escp2.c:975
+#, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:1992
+#: src/main/print-escp2.c:2197
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1994
+#: src/main/print-escp2.c:2199
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2208 src/cups/genppd.c:1484 src/cups/genppd.c:2059
+#: src/main/print-escp2.c:2413 src/cups/genppd.c:1517 src/cups/genppd.c:2093
 #, fuzzy
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2415
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Jednosměrně"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2417
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Jednosměrně"
 
-#: src/main/print-escp2.c:2243
+#: src/main/print-escp2.c:2448
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2450
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2452
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2454
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2456
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2287
+#: src/main/print-escp2.c:2492
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:2858
+#: src/main/print-escp2.c:3100
 #, 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:4107 src/main/print-olympus.c:2472
+#: src/main/print-escp2.c:4355 src/main/print-olympus.c:2641
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1841,361 +2565,378 @@ msgid "test print"
 msgstr "testovací tisk"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3205
-#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3217
-#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3233
-#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3255
-#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3276
-#: src/xml/xmli18n-tmp.h:3288 src/xml/xmli18n-tmp.h:3295
-#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3315
-#: src/xml/xmli18n-tmp.h:3327 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3368
-#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3380
-#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
-#: src/xml/xmli18n-tmp.h:3412 src/xml/xmli18n-tmp.h:3424
-#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3444
-#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3472
-#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3496
-#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3521
-#: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3544
-#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3556
-#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3581
-#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3598
-#: src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3754 src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:3809 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3863 src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:4058 src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:4163 src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:4227 src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:4335 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4467 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4594 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:4879 src/xml/xmli18n-tmp.h:4946
+#: src/xml/xmli18n-tmp.h:5000 src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:5243 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5365 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5512 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5667 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5784 src/xml/xmli18n-tmp.h:5805
+#: src/xml/xmli18n-tmp.h:5826
 msgid "Four Color Standard"
 msgstr "Čtyři barvy standardní"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3206
-#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3218
-#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3234
-#: src/xml/xmli18n-tmp.h:3244 src/xml/xmli18n-tmp.h:3251
-#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3268
-#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3289
-#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3306
-#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
-#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3354
-#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3377
-#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3389
-#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3413
-#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3435
-#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3455
-#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3485
-#: src/xml/xmli18n-tmp.h:3497 src/xml/xmli18n-tmp.h:3508
-#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3537
-#: src/xml/xmli18n-tmp.h:3545 src/xml/xmli18n-tmp.h:3549
-#: src/xml/xmli18n-tmp.h:3557 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3593
-#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3605
+#: src/xml/xmli18n-tmp.h:3759 src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3868 src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:4002 src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:4107 src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4472
+#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4817 src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5181 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5315 src/xml/xmli18n-tmp.h:5370
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5672
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5831
 msgid "Three Color Composite"
 msgstr "Tři barvy kompozitní"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3241
-#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3265
-#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3286
-#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
-#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3351
-#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3374
-#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3398
-#: src/xml/xmli18n-tmp.h:3410 src/xml/xmli18n-tmp.h:3422
-#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3452
-#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3470
-#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3494
-#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3519
-#: src/xml/xmli18n-tmp.h:3534 src/xml/xmli18n-tmp.h:3542
-#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3741 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4086 src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4933
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5421
+#: src/xml/xmli18n-tmp.h:5499 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5723
 msgid "Six Color Photo"
 msgstr "Å est barev foto"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3242
-#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3266
-#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3287
-#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3326
-#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3352
-#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3375
-#: src/xml/xmli18n-tmp.h:3387 src/xml/xmli18n-tmp.h:3399
-#: src/xml/xmli18n-tmp.h:3411 src/xml/xmli18n-tmp.h:3423
-#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3453
-#: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3483
-#: src/xml/xmli18n-tmp.h:3495 src/xml/xmli18n-tmp.h:3506
-#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3535
-#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3566
-#: src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3748 src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:3989 src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:4094 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4267 src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4940
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5661
+#: src/xml/xmli18n-tmp.h:5730
 msgid "Five Color Photo Composite"
 msgstr "Pět barev foto kompozitní"
 
 #: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
-#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
-#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
-#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
-#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
-#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
-#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
-#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
-#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:849
-#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:963
-#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1077
-#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1170
-#: src/xml/xmli18n-tmp.h:1220 src/xml/xmli18n-tmp.h:1277
-#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1376
-#: src/xml/xmli18n-tmp.h:1439 src/xml/xmli18n-tmp.h:1502
-#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1619
-#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1739
-#: src/xml/xmli18n-tmp.h:1773
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1050
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1240
+#: src/xml/xmli18n-tmp.h:1335 src/xml/xmli18n-tmp.h:1449
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1580
+#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1862
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2200 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2297
 msgid "Plain Paper"
 msgstr "Normální papír"
 
-#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
-#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
-#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
-#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
-#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
-#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
-#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
-#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
-#: src/xml/xmli18n-tmp.h:819 src/xml/xmli18n-tmp.h:858
-#: src/xml/xmli18n-tmp.h:915 src/xml/xmli18n-tmp.h:972
-#: src/xml/xmli18n-tmp.h:1029 src/xml/xmli18n-tmp.h:1086
-#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1176
-#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1286
-#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1385
-#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1508
-#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1628
-#: src/xml/xmli18n-tmp.h:1685 src/xml/xmli18n-tmp.h:1743
-#: src/xml/xmli18n-tmp.h:1779
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:101 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:365 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1160 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1740
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1871
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2136
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2267
+#: src/xml/xmli18n-tmp.h:2303
 msgid "Glossy Film"
 msgstr "Lesklý potah"
 
-#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
-#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
-#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
-#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
-#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
-#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
-#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
-#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
-#: src/xml/xmli18n-tmp.h:821 src/xml/xmli18n-tmp.h:861
-#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:975
-#: src/xml/xmli18n-tmp.h:1032 src/xml/xmli18n-tmp.h:1089
-#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1178
-#: src/xml/xmli18n-tmp.h:1232 src/xml/xmli18n-tmp.h:1289
-#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1388
-#: src/xml/xmli18n-tmp.h:1451 src/xml/xmli18n-tmp.h:1511
-#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1631
-#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1745
-#: src/xml/xmli18n-tmp.h:1781
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:845 src/xml/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:965 src/xml/xmli18n-tmp.h:1022
+#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1359
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1550
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1745 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2305
 msgid "Transparencies"
 msgstr "Fólie"
 
-#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
-#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
-#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
-#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
-#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
-#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
-#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
-#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
-#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:823
-#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:921
-#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:1035
-#: src/xml/xmli18n-tmp.h:1092 src/xml/xmli18n-tmp.h:1142
-#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1235
-#: src/xml/xmli18n-tmp.h:1292 src/xml/xmli18n-tmp.h:1344
-#: src/xml/xmli18n-tmp.h:1391 src/xml/xmli18n-tmp.h:1454
-#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1577
-#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1691
-#: src/xml/xmli18n-tmp.h:1747 src/xml/xmli18n-tmp.h:1783
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:55 src/xml/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:151 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1024
+#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2215
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2307
 msgid "Envelopes"
 msgstr "Obálky"
 
-#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
-#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
-#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
-#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
-#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
-#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
-#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
-#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
-#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:827
-#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:927
-#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:1041
-#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1146
-#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1241
-#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1348
-#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1460
-#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1583
-#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1697
-#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1787
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:1028
+#: src/xml/xmli18n-tmp.h:1085 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1275 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1556
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1665
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1834
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2076
+#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2311
 msgid "Matte Paper"
 msgstr "Matný papír"
 
-#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
-#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
-#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
-#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
-#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
-#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
-#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
-#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
-#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:831
-#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:933
-#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:1047
-#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1150
-#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1247
-#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1352
-#: src/xml/xmli18n-tmp.h:1403 src/xml/xmli18n-tmp.h:1466
-#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1589
-#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1703
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1791
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:167 src/xml/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:569
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1032
+#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1285 src/xml/xmli18n-tmp.h:1389
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1675
+#: src/xml/xmli18n-tmp.h:1770 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1889 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2012 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2227
+#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2315
 msgid "Inkjet Paper"
 msgstr "Papír pro inkoustové tiskárny"
 
-#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
-#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
-#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
-#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
-#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
-#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
-#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
-#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
-#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:833
-#: src/xml/xmli18n-tmp.h:879 src/xml/xmli18n-tmp.h:936
-#: src/xml/xmli18n-tmp.h:993 src/xml/xmli18n-tmp.h:1050
-#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1152
-#: src/xml/xmli18n-tmp.h:1190 src/xml/xmli18n-tmp.h:1250
-#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1354
-#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1469
-#: src/xml/xmli18n-tmp.h:1529 src/xml/xmli18n-tmp.h:1592
-#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1706
-#: src/xml/xmli18n-tmp.h:1757 src/xml/xmli18n-tmp.h:1793
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:425 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:512 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1034
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1499 src/xml/xmli18n-tmp.h:1562
+#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1775 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1955
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2088
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2317
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papír pro inkoustové tiskárny ve foto kvalitě"
 
-#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
-#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
-#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
-#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
-#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
-#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
-#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
-#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
-#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:835
-#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:939
-#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:1053
-#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1154
-#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1253
-#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1356
-#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1472
-#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1595
-#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1709
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1795
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1036
+#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1200
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1504 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1842
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2233
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2319
 msgid "Photo Paper"
 msgstr "Fotopapír"
 
-#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
-#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
-#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
-#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
-#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
-#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
-#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
-#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
-#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:837
-#: src/xml/xmli18n-tmp.h:885 src/xml/xmli18n-tmp.h:942
-#: src/xml/xmli18n-tmp.h:999 src/xml/xmli18n-tmp.h:1056
-#: src/xml/xmli18n-tmp.h:1113 src/xml/xmli18n-tmp.h:1156
-#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1212
-#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1256
-#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1358
-#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1475
-#: src/xml/xmli18n-tmp.h:1535 src/xml/xmli18n-tmp.h:1598
-#: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1712
-#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1797
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:179 src/xml/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:518 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:869 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1038
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1407
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1566
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1622
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1844
+#: src/xml/xmli18n-tmp.h:1898 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2321
 msgid "Premium Glossy Photo Paper"
 msgstr "Extra lesklý fotopapír"
 
-#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
-#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
-#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
-#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
-#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
-#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
-#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
-#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
-#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:841
-#: src/xml/xmli18n-tmp.h:891 src/xml/xmli18n-tmp.h:948
-#: src/xml/xmli18n-tmp.h:1005 src/xml/xmli18n-tmp.h:1062
-#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1160
-#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1262
-#: src/xml/xmli18n-tmp.h:1319 src/xml/xmli18n-tmp.h:1362
-#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1481
-#: src/xml/xmli18n-tmp.h:1541 src/xml/xmli18n-tmp.h:1604
-#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1718
-#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1801
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1042
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1419
+#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1570
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2027 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2242
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2325
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
-#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
-#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
-#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
-#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
-#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
-#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
-#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
-#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:843
-#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:951
-#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1065
-#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1162
-#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1265
-#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1368
-#: src/xml/xmli18n-tmp.h:1427 src/xml/xmli18n-tmp.h:1490
-#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1607
-#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1727
-#: src/xml/xmli18n-tmp.h:1767 src/xml/xmli18n-tmp.h:1803
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:91 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:191 src/xml/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:439 src/xml/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:787 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1044
+#: src/xml/xmli18n-tmp.h:1125 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1315 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1854
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2327
 msgid "Photo Quality Glossy Paper"
 msgstr "Lesklý papír ve foto kvalitě"
 
-#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
-#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
-#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
-#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
-#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
-#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
-#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
-#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:897
-#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:1011
-#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1125
-#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1206
-#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1325
-#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1430
-#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1553
-#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1667
-#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1805
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1130
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1320
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1616
+#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1856 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2329
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
-#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
-#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
-#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
-#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
-#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
-#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
-#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
-#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:847
-#: src/xml/xmli18n-tmp.h:903 src/xml/xmli18n-tmp.h:960
-#: src/xml/xmli18n-tmp.h:1017 src/xml/xmli18n-tmp.h:1074
-#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1168
-#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1214
-#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1274
-#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1374
-#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1499
-#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1616
-#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1736
-#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1809
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:129
+#: src/xml/xmli18n-tmp.h:203 src/xml/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:542 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1048
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1443
+#: src/xml/xmli18n-tmp.h:1539 src/xml/xmli18n-tmp.h:1578
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1720
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1985
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2333
 msgid "Other"
 msgstr "Jiný"
 
@@ -2211,58 +2952,62 @@ msgstr "Ru�ní s přestávkou"
 msgid "Manual without Pause"
 msgstr "Ru�ní bez přestávky"
 
-#: src/main/print-olympus.c:279
+#: src/main/print-olympus.c:281
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:280 src/cups/genppd.c:1685 src/cups/genppd.c:1713
-#: src/cups/genppd.c:1745 src/cups/genppd.c:1800 src/cups/genppd.c:1846
-#: src/cups/genppd.c:2147 src/cups/genppd.c:2160 src/cups/genppd.c:2183
-#: src/cups/genppd.c:2204 src/cups/genppd.c:2221
+#: src/main/print-olympus.c:282 src/cups/genppd.c:1718 src/cups/genppd.c:1746
+#: src/cups/genppd.c:1778 src/cups/genppd.c:1833 src/cups/genppd.c:1879
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2194 src/cups/genppd.c:2217
+#: src/cups/genppd.c:2238 src/cups/genppd.c:2255
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
-#: src/main/print-olympus.c:1132
+#: src/main/print-olympus.c:998 src/main/print-olympus.c:1061
+#: src/main/print-olympus.c:1165
 #, fuzzy
 msgid "Glossy"
 msgstr "Lesklý potah"
 
-#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
-#: src/main/print-olympus.c:1133
+#: src/main/print-olympus.c:999 src/main/print-olympus.c:1062
+#: src/main/print-olympus.c:1166
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
+#: src/main/print-olympus.c:1063 src/main/print-olympus.c:1167
 #, fuzzy
 msgid "Matte"
 msgstr "Matný papír"
 
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
+#. TRANSLATORS: 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.
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1901
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1770
+#: src/main/print-olympus.c:1936
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-olympus.c:1778
+#: src/main/print-olympus.c:1944
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1952
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-olympus.c:1793
+#: src/main/print-olympus.c:1959
 #, fuzzy
 msgid "Black Balance"
 msgstr "Černobíle"
 
-#: src/main/print-olympus.c:1794
+#: src/main/print-olympus.c:1960
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Upravit vyrovnání modrozelené tisku"
@@ -2295,7 +3040,7 @@ msgstr "Rychleschnoucí foto"
 msgid "Quick-dry Transparency"
 msgstr "Rychleschnoucí fólie"
 
-#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3687
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:5925
 msgid "Manual"
 msgstr "Ru�ní"
 
@@ -2380,24 +3125,24 @@ msgid "2400x600 DPI"
 msgstr "2400×600 DPI"
 
 #: src/main/print-pcl.c:278 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3638
-#: src/xml/xmli18n-tmp.h:3647 src/xml/xmli18n-tmp.h:3656
-#: src/xml/xmli18n-tmp.h:3664
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5875
+#: src/xml/xmli18n-tmp.h:5884 src/xml/xmli18n-tmp.h:5893
+#: src/xml/xmli18n-tmp.h:5901
 msgid "Draft"
 msgstr ""
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:3633 src/xml/xmli18n-tmp.h:3641
-#: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3658
-#: src/xml/xmli18n-tmp.h:3666
+#: src/xml/xmli18n-tmp.h:5870 src/xml/xmli18n-tmp.h:5878
+#: src/xml/xmli18n-tmp.h:5886 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5903
 #, fuzzy
 msgid "High"
 msgstr "Výška:"
 
 #: src/main/print-pcl.c:282 src/main/print-pcl.c:283
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3634
-#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3650
-#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3667
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5896 src/xml/xmli18n-tmp.h:5904
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografie"
@@ -2433,15 +3178,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3671
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:5908
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3708
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:5946
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3823
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6061
 msgid "Custom"
 msgstr "Vlastní"
 
@@ -2449,35 +3194,44 @@ msgstr "Vlastní"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3629
-#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3654
+#: src/main/print-weave.c:1511
+msgid "Fatal error!"
+msgstr ""
+
+#: src/main/print-weave.c:1547
+msgid ""
+"Please report the above information to gimp-print-devel@lists.sourceforge.net"
+msgstr ""
+
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:5866
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5891
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3630
-#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3655
-#: src/xml/xmli18n-tmp.h:3663
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5900
 msgid "Economy"
 msgstr ""
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3635
-#: src/xml/xmli18n-tmp.h:3642 src/xml/xmli18n-tmp.h:3651
-#: src/xml/xmli18n-tmp.h:3660 src/xml/xmli18n-tmp.h:3668
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:5872
+#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3636
-#: src/xml/xmli18n-tmp.h:3643 src/xml/xmli18n-tmp.h:3652
-#: src/xml/xmli18n-tmp.h:3661 src/xml/xmli18n-tmp.h:3669
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:5873
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5889
+#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5906
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Å est barev foto"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1326 src/cups/genppd.c:1989
-#: src/xml/xmli18n-tmp.h:3637 src/xml/xmli18n-tmp.h:3644
-#: src/xml/xmli18n-tmp.h:3653 src/xml/xmli18n-tmp.h:3662
-#: src/xml/xmli18n-tmp.h:3670
+#: src/main/generic-options.c:41 src/cups/genppd.c:1359 src/cups/genppd.c:2023
+#: src/xml/xmli18n-tmp.h:5874 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5899
+#: src/xml/xmli18n-tmp.h:5907
 msgid "Best"
 msgstr ""
 
@@ -3240,81 +3994,81 @@ msgstr ""
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:960
+#: src/cups/genppd.c:993
 msgid "English"
 msgstr "Czech"
 
-#: src/cups/genppd.c:1159 src/cups/genppd.c:1175 src/cups/genppd.c:1934
-#: src/cups/genppd.c:1935
+#: src/cups/genppd.c:1192 src/cups/genppd.c:1208 src/cups/genppd.c:1968
+#: src/cups/genppd.c:1969
 #, fuzzy
 msgid "Media Size"
 msgstr "Velikost média:"
 
-#: src/cups/genppd.c:1248 src/cups/genppd.c:1970
+#: src/cups/genppd.c:1281 src/cups/genppd.c:2004
 #, fuzzy
 msgid "Color Model"
 msgstr "Barva"
 
-#: src/cups/genppd.c:1275 src/cups/genppd.c:1972
+#: src/cups/genppd.c:1308 src/cups/genppd.c:2006
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "Odstíny šedi"
 
-#: src/cups/genppd.c:1285 src/cups/genppd.c:1976
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2010
 #, fuzzy
 msgid "RGB Color"
 msgstr "Barva"
 
-#: src/cups/genppd.c:1292 src/cups/genppd.c:1977
+#: src/cups/genppd.c:1325 src/cups/genppd.c:2011
 msgid "CMY Color"
 msgstr "Barvy CMY"
 
-#: src/cups/genppd.c:1317 src/cups/genppd.c:1987
+#: src/cups/genppd.c:1350 src/cups/genppd.c:2021
 msgid "Color Precision"
 msgstr ""
 
-#: src/cups/genppd.c:1573 src/cups/genppd.c:2080
+#: src/cups/genppd.c:1606 src/cups/genppd.c:2114
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:1590 src/cups/genppd.c:2096
+#: src/cups/genppd.c:1623 src/cups/genppd.c:2130
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:1615 src/cups/genppd.c:2113
+#: src/cups/genppd.c:1648 src/cups/genppd.c:2147
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1620 src/cups/genppd.c:2114
+#: src/cups/genppd.c:1653 src/cups/genppd.c:2148
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1621 src/cups/genppd.c:2115
+#: src/cups/genppd.c:1654 src/cups/genppd.c:2149
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1622 src/cups/genppd.c:2116
+#: src/cups/genppd.c:1655 src/cups/genppd.c:2150
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1716 src/cups/genppd.c:2162
+#: src/cups/genppd.c:1749 src/cups/genppd.c:2196
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1718 src/cups/genppd.c:2164
+#: src/cups/genppd.c:1751 src/cups/genppd.c:2198
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1757 src/cups/genppd.c:1820 src/cups/genppd.c:1864
-#: src/cups/genppd.c:2185 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+#: src/cups/genppd.c:1790 src/cups/genppd.c:1853 src/cups/genppd.c:1897
+#: src/cups/genppd.c:2219 src/cups/genppd.c:2249 src/cups/genppd.c:2266
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1762 src/cups/genppd.c:2189
+#: src/cups/genppd.c:1795 src/cups/genppd.c:2223
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/cups/genppd.c:1805 src/cups/genppd.c:2209
+#: src/cups/genppd.c:1838 src/cups/genppd.c:2243
 #, c-format
 msgid "%.1f mm"
 msgstr ""
@@ -3629,51 +4383,61 @@ msgstr ""
 "Nemohu detekovat typ tiskárny.\n"
 "Použijte prosím -m pro ur�ení modelu své tiskárny.\n"
 
-#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:383
-#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
-#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
-#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
-#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
-#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
-#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
-#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
-#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
-#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
-#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
-#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
-#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
-#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
-#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
-#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
-#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
-#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
-#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
-#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
-#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
-#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
-#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
-#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
-#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
-#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
-#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
-#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
-#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
-#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
-#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1503
-#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1509
-#: src/xml/xmli18n-tmp.h:1512 src/xml/xmli18n-tmp.h:1515
-#: src/xml/xmli18n-tmp.h:1518 src/xml/xmli18n-tmp.h:1521
-#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1527
-#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
-#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
-#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
-#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
-#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
-#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:2655
-#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2717
-#: src/xml/xmli18n-tmp.h:3045 src/xml/xmli18n-tmp.h:3252
-#: src/xml/xmli18n-tmp.h:3273 src/xml/xmli18n-tmp.h:3363
-#: src/xml/xmli18n-tmp.h:3531
+#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2001
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2010 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2025
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:4085 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4612 src/xml/xmli18n-tmp.h:5481
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotopapír"
@@ -3685,131 +4449,303 @@ msgid "Unknown"
 msgstr ""
 
 #: src/escputil/escputil.c:1000 src/escputil/escputil.c:1289
-#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1921
-#: src/xml/xmli18n-tmp.h:1937 src/xml/xmli18n-tmp.h:2002
-#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2079
-#: src/xml/xmli18n-tmp.h:2105 src/xml/xmli18n-tmp.h:2119
-#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2173
-#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
-#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
-#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2293
-#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2346
-#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2418
-#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2445
-#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2469
-#: src/xml/xmli18n-tmp.h:2484 src/xml/xmli18n-tmp.h:2512
-#: src/xml/xmli18n-tmp.h:2525 src/xml/xmli18n-tmp.h:2564
-#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2626
-#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2746
-#: src/xml/xmli18n-tmp.h:2762 src/xml/xmli18n-tmp.h:2843
-#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2895
-#: src/xml/xmli18n-tmp.h:2912 src/xml/xmli18n-tmp.h:2946
-#: src/xml/xmli18n-tmp.h:3001 src/xml/xmli18n-tmp.h:3015
-#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3122
-#: src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2461 src/xml/xmli18n-tmp.h:2526
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2683 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2711 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3101 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3661
+#: src/xml/xmli18n-tmp.h:3678 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3750 src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:3782 src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:3932 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3964 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4388 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:4639 src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:4875 src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4936
+#: src/xml/xmli18n-tmp.h:4942 src/xml/xmli18n-tmp.h:4968
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5339 src/xml/xmli18n-tmp.h:5348
+#: src/xml/xmli18n-tmp.h:5355 src/xml/xmli18n-tmp.h:5361
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5417
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5430
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5477 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5502
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5536 src/xml/xmli18n-tmp.h:5544
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5557
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5657 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5719
+#: src/xml/xmli18n-tmp.h:5726 src/xml/xmli18n-tmp.h:5732
+#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5779
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Světle modrozelená"
 
 #: src/escputil/escputil.c:1001 src/escputil/escputil.c:1290
-#: src/xml/xmli18n-tmp.h:1906 src/xml/xmli18n-tmp.h:1922
-#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:2003
-#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2080
-#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2120
-#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2174
-#: src/xml/xmli18n-tmp.h:2188 src/xml/xmli18n-tmp.h:2201
-#: src/xml/xmli18n-tmp.h:2214 src/xml/xmli18n-tmp.h:2227
-#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2294
-#: src/xml/xmli18n-tmp.h:2309 src/xml/xmli18n-tmp.h:2347
-#: src/xml/xmli18n-tmp.h:2360 src/xml/xmli18n-tmp.h:2419
-#: src/xml/xmli18n-tmp.h:2432 src/xml/xmli18n-tmp.h:2446
-#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2470
-#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2513
-#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2565
-#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2627
-#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2748
-#: src/xml/xmli18n-tmp.h:2761 src/xml/xmli18n-tmp.h:2844
-#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2896
-#: src/xml/xmli18n-tmp.h:2913 src/xml/xmli18n-tmp.h:2947
-#: src/xml/xmli18n-tmp.h:3000 src/xml/xmli18n-tmp.h:3014
-#: src/xml/xmli18n-tmp.h:3028 src/xml/xmli18n-tmp.h:3123
-#: src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2446
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2527
+#: src/xml/xmli18n-tmp.h:2541 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2644
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2698
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2751
+#: src/xml/xmli18n-tmp.h:2803 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2956 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2994
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3381
+#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3662
+#: src/xml/xmli18n-tmp.h:3746 src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:3778 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3934 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3966 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:4265 src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:4390 src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:4428 src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4452
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4465
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4512 src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4586 src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:4641 src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4903
+#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4970
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:5044 src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5168
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5241 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5334
+#: src/xml/xmli18n-tmp.h:5341 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5363
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5419
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5471
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5504
+#: src/xml/xmli18n-tmp.h:5510 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5652
+#: src/xml/xmli18n-tmp.h:5659 src/xml/xmli18n-tmp.h:5665
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5721
+#: src/xml/xmli18n-tmp.h:5728 src/xml/xmli18n-tmp.h:5734
+#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5781
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Světle fialová"
 
-#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2433
-#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:3002
-#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3030
+#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3679 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4409 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:4566 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4605 src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4664 src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5376 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5450
+#: src/xml/xmli18n-tmp.h:5475 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5533 src/xml/xmli18n-tmp.h:5542
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5678 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5717
+#: src/xml/xmli18n-tmp.h:5747 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5777
 #, fuzzy
 msgid "Light Black"
 msgstr "Černá"
 
-#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:384
-#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
-#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
-#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
-#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
-#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
-#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
-#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
-#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
-#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
-#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
-#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
-#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
-#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
-#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
-#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
-#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
-#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
-#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
-#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
-#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
-#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
-#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
-#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
-#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
-#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
-#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
-#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
-#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
-#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
-#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1504
-#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1510
-#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1516
-#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1522
-#: src/xml/xmli18n-tmp.h:1525 src/xml/xmli18n-tmp.h:1528
-#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1534
-#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1540
-#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1546
-#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1552
-#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1558
-#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:2654
-#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2716
-#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3264
-#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3371
-#: src/xml/xmli18n-tmp.h:3539
+#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:508 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:532 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:538 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:562 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:568 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
+#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
+#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
+#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
+#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
+#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
+#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
+#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
+#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
+#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
+#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
+#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2011 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2026
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2032
+#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2038
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:4044 src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:5530
 #, fuzzy
 msgid "Matte Black"
 msgstr "Matný papír"
 
-#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:2658
-#: src/xml/xmli18n-tmp.h:2702 src/xml/xmli18n-tmp.h:2720
-#: src/xml/xmli18n-tmp.h:3048
+#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3995 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4006 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4020 src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:4106 src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4148
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Lesklý potah"
 
-#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:2760
-#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3013
-#: src/xml/xmli18n-tmp.h:3027
+#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3676
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4616 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5534 src/xml/xmli18n-tmp.h:5573
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Černá"
 
 #: src/escputil/escputil.c:1010 src/escputil/escputil.c:1029
-#: src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:4099 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4189
 #, fuzzy
 msgid "Orange"
 msgstr "Velikost"
@@ -4454,8229 +5390,8359 @@ msgstr "Tisknu..."
 #: src/xml/xmli18n-tmp.h:68 src/xml/xmli18n-tmp.h:70 src/xml/xmli18n-tmp.h:72
 #: src/xml/xmli18n-tmp.h:74 src/xml/xmli18n-tmp.h:76 src/xml/xmli18n-tmp.h:78
 #: src/xml/xmli18n-tmp.h:80 src/xml/xmli18n-tmp.h:82 src/xml/xmli18n-tmp.h:84
-#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:92
-#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
-#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
-#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
-#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
-#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
-#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
-#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
-#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
-#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
-#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
-#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
-#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
-#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
-#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
-#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
-#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
-#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
-#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
-#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
-#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
-#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
-#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
-#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
-#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
-#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
-#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
-#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
-#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
-#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
-#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
-#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
-#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
-#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
-#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
-#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
-#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
-#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
-#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
-#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
-#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
-#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
-#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
-#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
-#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
-#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
-#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
-#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
-#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
-#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
-#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
-#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
-#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
-#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
-#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
-#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
-#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
-#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
-#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
-#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
-#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
-#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
-#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
-#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
-#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
-#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
-#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
-#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
-#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
-#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
-#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
-#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
-#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
-#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
-#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
-#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
-#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
-#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
-#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
-#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
-#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
-#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
-#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
-#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
-#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
-#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
-#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
-#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
-#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
-#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
-#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
-#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
-#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
-#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
-#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
-#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
-#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:92 src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:102 src/xml/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:106 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:114 src/xml/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:118 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:126 src/xml/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:130 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:136 src/xml/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:144 src/xml/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:168 src/xml/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:192 src/xml/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:216 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:232 src/xml/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:240 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:256 src/xml/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:264 src/xml/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:304 src/xml/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:312 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:320 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:328 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:336 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:344 src/xml/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:352 src/xml/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:384 src/xml/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:408 src/xml/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:412 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:432 src/xml/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:444 src/xml/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:448 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:468 src/xml/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:484 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:642 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:698 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:714 src/xml/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:722 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:738 src/xml/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:746 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:764 src/xml/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:780 src/xml/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:804 src/xml/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:814
 #: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:818
 #: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:822
 #: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:826
 #: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:830
-#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:834
-#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:838
-#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:842
-#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:846
-#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:850
-#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
-#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
-#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
-#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
-#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
-#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
-#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
-#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:898
-#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
-#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
-#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
-#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
-#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
-#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
-#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
-#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
-#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
-#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
-#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
-#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
-#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
-#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
-#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
-#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
-#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
-#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
-#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
-#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1018
-#: src/xml/xmli18n-tmp.h:1021 src/xml/xmli18n-tmp.h:1024
-#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1030
-#: src/xml/xmli18n-tmp.h:1033 src/xml/xmli18n-tmp.h:1036
-#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1042
-#: src/xml/xmli18n-tmp.h:1045 src/xml/xmli18n-tmp.h:1048
-#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1054
-#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1060
-#: src/xml/xmli18n-tmp.h:1063 src/xml/xmli18n-tmp.h:1066
-#: src/xml/xmli18n-tmp.h:1069 src/xml/xmli18n-tmp.h:1072
-#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1078
-#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1084
-#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1090
-#: src/xml/xmli18n-tmp.h:1093 src/xml/xmli18n-tmp.h:1096
-#: src/xml/xmli18n-tmp.h:1099 src/xml/xmli18n-tmp.h:1102
-#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1108
-#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1114
-#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1120
-#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1126
-#: src/xml/xmli18n-tmp.h:1129 src/xml/xmli18n-tmp.h:1132
-#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
-#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
-#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
-#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
-#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
-#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
-#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
-#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
-#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
-#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
-#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
-#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
-#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
-#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1189
-#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1193
-#: src/xml/xmli18n-tmp.h:1195 src/xml/xmli18n-tmp.h:1197
-#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1201
-#: src/xml/xmli18n-tmp.h:1203 src/xml/xmli18n-tmp.h:1205
-#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1209
-#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1221
-#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
-#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
-#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
-#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
-#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
-#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
-#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
-#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
-#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
-#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
-#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
-#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
-#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
-#: src/xml/xmli18n-tmp.h:1302 src/xml/xmli18n-tmp.h:1305
-#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1311
-#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1317
-#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1323
-#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1329
-#: src/xml/xmli18n-tmp.h:1332 src/xml/xmli18n-tmp.h:1335
-#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
-#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1343
-#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1347
-#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1351
-#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1355
-#: src/xml/xmli18n-tmp.h:1357 src/xml/xmli18n-tmp.h:1359
-#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1363
-#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1367
-#: src/xml/xmli18n-tmp.h:1369 src/xml/xmli18n-tmp.h:1371
-#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1375
-#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1566
-#: src/xml/xmli18n-tmp.h:1569 src/xml/xmli18n-tmp.h:1572
-#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1578
-#: src/xml/xmli18n-tmp.h:1581 src/xml/xmli18n-tmp.h:1584
-#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1590
-#: src/xml/xmli18n-tmp.h:1593 src/xml/xmli18n-tmp.h:1596
-#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1602
-#: src/xml/xmli18n-tmp.h:1605 src/xml/xmli18n-tmp.h:1608
-#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1614
-#: src/xml/xmli18n-tmp.h:1617 src/xml/xmli18n-tmp.h:1620
-#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1626
-#: src/xml/xmli18n-tmp.h:1629 src/xml/xmli18n-tmp.h:1632
-#: src/xml/xmli18n-tmp.h:1635 src/xml/xmli18n-tmp.h:1638
-#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1644
-#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
-#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
-#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
-#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
-#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
-#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
-#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
-#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
-#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
-#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
-#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
-#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
-#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
-#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
-#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:1778
-#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1782
-#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1786
-#: src/xml/xmli18n-tmp.h:1788 src/xml/xmli18n-tmp.h:1790
-#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1794
-#: src/xml/xmli18n-tmp.h:1796 src/xml/xmli18n-tmp.h:1798
-#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1802
-#: src/xml/xmli18n-tmp.h:1804 src/xml/xmli18n-tmp.h:1806
-#: src/xml/xmli18n-tmp.h:1808 src/xml/xmli18n-tmp.h:1810
-#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3204
-#: src/xml/xmli18n-tmp.h:3210 src/xml/xmli18n-tmp.h:3216
-#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3232
-#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3250
-#: src/xml/xmli18n-tmp.h:3294 src/xml/xmli18n-tmp.h:3302
-#: src/xml/xmli18n-tmp.h:3304 src/xml/xmli18n-tmp.h:3312
-#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3379
-#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
-#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3421
-#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3441
-#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3469
-#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3555
-#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3597
-#: src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:1017
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1025
+#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1035 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1047 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1056
+#: src/xml/xmli18n-tmp.h:1061 src/xml/xmli18n-tmp.h:1066
+#: src/xml/xmli18n-tmp.h:1071 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1086
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1096
+#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1116
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1126
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1136
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1161 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1181 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1206
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1216
+#: src/xml/xmli18n-tmp.h:1221 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1236
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1246
+#: src/xml/xmli18n-tmp.h:1251 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1261 src/xml/xmli18n-tmp.h:1266
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1281 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1291 src/xml/xmli18n-tmp.h:1296
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1311 src/xml/xmli18n-tmp.h:1316
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1326
+#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1336
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1378 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1414 src/xml/xmli18n-tmp.h:1420
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1432
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1450 src/xml/xmli18n-tmp.h:1455
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1465
+#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1480 src/xml/xmli18n-tmp.h:1485
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1540 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1551 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1583 src/xml/xmli18n-tmp.h:1585
+#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1603 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1607 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1646
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1666
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1676
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1716
+#: src/xml/xmli18n-tmp.h:1721 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1736
+#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1835
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1843
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1851
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:2049
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2057
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2065
+#: src/xml/xmli18n-tmp.h:2069 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2113
+#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2129
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2137
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2153
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2161
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2185
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2264
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2272
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2276
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2282 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2286 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2296
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2300
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2308
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2314 src/xml/xmli18n-tmp.h:2316
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2324
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:3787 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3895 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:4223 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5579
+#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5825
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Bright White Paper"
 msgstr "Matný papír"
 
-#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
-#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
-#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
-#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
-#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
-#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
-#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
-#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:817
-#: src/xml/xmli18n-tmp.h:855 src/xml/xmli18n-tmp.h:912
-#: src/xml/xmli18n-tmp.h:969 src/xml/xmli18n-tmp.h:1026
-#: src/xml/xmli18n-tmp.h:1083 src/xml/xmli18n-tmp.h:1136
-#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1226
-#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1338
-#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1445
-#: src/xml/xmli18n-tmp.h:1505 src/xml/xmli18n-tmp.h:1568
-#: src/xml/xmli18n-tmp.h:1625 src/xml/xmli18n-tmp.h:1682
-#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1777
-#: src/xml/xmli18n-tmp.h:3675
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:139 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:959 src/xml/xmli18n-tmp.h:1018
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1155
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1546
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1931
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:5912
 msgid "Postcard"
 msgstr "Pohlednice"
 
-#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
-#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
-#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
-#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
-#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
-#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
-#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
-#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:825
-#: src/xml/xmli18n-tmp.h:867 src/xml/xmli18n-tmp.h:924
-#: src/xml/xmli18n-tmp.h:981 src/xml/xmli18n-tmp.h:1038
-#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1144
-#: src/xml/xmli18n-tmp.h:1182 src/xml/xmli18n-tmp.h:1238
-#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1346
-#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1457
-#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1580
-#: src/xml/xmli18n-tmp.h:1637 src/xml/xmli18n-tmp.h:1694
-#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1785
+#: src/xml/xmli18n-tmp.h:13 src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:155 src/xml/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:415 src/xml/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:851 src/xml/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1026
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1175
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1554
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1832
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2309
 msgid "Back Light Film"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
-#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
-#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
-#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
-#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
-#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
-#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
-#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:829
-#: src/xml/xmli18n-tmp.h:873 src/xml/xmli18n-tmp.h:930
-#: src/xml/xmli18n-tmp.h:987 src/xml/xmli18n-tmp.h:1044
-#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1148
-#: src/xml/xmli18n-tmp.h:1186 src/xml/xmli18n-tmp.h:1244
-#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1350
-#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1463
-#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1586
-#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1700
-#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1789
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:419 src/xml/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:857 src/xml/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1030
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1383
+#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1558
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2313
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Matný papír"
 
-#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
-#: src/xml/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:421
 msgid "Premium Presentation Paper Matte"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:27
-#, fuzzy
-msgid "Premium Glossy Photo Paper 170 wt"
-msgstr "Extra lesklý fotopapír"
-
-#: src/xml/xmli18n-tmp.h:29
-#, fuzzy
-msgid "Premium Glossy Photo Paper 250 wt"
-msgstr "Extra lesklý fotopapír"
-
-#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
-#: src/xml/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:431
 #, fuzzy
 msgid "Ultra Glossy Photo Paper"
 msgstr "Lesklý fotopapír"
 
-#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
-#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
-#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
-#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
-#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
-#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
-#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
-#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:839
-#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:945
-#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1059
-#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1158
-#: src/xml/xmli18n-tmp.h:1196 src/xml/xmli18n-tmp.h:1259
-#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1360
-#: src/xml/xmli18n-tmp.h:1415 src/xml/xmli18n-tmp.h:1478
-#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1601
-#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1715
-#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1210
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1413
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1568
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1695
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1964
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2176 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2287 src/xml/xmli18n-tmp.h:2323
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Extra lesklý fotopapír"
 
-#: src/xml/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:437
 #, fuzzy
-msgid "Premium Semigloss Photo Paper 170 wt"
+msgid "Ultra Premium Photo Paper Luster"
 msgstr "Extra lesklý fotopapír"
 
 #: src/xml/xmli18n-tmp.h:37
+msgid "CD or DVD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:93 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1230
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1437
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2331
 #, fuzzy
-msgid "Premium Semigloss Photo Paper 250 wt"
+msgid "ColorLife Paper"
+msgstr "Papír ColorLife"
+
+#: src/xml/xmli18n-tmp.h:73
+#, fuzzy
+msgid "Premium Glossy Photo Paper 170 wt"
 msgstr "Extra lesklý fotopapír"
 
-#: src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:75
 #, fuzzy
-msgid "Premium Luster Photo Paper 250 wt"
+msgid "Premium Glossy Photo Paper 250 wt"
 msgstr "Extra lesklý fotopapír"
 
-#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
-#: src/xml/xmli18n-tmp.h:334
+#: src/xml/xmli18n-tmp.h:81
 #, fuzzy
-msgid "Ultra Premium Photo Paper Luster"
+msgid "Premium Semigloss Photo Paper 170 wt"
 msgstr "Extra lesklý fotopapír"
 
-#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
-#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
-#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
-#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
-#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
-#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
-#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
-#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:845
-#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:957
-#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1071
-#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1166
-#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1271
-#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1372
-#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1496
-#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1613
-#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1733
-#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1807
+#: src/xml/xmli18n-tmp.h:83
 #, fuzzy
-msgid "ColorLife Paper"
-msgstr "Papír ColorLife"
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr "Extra lesklý fotopapír"
 
-#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
-#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
-#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
-#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
-#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
-#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
-#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
-#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
-#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
-#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
-#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
-#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
-#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
-#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
-#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
-#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
-#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
-#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
-#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
-#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
-#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
-#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
-#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
-#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
-#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
-#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
-#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
-#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
-#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
-#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
-#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
-#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
-#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
-#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
-#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
-#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
-#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
-#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
-#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
-#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
-#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
-#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
-#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
-#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
-#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
-#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
-#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:851
-#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:857
-#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:863
-#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:869
-#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:875
-#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:881
-#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:887
-#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:893
-#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:899
-#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:905
-#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:911
-#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:917
-#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:923
-#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:929
-#: src/xml/xmli18n-tmp.h:932 src/xml/xmli18n-tmp.h:935
-#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:941
-#: src/xml/xmli18n-tmp.h:944 src/xml/xmli18n-tmp.h:947
-#: src/xml/xmli18n-tmp.h:950 src/xml/xmli18n-tmp.h:953
-#: src/xml/xmli18n-tmp.h:956 src/xml/xmli18n-tmp.h:959
-#: src/xml/xmli18n-tmp.h:962 src/xml/xmli18n-tmp.h:965
-#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:971
-#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:977
-#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:983
-#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:989
-#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:995
-#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1001
-#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1007
-#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1013
-#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1019
-#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1025
-#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1031
-#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1037
-#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1043
-#: src/xml/xmli18n-tmp.h:1046 src/xml/xmli18n-tmp.h:1049
-#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1055
-#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1061
-#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1067
-#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1073
-#: src/xml/xmli18n-tmp.h:1076 src/xml/xmli18n-tmp.h:1079
-#: src/xml/xmli18n-tmp.h:1082 src/xml/xmli18n-tmp.h:1085
-#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1091
-#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1097
-#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1103
-#: src/xml/xmli18n-tmp.h:1106 src/xml/xmli18n-tmp.h:1109
-#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1115
-#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1121
-#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1127
-#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1133
-#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1225
-#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1231
-#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1237
-#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1243
-#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1249
-#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1255
-#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1261
-#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1267
-#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1273
-#: src/xml/xmli18n-tmp.h:1276 src/xml/xmli18n-tmp.h:1279
-#: src/xml/xmli18n-tmp.h:1282 src/xml/xmli18n-tmp.h:1285
-#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1291
-#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1297
-#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1303
-#: src/xml/xmli18n-tmp.h:1306 src/xml/xmli18n-tmp.h:1309
-#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1315
-#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1321
-#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1327
-#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1333
-#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1567
-#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1573
-#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1579
-#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1585
-#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1591
-#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1597
-#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1603
-#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1609
-#: src/xml/xmli18n-tmp.h:1612 src/xml/xmli18n-tmp.h:1615
-#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1621
-#: src/xml/xmli18n-tmp.h:1624 src/xml/xmli18n-tmp.h:1627
-#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1633
-#: src/xml/xmli18n-tmp.h:1636 src/xml/xmli18n-tmp.h:1639
-#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1645
-#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1651
-#: src/xml/xmli18n-tmp.h:1654 src/xml/xmli18n-tmp.h:1657
-#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1663
-#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1669
-#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1675
-#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3223
-#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3231
-#: src/xml/xmli18n-tmp.h:3238 src/xml/xmli18n-tmp.h:3239
-#: src/xml/xmli18n-tmp.h:3300 src/xml/xmli18n-tmp.h:3301
-#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3311
-#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3396
-#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3408
-#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3420
-#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3432
-#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3440
-#: src/xml/xmli18n-tmp.h:3479 src/xml/xmli18n-tmp.h:3480
-#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3492
-#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3554
-#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:87
+#, fuzzy
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr "Extra lesklý fotopapír"
+
+#: src/xml/xmli18n-tmp.h:133 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:149 src/xml/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:173 src/xml/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:197 src/xml/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:205 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:221 src/xml/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:229 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:245 src/xml/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:253 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:261 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:269 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:277 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:285 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:293 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:301 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:309 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:317 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:325 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:333 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:341 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:349 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:357 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:619 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:643 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:667 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:691 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:707 src/xml/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:715 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:731 src/xml/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:739 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:755 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1062
+#: src/xml/xmli18n-tmp.h:1067 src/xml/xmli18n-tmp.h:1072
+#: src/xml/xmli18n-tmp.h:1077 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1092
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1102
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1112
+#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1122
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1132
+#: src/xml/xmli18n-tmp.h:1137 src/xml/xmli18n-tmp.h:1142
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1157 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1177 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1192
+#: src/xml/xmli18n-tmp.h:1197 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1212
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1222
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1242
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1252
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1272
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1287 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1297 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1327 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1385 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1445 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1461
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1516 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1647
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1657
+#: src/xml/xmli18n-tmp.h:1662 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1677
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1687
+#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1742 src/xml/xmli18n-tmp.h:1747
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1767
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1807
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2090 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2098 src/xml/xmli18n-tmp.h:2102
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2118
+#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2126
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2162 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2190
+#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:3884 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:4779 src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:4845 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4919
+#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4980
+#: src/xml/xmli18n-tmp.h:4986 src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5209 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5276
+#: src/xml/xmli18n-tmp.h:5277 src/xml/xmli18n-tmp.h:5283
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5607 src/xml/xmli18n-tmp.h:5633
+#: src/xml/xmli18n-tmp.h:5634 src/xml/xmli18n-tmp.h:5640
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
-#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
-#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
-#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
-#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:852
-#: src/xml/xmli18n-tmp.h:909 src/xml/xmli18n-tmp.h:966
-#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1080
-#: src/xml/xmli18n-tmp.h:1172 src/xml/xmli18n-tmp.h:1223
-#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1336
-#: src/xml/xmli18n-tmp.h:1379 src/xml/xmli18n-tmp.h:1442
-#: src/xml/xmli18n-tmp.h:1565 src/xml/xmli18n-tmp.h:1622
-#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1775
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:142 src/xml/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:150 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:174 src/xml/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:198 src/xml/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:214 src/xml/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:222 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:238 src/xml/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:246 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:262 src/xml/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:302 src/xml/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:310 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:318 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:326 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:334 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:342 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:350 src/xml/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:636 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:660 src/xml/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:708 src/xml/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:716 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:732 src/xml/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:756 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1103
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1123
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1158 src/xml/xmli18n-tmp.h:1163
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1183
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1193
+#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1213
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1223
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1238 src/xml/xmli18n-tmp.h:1243
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1253
+#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1283
+#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1313
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1333
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1362 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1374 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1462
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1472
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1487 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1502
+#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:1532
+#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1542
+#: src/xml/xmli18n-tmp.h:1633 src/xml/xmli18n-tmp.h:1638
+#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1648
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1658
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1713 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1728
+#: src/xml/xmli18n-tmp.h:1733 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1768
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2071
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2095
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2115 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2123 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2139 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2183
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2191
+#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2199
+#, fuzzy
+msgid "MISQuadtone"
+msgstr "Quadtone"
+
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1150 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2299
 msgid "Plain Paper Fast Load"
 msgstr "Rychlé podávání normálního papíru"
 
-#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
-#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
-#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1364
-#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1484
-#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1970 src/xml/xmli18n-tmp.h:2030
+#: src/xml/xmli18n-tmp.h:2245
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Matný papír"
 
-#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
-#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
-#: src/xml/xmli18n-tmp.h:1202 src/xml/xmli18n-tmp.h:1366
-#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1487
-#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:881 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2248
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
-#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
-#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
-#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
-#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
-#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
-#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
-#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
-#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
-#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
-#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1377
-#: src/xml/xmli18n-tmp.h:1380 src/xml/xmli18n-tmp.h:1383
-#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1389
-#: src/xml/xmli18n-tmp.h:1392 src/xml/xmli18n-tmp.h:1395
-#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1401
-#: src/xml/xmli18n-tmp.h:1404 src/xml/xmli18n-tmp.h:1407
-#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1413
-#: src/xml/xmli18n-tmp.h:1416 src/xml/xmli18n-tmp.h:1419
-#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1425
-#: src/xml/xmli18n-tmp.h:1428 src/xml/xmli18n-tmp.h:1431
-#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1437
-#: src/xml/xmli18n-tmp.h:1440 src/xml/xmli18n-tmp.h:1443
-#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1449
-#: src/xml/xmli18n-tmp.h:1452 src/xml/xmli18n-tmp.h:1455
-#: src/xml/xmli18n-tmp.h:1458 src/xml/xmli18n-tmp.h:1461
-#: src/xml/xmli18n-tmp.h:1464 src/xml/xmli18n-tmp.h:1467
-#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1473
-#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1479
-#: src/xml/xmli18n-tmp.h:1482 src/xml/xmli18n-tmp.h:1485
-#: src/xml/xmli18n-tmp.h:1488 src/xml/xmli18n-tmp.h:1491
-#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1497
-#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1677
-#: src/xml/xmli18n-tmp.h:1680 src/xml/xmli18n-tmp.h:1683
-#: src/xml/xmli18n-tmp.h:1686 src/xml/xmli18n-tmp.h:1689
-#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1695
-#: src/xml/xmli18n-tmp.h:1698 src/xml/xmli18n-tmp.h:1701
-#: src/xml/xmli18n-tmp.h:1704 src/xml/xmli18n-tmp.h:1707
-#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1713
-#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1719
-#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1725
-#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1731
-#: src/xml/xmli18n-tmp.h:1734 src/xml/xmli18n-tmp.h:1737
-#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3503
-#: src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:1863
+#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1881
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1893
+#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1905
+#: src/xml/xmli18n-tmp.h:1908 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1923
+#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:1950 src/xml/xmli18n-tmp.h:1953
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1968 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1983
+#: src/xml/xmli18n-tmp.h:1986 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2204 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2255
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5645
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Å est barev foto"
 
-#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
-#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
-#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
-#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
-#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
-#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
-#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
-#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
-#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
-#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
-#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1378
-#: src/xml/xmli18n-tmp.h:1381 src/xml/xmli18n-tmp.h:1384
-#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1390
-#: src/xml/xmli18n-tmp.h:1393 src/xml/xmli18n-tmp.h:1396
-#: src/xml/xmli18n-tmp.h:1399 src/xml/xmli18n-tmp.h:1402
-#: src/xml/xmli18n-tmp.h:1405 src/xml/xmli18n-tmp.h:1408
-#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1414
-#: src/xml/xmli18n-tmp.h:1417 src/xml/xmli18n-tmp.h:1420
-#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1426
-#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1432
-#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1438
-#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1444
-#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1450
-#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1456
-#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1462
-#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1468
-#: src/xml/xmli18n-tmp.h:1471 src/xml/xmli18n-tmp.h:1474
-#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1480
-#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1486
-#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1492
-#: src/xml/xmli18n-tmp.h:1495 src/xml/xmli18n-tmp.h:1498
-#: src/xml/xmli18n-tmp.h:1501 src/xml/xmli18n-tmp.h:1678
-#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1684
-#: src/xml/xmli18n-tmp.h:1687 src/xml/xmli18n-tmp.h:1690
-#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1696
-#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1702
-#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1708
-#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1714
-#: src/xml/xmli18n-tmp.h:1717 src/xml/xmli18n-tmp.h:1720
-#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1726
-#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1732
-#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1738
-#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3517
-#: src/xml/xmli18n-tmp.h:3577
+#: src/xml/xmli18n-tmp.h:835 src/xml/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:841 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1879 src/xml/xmli18n-tmp.h:1882
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1894
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1909 src/xml/xmli18n-tmp.h:1912
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1924
+#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1954
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1969 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1984
+#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2208
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2229 src/xml/xmli18n-tmp.h:2232
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2238
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2244
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2253 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2259 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5714
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1826
-#: src/xml/xmli18n-tmp.h:1839 src/xml/xmli18n-tmp.h:1852
-#: src/xml/xmli18n-tmp.h:1907 src/xml/xmli18n-tmp.h:1923
-#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1952
-#: src/xml/xmli18n-tmp.h:1965 src/xml/xmli18n-tmp.h:2054
-#: src/xml/xmli18n-tmp.h:2081 src/xml/xmli18n-tmp.h:2146
-#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
-#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
-#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2348
-#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2407
-#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2899
-#: src/xml/xmli18n-tmp.h:2916 src/xml/xmli18n-tmp.h:3142
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1139
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1154 src/xml/xmli18n-tmp.h:1159
+#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1179
+#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1199
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1214 src/xml/xmli18n-tmp.h:1219
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1229
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1244 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1259
+#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1274 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1289
+#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1309
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1329
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1423
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1429
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1447
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1634
+#: src/xml/xmli18n-tmp.h:1639 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1664
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1764
+#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1784
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1799 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1819
+msgid "MIS Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1463 src/xml/xmli18n-tmp.h:1468
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1478
+#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1508
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1533 src/xml/xmli18n-tmp.h:1538
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4858 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:5289
+msgid "Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2489 src/xml/xmli18n-tmp.h:2578
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2713 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2752
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2885 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:3051 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3665
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1828
-#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1853
-#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1879
-#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
-#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1940
-#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1966
-#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2055
-#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2133
-#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2175
-#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
-#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
-#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2336
-#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
-#: src/xml/xmli18n-tmp.h:2408 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2699
+#: src/xml/xmli18n-tmp.h:2714 src/xml/xmli18n-tmp.h:2727
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2886
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:3052
 msgid "180 DPI Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1830
-#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1854
-#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1880
-#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
-#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1941
-#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1967
-#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
-#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2134
-#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2176
-#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
-#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
-#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2337
-#: src/xml/xmli18n-tmp.h:2350 src/xml/xmli18n-tmp.h:2363
-#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
-#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2434
-#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2459
-#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2529
-#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2601
-#: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2703
-#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2735
-#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2768
-#: src/xml/xmli18n-tmp.h:2872 src/xml/xmli18n-tmp.h:2884
-#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2917
-#: src/xml/xmli18n-tmp.h:2961 src/xml/xmli18n-tmp.h:3007
-#: src/xml/xmli18n-tmp.h:3021 src/xml/xmli18n-tmp.h:3035
-#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3126
-#: src/xml/xmli18n-tmp.h:3143
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2404
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2658
+#: src/xml/xmli18n-tmp.h:2672 src/xml/xmli18n-tmp.h:2700
+#: src/xml/xmli18n-tmp.h:2715 src/xml/xmli18n-tmp.h:2728
+#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2754
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2919 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3053
+#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3125
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3292
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3530
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3649
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3684
 #, fuzzy
 msgid "360 x 180 DPI Draft"
 msgstr "150×150 DPI"
 
-#: src/xml/xmli18n-tmp.h:1818 src/xml/xmli18n-tmp.h:1831
-#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1855
-#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1881
-#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
-#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1942
-#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1968
-#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2135
-#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2392 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2418 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2479 src/xml/xmli18n-tmp.h:2492
+#: src/xml/xmli18n-tmp.h:2581 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2862 src/xml/xmli18n-tmp.h:2934
 #, fuzzy
 msgid "360 DPI High Quality"
 msgstr "600 DPI vysoká kvalita"
 
-#: src/xml/xmli18n-tmp.h:1819 src/xml/xmli18n-tmp.h:1832
-#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1856
-#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1882
-#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
-#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1943
-#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1969
-#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1992
-#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2020
-#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
-#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
-#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2096
-#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2123
-#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2149
-#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2177
-#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2205
-#: src/xml/xmli18n-tmp.h:2218 src/xml/xmli18n-tmp.h:2231
-#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2254
-#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
-#: src/xml/xmli18n-tmp.h:2297 src/xml/xmli18n-tmp.h:2312
-#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2339
-#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
-#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2385
-#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2411
-#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2435
-#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2460
-#: src/xml/xmli18n-tmp.h:2473 src/xml/xmli18n-tmp.h:2488
-#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2516
-#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2541
-#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2591
-#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
-#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2645
-#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2675
-#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2704
-#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2736
-#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2769
-#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2808
-#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2833
-#: src/xml/xmli18n-tmp.h:2847 src/xml/xmli18n-tmp.h:2861
-#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2885
-#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2918
-#: src/xml/xmli18n-tmp.h:2935 src/xml/xmli18n-tmp.h:2950
-#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2987
-#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3022
-#: src/xml/xmli18n-tmp.h:3036 src/xml/xmli18n-tmp.h:3050
-#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3081
-#: src/xml/xmli18n-tmp.h:3098 src/xml/xmli18n-tmp.h:3113
-#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2369 src/xml/xmli18n-tmp.h:2380
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2406
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2493
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2544
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
+#: src/xml/xmli18n-tmp.h:2582 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2729
+#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2806
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2836
+#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
+#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3012
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3040
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3184 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3424 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3485 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3573
+#: src/xml/xmli18n-tmp.h:3587 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3650 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3685
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
 
-#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1833
-#: src/xml/xmli18n-tmp.h:1846 src/xml/xmli18n-tmp.h:1857
-#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1883
-#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1912
-#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1944
-#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1970
-#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1993
-#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2021
-#: src/xml/xmli18n-tmp.h:2033 src/xml/xmli18n-tmp.h:2045
-#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
-#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2097
-#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2124
-#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2150
-#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2178
-#: src/xml/xmli18n-tmp.h:2193 src/xml/xmli18n-tmp.h:2206
-#: src/xml/xmli18n-tmp.h:2219 src/xml/xmli18n-tmp.h:2232
-#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2255
-#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
-#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2313
-#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2340
-#: src/xml/xmli18n-tmp.h:2352 src/xml/xmli18n-tmp.h:2365
-#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2386
-#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2412
-#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2436
-#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2461
-#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2489
-#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2517
-#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2542
-#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2567
-#: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2592
-#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2616
-#: src/xml/xmli18n-tmp.h:2631 src/xml/xmli18n-tmp.h:2646
-#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2676
-#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2705
-#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2737
-#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2770
-#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2809
-#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2834
-#: src/xml/xmli18n-tmp.h:2848 src/xml/xmli18n-tmp.h:2862
-#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2886
-#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2919
-#: src/xml/xmli18n-tmp.h:2936 src/xml/xmli18n-tmp.h:2951
-#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2988
-#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3023
-#: src/xml/xmli18n-tmp.h:3037 src/xml/xmli18n-tmp.h:3051
-#: src/xml/xmli18n-tmp.h:3066 src/xml/xmli18n-tmp.h:3083
-#: src/xml/xmli18n-tmp.h:3099 src/xml/xmli18n-tmp.h:3114
-#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:2344 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2452 src/xml/xmli18n-tmp.h:2468
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2494
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2557 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:2594
+#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2648
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2674
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2807
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2837
+#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
+#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3013
+#: src/xml/xmli18n-tmp.h:3026 src/xml/xmli18n-tmp.h:3041
+#: src/xml/xmli18n-tmp.h:3055 src/xml/xmli18n-tmp.h:3066
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3140
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3170
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3229
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3333
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3358
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3385
+#: src/xml/xmli18n-tmp.h:3397 src/xml/xmli18n-tmp.h:3409
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3442
+#: src/xml/xmli18n-tmp.h:3459 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3574
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3637
+#: src/xml/xmli18n-tmp.h:3651 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3686
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1834
-#: src/xml/xmli18n-tmp.h:1847 src/xml/xmli18n-tmp.h:1858
-#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1884
-#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1913
-#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1945
-#: src/xml/xmli18n-tmp.h:1958 src/xml/xmli18n-tmp.h:1971
-#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:1994
-#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2022
-#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2046
-#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2071
-#: src/xml/xmli18n-tmp.h:2086 src/xml/xmli18n-tmp.h:2098
-#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2125
-#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2151
-#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2179
-#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2207
-#: src/xml/xmli18n-tmp.h:2220 src/xml/xmli18n-tmp.h:2233
-#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2256
-#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
-#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2314
-#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2341
-#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
-#: src/xml/xmli18n-tmp.h:2376 src/xml/xmli18n-tmp.h:2387
-#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2413
-#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2437
-#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2462
-#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2490
-#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2518
-#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2543
-#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
-#: src/xml/xmli18n-tmp.h:2580 src/xml/xmli18n-tmp.h:2593
-#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2617
-#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
-#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2677
-#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2706
-#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2738
-#: src/xml/xmli18n-tmp.h:2753 src/xml/xmli18n-tmp.h:2771
-#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2810
-#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2835
-#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
-#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2887
-#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2921
-#: src/xml/xmli18n-tmp.h:2937 src/xml/xmli18n-tmp.h:2952
-#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2990
-#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3024
-#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3052
-#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3085
-#: src/xml/xmli18n-tmp.h:3100 src/xml/xmli18n-tmp.h:3115
-#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:2345 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2469
+#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2546
+#: src/xml/xmli18n-tmp.h:2558 src/xml/xmli18n-tmp.h:2570
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2595
+#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2622
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2675
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2731
+#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2808
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2838
+#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2890
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2922 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3014
+#: src/xml/xmli18n-tmp.h:3027 src/xml/xmli18n-tmp.h:3042
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3067
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3186 src/xml/xmli18n-tmp.h:3201
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3334
+#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3359
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3444
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3475
+#: src/xml/xmli18n-tmp.h:3489 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3533 src/xml/xmli18n-tmp.h:3547
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3652 src/xml/xmli18n-tmp.h:3669
+#: src/xml/xmli18n-tmp.h:3687
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
-#: src/xml/xmli18n-tmp.h:1978 src/xml/xmli18n-tmp.h:2004
-#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2030
-#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2067
-#: src/xml/xmli18n-tmp.h:2094 src/xml/xmli18n-tmp.h:2107
-#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2161
-#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2252
-#: src/xml/xmli18n-tmp.h:2280 src/xml/xmli18n-tmp.h:2295
-#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2323
-#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
-#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2486
-#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2552
-#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2613
-#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
-#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2686
-#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2806
-#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2831
-#: src/xml/xmli18n-tmp.h:2845 src/xml/xmli18n-tmp.h:2859
-#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2948
-#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3080
-#: src/xml/xmli18n-tmp.h:3097 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2554
+#: src/xml/xmli18n-tmp.h:2566 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2804 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2834 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3076
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3382
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3586 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3634
 #, fuzzy
 msgid "360 x 120 DPI Economy"
 msgstr "600×600 DPI �ernobíle"
 
-#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1842
-#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2005
-#: src/xml/xmli18n-tmp.h:2019 src/xml/xmli18n-tmp.h:2031
-#: src/xml/xmli18n-tmp.h:2043 src/xml/xmli18n-tmp.h:2068
-#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
-#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2162
-#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2253
-#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2296
-#: src/xml/xmli18n-tmp.h:2311 src/xml/xmli18n-tmp.h:2324
-#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2384
-#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2487
-#: src/xml/xmli18n-tmp.h:2500 src/xml/xmli18n-tmp.h:2553
-#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2614
-#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2644
-#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2687
-#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2807
-#: src/xml/xmli18n-tmp.h:2820 src/xml/xmli18n-tmp.h:2832
-#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
-#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2949
-#: src/xml/xmli18n-tmp.h:3112
+#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2555
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2632
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3077
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3211
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3383
+#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3635
 #, fuzzy
 msgid "360 x 240 DPI Draft"
 msgstr "600×600 DPI"
 
-#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1872
-#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1898
-#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1930
-#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1959
-#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:1995
-#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2023
-#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2047
-#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2087
-#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2112
-#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2139
-#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2166
-#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2328
-#: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2388
-#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2557
-#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2922
-#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2991
-#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3086
+#: src/xml/xmli18n-tmp.h:2383 src/xml/xmli18n-tmp.h:2396
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2422
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2470 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2507 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2704 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:3057 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3118 src/xml/xmli18n-tmp.h:3445
+#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3514
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3609
 #, fuzzy
 msgid "720 DPI High Quality"
 msgstr "1200 DPI vysoká kvalita"
 
-#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1873
-#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1899
-#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1931
-#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1984
-#: src/xml/xmli18n-tmp.h:1996 src/xml/xmli18n-tmp.h:2010
-#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2036
-#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2061
-#: src/xml/xmli18n-tmp.h:2073 src/xml/xmli18n-tmp.h:2088
-#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2127
-#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2153
-#: src/xml/xmli18n-tmp.h:2167 src/xml/xmli18n-tmp.h:2181
-#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2208
-#: src/xml/xmli18n-tmp.h:2221 src/xml/xmli18n-tmp.h:2234
-#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2257
-#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2285
-#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2315
-#: src/xml/xmli18n-tmp.h:2329 src/xml/xmli18n-tmp.h:2354
-#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2389
-#: src/xml/xmli18n-tmp.h:2399 src/xml/xmli18n-tmp.h:2425
-#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2451
-#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
-#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2504
-#: src/xml/xmli18n-tmp.h:2519 src/xml/xmli18n-tmp.h:2534
-#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2558
-#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2605
-#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2633
-#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2663
-#: src/xml/xmli18n-tmp.h:2678 src/xml/xmli18n-tmp.h:2691
-#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2725
-#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2754
-#: src/xml/xmli18n-tmp.h:2772 src/xml/xmli18n-tmp.h:2787
-#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2811
-#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2836
-#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
-#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2888
-#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2923
-#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2953
-#: src/xml/xmli18n-tmp.h:2968 src/xml/xmli18n-tmp.h:2978
-#: src/xml/xmli18n-tmp.h:2992 src/xml/xmli18n-tmp.h:3011
-#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3039
-#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
-#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3101
-#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3130
-#: src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:2384 src/xml/xmli18n-tmp.h:2397
+#: src/xml/xmli18n-tmp.h:2410 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2548 src/xml/xmli18n-tmp.h:2560
+#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2691 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2794 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2839
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2923 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3105
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3129
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3231 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3311
+#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3335
+#: src/xml/xmli18n-tmp.h:3348 src/xml/xmli18n-tmp.h:3360
+#: src/xml/xmli18n-tmp.h:3372 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3427 src/xml/xmli18n-tmp.h:3446
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3576 src/xml/xmli18n-tmp.h:3593
+#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3688
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1874
-#: src/xml/xmli18n-tmp.h:1887 src/xml/xmli18n-tmp.h:1900
-#: src/xml/xmli18n-tmp.h:1916 src/xml/xmli18n-tmp.h:1932
-#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1985
-#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2011
-#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2037
-#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2062
-#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2089
-#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2128
-#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2154
-#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2182
-#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2258
-#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
-#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2316
-#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2390
-#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2559
-#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2634
-#: src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2385 src/xml/xmli18n-tmp.h:2398
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2535
+#: src/xml/xmli18n-tmp.h:2549 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2782
+#: src/xml/xmli18n-tmp.h:2795 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3388
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1200 DPI nejvyšší kvalita"
 
-#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1960
-#: src/xml/xmli18n-tmp.h:2100 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2902
 #, fuzzy
 msgid "720 DPI Highest Quality"
 msgstr "1200 DPI nejvyšší kvalita"
 
-#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2259
-#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
-#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2317
-#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2477
-#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2505
-#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2606
-#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2635
-#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2740
-#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2866
-#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2796 src/xml/xmli18n-tmp.h:2811
+#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3216 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3412
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2260
-#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
-#: src/xml/xmli18n-tmp.h:2303 src/xml/xmli18n-tmp.h:2318
-#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2771 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2812
+#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:3160 src/xml/xmli18n-tmp.h:3390
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1200 DPI nejvyšší kvalita"
 
-#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2439
-#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2493
-#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2546
-#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2582
-#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2620
-#: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2664
-#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
-#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2726
-#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2755
-#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2789
-#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2812
-#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2878
-#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
-#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2939
-#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2969
-#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2994
-#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
-#: src/xml/xmli18n-tmp.h:3088 src/xml/xmli18n-tmp.h:3102
-#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3131
-#: src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2963
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3070
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3106
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3297 src/xml/xmli18n-tmp.h:3313
+#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
+#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3401
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3492
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3577 src/xml/xmli18n-tmp.h:3594
+#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3671 src/xml/xmli18n-tmp.h:3689
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2426
-#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2452
-#: src/xml/xmli18n-tmp.h:2464 src/xml/xmli18n-tmp.h:2479
-#: src/xml/xmli18n-tmp.h:2494 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2547
-#: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2583
-#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2621
-#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2665
-#: src/xml/xmli18n-tmp.h:2680 src/xml/xmli18n-tmp.h:2694
-#: src/xml/xmli18n-tmp.h:2709 src/xml/xmli18n-tmp.h:2727
-#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2756
-#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2790
-#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2813
-#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2837
-#: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2879
-#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
-#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2940
-#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2970
-#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2995
-#: src/xml/xmli18n-tmp.h:3012 src/xml/xmli18n-tmp.h:3026
-#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3055
-#: src/xml/xmli18n-tmp.h:3072 src/xml/xmli18n-tmp.h:3089
-#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3118
-#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3071
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3107
+#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3251
+#: src/xml/xmli18n-tmp.h:3266 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3298 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3324 src/xml/xmli18n-tmp.h:3337
+#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3374 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3463
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3535 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3563 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3612
+#: src/xml/xmli18n-tmp.h:3626 src/xml/xmli18n-tmp.h:3641
+#: src/xml/xmli18n-tmp.h:3655 src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:3690
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:4374
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Černá/tmavá žlutá"
 
-#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2584
-#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2711
-#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2743
-#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2776
-#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2908
-#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2972
-#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3057
-#: src/xml/xmli18n-tmp.h:3074 src/xml/xmli18n-tmp.h:3091
-#: src/xml/xmli18n-tmp.h:3105 src/xml/xmli18n-tmp.h:3134
-#: src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3108
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3267
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3495
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3614
+#: src/xml/xmli18n-tmp.h:3628 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3692
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2666 src/xml/xmli18n-tmp.h:2681
-#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2728
-#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2775
-#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2814
-#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2838
-#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2926
-#: src/xml/xmli18n-tmp.h:2941 src/xml/xmli18n-tmp.h:2971
-#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
-#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
-#: src/xml/xmli18n-tmp.h:3090 src/xml/xmli18n-tmp.h:3104
-#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3133
-#: src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3190 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3234 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3325 src/xml/xmli18n-tmp.h:3338
+#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3362
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3505
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3613
+#: src/xml/xmli18n-tmp.h:3627 src/xml/xmli18n-tmp.h:3642
+#: src/xml/xmli18n-tmp.h:3656 src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:3691
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2712
-#: src/xml/xmli18n-tmp.h:2730 src/xml/xmli18n-tmp.h:2759
-#: src/xml/xmli18n-tmp.h:2777 src/xml/xmli18n-tmp.h:2909
-#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2973
-#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3058
-#: src/xml/xmli18n-tmp.h:3075 src/xml/xmli18n-tmp.h:3092
-#: src/xml/xmli18n-tmp.h:3106 src/xml/xmli18n-tmp.h:3135
-#: src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3301 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3496
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3615
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2798 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3502
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2965
-#: src/xml/xmli18n-tmp.h:2989 src/xml/xmli18n-tmp.h:3067
-#: src/xml/xmli18n-tmp.h:3084
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:3607
 #, fuzzy
 msgid "720 x 360 DPI Enhanced"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:3479
 #, fuzzy
 msgid "Black 1"
 msgstr "Černá"
 
-#: src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3480
 #, fuzzy
 msgid "Black 2"
 msgstr "Černá"
 
-#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3065
-#: src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3605
 #, fuzzy
 msgid "360 DPI Enhanced"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3516
 #, fuzzy
 msgid "1440 x 720 DPI High Quality"
 msgstr "1200 DPI nejvyšší kvalita"
 
-#: src/xml/xmli18n-tmp.h:3153
-msgid "Lower Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3677
+#, fuzzy
+msgid "Vivid Light Magenta"
+msgstr "Světle fialová"
 
-#: src/xml/xmli18n-tmp.h:3154
-msgid "Upper Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3682
+#, fuzzy
+msgid "Vivid Magenta"
+msgstr "Fialová"
+
+#: src/xml/xmli18n-tmp.h:3694
+#, fuzzy
+msgid "Main Tray"
+msgstr "Podava�"
+
+#: src/xml/xmli18n-tmp.h:3695
+#, fuzzy
+msgid "Photo Tray"
+msgstr "Fotografie"
 
-#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3160
-#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3176
-#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3186
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3725 src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:3732
 #, fuzzy
 msgid "Print to CD"
 msgstr "Tisknout do souboru?"
 
-#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3181
-#: src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:3730
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Podava�"
 
-#: src/xml/xmli18n-tmp.h:3157 src/xml/xmli18n-tmp.h:3182
-#: src/xml/xmli18n-tmp.h:3185
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:3731
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3159 src/xml/xmli18n-tmp.h:3164
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3705
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Ru�ní"
 
-#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3709
 msgid "Roll Feed (cut each page)"
 msgstr "Podávací válec (odříznout každou stranu)"
 
-#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3710
 msgid "Roll Feed (do not cut)"
 msgstr "Podávací válec (neodřezávat)"
 
-#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3171
-#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3180
-#: src/xml/xmli18n-tmp.h:3193
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3716 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3739
 msgid "Roll Feed"
 msgstr "Podávací válec"
 
-#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3714 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3723
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Ru�ní výběr"
 
-#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3715 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3724
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Ru�ní"
 
-#: src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3733
 #, fuzzy
 msgid "Photo Board"
 msgstr "Fotopapír"
 
-#: src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3734
 msgid "Cut Sheet Bin 1"
 msgstr "Přihrádka řezaných listů 1"
 
-#: src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3735
 msgid "Cut Sheet Bin 2"
 msgstr "Přihrádka řezaných listů 2"
 
-#: src/xml/xmli18n-tmp.h:3190
+#: src/xml/xmli18n-tmp.h:3736
 msgid "Cut Sheet Autoselect"
 msgstr "Automatický výběr řezaných listů"
 
-#: src/xml/xmli18n-tmp.h:3191
+#: src/xml/xmli18n-tmp.h:3737
 msgid "Manual Selection"
 msgstr "Ru�ní výběr"
 
-#: src/xml/xmli18n-tmp.h:3199 src/xml/xmli18n-tmp.h:3207
-#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3219
-#: src/xml/xmli18n-tmp.h:3227 src/xml/xmli18n-tmp.h:3235
-#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3257
-#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3278
-#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3297
-#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3317
-#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3342
-#: src/xml/xmli18n-tmp.h:3356 src/xml/xmli18n-tmp.h:3382
-#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
-#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3426
-#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3446
-#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3474
-#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3498
-#: src/xml/xmli18n-tmp.h:3510 src/xml/xmli18n-tmp.h:3524
-#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3558
-#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:3584
-#: src/xml/xmli18n-tmp.h:3594 src/xml/xmli18n-tmp.h:3600
-#: src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3763 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3872 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:4067 src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4172 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4236 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:4754 src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5102 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5679 src/xml/xmli18n-tmp.h:5748
+#: src/xml/xmli18n-tmp.h:5793 src/xml/xmli18n-tmp.h:5814
+#: src/xml/xmli18n-tmp.h:5835
 msgid "One Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3208
-#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3220
-#: src/xml/xmli18n-tmp.h:3228 src/xml/xmli18n-tmp.h:3236
-#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3259
-#: src/xml/xmli18n-tmp.h:3270 src/xml/xmli18n-tmp.h:3280
-#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3298
-#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3318
-#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3344
-#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3383
-#: src/xml/xmli18n-tmp.h:3391 src/xml/xmli18n-tmp.h:3403
-#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3427
-#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3447
-#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3475
-#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3499
-#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3526
-#: src/xml/xmli18n-tmp.h:3551 src/xml/xmli18n-tmp.h:3559
-#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3586
-#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3601
-#: src/xml/xmli18n-tmp.h:3607
+#: src/xml/xmli18n-tmp.h:3765 src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4484 src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:4756 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5321
+#: src/xml/xmli18n-tmp.h:5382 src/xml/xmli18n-tmp.h:5451
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5795 src/xml/xmli18n-tmp.h:5816
+#: src/xml/xmli18n-tmp.h:5837
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Tři barvy kompozitní"
 
-#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
-#: src/xml/xmli18n-tmp.h:3215 src/xml/xmli18n-tmp.h:3221
-#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3237
-#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3271
-#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3299
-#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3319
-#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3345
-#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3384
-#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
-#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3428
-#: src/xml/xmli18n-tmp.h:3438 src/xml/xmli18n-tmp.h:3448
-#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3463
-#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3476
-#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3500
-#: src/xml/xmli18n-tmp.h:3513 src/xml/xmli18n-tmp.h:3527
-#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3560
-#: src/xml/xmli18n-tmp.h:3573 src/xml/xmli18n-tmp.h:3587
-#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3602
-#: src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:3824 src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5325
+#: src/xml/xmli18n-tmp.h:5386 src/xml/xmli18n-tmp.h:5455
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5757
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5841
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Čtyři barvy standardní"
 
-#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3248
-#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
-#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3360
-#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
-#: src/xml/xmli18n-tmp.h:3417 src/xml/xmli18n-tmp.h:3429
-#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3459
-#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3501 src/xml/xmli18n-tmp.h:3514
-#: src/xml/xmli18n-tmp.h:3528 src/xml/xmli18n-tmp.h:3574
-#: src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4424 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:5066 src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:5196 src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5391
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5762
 msgid "Five Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3249
-#: src/xml/xmli18n-tmp.h:3272 src/xml/xmli18n-tmp.h:3293
-#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3333
-#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3361
-#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
-#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3430
-#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3460
-#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3478
-#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3502
-#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3529
-#: src/xml/xmli18n-tmp.h:3575 src/xml/xmli18n-tmp.h:3589
+#: src/xml/xmli18n-tmp.h:3780 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:4078 src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:4430 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4972
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5150 src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5336
+#: src/xml/xmli18n-tmp.h:5397 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5768
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Å est barev foto"
 
-#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3919 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:4781 src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:4795 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4921
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:4996
+#: src/xml/xmli18n-tmp.h:5023 src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:5226 src/xml/xmli18n-tmp.h:5279
+#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5603 src/xml/xmli18n-tmp.h:5609
+#: src/xml/xmli18n-tmp.h:5636 src/xml/xmli18n-tmp.h:5642
+#, fuzzy
+msgid "Gray 3"
+msgstr "Podava� 3"
+
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4782 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4796 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4916 src/xml/xmli18n-tmp.h:4922
+#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4983
+#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5286 src/xml/xmli18n-tmp.h:5294
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5643
+#, fuzzy
+msgid "Gray 2"
+msgstr "Podava� 2"
+
+#: src/xml/xmli18n-tmp.h:3855 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:4856 src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:4931 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4998
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:5214 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5611
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5644
+#, fuzzy
+msgid "Gray 1"
+msgstr "Podava� 1"
+
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4985 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5606 src/xml/xmli18n-tmp.h:5639
+#, fuzzy
+msgid "MIS Quadtone"
+msgstr "Quadtone"
+
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4114
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Sedm barev rozšířené"
 
-#: src/xml/xmli18n-tmp.h:3260 src/xml/xmli18n-tmp.h:3281
+#: src/xml/xmli18n-tmp.h:4016 src/xml/xmli18n-tmp.h:4121
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Tři barvy kompozitní"
 
-#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3282
+#: src/xml/xmli18n-tmp.h:4021 src/xml/xmli18n-tmp.h:4126
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Čtyři barvy standardní"
 
-#: src/xml/xmli18n-tmp.h:3262 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4132
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Šet barev rozšířené kompozitní"
 
-#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:4035 src/xml/xmli18n-tmp.h:4140
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sedm barev rozšířené"
 
-#: src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:4141
+#, fuzzy
+msgid "MatteBlack"
+msgstr "Matný papír"
+
+#: src/xml/xmli18n-tmp.h:4224
 #, fuzzy
 msgid "Default Black"
 msgstr "Nastavit implicitní"
 
-#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
-#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3365
-#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3504
-#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3533
-#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3564
-#: src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4446 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4573 src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:5344
+#: src/xml/xmli18n-tmp.h:5413 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Seven Color Photo"
 msgstr "Sedm barev foto"
 
-#: src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:4315
 msgid "Six Color Enhanced Composite"
 msgstr "Šet barev rozšířené kompozitní"
 
-#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3348
-#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3516
-#: src/xml/xmli18n-tmp.h:3530 src/xml/xmli18n-tmp.h:3576
-#: src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:4368 src/xml/xmli18n-tmp.h:4437
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:5404
+#: src/xml/xmli18n-tmp.h:5473 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5775
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Sedm barev foto"
 
-#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3355
-#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3523
-#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5745
 msgid "Two Level Grayscale"
 msgstr "Dva úrovně stupňů šedi"
 
-#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3357
-#: src/xml/xmli18n-tmp.h:3511 src/xml/xmli18n-tmp.h:3525
-#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:4412 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5448
+#: src/xml/xmli18n-tmp.h:5681 src/xml/xmli18n-tmp.h:5750
 msgid "Two Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3372
-#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3540
+#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5531
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Å est barev foto"
 
-#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3378
-#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:4652 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5570
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Å est barev foto"
 
-#: src/xml/xmli18n-tmp.h:3462 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:5288
+msgid "MIS Six Tone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:4994
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5291
+#, fuzzy
+msgid "Gray 5"
+msgstr "Podava� 1"
+
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:4928 src/xml/xmli18n-tmp.h:4995
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5292
+#, fuzzy
+msgid "Gray 4"
+msgstr "Podava� 4"
+
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5145
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Å est barev foto"
 
-#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3615
-#: src/xml/xmli18n-tmp.h:3621
+#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5852
+#: src/xml/xmli18n-tmp.h:5858
 #, fuzzy
 msgid "Interleave"
 msgstr "Název tiskárny:"
 
-#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3616
-#: src/xml/xmli18n-tmp.h:3622
+#: src/xml/xmli18n-tmp.h:5848 src/xml/xmli18n-tmp.h:5853
+#: src/xml/xmli18n-tmp.h:5859
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3612 src/xml/xmli18n-tmp.h:3617
-#: src/xml/xmli18n-tmp.h:3623
+#: src/xml/xmli18n-tmp.h:5849 src/xml/xmli18n-tmp.h:5854
+#: src/xml/xmli18n-tmp.h:5860
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3613 src/xml/xmli18n-tmp.h:3618
-#: src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5855
+#: src/xml/xmli18n-tmp.h:5861
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:5862
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Název tiskárny:"
 
-#: src/xml/xmli18n-tmp.h:3626
+#: src/xml/xmli18n-tmp.h:5863
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Jas:"
 
-#: src/xml/xmli18n-tmp.h:3628
+#: src/xml/xmli18n-tmp.h:5865
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:5909
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:5910
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:3674
+#: src/xml/xmli18n-tmp.h:5911
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:3679
+#: src/xml/xmli18n-tmp.h:5916
 msgid "3x5"
 msgstr "3×5"
 
-#: src/xml/xmli18n-tmp.h:3680
+#: src/xml/xmli18n-tmp.h:5917
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:5918
 msgid "4x6"
 msgstr "4×6"
 
-#: src/xml/xmli18n-tmp.h:3682
+#: src/xml/xmli18n-tmp.h:5919
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson fotopapír 4×6"
 
-#: src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:5920
+#, fuzzy
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr "Epson fotopapír 4×6"
+
+#: src/xml/xmli18n-tmp.h:5921
 msgid "5x7"
 msgstr "5×7"
 
-#: src/xml/xmli18n-tmp.h:3684
+#: src/xml/xmli18n-tmp.h:5922
 msgid "5x8"
 msgstr "5×8"
 
-#: src/xml/xmli18n-tmp.h:3685
+#: src/xml/xmli18n-tmp.h:5923
 msgid "6x8"
 msgstr "6×8"
 
-#: src/xml/xmli18n-tmp.h:3686
+#: src/xml/xmli18n-tmp.h:5924
 msgid "8x10"
 msgstr "8×10"
 
-#: src/xml/xmli18n-tmp.h:3688
+#: src/xml/xmli18n-tmp.h:5926
 msgid "12x18"
 msgstr "12×18"
 
-#: src/xml/xmli18n-tmp.h:3689
+#: src/xml/xmli18n-tmp.h:5927
 msgid "Super B 13x19"
 msgstr "Super B 13×19"
 
-#: src/xml/xmli18n-tmp.h:3690
+#: src/xml/xmli18n-tmp.h:5928
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3691
+#: src/xml/xmli18n-tmp.h:5929
 msgid "8x12"
 msgstr "8×12"
 
-#: src/xml/xmli18n-tmp.h:3692
+#: src/xml/xmli18n-tmp.h:5930
 msgid "11x14"
 msgstr "11×14"
 
-#: src/xml/xmli18n-tmp.h:3693
+#: src/xml/xmli18n-tmp.h:5931
 msgid "16x20"
 msgstr "16×20"
 
-#: src/xml/xmli18n-tmp.h:3694
+#: src/xml/xmli18n-tmp.h:5932
 msgid "16x24"
 msgstr "16×24"
 
-#: src/xml/xmli18n-tmp.h:3695
+#: src/xml/xmli18n-tmp.h:5933
 msgid "20x24"
 msgstr "20×24"
 
-#: src/xml/xmli18n-tmp.h:3696
+#: src/xml/xmli18n-tmp.h:5934
 msgid "20x30"
 msgstr "20×30"
 
-#: src/xml/xmli18n-tmp.h:3697
+#: src/xml/xmli18n-tmp.h:5935
 msgid "22x30"
 msgstr "22×30"
 
-#: src/xml/xmli18n-tmp.h:3698
+#: src/xml/xmli18n-tmp.h:5936
 msgid "24x30"
 msgstr "24×30"
 
-#: src/xml/xmli18n-tmp.h:3699
+#: src/xml/xmli18n-tmp.h:5937
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3700
+#: src/xml/xmli18n-tmp.h:5938
 msgid "30x40"
 msgstr "30×40"
 
-#: src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:5939
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:3702
+#: src/xml/xmli18n-tmp.h:5940
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:3703
+#: src/xml/xmli18n-tmp.h:5941
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:5942
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:3705
+#: src/xml/xmli18n-tmp.h:5943
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:3706
+#: src/xml/xmli18n-tmp.h:5944
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:3707
+#: src/xml/xmli18n-tmp.h:5945
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:3709
+#: src/xml/xmli18n-tmp.h:5947
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:3710
+#: src/xml/xmli18n-tmp.h:5948
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:5949
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:5950
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:3713
+#: src/xml/xmli18n-tmp.h:5951
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:3714
+#: src/xml/xmli18n-tmp.h:5952
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:3715
+#: src/xml/xmli18n-tmp.h:5953
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:3716
+#: src/xml/xmli18n-tmp.h:5954
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:5955
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:5956
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:5957
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:5958
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:5959
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:3722
+#: src/xml/xmli18n-tmp.h:5960
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:3723
+#: src/xml/xmli18n-tmp.h:5961
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:3724
+#: src/xml/xmli18n-tmp.h:5962
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:3725
+#: src/xml/xmli18n-tmp.h:5963
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:3726
+#: src/xml/xmli18n-tmp.h:5964
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:5965
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:5966
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:5967
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:3730
+#: src/xml/xmli18n-tmp.h:5968
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:3731
+#: src/xml/xmli18n-tmp.h:5969
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:3732
+#: src/xml/xmli18n-tmp.h:5970
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:3733
+#: src/xml/xmli18n-tmp.h:5971
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:3734
+#: src/xml/xmli18n-tmp.h:5972
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:3735
+#: src/xml/xmli18n-tmp.h:5973
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:3736
+#: src/xml/xmli18n-tmp.h:5974
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:3737
+#: src/xml/xmli18n-tmp.h:5975
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5976
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3739
+#: src/xml/xmli18n-tmp.h:5977
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:5978
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:3741
+#: src/xml/xmli18n-tmp.h:5979
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:5980
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:3743
+#: src/xml/xmli18n-tmp.h:5981
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:5982
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:5983
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:3746
+#: src/xml/xmli18n-tmp.h:5984
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:3747
+#: src/xml/xmli18n-tmp.h:5985
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:3748
+#: src/xml/xmli18n-tmp.h:5986
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:5987
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:3750
+#: src/xml/xmli18n-tmp.h:5988
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:3751
+#: src/xml/xmli18n-tmp.h:5989
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:5990
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:5991
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:3754
+#: src/xml/xmli18n-tmp.h:5992
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:3755
+#: src/xml/xmli18n-tmp.h:5993
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:3756
+#: src/xml/xmli18n-tmp.h:5994
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:5995
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:3758
+#: src/xml/xmli18n-tmp.h:5996
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:3759
+#: src/xml/xmli18n-tmp.h:5997
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:5998
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:3761
+#: src/xml/xmli18n-tmp.h:5999
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:6000
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:3763
+#: src/xml/xmli18n-tmp.h:6001
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:6002
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:3765
+#: src/xml/xmli18n-tmp.h:6003
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:3766
+#: src/xml/xmli18n-tmp.h:6004
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:6005
 #, fuzzy
 msgid "DL landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:3768
+#: src/xml/xmli18n-tmp.h:6006
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:3769
+#: src/xml/xmli18n-tmp.h:6007
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:3770
+#: src/xml/xmli18n-tmp.h:6008
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:6009
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:3772
+#: src/xml/xmli18n-tmp.h:6010
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:6011
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:3774
+#: src/xml/xmli18n-tmp.h:6012
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:3775
+#: src/xml/xmli18n-tmp.h:6013
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:6014
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:6015
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Na šířku"
 
-#: src/xml/xmli18n-tmp.h:3778
+#: src/xml/xmli18n-tmp.h:6016
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:3779
+#: src/xml/xmli18n-tmp.h:6017
 #, fuzzy
 msgid "ArchA transposed"
 msgstr "ArchA pří�ně"
 
-#: src/xml/xmli18n-tmp.h:3780
+#: src/xml/xmli18n-tmp.h:6018
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:6019
 #, fuzzy
 msgid "ArchB transposed"
 msgstr "ArchB pří�ně"
 
-#: src/xml/xmli18n-tmp.h:3782
+#: src/xml/xmli18n-tmp.h:6020
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:6021
 #, fuzzy
 msgid "ArchC transposed"
 msgstr "ArchC pří�ně"
 
-#: src/xml/xmli18n-tmp.h:3784
+#: src/xml/xmli18n-tmp.h:6022
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:6023
 #, fuzzy
 msgid "ArchD transposed"
 msgstr "ArchD pří�ně"
 
-#: src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:6024
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:3787
+#: src/xml/xmli18n-tmp.h:6025
 #, fuzzy
 msgid "ArchE transposed"
 msgstr "ArchE pří�ně"
 
-#: src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:6026
 msgid "American foolscap"
 msgstr "Americký foolscap"
 
-#: src/xml/xmli18n-tmp.h:3789
+#: src/xml/xmli18n-tmp.h:6027
 msgid "European foolscap"
 msgstr "Evropský foolscap"
 
-#: src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:6028
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:6029
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:3792
+#: src/xml/xmli18n-tmp.h:6030
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:6031
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/xml/xmli18n-tmp.h:3794
+#: src/xml/xmli18n-tmp.h:6032
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:3795
+#: src/xml/xmli18n-tmp.h:6033
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:6034
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:6035
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:6036
 msgid "Small paperback"
 msgstr "Malá brožura"
 
-#: src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:6037
 msgid "Penguin small paperback"
 msgstr "Malá brožura Penguin"
 
-#: src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:6038
 msgid "Penguin large paperback"
 msgstr "Velká brožura Penguin"
 
-#: src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:6039
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3802
+#: src/xml/xmli18n-tmp.h:6040
 msgid "Hagaki Card"
 msgstr "Karta Hagaki"
 
-#: src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:6041
 msgid "Oufuku Card"
 msgstr "Karta Oufuku"
 
-#: src/xml/xmli18n-tmp.h:3804
+#: src/xml/xmli18n-tmp.h:6042
 msgid "Japanese long envelope #3"
 msgstr "Japonská dlouhá obálka #3"
 
-#: src/xml/xmli18n-tmp.h:3805
+#: src/xml/xmli18n-tmp.h:6043
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japonská dlouhá obálka #3"
 
-#: src/xml/xmli18n-tmp.h:3806
+#: src/xml/xmli18n-tmp.h:6044
 msgid "Japanese long envelope #4"
 msgstr "Japonská dlouhá obálka #4"
 
-#: src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:6045
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japonská dlouhá obálka #4"
 
-#: src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:6046
 msgid "Japanese Kaku envelope #4"
 msgstr "Japonská obálka Kaku #4"
 
-#: src/xml/xmli18n-tmp.h:3809
+#: src/xml/xmli18n-tmp.h:6047
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japonská obálka Kaku #4"
 
-#: src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:6048
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:6049
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:6050
 msgid "A2 Invitation"
 msgstr "Pozvánka A2"
 
-#: src/xml/xmli18n-tmp.h:3813
+#: src/xml/xmli18n-tmp.h:6051
 msgid "Monarch Envelope"
 msgstr "Obálka Monarch"
 
-#: src/xml/xmli18n-tmp.h:3814
+#: src/xml/xmli18n-tmp.h:6052
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Obálka Monarch"
 
-#: src/xml/xmli18n-tmp.h:3815
+#: src/xml/xmli18n-tmp.h:6053
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3816
+#: src/xml/xmli18n-tmp.h:6054
 #, fuzzy
 msgid "4x7"
 msgstr "5×7"
 
-#: src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:6055
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3818
+#: src/xml/xmli18n-tmp.h:6056
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3819
+#: src/xml/xmli18n-tmp.h:6057
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Pohlednice"
 
-#: src/xml/xmli18n-tmp.h:3820
+#: src/xml/xmli18n-tmp.h:6058
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:6059
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:6060
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3824
+#: src/xml/xmli18n-tmp.h:6062
 msgid "89 mm Roll Paper"
 msgstr "Rolovaný papír 89 mm"
 
-#: src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:6063
 msgid "4 Inch Roll Paper"
 msgstr "Rolovaný papír 4 palce"
 
-#: src/xml/xmli18n-tmp.h:3826
+#: src/xml/xmli18n-tmp.h:6064
 msgid "5 Inch Roll Paper"
 msgstr "Rolovaný papír 5 palců"
 
-#: src/xml/xmli18n-tmp.h:3827
+#: src/xml/xmli18n-tmp.h:6065
 msgid "210 mm Roll Paper"
 msgstr "Rolovaný papír 210 mm"
 
-#: src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:6066
 msgid "13 Inch Roll Paper"
 msgstr "Rolovaný papír 13 palců"
 
-#: src/xml/xmli18n-tmp.h:3829
+#: src/xml/xmli18n-tmp.h:6067
 #, fuzzy
 msgid "17 Inch Roll Paper"
 msgstr "Rolovaný papír 13 palců"
 
-#: src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:6068
 msgid "22 Inch Roll Paper"
 msgstr "Rolovaný papír 22 palce"
 
-#: src/xml/xmli18n-tmp.h:3831
+#: src/xml/xmli18n-tmp.h:6069
 msgid "24 Inch Roll Paper"
 msgstr "Rolovaný papír 24 palce"
 
-#: src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:6070
 msgid "36 Inch Roll Paper"
 msgstr "Rolovaný papír 36 palců"
 
-#: src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:6071
 msgid "44 Inch Roll Paper"
 msgstr "Rolovaný papír 44 palce"
 
-#: src/xml/xmli18n-tmp.h:3834
+#: src/xml/xmli18n-tmp.h:6072
 #, fuzzy
 msgid "60 Inch Roll Paper"
 msgstr "Rolovaný papír 36 palců"
 
-#: src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:6073
 #, fuzzy
 msgid "64 Inch Roll Paper"
 msgstr "Rolovaný papír 4 palce"
 
-#: src/xml/xmli18n-tmp.h:3836
+#: src/xml/xmli18n-tmp.h:6074
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3837
+#: src/xml/xmli18n-tmp.h:6075
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:6076
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:6077
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:6078
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:6079
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:6080
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:6081
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3844
+#: src/xml/xmli18n-tmp.h:6082
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:6083
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3846
+#: src/xml/xmli18n-tmp.h:6084
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3847
+#: src/xml/xmli18n-tmp.h:6085
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3848
+#: src/xml/xmli18n-tmp.h:6086
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:6087
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3850
+#: src/xml/xmli18n-tmp.h:6088
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:6089
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:6090
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3853
+#: src/xml/xmli18n-tmp.h:6091
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3854
+#: src/xml/xmli18n-tmp.h:6092
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3855
+#: src/xml/xmli18n-tmp.h:6093
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3856
+#: src/xml/xmli18n-tmp.h:6094
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3857
+#: src/xml/xmli18n-tmp.h:6095
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3858
+#: src/xml/xmli18n-tmp.h:6096
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:6097
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:6098
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:6099
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:6100
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3863
+#: src/xml/xmli18n-tmp.h:6101
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:6102
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:6103
 msgid "Canon S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:6104
 msgid "Canon S200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3867
+#: src/xml/xmli18n-tmp.h:6105
 msgid "Canon S300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3868
+#: src/xml/xmli18n-tmp.h:6106
 msgid "Canon S400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3869
+#: src/xml/xmli18n-tmp.h:6107
 msgid "Canon S450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3870
+#: src/xml/xmli18n-tmp.h:6108
 msgid "Canon S500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:6109
 msgid "Canon S600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3872
+#: src/xml/xmli18n-tmp.h:6110
 msgid "Canon S630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3873
+#: src/xml/xmli18n-tmp.h:6111
 msgid "Canon S800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3874
+#: src/xml/xmli18n-tmp.h:6112
 msgid "Canon S4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:6113
 msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:6114
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3877
+#: src/xml/xmli18n-tmp.h:6115
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3878
+#: src/xml/xmli18n-tmp.h:6116
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:6117
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3880
+#: src/xml/xmli18n-tmp.h:6118
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3881
+#: src/xml/xmli18n-tmp.h:6119
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:6120
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:6121
 msgid "Canon PIXMA iP4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3884
+#: src/xml/xmli18n-tmp.h:6122
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3885
+#: src/xml/xmli18n-tmp.h:6123
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3886
+#: src/xml/xmli18n-tmp.h:6124
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3887
+#: src/xml/xmli18n-tmp.h:6125
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3888
+#: src/xml/xmli18n-tmp.h:6126
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:6127
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:6128
+msgid "Canon PIXMA iX4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6129
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:6130
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:6131
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:6132
 msgid "Canon PIXMA MP160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:6133
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3895
+#: src/xml/xmli18n-tmp.h:6134
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:6135
 msgid "Canon PIXMA MP220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3897
+#: src/xml/xmli18n-tmp.h:6136
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:6137
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:6138
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3900
+#: src/xml/xmli18n-tmp.h:6139
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:6140
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3902
+#: src/xml/xmli18n-tmp.h:6141
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3903
+#: src/xml/xmli18n-tmp.h:6142
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:6143
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:6144
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:6145
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:6146
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:6147
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:6148
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3910
+#: src/xml/xmli18n-tmp.h:6149
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:6150
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3912
+#: src/xml/xmli18n-tmp.h:6151
 msgid "Canon i80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3913
+#: src/xml/xmli18n-tmp.h:6152
 msgid "Canon i560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3914
+#: src/xml/xmli18n-tmp.h:6153
 msgid "Canon i850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:6154
 msgid "Canon i860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3916
+#: src/xml/xmli18n-tmp.h:6155
 msgid "Canon i865"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:6156
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:6157
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3919
+#: src/xml/xmli18n-tmp.h:6158
 #, fuzzy
 msgid "Epson B-300"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:3920
+#: src/xml/xmli18n-tmp.h:6159
 #, fuzzy
 msgid "Epson B-308"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:3921
+#: src/xml/xmli18n-tmp.h:6160
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:3922
+#: src/xml/xmli18n-tmp.h:6161
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:3923
+#: src/xml/xmli18n-tmp.h:6162
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:3924
+#: src/xml/xmli18n-tmp.h:6163
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:6164
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:6165
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:6166
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:6167
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:6168
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C41sx"
 
-#: src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:6169
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C41ux"
 
-#: src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:6170
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C41ux"
 
-#: src/xml/xmli18n-tmp.h:3932
+#: src/xml/xmli18n-tmp.h:6171
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C42sx"
 
-#: src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:6172
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3934
+#: src/xml/xmli18n-tmp.h:6173
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3935
+#: src/xml/xmli18n-tmp.h:6174
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:6175
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3937
+#: src/xml/xmli18n-tmp.h:6176
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:6177
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3939
+#: src/xml/xmli18n-tmp.h:6178
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:6179
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:6180
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:3942
+#: src/xml/xmli18n-tmp.h:6181
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3943
+#: src/xml/xmli18n-tmp.h:6182
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:6183
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:6184
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3946
+#: src/xml/xmli18n-tmp.h:6185
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:3947
+#: src/xml/xmli18n-tmp.h:6186
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:3948
+#: src/xml/xmli18n-tmp.h:6187
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3949
+#: src/xml/xmli18n-tmp.h:6188
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:6189
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:3951
+#: src/xml/xmli18n-tmp.h:6190
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:6191
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3953
+#: src/xml/xmli18n-tmp.h:6192
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:6193
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:6194
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3956
+#: src/xml/xmli18n-tmp.h:6195
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:3957
+#: src/xml/xmli18n-tmp.h:6196
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3958
+#: src/xml/xmli18n-tmp.h:6197
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3959
+#: src/xml/xmli18n-tmp.h:6198
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:3960
+#: src/xml/xmli18n-tmp.h:6199
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:6200
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:6201
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:6202
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:3964
+#: src/xml/xmli18n-tmp.h:6203
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:6204
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3966
+#: src/xml/xmli18n-tmp.h:6205
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3967
+#: src/xml/xmli18n-tmp.h:6206
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:6207
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:6208
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3970
+#: src/xml/xmli18n-tmp.h:6209
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:6210
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:3972
+#: src/xml/xmli18n-tmp.h:6211
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:6212
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:6213
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:3975
+#: src/xml/xmli18n-tmp.h:6214
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:6215
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:6216
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:6217
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:3979
+#: src/xml/xmli18n-tmp.h:6218
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:6219
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:3981
+#: src/xml/xmli18n-tmp.h:6220
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:3982
+#: src/xml/xmli18n-tmp.h:6221
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:3983
+#: src/xml/xmli18n-tmp.h:6222
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:3984
+#: src/xml/xmli18n-tmp.h:6223
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:6224
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:6225
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:3987
+#: src/xml/xmli18n-tmp.h:6226
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:6227
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:3989
+#: src/xml/xmli18n-tmp.h:6228
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:6229
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:6230
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:3992
+#: src/xml/xmli18n-tmp.h:6231
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:3993
+#: src/xml/xmli18n-tmp.h:6232
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:6233
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:3995
+#: src/xml/xmli18n-tmp.h:6234
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:6235
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:6236
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3998
+#: src/xml/xmli18n-tmp.h:6237
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3999
+#: src/xml/xmli18n-tmp.h:6238
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:6239
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:6240
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:4002
+#: src/xml/xmli18n-tmp.h:6241
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:6242
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:6243
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4005
+#: src/xml/xmli18n-tmp.h:6244
 #, fuzzy
-msgid "Epson Stylus Offixe TX300F"
+msgid "Epson Stylus Office TX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4006
+#: src/xml/xmli18n-tmp.h:6245
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:6246
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:4008
+#: src/xml/xmli18n-tmp.h:6247
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4009
+#: src/xml/xmli18n-tmp.h:6248
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:6249
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:6250
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:6251
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4013
+#: src/xml/xmli18n-tmp.h:6252
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4014
+#: src/xml/xmli18n-tmp.h:6253
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:6254
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:4016
+#: src/xml/xmli18n-tmp.h:6255
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:6256
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:6257
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4019
+#: src/xml/xmli18n-tmp.h:6258
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:4020
+#: src/xml/xmli18n-tmp.h:6259
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:4021
+#: src/xml/xmli18n-tmp.h:6260
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:4022
+#: src/xml/xmli18n-tmp.h:6261
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:4023
+#: src/xml/xmli18n-tmp.h:6262
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:4024
+#: src/xml/xmli18n-tmp.h:6263
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:6264
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:6265
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:4027
+#: src/xml/xmli18n-tmp.h:6266
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:6267
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:6268
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:6269
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:4031
+#: src/xml/xmli18n-tmp.h:6270
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:6271
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4033
+#: src/xml/xmli18n-tmp.h:6272
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4034
+#: src/xml/xmli18n-tmp.h:6273
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4035
+#: src/xml/xmli18n-tmp.h:6274
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:6275
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4037
+#: src/xml/xmli18n-tmp.h:6276
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:4038
+#: src/xml/xmli18n-tmp.h:6277
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:4039
+#: src/xml/xmli18n-tmp.h:6278
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:6279
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4041
+#: src/xml/xmli18n-tmp.h:6280
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:6281
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:6282
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4044
+#: src/xml/xmli18n-tmp.h:6283
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:6284
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:6285
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:6286
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:6287
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4049
+#: src/xml/xmli18n-tmp.h:6288
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:6289
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4051
+#: src/xml/xmli18n-tmp.h:6290
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:6291
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4053
+#: src/xml/xmli18n-tmp.h:6292
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4054
+#: src/xml/xmli18n-tmp.h:6293
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:6294
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4056
+#: src/xml/xmli18n-tmp.h:6295
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:6296
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4058
+#: src/xml/xmli18n-tmp.h:6297
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4059
+#: src/xml/xmli18n-tmp.h:6298
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:6299
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:6300
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4062
+#: src/xml/xmli18n-tmp.h:6301
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:6302
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4064
+#: src/xml/xmli18n-tmp.h:6303
+#, fuzzy
+msgid "Epson Stylus Photo R2880"
+msgstr "Stylus Photo 1280"
+
+#: src/xml/xmli18n-tmp.h:6304
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4065
+#: src/xml/xmli18n-tmp.h:6305
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:6306
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4067
+#: src/xml/xmli18n-tmp.h:6307
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:6308
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4069
+#: src/xml/xmli18n-tmp.h:6309
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:6310
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:6311
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4072
+#: src/xml/xmli18n-tmp.h:6312
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:6313
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4074
+#: src/xml/xmli18n-tmp.h:6314
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4075
+#: src/xml/xmli18n-tmp.h:6315
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4076
+#: src/xml/xmli18n-tmp.h:6316
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:6317
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4078
+#: src/xml/xmli18n-tmp.h:6318
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:6319
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:6320
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:6321
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4082
+#: src/xml/xmli18n-tmp.h:6322
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:6323
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4084
+#: src/xml/xmli18n-tmp.h:6324
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4085
+#: src/xml/xmli18n-tmp.h:6325
 #, fuzzy
-msgid "Epson Stylus Photo TX800W"
+msgid "Epson Stylus Photo TX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4086
+#: src/xml/xmli18n-tmp.h:6326
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:4087
+#: src/xml/xmli18n-tmp.h:6327
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:4088
+#: src/xml/xmli18n-tmp.h:6328
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4089
+#: src/xml/xmli18n-tmp.h:6329
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:6330
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:4091
+#: src/xml/xmli18n-tmp.h:6331
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:6332
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4093
+#: src/xml/xmli18n-tmp.h:6333
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4094
+#: src/xml/xmli18n-tmp.h:6334
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:6335
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:6336
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4097
+#: src/xml/xmli18n-tmp.h:6337
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:6338
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4099
+#: src/xml/xmli18n-tmp.h:6339
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:6340
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:6341
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:6342
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:6343
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:6344
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:6345
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:6346
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:6347
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:6348
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:6349
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4110
+#: src/xml/xmli18n-tmp.h:6350
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:6351
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:6352
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4113
+#: src/xml/xmli18n-tmp.h:6353
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:6354
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:6355
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4116
+#: src/xml/xmli18n-tmp.h:6356
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:6357
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4118
+#: src/xml/xmli18n-tmp.h:6358
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4119
+#: src/xml/xmli18n-tmp.h:6359
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:6360
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4121
+#: src/xml/xmli18n-tmp.h:6361
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:6362
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:6363
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4124
+#: src/xml/xmli18n-tmp.h:6364
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:6365
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4126
+#: src/xml/xmli18n-tmp.h:6366
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4127
+#: src/xml/xmli18n-tmp.h:6367
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4128
+#: src/xml/xmli18n-tmp.h:6368
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4129
+#: src/xml/xmli18n-tmp.h:6369
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:6370
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:6371
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:6372
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:6373
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:6374
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:6375
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:6376
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:6377
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:6378
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:6379
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:6380
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:6381
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:6382
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:6383
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4144
+#: src/xml/xmli18n-tmp.h:6384
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:6385
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:6386
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:6387
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:6388
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:6389
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:6390
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:6391
+#, fuzzy
+msgid "Epson Stylus DX4000"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:6392
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:6393
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:6394
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4154
+#: src/xml/xmli18n-tmp.h:6395
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:6396
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:6397
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:6398
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:6399
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:6400
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:6401
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:6402
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:6403
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:6404
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:6405
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:6406
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:6407
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:6408
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:6409
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:6410
 #, fuzzy
-msgid "Epson Stylus PX700FW"
+msgid "Epson Stylus PX700W"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:6411
 #, fuzzy
 msgid "Epson Stylus PX800FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:6412
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4172
+#: src/xml/xmli18n-tmp.h:6413
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:6414
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4174
+#: src/xml/xmli18n-tmp.h:6415
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:6416
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:6417
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4177
+#: src/xml/xmli18n-tmp.h:6418
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4178
+#: src/xml/xmli18n-tmp.h:6419
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4179
+#: src/xml/xmli18n-tmp.h:6420
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4180
+#: src/xml/xmli18n-tmp.h:6421
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4181
+#: src/xml/xmli18n-tmp.h:6422
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:6423
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:6424
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:6425
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:6426
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:6427
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4187
+#: src/xml/xmli18n-tmp.h:6428
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4188
+#: src/xml/xmli18n-tmp.h:6429
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:6430
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:6431
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:6432
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4192
+#: src/xml/xmli18n-tmp.h:6433
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:6434
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:6435
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:6436
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4196
+#: src/xml/xmli18n-tmp.h:6437
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:6438
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:6439
 msgid "Epson PictureMate 215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4199
+#: src/xml/xmli18n-tmp.h:6440
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:6441
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:6442
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:6443
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4204
+#: src/xml/xmli18n-tmp.h:6445
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:6446
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:6447
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4207
+#: src/xml/xmli18n-tmp.h:6448
 msgid "Epson WorkForce 30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:6449
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:6450
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:6451
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:6452
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4212
+#: src/xml/xmli18n-tmp.h:6453
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:6454
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:6455
 msgid "Epson E 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4215
+#: src/xml/xmli18n-tmp.h:6456
 msgid "Epson E 150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4216
+#: src/xml/xmli18n-tmp.h:6457
 msgid "Epson E 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:6458
 msgid "Epson E 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:6459
 msgid "Epson E 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4219
+#: src/xml/xmli18n-tmp.h:6460
 msgid "Epson E 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:6461
 msgid "Epson E 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:6462
 msgid "Epson E 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:6463
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:6464
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4224
+#: src/xml/xmli18n-tmp.h:6465
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:6466
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:6467
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:6468
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4228
+#: src/xml/xmli18n-tmp.h:6469
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4229
+#: src/xml/xmli18n-tmp.h:6470
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:6471
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:6472
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:6473
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:6474
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:6475
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:6476
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:6477
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:6478
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4238
+#: src/xml/xmli18n-tmp.h:6479
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:6480
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:6481
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:6482
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4242
+#: src/xml/xmli18n-tmp.h:6483
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4243
+#: src/xml/xmli18n-tmp.h:6484
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:6485
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:6486
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4246
+#: src/xml/xmli18n-tmp.h:6487
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:6488
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:6490
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4251
+#: src/xml/xmli18n-tmp.h:6492
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4253
+#: src/xml/xmli18n-tmp.h:6494
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4254
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:6496
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:6497
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:6498
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:6499
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4259
+#: src/xml/xmli18n-tmp.h:6500
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4260
+#: src/xml/xmli18n-tmp.h:6501
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:6502
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4262
+#: src/xml/xmli18n-tmp.h:6503
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4263
+#: src/xml/xmli18n-tmp.h:6504
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4264
+#: src/xml/xmli18n-tmp.h:6505
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4265
+#: src/xml/xmli18n-tmp.h:6506
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:6507
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:6508
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:6509
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:6510
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:6511
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:6512
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:6513
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:6514
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4274
+#: src/xml/xmli18n-tmp.h:6515
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4275
+#: src/xml/xmli18n-tmp.h:6516
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4276
+#: src/xml/xmli18n-tmp.h:6517
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:6518
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:6519
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:6520
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:6521
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:6522
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:6523
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:6524
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:6525
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4285
+#: src/xml/xmli18n-tmp.h:6526
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4286
+#: src/xml/xmli18n-tmp.h:6527
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:6528
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:6529
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:6530
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:6531
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:6532
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4292
+#: src/xml/xmli18n-tmp.h:6533
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:6534
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:6535
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4295
+#: src/xml/xmli18n-tmp.h:6536
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4296
+#: src/xml/xmli18n-tmp.h:6537
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4297
+#: src/xml/xmli18n-tmp.h:6538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:6539
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4299
+#: src/xml/xmli18n-tmp.h:6540
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:6541
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:6542
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:6543
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:6544
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4305
+#: src/xml/xmli18n-tmp.h:6546
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:6547
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4307
+#: src/xml/xmli18n-tmp.h:6548
+#, fuzzy
+msgid "Epson PX G5600"
+msgstr "Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6549
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4308
+#: src/xml/xmli18n-tmp.h:6550
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4309
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4310
+#: src/xml/xmli18n-tmp.h:6552
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:6553
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:6554
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4313
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:6556
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4315
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:6559
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:6560
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:6561
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:6562
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:6563
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:6564
 msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:6565
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4324
+#: src/xml/xmli18n-tmp.h:6566
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:6567
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4326
+#: src/xml/xmli18n-tmp.h:6568
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4327
+#: src/xml/xmli18n-tmp.h:6569
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:6570
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:6571
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Brother HL-1430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:6576
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Brother HL-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4337
+#: src/xml/xmli18n-tmp.h:6579
 msgid "Brother HL-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:6580
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:6581
 msgid "Brother HL-1670N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:6582
 msgid "Brother HL-1850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:6583
 msgid "Brother HL-1870N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:6584
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:6585
 msgid "Brother HL-2460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:6586
 msgid "Brother HL-2460N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:6587
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4346
+#: src/xml/xmli18n-tmp.h:6588
 msgid "Brother HL-5030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:6589
 msgid "Brother HL-5040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:6590
 msgid "Brother HL-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:6591
 msgid "Brother HL-5070N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4350
+#: src/xml/xmli18n-tmp.h:6592
 msgid "Brother HL-5140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4351
+#: src/xml/xmli18n-tmp.h:6593
 msgid "Brother HL-5150D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:6594
 msgid "Brother HL-5170DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:6595
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4354
+#: src/xml/xmli18n-tmp.h:6596
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:6597
 msgid "Brother HL-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:6598
 msgid "Brother HL-7050N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4357
+#: src/xml/xmli18n-tmp.h:6599
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4358
+#: src/xml/xmli18n-tmp.h:6600
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:6601
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:6602
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:6603
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:6604
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:6605
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:6606
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:6607
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:6608
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:6609
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:6610
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:6611
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:6612
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:6613
 msgid "DEC 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:6614
 msgid "DEC LN17"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4373
+#: src/xml/xmli18n-tmp.h:6615
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4374
+#: src/xml/xmli18n-tmp.h:6616
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:6617
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4376
+#: src/xml/xmli18n-tmp.h:6618
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:6619
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:6620
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:6621
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:6622
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:6623
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:6624
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:6625
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4384
+#: src/xml/xmli18n-tmp.h:6626
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4385
+#: src/xml/xmli18n-tmp.h:6627
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4386
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4387
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:6630
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4389
+#: src/xml/xmli18n-tmp.h:6631
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4392
+#: src/xml/xmli18n-tmp.h:6634
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:6635
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:6636
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:6637
 msgid "Epson EPL-N2050PS+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4397
+#: src/xml/xmli18n-tmp.h:6639
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:6640
 #, fuzzy
 msgid "Epson EPL-N2500PS"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4400
+#: src/xml/xmli18n-tmp.h:6642
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:6643
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4403
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:6646
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:6647
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/xml/xmli18n-tmp.h:4406
+#: src/xml/xmli18n-tmp.h:6648
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/xml/xmli18n-tmp.h:4407
+#: src/xml/xmli18n-tmp.h:6649
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/xml/xmli18n-tmp.h:4408
+#: src/xml/xmli18n-tmp.h:6650
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:6651
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:6652
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:6653
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:6654
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:6656
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:6657
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4416
+#: src/xml/xmli18n-tmp.h:6658
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:6659
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:6660
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:6661
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4420
-msgid "Gestetner 3532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4421
-msgid "Gestetner 4235g"
+#: src/xml/xmli18n-tmp.h:6662
+msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:6663
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4423
-msgid "Gestetner 4532"
+#: src/xml/xmli18n-tmp.h:6664
+msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4424
-msgid "Gestetner 4245g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:6665
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:6666
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:6668
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:6669
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:6670
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4431
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:6672
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:6673
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:6674
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:6675
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4436
+#: src/xml/xmli18n-tmp.h:6676
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4437
-msgid "Gestetner DSm635"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4438
-msgid "Gestetner DSm635G"
+#: src/xml/xmli18n-tmp.h:6677
+msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4439
-msgid "Gestetner DSm645"
+#: src/xml/xmli18n-tmp.h:6678
+msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4440
-msgid "Gestetner DS645G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:6679
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:6680
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4443
+#: src/xml/xmli18n-tmp.h:6681
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:6682
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:6683
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4446
-msgid "Gestetner DSm735"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4447
-msgid "Gestetner DSm735G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4448
-msgid "Gestetner DSm745"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4449
-msgid "Gestetner DSm745G"
+#: src/xml/xmli18n-tmp.h:6684
+msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4450
-msgid "Gestetner MP1100"
+#: src/xml/xmli18n-tmp.h:6685
+msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4451
-msgid "Gestetner DSm7110"
+#: src/xml/xmli18n-tmp.h:6686
+msgid "Gestetner MP1100/DSm7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4452
-msgid "Gestetner MP1350"
+#: src/xml/xmli18n-tmp.h:6687
+msgid "Gestetner MP1350/DSm7135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4453
-msgid "Gestetner DSm7135"
+#: src/xml/xmli18n-tmp.h:6688
+msgid "Gestetner MP1600/DSm716"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4454
-msgid "Gestetner MP1600"
+#: src/xml/xmli18n-tmp.h:6689
+msgid "Gestetner MP2000/DSm721d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4455
-msgid "Gestetner DSm716"
+#: src/xml/xmli18n-tmp.h:6690
+msgid "Gestetner MP2500/DSm625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4456
-msgid "Gestetner MP2000"
+#: src/xml/xmli18n-tmp.h:6691
+msgid "Gestetner MP3500/DSm735e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4457
-msgid "Gestetner DSm721d"
+#: src/xml/xmli18n-tmp.h:6692
+msgid "Gestetner MP4500/DSm745e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4458
-msgid "Gestetner MP2500"
+#: src/xml/xmli18n-tmp.h:6693
+msgid "Gestetner MP5500/DSm755"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4459
-msgid "Gestetner DSm625"
+#: src/xml/xmli18n-tmp.h:6694
+msgid "Gestetner MP6500/DSm765"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4460
-msgid "Gestetner MP3500"
+#: src/xml/xmli18n-tmp.h:6695
+msgid "Gestetner MP7500/DSm775"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4461
-msgid "Gestetner DSm735e"
+#: src/xml/xmli18n-tmp.h:6696
+msgid "Gestetner MP9000/DSm790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4462
-msgid "Gestetner MP4500"
+#: src/xml/xmli18n-tmp.h:6697
+msgid "Gestetner MP 161/DSm416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4463
-msgid "Gestetner DSm745e"
+#: src/xml/xmli18n-tmp.h:6698
+msgid "Gestetner MP 2510/DSm725e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4464
-msgid "Gestetner MP5500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4465
-msgid "Gestetner DSm755"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4466
-msgid "Gestetner MP6500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4467
-msgid "Gestetner DSm765"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4468
-msgid "Gestetner MP7500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4469
-msgid "Gestetner DSm775"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4470
-msgid "Gestetner MP9000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4471
-msgid "Gestetner DSm790"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4472
-msgid "Gestetner MP 161"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4473
-msgid "Gestetner DSm416"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4474
-msgid "Gestetner MP 2510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4475
-msgid "Gestetner DSm725e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:6699
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:6700
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4478
-msgid "Gestetner MP 3010"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4479
-msgid "Gestetner DSm730e"
+#: src/xml/xmli18n-tmp.h:6701
+msgid "Gestetner MP 3010/DSm730e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4480
+#: src/xml/xmli18n-tmp.h:6702
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:6703
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:6704
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:6705
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Gestetner MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:6707
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:6708
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:6709
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:6710
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4489
+#: src/xml/xmli18n-tmp.h:6711
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:6712
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:6713
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4492
+#: src/xml/xmli18n-tmp.h:6714
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:6715
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:6716
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4495
+#: src/xml/xmli18n-tmp.h:6717
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4496
+#: src/xml/xmli18n-tmp.h:6718
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4497
+#: src/xml/xmli18n-tmp.h:6719
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:6720
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:6721
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:6722
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:6723
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:6724
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:6725
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:6726
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:6727
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4506
+#: src/xml/xmli18n-tmp.h:6728
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:6729
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4508
+#: src/xml/xmli18n-tmp.h:6730
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4509
+#: src/xml/xmli18n-tmp.h:6731
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4510
+#: src/xml/xmli18n-tmp.h:6732
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:6733
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:6734
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:6735
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:6736
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:6737
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:6738
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:6739
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4518
+#: src/xml/xmli18n-tmp.h:6740
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:6741
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:6742
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:6743
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:6744
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4523
+#: src/xml/xmli18n-tmp.h:6745
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:6746
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:6747
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:6748
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:6749
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4528
+#: src/xml/xmli18n-tmp.h:6750
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4529
+#: src/xml/xmli18n-tmp.h:6751
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4530
+#: src/xml/xmli18n-tmp.h:6752
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:6753
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4532
+#: src/xml/xmli18n-tmp.h:6754
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:6755
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:6756
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:6757
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:6758
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:6759
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:6760
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4539
+#: src/xml/xmli18n-tmp.h:6761
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4540
+#: src/xml/xmli18n-tmp.h:6762
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4541
+#: src/xml/xmli18n-tmp.h:6763
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4542
+#: src/xml/xmli18n-tmp.h:6764
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4543
+#: src/xml/xmli18n-tmp.h:6765
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:6766
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:6767
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4546
+#: src/xml/xmli18n-tmp.h:6768
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:6769
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:6770
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:6771
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:6772
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:6773
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4552
+#: src/xml/xmli18n-tmp.h:6774
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:6775
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:6776
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:6777
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:6778
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:6779
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:6780
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:6781
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:6782
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:6783
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:6784
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:6785
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:6786
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:6787
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:6788
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4567
+#: src/xml/xmli18n-tmp.h:6789
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4568
+#: src/xml/xmli18n-tmp.h:6790
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:6791
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4570
+#: src/xml/xmli18n-tmp.h:6792
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4571
+#: src/xml/xmli18n-tmp.h:6793
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:6794
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:6795
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:6796
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:6797
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:6798
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:6799
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:6800
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:6801
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:6802
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:6803
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4582
+#: src/xml/xmli18n-tmp.h:6804
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4583
+#: src/xml/xmli18n-tmp.h:6805
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4584
+#: src/xml/xmli18n-tmp.h:6806
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4585
+#: src/xml/xmli18n-tmp.h:6807
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:6808
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:6809
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:6810
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:6811
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:6812
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:6813
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:6814
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4593
+#: src/xml/xmli18n-tmp.h:6815
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4594
+#: src/xml/xmli18n-tmp.h:6816
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:6817
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:6818
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4597
+#: src/xml/xmli18n-tmp.h:6819
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:6820
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:6821
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:6822
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:6823
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4602
+#: src/xml/xmli18n-tmp.h:6824
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:6825
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:6826
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:6827
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:6828
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4607
+#: src/xml/xmli18n-tmp.h:6829
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:6830
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4609
+#: src/xml/xmli18n-tmp.h:6831
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4610
+#: src/xml/xmli18n-tmp.h:6832
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:6833
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:6834
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4613
+#: src/xml/xmli18n-tmp.h:6835
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:6836
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:6837
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:6838
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:6839
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:6840
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:6841
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:6842
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:6843
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:6844
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:6845
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4624
+#: src/xml/xmli18n-tmp.h:6846
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4625
+#: src/xml/xmli18n-tmp.h:6847
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:6848
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4627
+#: src/xml/xmli18n-tmp.h:6849
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4628
+#: src/xml/xmli18n-tmp.h:6850
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:6851
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:6852
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:6853
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:6854
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:6855
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:6856
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:6857
 msgid "HP LaserJet 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4636
+#: src/xml/xmli18n-tmp.h:6858
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4637
+#: src/xml/xmli18n-tmp.h:6859
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4638
+#: src/xml/xmli18n-tmp.h:6860
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:6861
 msgid "HP LaserJet 1320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4640
+#: src/xml/xmli18n-tmp.h:6862
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:6863
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:6864
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:6865
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4644
+#: src/xml/xmli18n-tmp.h:6866
 msgid "HP LaserJet 2410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:6867
 msgid "HP LaserJet 2420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:6868
 msgid "HP LaserJet 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4647
+#: src/xml/xmli18n-tmp.h:6869
 msgid "HP LaserJet 3015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4648
+#: src/xml/xmli18n-tmp.h:6870
 msgid "HP LaserJet 3020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:6871
 msgid "HP LaserJet 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4650
+#: src/xml/xmli18n-tmp.h:6872
 msgid "HP LaserJet 3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:6873
 msgid "HP LaserJet 3052"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:6874
 msgid "HP LaserJet 3055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:6875
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:6876
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:6877
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:6878
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:6879
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:6880
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:6881
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4660
+#: src/xml/xmli18n-tmp.h:6882
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:6883
 msgid "HP LaserJet 3380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:6884
 msgid "HP LaserJet 3390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4663
+#: src/xml/xmli18n-tmp.h:6885
 msgid "HP LaserJet 3392"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:6886
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:6887
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:6888
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4667
+#: src/xml/xmli18n-tmp.h:6889
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:6890
 msgid "HP LaserJet 4240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:6891
 msgid "HP LaserJet 4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:6892
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4671
+#: src/xml/xmli18n-tmp.h:6893
 msgid "HP LaserJet 4345 mfp"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:6894
 msgid "HP LaserJet 4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:6895
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:6896
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:6897
 msgid "HP LaserJet 5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:6898
 msgid "HP LaserJet 5200L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:6899
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:6900
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:6901
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4680
+#: src/xml/xmli18n-tmp.h:6902
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:6903
 msgid "HP LaserJet 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4682
+#: src/xml/xmli18n-tmp.h:6904
 msgid "HP LaserJet 9040 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4683
+#: src/xml/xmli18n-tmp.h:6905
 msgid "HP LaserJet 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4684
+#: src/xml/xmli18n-tmp.h:6906
 msgid "HP LaserJet 9050 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:6907
 msgid "HP LaserJet M3027 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:6908
 msgid "HP LaserJet M3035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:6909
 msgid "HP LaserJet M4345 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:6910
 msgid "HP LaserJet M5025 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:6911
 msgid "HP LaserJet M5035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:6912
 msgid "HP LaserJet P2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:6913
 msgid "HP LaserJet P2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:6914
 msgid "HP LaserJet P3004"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:6915
 msgid "HP LaserJet P3005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:6916
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4695
+#: src/xml/xmli18n-tmp.h:6917
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:6918
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:6919
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:6920
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:6921
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4700
+#: src/xml/xmli18n-tmp.h:6922
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:6923
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:6924
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4703
+#: src/xml/xmli18n-tmp.h:6925
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:6926
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:6927
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4706
+#: src/xml/xmli18n-tmp.h:6928
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4707
+#: src/xml/xmli18n-tmp.h:6929
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:6930
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:6931
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4710
+#: src/xml/xmli18n-tmp.h:6932
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:6933
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:6934
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:6935
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:6936
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:6937
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:6938
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:6939
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4718
+#: src/xml/xmli18n-tmp.h:6940
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:6941
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:6942
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4721
+#: src/xml/xmli18n-tmp.h:6943
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:6944
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:6945
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:6946
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4725
+#: src/xml/xmli18n-tmp.h:6947
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:6948
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:6949
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4728
+#: src/xml/xmli18n-tmp.h:6950
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4729
+#: src/xml/xmli18n-tmp.h:6951
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:6952
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:6953
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4732
+#: src/xml/xmli18n-tmp.h:6954
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:6955
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:6956
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:6957
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:6958
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:6959
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:6960
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4739
+#: src/xml/xmli18n-tmp.h:6961
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4740
+#: src/xml/xmli18n-tmp.h:6962
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4741
+#: src/xml/xmli18n-tmp.h:6963
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4742
+#: src/xml/xmli18n-tmp.h:6964
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:6965
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:6966
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4745
+#: src/xml/xmli18n-tmp.h:6967
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:6968
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:6969
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:6970
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4749
+#: src/xml/xmli18n-tmp.h:6971
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:6972
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:6973
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4752
+#: src/xml/xmli18n-tmp.h:6974
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:6975
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:6976
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4755
+#: src/xml/xmli18n-tmp.h:6977
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:6978
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:6979
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:6980
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4759
+#: src/xml/xmli18n-tmp.h:6981
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4760
+#: src/xml/xmli18n-tmp.h:6982
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:6983
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4762
+#: src/xml/xmli18n-tmp.h:6984
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:6985
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:6986
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4765
+#: src/xml/xmli18n-tmp.h:6987
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:6988
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:6989
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Název tiskárny:"
 
-#: src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:6991
 msgid "IBM 4019"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:6992
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:6993
 msgid "IBM 4312"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4772
+#: src/xml/xmli18n-tmp.h:6994
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:6995
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4774
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4775
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4776
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:6999
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:7000
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:7002
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:7003
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:7004
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:7005
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:7006
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:7007
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:7008
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:7009
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:7010
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:7011
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4790
+#: src/xml/xmli18n-tmp.h:7012
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:7013
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:7014
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:7015
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4794
+#: src/xml/xmli18n-tmp.h:7016
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:7017
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:7018
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4797
+#: src/xml/xmli18n-tmp.h:7019
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:7020
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:7021
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:7022
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:7023
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:7025
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:7026
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:7027
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:7028
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4807
+#: src/xml/xmli18n-tmp.h:7029
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4808
+#: src/xml/xmli18n-tmp.h:7030
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:7031
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:7032
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:7034
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:7035
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:7037
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:7039
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:7040
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4819
+#: src/xml/xmli18n-tmp.h:7041
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:7042
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:7043
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:7044
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:7045
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:7046
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:7047
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:7048
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:7049
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:7050
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:7051
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4830
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:7057
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4837
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4840
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4842
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4852
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4853
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4854
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4855
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4866
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4867
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4873
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4874
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4883
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4886
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4888
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4890
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4894
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4896
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4903
-msgid "Lanier MP 2500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4904
-msgid "Lanier LD125"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4905
-msgid "Lanier MP 1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4906
-msgid "Lanier LD1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4907
-msgid "Lanier MP 1350"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4908
-msgid "Lanier LD1135"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4909
-msgid "Lanier MP 1600"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4910
-msgid "Lanier LD316"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4911
-msgid "Lanier MP 161"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4912
-msgid "Lanier LD016"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4913
-msgid "Lanier MP 2000"
+#: src/xml/xmli18n-tmp.h:7125
+msgid "Lanier MP2500/LD125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4914
-msgid "Lanier LD320d"
+#: src/xml/xmli18n-tmp.h:7126
+msgid "Lanier MP 1100/LD1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4915
-msgid "Lanier MP 2510"
+#: src/xml/xmli18n-tmp.h:7127
+msgid "Lanier MP 1350/LD1135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4916
-msgid "Lanier LD325"
+#: src/xml/xmli18n-tmp.h:7128
+msgid "Lanier MP 1600/LD316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4917
-msgid "Lanier MP 2550B"
+#: src/xml/xmli18n-tmp.h:7129
+msgid "Lanier MP 161/LD016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4918
-msgid "Lanier LD425B"
+#: src/xml/xmli18n-tmp.h:7130
+msgid "Lanier MP 2000/LD320d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4919
-msgid "Lanier MP 2550"
+#: src/xml/xmli18n-tmp.h:7131
+msgid "Lanier MP 2510/LD325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4920
-msgid "Lanier LD425"
+#: src/xml/xmli18n-tmp.h:7132
+msgid "Lanier MP 2550B/LD425B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4921
-msgid "Lanier MP 3010"
+#: src/xml/xmli18n-tmp.h:7133
+msgid "Lanier MP 2550/LD425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4922
-msgid "Lanier LD330"
+#: src/xml/xmli18n-tmp.h:7134
+msgid "Lanier MP 3010/LD330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4923
-msgid "Lanier MP 3350B"
+#: src/xml/xmli18n-tmp.h:7135
+msgid "Lanier MP 3350B/LD433B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4924
-msgid "Lanier LD433B"
+#: src/xml/xmli18n-tmp.h:7136
+msgid "Lanier MP 3350/LD433"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4925
-msgid "Lanier MP 3350"
+#: src/xml/xmli18n-tmp.h:7137
+msgid "Lanier MP 3500/LD335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4926
-msgid "Lanier LD433"
+#: src/xml/xmli18n-tmp.h:7138
+msgid "Lanier MP 4000B/LD040B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4927
-msgid "Lanier MP 3500"
+#: src/xml/xmli18n-tmp.h:7139
+msgid "Lanier MP 4000/LD040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4928
-msgid "Lanier LD335"
+#: src/xml/xmli18n-tmp.h:7140
+msgid "Lanier MP 4500/LD345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4929
-msgid "Lanier MP 4000B"
+#: src/xml/xmli18n-tmp.h:7141
+msgid "Lanier MP 5000B/LD050B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4930
-msgid "Lanier LD040B"
+#: src/xml/xmli18n-tmp.h:7142
+msgid "Lanier MP 5000/LD050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4931
-msgid "Lanier MP 4000"
+#: src/xml/xmli18n-tmp.h:7143
+msgid "Lanier MP 5500/LD255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4932
-msgid "Lanier LD040"
+#: src/xml/xmli18n-tmp.h:7144
+msgid "Lanier MP 6500/LD265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4933
-msgid "Lanier MP 4500"
+#: src/xml/xmli18n-tmp.h:7145
+msgid "Lanier MP 7500/LD275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4934
-msgid "Lanier LD345"
+#: src/xml/xmli18n-tmp.h:7146
+msgid "Lanier MP 9000/LD190"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4935
-msgid "Lanier MP 5000B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4936
-msgid "Lanier LD050B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4937
-msgid "Lanier MP 5000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4938
-msgid "Lanier LD050"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4939
-msgid "Lanier MP 5500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4940
-msgid "Lanier LD255"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4941
-msgid "Lanier MP 6500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4942
-msgid "Lanier LD265"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4943
-msgid "Lanier MP 7500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4944
-msgid "Lanier LD275"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4945
-msgid "Lanier MP 9000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4946
-msgid "Lanier LD190"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:7148
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4950
+#: src/xml/xmli18n-tmp.h:7150
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:7151
 msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4952
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4953
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:7155
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4960
+#: src/xml/xmli18n-tmp.h:7160
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:7161
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:7162
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4963
+#: src/xml/xmli18n-tmp.h:7163
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:7164
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:7165
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4966
-msgid "NRG 10515"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4967
-msgid "NRG 10518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4968
-msgid "NRG 10512"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4969
-msgid "NRG 2205"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4970
-msgid "NRG 2238"
+#: src/xml/xmli18n-tmp.h:7166
+msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4971
-msgid "NRG 2212"
+#: src/xml/xmli18n-tmp.h:7167
+msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4972
-msgid "NRG 2705"
+#: src/xml/xmli18n-tmp.h:7168
+msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4973
-msgid "NRG 2738"
+#: src/xml/xmli18n-tmp.h:7169
+msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4974
-msgid "NRG 2712"
+#: src/xml/xmli18n-tmp.h:7170
+msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4975
-msgid "NRG 3205"
+#: src/xml/xmli18n-tmp.h:7171
+msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4976
-msgid "NRG 3238"
+#: src/xml/xmli18n-tmp.h:7172
+msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4977
-msgid "NRG 3212"
+#: src/xml/xmli18n-tmp.h:7173
+msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4978
-msgid "NRG 3525"
+#: src/xml/xmli18n-tmp.h:7174
+msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4979
-msgid "NRG 3508"
+#: src/xml/xmli18n-tmp.h:7175
+msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4980
-msgid "NRG 3502"
+#: src/xml/xmli18n-tmp.h:7176
+msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4981
-msgid "NRG 3545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4982
-msgid "NRG 3518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4983
-msgid "NRG 3532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4984
-msgid "NRG 4525"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4985
-msgid "NRG 4508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4986
-msgid "NRG 4502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4987
-msgid "NRG 4545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4988
-msgid "NRG 4518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4989
-msgid "NRG 4532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4990
-msgid "NRG 6002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4991
-msgid "NRG 6005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4992
-msgid "NRG 6008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4993
-msgid "NRG 7502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4994
-msgid "NRG 7505"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4995
-msgid "NRG 7508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4996
-msgid "NRG 9005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4997
-msgid "NRG 9008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4998
-msgid "NRG 9002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:7177
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:7178
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5001
+#: src/xml/xmli18n-tmp.h:7179
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:7180
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:7181
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:7182
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:7183
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5006
+#: src/xml/xmli18n-tmp.h:7184
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:7185
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:7186
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5009
+#: src/xml/xmli18n-tmp.h:7187
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:7188
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:7189
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:7190
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:7191
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:7192
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5015
+#: src/xml/xmli18n-tmp.h:7193
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5016
+#: src/xml/xmli18n-tmp.h:7194
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5017
+#: src/xml/xmli18n-tmp.h:7195
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:7196
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:7197
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:7198
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:7199
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:7200
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:7201
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:7202
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5025
+#: src/xml/xmli18n-tmp.h:7203
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:7204
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:7205
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5028
+#: src/xml/xmli18n-tmp.h:7206
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:7207
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:7208
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:7209
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:7210
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5033
+#: src/xml/xmli18n-tmp.h:7211
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:7212
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:7213
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:7214
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:7215
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:7216
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:7217
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5040
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5051
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5053
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:7234
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:7235
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5060
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5062
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5063
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:7242
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:7243
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:7244
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:7245
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:7246
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:7247
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:7248
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:7249
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5072
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5074
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5075
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5076
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:7255
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:7258
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5081
+#: src/xml/xmli18n-tmp.h:7259
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:7263
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5086
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5088
+#: src/xml/xmli18n-tmp.h:7266
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:7267
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5090
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5091
+#: src/xml/xmli18n-tmp.h:7269
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:7270
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5093
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5099
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5103
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5104
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:7284
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5107
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5108
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5110
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5118
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5120
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5126
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5127
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5131
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5133
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5134
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5138
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5146
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5147
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5150
-msgid "Savin 2535"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5151
-msgid "Savin 2235"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5152
-msgid "Savin 2545"
+#: src/xml/xmli18n-tmp.h:7328
+msgid "Savin 2535/2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5153
-msgid "Savin 2245"
+#: src/xml/xmli18n-tmp.h:7329
+msgid "Savin 2545/2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5154
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Savin 2560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5155
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5158
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5160
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5163
-msgid "Savin 4035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5164
-msgid "Savin 4135g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5165
-msgid "Savin 4035e"
+#: src/xml/xmli18n-tmp.h:7339
+msgid "Savin 4035/4135g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5166
-msgid "Savin 4135eG"
+#: src/xml/xmli18n-tmp.h:7340
+msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5167
-msgid "Savin 4045"
+#: src/xml/xmli18n-tmp.h:7341
+msgid "Savin 4045/4145g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5168
-msgid "Savin 4145g"
+#: src/xml/xmli18n-tmp.h:7342
+msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5169
-msgid "Savin 4045e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5170
-msgid "Savin 4145eG"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5171
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Savin 4060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5173
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5174
+#: src/xml/xmli18n-tmp.h:7346
 msgid "Savin 4090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:7348
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5177
+#: src/xml/xmli18n-tmp.h:7349
 msgid "Savin 8020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:7353
 msgid "Savin 8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5183
-msgid "Savin 8035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5184
-msgid "Savin 8035g"
+#: src/xml/xmli18n-tmp.h:7355
+msgid "Savin 8035/8035g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5186
-msgid "Savin 8045"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5187
-msgid "Savin 8045g"
+#: src/xml/xmli18n-tmp.h:7357
+msgid "Savin 8045/8045g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5190
+#: src/xml/xmli18n-tmp.h:7360
 msgid "Savin 8065"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5192
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Savin 8090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5194
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:7370
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5201
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:7373
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:7374
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5205
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5206
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:7379
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5211
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Nastavit tiskárnu"
 
-#: src/xml/xmli18n-tmp.h:5212
+#: src/xml/xmli18n-tmp.h:7382
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5213
+#: src/xml/xmli18n-tmp.h:7383
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5216
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5221
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5224
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5225
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5227
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5230
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:7404
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5236
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:7409
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:7410
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5244
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5247
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5249
+#: src/xml/xmli18n-tmp.h:7419
+msgid "Canon SELPHY-CP-520"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Canon SELPHY-CP-720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5252
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Canon SELPHY-CP-730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Canon SELPHY-CP-740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Canon SELPHY-CP-750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Canon SELPHY ES1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Canon SELPHY ES2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Canon SELPHY ES20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5258
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5259
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:7434
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:7438
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5268
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Dai Nippon Printing DS40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Dai Nippon Printing DS80"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5269
+#: src/xml/xmli18n-tmp.h:7442
 msgid "RAW DATA 8 bit"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Epson Stylus Offixe TX300F"
+#~ msgstr "Stylus C20sx"
+
 #~ msgid "ISOLatin1"
 #~ msgstr "UTF-8"
 
diff --git a/po/da.gmo b/po/da.gmo
index 46835c5..a5c6f29 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 60f1c42..e73f157 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,18 +1,18 @@
-# Danish translation of gutenprint-5.2.0-rc1
-# Copyright (C) 2001, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Danish translation of gutenprint-5.2.3.99.1
+# Copyright (C) 2001, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gutenprint package.
 #
 # Keld Simonsen <keld@dkuug.dk>, 2001.
 # Kjartan Maraas <kmaraas@gnome.org>, 2001.
 # Mogens Jæger <mogens@jaeger.tf>, 2006, 2007, 2008.
-# Mogens Jaeger <mogensjaeger@gmail.com>, 2008.
+# Mogens Jæger <mogensjaeger@gmail.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gutenprint 5.2.0-rc1\n"
+"Project-Id-Version: gutenprint 5.2.3.99.1\n"
 "Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-21 22:25-0500\n"
-"PO-Revision-Date: 2008-10-07 11:36+0200\n"
-"Last-Translator: Mogens Jaeger <mogensjaeger@gmail.com>\n"
+"POT-Creation-Date: 2009-07-26 19:14-0400\n"
+"PO-Revision-Date: 2009-06-25 01:51+0200\n"
+"Last-Translator: Mogens Jæger <mogensjaeger@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2109 src/main/print-pcl.c:1779
+#: src/main/print-escp2.c:2314 src/main/print-pcl.c:1779
 msgid "Default"
 msgstr "Standard"
 
@@ -97,15 +97,15 @@ msgstr "Tæthed"
 
 #: src/main/dither-main.c:91 src/main/print-canon.c:300
 #: src/main/print-canon.c:308 src/main/print-canon.c:316
-#: src/main/print-canon.c:324 src/main/print-escp2.c:439
-#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
-#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-canon.c:324 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: 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-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:1769
-#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
-#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1935
+#: src/main/print-olympus.c:1943 src/main/print-olympus.c:1951
+#: src/main/print-olympus.c:1959 src/main/print-pcl.c:1324
 #: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
 #: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
@@ -166,7 +166,7 @@ msgid "Dither algorithm"
 msgstr "Dither-algoritme"
 
 #: src/main/print-canon.c:199 src/main/print-escp2.c:165
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1866
 #: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Papirstørrelse"
@@ -183,8 +183,8 @@ msgstr "Papirstørrelse"
 #: src/main/print-escp2.c:254 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:1704 src/main/print-olympus.c:1710
-#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-olympus.c:1866 src/main/print-olympus.c:1872
+#: src/main/print-olympus.c:1878 src/main/print-olympus.c:1884
 #: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
 #: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
 #: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
@@ -193,31 +193,31 @@ msgid "Basic Printer Setup"
 msgstr "Basis printerindstillinger"
 
 #: src/main/print-canon.c:200 src/main/print-escp2.c:166
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1867
 #: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr "Størrelse på det papir der skal udskrives på"
 
 #: src/main/print-canon.c:205 src/main/print-escp2.c:171
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1259 src/cups/genppd.c:1339 src/cups/genppd.c:2001
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1872
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1372 src/cups/genppd.c:2035
 msgid "Media Type"
 msgstr "Medietype"
 
 #: src/main/print-canon.c:206 src/main/print-escp2.c:172
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1873
 #: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Medietype (almindeligt papir, fotopapir, o.s.v.)"
 
 #: src/main/print-canon.c:211 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
-#: src/main/print-pcl.c:1265 src/cups/genppd.c:1368 src/cups/genppd.c:2020
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1878
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1401 src/cups/genppd.c:2054
 msgid "Media Source"
 msgstr "Mediekilde"
 
 #: src/main/print-canon.c:212 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1879
 #: src/main/print-pcl.c:1266
 msgid "Source (input slot) of the media"
 msgstr "I hvilken bakke er mediet"
@@ -228,7 +228,7 @@ msgstr "Cd center størrelse"
 
 #: src/main/print-canon.c:218 src/main/print-escp2.c:190
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
-msgstr "Print kun udenfor centeret af Cd-en, eller helt ind til hullet"
+msgstr "Print kun udenfor centeret af cd'en, eller helt ind til hullet"
 
 #: src/main/print-canon.c:223 src/main/print-escp2.c:195
 msgid "CD Size (Custom)"
@@ -253,8 +253,8 @@ msgstr "Cd vandret finjustering"
 #: src/main/print-canon.c:235 src/main/print-canon.c:241
 #: src/main/print-canon.c:253 src/main/print-escp2.c:207
 #: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1906
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr "Avanceret printeropsætning"
@@ -262,32 +262,32 @@ msgstr "Avanceret printeropsætning"
 #: src/main/print-canon.c:236 src/main/print-canon.c:242
 #: src/main/print-escp2.c:208 src/main/print-escp2.c:214
 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-canon.c:241 src/main/print-escp2.c:213
 msgid "CD Vertical Fine Adjustment"
 msgstr "Cd lodret finjustering"
 
 #: src/main/print-canon.c:247 src/main/print-escp2.c:219
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
-#: src/main/print-pcl.c:1277 src/cups/genppd.c:1446 src/cups/genppd.c:2056
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1884
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1479 src/cups/genppd.c:2090
 msgid "Resolution"
 msgstr "Opløsning"
 
 #: src/main/print-canon.c:248 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1723
+#: src/main/print-olympus.c:1885
 msgid "Resolution and quality of the print"
 msgstr "Opløsning og kvalitet af udskriften"
 
 #: src/main/print-canon.c:253 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Blæktype"
 
 #: src/main/print-canon.c:254 src/main/print-escp2.c:231
 #: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
+#: src/main/print-olympus.c:1891 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Blæktype i printeren"
@@ -305,32 +305,33 @@ msgstr "Blækkanaler"
 #: 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-escp2.c:320 src/main/print-escp2.c:767
-#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
-#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
-#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
-#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:893 src/main/print-escp2.c:901
+#: src/main/print-escp2.c:909 src/main/print-escp2.c:925
+#: src/main/print-escp2.c:933 src/main/print-escp2.c:941
+#: src/main/print-escp2.c:949 src/main/print-escp2.c:957
+#: src/main/print-escp2.c:965 src/main/print-escp2.c:973
 #: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr "Avanceret printerfunktionalitet"
 
-#: src/main/print-canon.c:265 src/main/print-escp2.c:326
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-canon.c:265 src/main/print-escp2.c:332
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1912
 #: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Printningstilstand"
 
 #: src/main/print-canon.c:265 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:326
-#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-color.c:208 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1912 src/main/print-pcl.c:1295
 #: src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr "Kerneparameter"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:327
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-canon.c:266 src/main/print-escp2.c:333
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1913
 #: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Printnings udskriftstilstand"
@@ -358,77 +359,84 @@ msgstr "Udskriftskvalitet"
 msgid "Basic Output Adjustment"
 msgstr "Basis udskriftsjustering"
 
-#: src/main/print-canon.c:300 src/main/print-escp2.c:439
+#: src/main/print-canon.c:300 src/main/print-escp2.c:445
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 msgid "Cyan Density"
 msgstr "Tæthed for cyan"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:301 src/main/print-escp2.c:446
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 msgid "Adjust the cyan density"
 msgstr "Justér tæthed for cyan"
 
-#: src/main/print-canon.c:308 src/main/print-escp2.c:447
+#: src/main/print-canon.c:308 src/main/print-escp2.c:453
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 msgid "Magenta Density"
 msgstr "Tæthed for magenta"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:309 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 msgid "Adjust the magenta density"
 msgstr "Justér tæthed for magenta"
 
-#: src/main/print-canon.c:316 src/main/print-escp2.c:455
+#: src/main/print-canon.c:316 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 msgid "Yellow Density"
 msgstr "Tæthed for gul"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:317 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 msgid "Adjust the yellow density"
 msgstr "Justér tæthed for gul"
 
-#: src/main/print-canon.c:324 src/main/print-escp2.c:463
+#: src/main/print-canon.c:324 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 msgid "Black Density"
 msgstr "Tæthed for sort"
 
-#: src/main/print-canon.c:325 src/main/print-escp2.c:464
+#: src/main/print-canon.c:325 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 msgid "Adjust the black density"
 msgstr "Justér tæthed for sort"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:333
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:541 src/main/print-escp2.c:542
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 msgid "Light Cyan Transition"
 msgstr "Lys cyan overgang"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:340
-#: src/main/print-canon.c:348 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
-#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
-#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
-#: src/main/print-pcl.c:1364
+#: src/main/print-canon.c:348 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:541
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:557
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:573
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:589
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:605
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:621
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:637
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:653
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:669
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:685
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:701
+#: src/main/print-escp2.c:709 src/main/print-escp2.c:717
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:733
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:749
+#: src/main/print-escp2.c:757 src/main/print-escp2.c:765
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:781
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:797
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:813
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:829
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:845
+#: src/main/print-escp2.c:853 src/main/print-escp2.c:861
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr "Avanceret blækjustering"
 
 #: src/main/print-canon.c:340 src/main/print-canon.c:341
-#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
+#: src/main/print-escp2.c:573 src/main/print-escp2.c:574
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 msgid "Light Magenta Transition"
@@ -438,14 +446,14 @@ msgstr "Lys cyan overgang"
 msgid "Light Yellow Transition"
 msgstr "Lys gul overgang"
 
-#: src/main/print-canon.c:368 src/main/print-escp2.c:2283
-#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3609
-#: src/xml/xmli18n-tmp.h:3614 src/xml/xmli18n-tmp.h:3620
-#: src/xml/xmli18n-tmp.h:3627
+#: src/main/print-canon.c:368 src/main/print-escp2.c:2488
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5851 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5864
 msgid "Off"
 msgstr "Afbrudt"
 
-#: src/main/print-canon.c:369 src/main/print-escp2.c:2285
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2490
 #: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr "Lang kant (standard)"
@@ -454,63 +462,64 @@ msgstr "Lang kant (standard)"
 msgid "Short Edge (Flip)"
 msgstr "Kort kant (vend)"
 
-#: src/main/print-canon.c:646 src/main/print-escp2.c:2005
-#: src/xml/xmli18n-tmp.h:3676
+#: src/main/print-canon.c:646 src/main/print-escp2.c:2210
+#: src/xml/xmli18n-tmp.h:5913
 msgid "CD - 5 inch"
 msgstr "Cd - 12 cm"
 
-#: src/main/print-canon.c:648 src/main/print-escp2.c:2007
-#: src/xml/xmli18n-tmp.h:3677
+#: src/main/print-canon.c:648 src/main/print-escp2.c:2212
+#: src/xml/xmli18n-tmp.h:5914
 msgid "CD - 3 inch"
 msgstr "Cd - 8 cm"
 
-#: src/main/print-canon.c:650 src/main/print-escp2.c:2009
-#: src/xml/xmli18n-tmp.h:3678
+#: src/main/print-canon.c:650 src/main/print-escp2.c:2214
+#: src/xml/xmli18n-tmp.h:5915
 msgid "CD - Custom"
 msgstr "Cd - egendefineret"
 
-#: src/main/print-canon.c:673 src/main/print-escp2.c:2034
-#: src/cups/genppd.c:1323 src/cups/genppd.c:1572 src/cups/genppd.c:1988
-#: src/cups/genppd.c:2079
+#: src/main/print-canon.c:673 src/main/print-escp2.c:2239
+#: src/cups/genppd.c:1356 src/cups/genppd.c:1605 src/cups/genppd.c:2022
+#: src/cups/genppd.c:2113
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-canon.c:675 src/main/print-escp2.c:2036
+#: src/main/print-canon.c:675 src/main/print-escp2.c:2241
 msgid "Print To Hub"
 msgstr "Print til center"
 
-#: src/main/print-canon.c:790 src/main/print-escp2.c:2447
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-canon.c:790 src/main/print-escp2.c:2652
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2167
 #: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
 #: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Farver"
 
-#: src/main/print-canon.c:792 src/main/print-escp2.c:2449
+#: src/main/print-canon.c:792 src/main/print-escp2.c:2654
 #: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
 #: src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "Sort og hvid"
 
-#: src/main/print-canon.c:831 src/main/print-escp2.c:2089
+#: src/main/print-canon.c:831 src/main/print-escp2.c:2294
 #: src/main/print-pcl.c:1797 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr "Manuel kontrol"
 
-#: src/main/print-canon.c:833 src/main/print-escp2.c:2131
-#: src/main/print-escp2.c:2229 src/main/print-escp2.c:2241
+#: src/main/print-canon.c:833 src/main/print-escp2.c:2336
+#: src/main/print-escp2.c:2434 src/main/print-escp2.c:2446
 #: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
 #: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
-#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1215
-#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1219
-#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
-#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3170
-#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3177
-#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3461
-#: src/xml/xmli18n-tmp.h:3464 src/xml/xmli18n-tmp.h:3632
-#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3648
-#: src/xml/xmli18n-tmp.h:3657 src/xml/xmli18n-tmp.h:3665
+#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1627 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3713 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3722 src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5902
 msgid "Standard"
 msgstr "Standard"
 
@@ -547,7 +556,7 @@ msgid "Pre-Dithered"
 msgstr "Forud dithered"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1268 src/cups/genppd.c:1971
+#: src/cups/genppd.c:1301 src/cups/genppd.c:2005
 msgid "Grayscale"
 msgstr "Gråtone"
 
@@ -563,11 +572,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1299 src/cups/genppd.c:1978
+#: src/main/print-color.c:129 src/cups/genppd.c:1332 src/cups/genppd.c:2012
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1306 src/cups/genppd.c:1979
+#: src/main/print-color.c:131 src/cups/genppd.c:1339 src/cups/genppd.c:2013
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -627,7 +636,7 @@ msgid "Output image type"
 msgstr "Udskrifts billedtype"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338
 msgid "Raw Channels"
 msgstr "Ufiltrerede kanaler"
 
@@ -689,56 +698,208 @@ msgstr "Gammaværdi som formodet af program"
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
 #: src/escputil/escputil.c:997 src/escputil/escputil.c:1017
-#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:1812
-#: src/xml/xmli18n-tmp.h:1823 src/xml/xmli18n-tmp.h:1836
-#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1863
-#: src/xml/xmli18n-tmp.h:1876 src/xml/xmli18n-tmp.h:1889
-#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1918
-#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1949
-#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1975
-#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:1999
-#: src/xml/xmli18n-tmp.h:2013 src/xml/xmli18n-tmp.h:2027
-#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2051
-#: src/xml/xmli18n-tmp.h:2064 src/xml/xmli18n-tmp.h:2076
-#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2102
-#: src/xml/xmli18n-tmp.h:2116 src/xml/xmli18n-tmp.h:2130
-#: src/xml/xmli18n-tmp.h:2143 src/xml/xmli18n-tmp.h:2156
-#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2184
-#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2210
-#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2236
-#: src/xml/xmli18n-tmp.h:2249 src/xml/xmli18n-tmp.h:2262
-#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2290
-#: src/xml/xmli18n-tmp.h:2305 src/xml/xmli18n-tmp.h:2320
-#: src/xml/xmli18n-tmp.h:2332 src/xml/xmli18n-tmp.h:2343
-#: src/xml/xmli18n-tmp.h:2356 src/xml/xmli18n-tmp.h:2369
-#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2392
-#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2415
-#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2442
-#: src/xml/xmli18n-tmp.h:2454 src/xml/xmli18n-tmp.h:2466
-#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2496
-#: src/xml/xmli18n-tmp.h:2509 src/xml/xmli18n-tmp.h:2522
-#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
-#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2574
-#: src/xml/xmli18n-tmp.h:2586 src/xml/xmli18n-tmp.h:2598
-#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2623
-#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2653
-#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2683
-#: src/xml/xmli18n-tmp.h:2697 src/xml/xmli18n-tmp.h:2715
-#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2745
-#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
-#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2803
-#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2828
-#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2854
-#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2881
-#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2915
-#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2943
-#: src/xml/xmli18n-tmp.h:2959 src/xml/xmli18n-tmp.h:2976
-#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:3004
-#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3032
-#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3062
-#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3093
-#: src/xml/xmli18n-tmp.h:3107 src/xml/xmli18n-tmp.h:3125
-#: src/xml/xmli18n-tmp.h:3141
+#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2387
+#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2413
+#: src/xml/xmli18n-tmp.h:2426 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2499
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2551
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2575
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2708
+#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2786
+#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2814
+#: src/xml/xmli18n-tmp.h:2829 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2893
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2966
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3005 src/xml/xmli18n-tmp.h:3020
+#: src/xml/xmli18n-tmp.h:3033 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3061 src/xml/xmli18n-tmp.h:3073
+#: src/xml/xmli18n-tmp.h:3085 src/xml/xmli18n-tmp.h:3098
+#: src/xml/xmli18n-tmp.h:3110 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3377
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3616
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3648
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3766 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3775 src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:3794 src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:3805 src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3869 src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:3880 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3902 src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:3913 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:3948 src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:3970 src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:3983 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4023 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4064 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4075 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4088 src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:4103 src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:4118 src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:4143 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:4203 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4275 src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4309 src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4356 src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4421
+#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4449
+#: src/xml/xmli18n-tmp.h:4456 src/xml/xmli18n-tmp.h:4462
+#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4485 src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:4551 src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:4694 src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4717 src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:4818 src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:4829 src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4885 src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4935
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:5041 src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:5052 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:5121 src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5165
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5182 src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:5193 src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:5271 src/xml/xmli18n-tmp.h:5299
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5327 src/xml/xmli18n-tmp.h:5331
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5347
+#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5367 src/xml/xmli18n-tmp.h:5371
+#: src/xml/xmli18n-tmp.h:5383 src/xml/xmli18n-tmp.h:5388
+#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5440
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5461 src/xml/xmli18n-tmp.h:5468
+#: src/xml/xmli18n-tmp.h:5476 src/xml/xmli18n-tmp.h:5486
+#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5514
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5525
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5543
+#: src/xml/xmli18n-tmp.h:5550 src/xml/xmli18n-tmp.h:5556
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5574 src/xml/xmli18n-tmp.h:5582
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5592
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5625
+#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5649
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5662
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5690
+#: src/xml/xmli18n-tmp.h:5694 src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5731
+#: src/xml/xmli18n-tmp.h:5738 src/xml/xmli18n-tmp.h:5742
+#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5759
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5770
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5807
+#: src/xml/xmli18n-tmp.h:5811 src/xml/xmli18n-tmp.h:5817
+#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5828
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5843
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -748,56 +909,208 @@ msgstr "Justér gamma for cyan"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
 #: src/escputil/escputil.c:998 src/escputil/escputil.c:1018
-#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:1813
-#: src/xml/xmli18n-tmp.h:1824 src/xml/xmli18n-tmp.h:1837
-#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1864
-#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1890
-#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1919
-#: src/xml/xmli18n-tmp.h:1935 src/xml/xmli18n-tmp.h:1950
-#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1976
-#: src/xml/xmli18n-tmp.h:1988 src/xml/xmli18n-tmp.h:2000
-#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2028
-#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2052
-#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2077
-#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2103
-#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2131
-#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2157
-#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2185
-#: src/xml/xmli18n-tmp.h:2198 src/xml/xmli18n-tmp.h:2211
-#: src/xml/xmli18n-tmp.h:2224 src/xml/xmli18n-tmp.h:2237
-#: src/xml/xmli18n-tmp.h:2250 src/xml/xmli18n-tmp.h:2263
-#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2291
-#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2321
-#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2344
-#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2370
-#: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2393
-#: src/xml/xmli18n-tmp.h:2405 src/xml/xmli18n-tmp.h:2416
-#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2443
-#: src/xml/xmli18n-tmp.h:2455 src/xml/xmli18n-tmp.h:2467
-#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2497
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2523
-#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2575
-#: src/xml/xmli18n-tmp.h:2587 src/xml/xmli18n-tmp.h:2599
-#: src/xml/xmli18n-tmp.h:2611 src/xml/xmli18n-tmp.h:2624
-#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
-#: src/xml/xmli18n-tmp.h:2670 src/xml/xmli18n-tmp.h:2684
-#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2714
-#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2747
-#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2780
-#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
-#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2829
-#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2855
-#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2882
-#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2914
-#: src/xml/xmli18n-tmp.h:2931 src/xml/xmli18n-tmp.h:2944
-#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2975
-#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:3005
-#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3033
-#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3060
-#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3094
-#: src/xml/xmli18n-tmp.h:3108 src/xml/xmli18n-tmp.h:3124
-#: src/xml/xmli18n-tmp.h:3140
+#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2361
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2388
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2414
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2459 src/xml/xmli18n-tmp.h:2474
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2512 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2552
+#: src/xml/xmli18n-tmp.h:2564 src/xml/xmli18n-tmp.h:2576
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2787
+#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2815
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2868
+#: src/xml/xmli18n-tmp.h:2881 src/xml/xmli18n-tmp.h:2894
+#: src/xml/xmli18n-tmp.h:2905 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:2967
+#: src/xml/xmli18n-tmp.h:2979 src/xml/xmli18n-tmp.h:2991
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3062 src/xml/xmli18n-tmp.h:3074
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3099
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3135 src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:3163 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3353
+#: src/xml/xmli18n-tmp.h:3365 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
+#: src/xml/xmli18n-tmp.h:3420 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3542 src/xml/xmli18n-tmp.h:3556
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3600 src/xml/xmli18n-tmp.h:3617
+#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3647
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3751 src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:3784 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3795 src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:3806 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3837 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3903 src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3939 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3960 src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:3972 src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:3984 src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:3999 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:4039 src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:4104 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:4170 src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4194 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:4230 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:4276 src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4311 src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4338 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:4401 src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:4427 src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:4442 src/xml/xmli18n-tmp.h:4451
+#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4464
+#: src/xml/xmli18n-tmp.h:4470 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4486 src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:4511 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:4809 src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4909 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:5007 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5018 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5111 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5123 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5148 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:5240 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5250 src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:5261 src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5301
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5313
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5349
+#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5401
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5441
+#: src/xml/xmli18n-tmp.h:5453 src/xml/xmli18n-tmp.h:5458
+#: src/xml/xmli18n-tmp.h:5463 src/xml/xmli18n-tmp.h:5470
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5496 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5527
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5552 src/xml/xmli18n-tmp.h:5558
+#: src/xml/xmli18n-tmp.h:5564 src/xml/xmli18n-tmp.h:5568
+#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5593
+#: src/xml/xmli18n-tmp.h:5598 src/xml/xmli18n-tmp.h:5616
+#: src/xml/xmli18n-tmp.h:5620 src/xml/xmli18n-tmp.h:5626
+#: src/xml/xmli18n-tmp.h:5631 src/xml/xmli18n-tmp.h:5651
+#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
+#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5674
+#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5720
+#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5733
+#: src/xml/xmli18n-tmp.h:5739 src/xml/xmli18n-tmp.h:5743
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5818
+#: src/xml/xmli18n-tmp.h:5823 src/xml/xmli18n-tmp.h:5829
+#: src/xml/xmli18n-tmp.h:5833 src/xml/xmli18n-tmp.h:5839
+#: src/xml/xmli18n-tmp.h:5844
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -807,56 +1120,208 @@ msgstr "Justér gamma for magenta"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
 #: src/escputil/escputil.c:999 src/escputil/escputil.c:1019
-#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:1814
-#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
-#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1865
-#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1891
-#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1920
-#: src/xml/xmli18n-tmp.h:1936 src/xml/xmli18n-tmp.h:1951
-#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1977
-#: src/xml/xmli18n-tmp.h:1989 src/xml/xmli18n-tmp.h:2001
-#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2029
-#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2053
-#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2078
-#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2104
-#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
-#: src/xml/xmli18n-tmp.h:2145 src/xml/xmli18n-tmp.h:2158
-#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2186
-#: src/xml/xmli18n-tmp.h:2199 src/xml/xmli18n-tmp.h:2212
-#: src/xml/xmli18n-tmp.h:2225 src/xml/xmli18n-tmp.h:2238
-#: src/xml/xmli18n-tmp.h:2251 src/xml/xmli18n-tmp.h:2264
-#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2292
-#: src/xml/xmli18n-tmp.h:2307 src/xml/xmli18n-tmp.h:2322
-#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
-#: src/xml/xmli18n-tmp.h:2358 src/xml/xmli18n-tmp.h:2371
-#: src/xml/xmli18n-tmp.h:2382 src/xml/xmli18n-tmp.h:2394
-#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2417
-#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2444
-#: src/xml/xmli18n-tmp.h:2456 src/xml/xmli18n-tmp.h:2468
-#: src/xml/xmli18n-tmp.h:2483 src/xml/xmli18n-tmp.h:2498
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2524
-#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2551
-#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2576
-#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
-#: src/xml/xmli18n-tmp.h:2612 src/xml/xmli18n-tmp.h:2625
-#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2651
-#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2685
-#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2713
-#: src/xml/xmli18n-tmp.h:2734 src/xml/xmli18n-tmp.h:2749
-#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2779
-#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2805
-#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2830
-#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2856
-#: src/xml/xmli18n-tmp.h:2871 src/xml/xmli18n-tmp.h:2883
-#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2910
-#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2945
-#: src/xml/xmli18n-tmp.h:2960 src/xml/xmli18n-tmp.h:2974
-#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3006
-#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3034
-#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3061
-#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3095
-#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3120
-#: src/xml/xmli18n-tmp.h:3136
+#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2389
+#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2444
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2475
+#: src/xml/xmli18n-tmp.h:2488 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2513 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2565 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2602
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2762
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2788
+#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2816
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2846
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2906 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3022
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3048
+#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3075
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3124
+#: src/xml/xmli18n-tmp.h:3136 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3175
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3315 src/xml/xmli18n-tmp.h:3329
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3433
+#: src/xml/xmli18n-tmp.h:3455 src/xml/xmli18n-tmp.h:3468
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3497
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3601 src/xml/xmli18n-tmp.h:3618
+#: src/xml/xmli18n-tmp.h:3632 src/xml/xmli18n-tmp.h:3643
+#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3747 src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3834 src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:3844 src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:3867 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:3900 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3910 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3935 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:3967 src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:3979 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4005 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4062 src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4110 src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:4124 src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4167 src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:4272 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:4321 src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:4334 src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4367 src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4471
+#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4505 src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4549 src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:4562 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4580 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4602 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:4678 src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:4691 src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4770 src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4893 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4904 src/xml/xmli18n-tmp.h:4911
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:4971 src/xml/xmli18n-tmp.h:4978
+#: src/xml/xmli18n-tmp.h:5004 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5050 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5071 src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:5097 src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:5142 src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:5169 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5184
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5257 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5318
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5358
+#: src/xml/xmli18n-tmp.h:5364 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5385
+#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5438
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5454
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5465
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5511
+#: src/xml/xmli18n-tmp.h:5516 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5547 src/xml/xmli18n-tmp.h:5554
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5584 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5617 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5632
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5687
+#: src/xml/xmli18n-tmp.h:5692 src/xml/xmli18n-tmp.h:5698
+#: src/xml/xmli18n-tmp.h:5705 src/xml/xmli18n-tmp.h:5713
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5729
+#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
+#: src/xml/xmli18n-tmp.h:5744 src/xml/xmli18n-tmp.h:5756
+#: src/xml/xmli18n-tmp.h:5761 src/xml/xmli18n-tmp.h:5767
+#: src/xml/xmli18n-tmp.h:5774 src/xml/xmli18n-tmp.h:5782
+#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5792
+#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5803
+#: src/xml/xmli18n-tmp.h:5809 src/xml/xmli18n-tmp.h:5813
+#: src/xml/xmli18n-tmp.h:5819 src/xml/xmli18n-tmp.h:5824
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5845
 msgid "Yellow"
 msgstr "Gul"
 
@@ -866,9 +1331,17 @@ msgstr "Justér gamma for gul"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
 #: src/escputil/escputil.c:1006 src/escputil/escputil.c:1025
-#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2700
-#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2795
-#: src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:4041 src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:4056 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4091 src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:4155 src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5155
 msgid "Red"
 msgstr "Rød"
 
@@ -886,8 +1359,13 @@ msgstr "Justér gamma for grøn"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
 #: src/escputil/escputil.c:1007 src/escputil/escputil.c:1026
-#: src/xml/xmli18n-tmp.h:2657 src/xml/xmli18n-tmp.h:2701
-#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4051 src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:4084 src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:5156
 msgid "Blue"
 msgstr "Blå"
 
@@ -898,53 +1376,183 @@ msgstr "Justér gamma for blå"
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
 #: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1016 src/escputil/escputil.c:1285
-#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
-#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
-#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1875
-#: src/xml/xmli18n-tmp.h:1888 src/xml/xmli18n-tmp.h:1901
-#: src/xml/xmli18n-tmp.h:1917 src/xml/xmli18n-tmp.h:1933
-#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1961
-#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1986
-#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2012
-#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2038
-#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2063
-#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2090
-#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2115
-#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2142
-#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2169
-#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
-#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
-#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2248
-#: src/xml/xmli18n-tmp.h:2261 src/xml/xmli18n-tmp.h:2274
-#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2304
-#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2331
-#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
-#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
-#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2403
-#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2420
-#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2441
-#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2465
-#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2495
-#: src/xml/xmli18n-tmp.h:2508 src/xml/xmli18n-tmp.h:2521
-#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
-#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2573
-#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2597
-#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2622
-#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2672
-#: src/xml/xmli18n-tmp.h:2682 src/xml/xmli18n-tmp.h:2731
-#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2764
-#: src/xml/xmli18n-tmp.h:2781 src/xml/xmli18n-tmp.h:2794
-#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2815
-#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2839
-#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2868
-#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2894
-#: src/xml/xmli18n-tmp.h:2911 src/xml/xmli18n-tmp.h:2929
-#: src/xml/xmli18n-tmp.h:2942 src/xml/xmli18n-tmp.h:2977
-#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:3003
-#: src/xml/xmli18n-tmp.h:3017 src/xml/xmli18n-tmp.h:3031
-#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3079
-#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3110
-#: src/xml/xmli18n-tmp.h:3121 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2372
+#: src/xml/xmli18n-tmp.h:2386 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2457
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2510
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2536
+#: src/xml/xmli18n-tmp.h:2550 src/xml/xmli18n-tmp.h:2562
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2599 src/xml/xmli18n-tmp.h:2614
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2639
+#: src/xml/xmli18n-tmp.h:2653 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2965
+#: src/xml/xmli18n-tmp.h:2977 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3019
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3060 src/xml/xmli18n-tmp.h:3072
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3133 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3196
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3526
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3680 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3755 src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:3804 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3819 src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:3831 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3846 src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3873 src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:3924 src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:3943 src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:4022 src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4059 src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:4142 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4164 src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:4179 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:4255 src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4289 src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:4308 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4413 src/xml/xmli18n-tmp.h:4420
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4455
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4507 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:4565 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:4604 src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:4702 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:4733 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:4786 src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4920 src/xml/xmli18n-tmp.h:4926
+#: src/xml/xmli18n-tmp.h:4934 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:4973 src/xml/xmli18n-tmp.h:4981
+#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:4993
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:5047 src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5151
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5186
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5223 src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5270
+#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5284
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5320
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5337
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5375
+#: src/xml/xmli18n-tmp.h:5378 src/xml/xmli18n-tmp.h:5380
+#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5435
+#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5447
+#: src/xml/xmli18n-tmp.h:5449 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5474
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5492
+#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5571
+#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5590
+#: src/xml/xmli18n-tmp.h:5596 src/xml/xmli18n-tmp.h:5602
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5614
+#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5629
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5655
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5680 src/xml/xmli18n-tmp.h:5682
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5700
+#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5716
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5749
+#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5769 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5794
+#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5806
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5836
+#: src/xml/xmli18n-tmp.h:5842
 msgid "Black"
 msgstr "Sort"
 
@@ -952,7 +1560,7 @@ msgstr "Sort"
 msgid "Adjust the black gamma"
 msgstr "Justér sort gamma"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1769
+#: src/main/print-color.c:322 src/main/print-olympus.c:1935
 msgid "Cyan Balance"
 msgstr "Cyan balance"
 
@@ -965,7 +1573,7 @@ msgstr "Grå balance"
 msgid "Adjust the cyan gray balance"
 msgstr "Justér cyans gråbalance"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1777
+#: src/main/print-color.c:330 src/main/print-olympus.c:1943
 msgid "Magenta Balance"
 msgstr "Magenta balance"
 
@@ -973,7 +1581,7 @@ msgstr "Magenta balance"
 msgid "Adjust the magenta gray balance"
 msgstr "Justér magentas gråbalance"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1785
+#: src/main/print-color.c:338 src/main/print-olympus.c:1951
 msgid "Yellow Balance"
 msgstr "Gul balance"
 
@@ -1000,11 +1608,11 @@ msgstr "Begræns blækmængde"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
-#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
-#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
-#: src/main/print-escp2.c:759
+#: src/main/print-escp2.c:344 src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356 src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368 src/main/print-escp2.c:374
+#: src/main/print-escp2.c:869 src/main/print-escp2.c:877
+#: src/main/print-escp2.c:885
 msgid "Advanced Output Control"
 msgstr "Avanceret udskriftskontrol"
 
@@ -1012,37 +1620,37 @@ msgstr "Avanceret udskriftskontrol"
 msgid "Limit the total ink printed to the page"
 msgstr "Begræns den samlede mængde blæk der printes på siden"
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:743
+#: src/main/print-color.c:365 src/main/print-escp2.c:869
 msgid "GCR Transition"
 msgstr "GCR overgang"
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:744
+#: src/main/print-color.c:366 src/main/print-escp2.c:870
 msgid "Adjust the gray component transition rate"
 msgstr "Justér den grå bestanddels overgangsniveau"
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:751
+#: src/main/print-color.c:373 src/main/print-escp2.c:877
 msgid "GCR Lower Bound"
 msgstr "GCR nedre grænse"
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:752
+#: src/main/print-color.c:374 src/main/print-escp2.c:878
 msgid "Lower bound of gray component reduction"
 msgstr "Nedre grænse for reduktion af grå bestanddel"
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:759
+#: src/main/print-color.c:381 src/main/print-escp2.c:885
 msgid "GCR Upper Bound"
 msgstr "GCR overgrænse"
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:760
+#: src/main/print-color.c:382 src/main/print-escp2.c:886
 msgid "Upper bound of gray component reduction"
 msgstr "Overgrænse for reduktion af grå bestanddel"
 
 #: src/main/print-color.c:421
 msgid "LUT dump file"
-msgstr "LookUp Table overførselsfil"
+msgstr "LUT overførselsfil"
 
 #: src/main/print-color.c:422
 msgid "Dump file for LUT for external color adjustment"
-msgstr "Overførselsfil for LookUp Table til ekstern farvejustering"
+msgstr "Overførselsfil for LUT til ekstern farvejustering"
 
 #: src/main/print-color.c:455 src/main/print-color.c:465
 #: src/main/print-color.c:473 src/main/print-color.c:481
@@ -1285,11 +1893,11 @@ msgstr "Avanceret udskriftsjustering"
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr "Printretning (envejs giver højere kvalitet, men er langsommere)"
 
-#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1906
 msgid "Borderless"
 msgstr "Med/uden margin"
 
-#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1907
 msgid "Print without borders"
 msgstr "Print uden margin"
 
@@ -1302,7 +1910,7 @@ msgid "Interleave pattern to use"
 msgstr "Udjævningsmønster der skal bruges"
 
 #: src/main/print-escp2.c:266 src/main/print-escp2.c:267
-#: src/cups/genppd.c:1567 src/cups/genppd.c:2078
+#: src/cups/genppd.c:1600 src/cups/genppd.c:2112
 msgid "Output Order"
 msgstr "Udskriftsrækkefølge"
 
@@ -1343,334 +1951,432 @@ msgid "Has multiple choices of ink cartridges"
 msgstr "Har flere valgmuligheder af blækpatroner"
 
 #: src/main/print-escp2.c:320 src/main/print-escp2.c:321
+msgid "Raw Channel Names"
+msgstr "Ufiltrerede kanalnavne"
+
+#: src/main/print-escp2.c:326 src/main/print-escp2.c:327
+#, fuzzy
 msgid "Channel Names"
-msgstr "Kanalnavne"
+msgstr "Ufiltrerede kanalnavne"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:339
 msgid "Raw Channel Count"
 msgstr "Ufiltreret kanal tælling"
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:344
 msgid "Cyan Map"
 msgstr "Diagram for cyan"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:345
 msgid "Adjust the cyan map"
 msgstr "Justér diagram for cyan"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350
 msgid "Magenta Map"
 msgstr "Diagram for magenta"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:351
 msgid "Adjust the magenta map"
 msgstr "Justér diagram for magenta"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356
 msgid "Yellow Map"
 msgstr "Diagram for gul"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:357
 msgid "Adjust the yellow map"
 msgstr "Justér diagram for gul"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362
 msgid "Blue Map"
 msgstr "Diagram for blå"
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:363
 msgid "Adjust the blue map"
 msgstr "Justér diagram for blå"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368
 msgid "Orange Map"
 msgstr "Diagram for orange"
 
-#: src/main/print-escp2.c:363
+#: src/main/print-escp2.c:369
 msgid "Adjust the orange map"
 msgstr "Justér diagram for orange"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:374
 msgid "Red Map"
 msgstr "Diagram for rød"
 
-#: src/main/print-escp2.c:369
+#: src/main/print-escp2.c:375
 msgid "Adjust the red map"
 msgstr "Justér diagram for rød"
 
-#: src/main/print-escp2.c:471
+#: src/main/print-escp2.c:477
 msgid "Red Density"
 msgstr "Tæthed for rød"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:478
 msgid "Adjust the red density"
 msgstr "Justér tæthed for rød"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:485
 msgid "Blue Density"
 msgstr "Tæthed for blå"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:486
 msgid "Adjust the blue density"
 msgstr "Justér tæthed for blå"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:493
 msgid "Orange Density"
 msgstr "Tæthed for orange"
 
-#: src/main/print-escp2.c:488
+#: src/main/print-escp2.c:494
 msgid "Adjust the orange density"
 msgstr "Justér tæthed for orange"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:501
 msgid "Gloss Level"
 msgstr "Glansniveau"
 
-#: src/main/print-escp2.c:496
+#: src/main/print-escp2.c:502
 msgid "Adjust the gloss level"
 msgstr "Justér glansniveau"
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:509
 msgid "Drop Size Small"
 msgstr "Lille dråbestørrelse"
 
-#: src/main/print-escp2.c:504
+#: src/main/print-escp2.c:510
 msgid "Drop Size 1 (small)"
 msgstr "Dråbestørrelse 1 (lille)"
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:517
 msgid "Drop Size Medium"
 msgstr "Mellem dråbestørrelse"
 
-#: src/main/print-escp2.c:512
+#: src/main/print-escp2.c:518
 msgid "Drop Size 2 (medium)"
 msgstr "Dråbestørrelse 2 (mellem)"
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:525
 msgid "Drop Size Large"
 msgstr "Stor dråbestørrelse"
 
-#: src/main/print-escp2.c:520
+#: src/main/print-escp2.c:526
 msgid "Drop Size 3 (large)"
 msgstr "Dråbestørrelse 3 (stor)"
 
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:534
 msgid "Light Cyan Value"
 msgstr "Lys cyan værdi"
 
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:550
 msgid "Light Cyan Density Scale"
 msgstr "Tæthedsskala for lys cyan"
 
-#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
+#: src/main/print-escp2.c:557 src/main/print-escp2.c:558
 msgid "Light Magenta Value"
 msgstr "Lys magenta værdi"
 
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:566
 msgid "Light Magenta Density Scale"
 msgstr "Tæthedsskala for lys magenta"
 
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:582
 msgid "Dark Yellow Value"
 msgstr "Mørkegul værdi"
 
-#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
+#: src/main/print-escp2.c:589 src/main/print-escp2.c:590
 msgid "Dark Yellow Transition"
 msgstr "Mørkgul overgang"
 
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:598
 msgid "Dark Yellow Density Scale"
 msgstr "Tæthedsskala for mørkegul"
 
-#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
+#: src/main/print-escp2.c:605 src/main/print-escp2.c:606
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:630
 msgid "Gray Value"
 msgstr "Gråtone værdi"
 
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
-#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:614
+#: src/main/print-escp2.c:637 src/main/print-escp2.c:638
 msgid "Gray Transition"
 msgstr "Grå overgang"
 
-#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
+#: src/main/print-escp2.c:621 src/main/print-escp2.c:622
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:646
 msgid "Gray Density Scale"
 msgstr "Tæthedsskala for gråtone"
 
-#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
+#: src/main/print-escp2.c:653 src/main/print-escp2.c:654
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:726
 msgid "Light Gray Value"
 msgstr "Lysegrå værdi"
 
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
-#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:662
+#: src/main/print-escp2.c:733 src/main/print-escp2.c:734
 msgid "Light Gray Transition"
 msgstr "Lysgrå overgang"
 
-#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
-#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
+#: src/main/print-escp2.c:669 src/main/print-escp2.c:670
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:742
 msgid "Light Gray Density Scale"
 msgstr "Tæthedsskala for lysegrå"
 
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:678
 msgid "Dark Gray Value"
 msgstr "Mørkegrå værdi"
 
-#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
+#: src/main/print-escp2.c:685 src/main/print-escp2.c:686
 msgid "Dark Gray Transition"
 msgstr "Mørkgrå overgang"
 
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:694
 msgid "Dark Gray Density Scale"
 msgstr "Tæthedsskala for mørkegrå"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:701
 msgid "Mid Gray Value"
 msgstr "Midtgrå værdi"
 
-#: src/main/print-escp2.c:696
+#: src/main/print-escp2.c:702
 msgid "Medium Gray Value"
 msgstr "Mellemgrå værdi"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:709
 msgid "Mid Gray Transition"
 msgstr "Mellemgrå overgang"
 
-#: src/main/print-escp2.c:704
+#: src/main/print-escp2.c:710
 msgid "Medium Gray Transition"
 msgstr "Middelgrå overgang"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:717
 msgid "Mid Gray Density Scale"
 msgstr "Tæthedsskala for midtgrå"
 
-#: src/main/print-escp2.c:712
+#: src/main/print-escp2.c:718
 msgid "Medium Gray Density Scale"
 msgstr "Tæthedsskala for mellemgrå"
 
-#: src/main/print-escp2.c:767
+# Hextone er når S/H billeder printes med 5 forskellige gråtoner i printeren, i stedet for 5 farver.
+#: src/main/print-escp2.c:749
+msgid "Hextone Gray 5 Value"
+msgstr "Hextonegrå 5 værdi"
+
+#: src/main/print-escp2.c:750
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr "Hextonegrå 5 (mørkeste) værdi"
+
+#: src/main/print-escp2.c:757
+msgid "Hextone Gray 5 Transition"
+msgstr "Hextonegrå 5 overgang"
+
+#: src/main/print-escp2.c:758
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr "Hextonegrå 5 (mørkeste) overgang"
+
+#: src/main/print-escp2.c:765
+msgid "Hextone Gray 5 Density Scale"
+msgstr "Hextonegrå 5 tæthedsskala"
+
+#: src/main/print-escp2.c:766
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr "Hextonegrå 5 (mørkeste) tæthedsskala"
+
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:774
+msgid "Hextone Gray 4 Value"
+msgstr "Hextonegrå 4 værdi"
+
+#: src/main/print-escp2.c:781 src/main/print-escp2.c:782
+msgid "Hextone Gray 4 Transition"
+msgstr "Hextonegrå 4 overgang"
+
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:790
+msgid "Hextone Gray 4 Density Scale"
+msgstr "Hextonegrå 4 tæthedsskala"
+
+#: src/main/print-escp2.c:797 src/main/print-escp2.c:798
+msgid "Hextone Gray 3 Value"
+msgstr "Hextonegrå 3 værdi"
+
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:806
+msgid "Hextone Gray 3 Transition"
+msgstr "Hextonegrå 3 overgang"
+
+#: src/main/print-escp2.c:813 src/main/print-escp2.c:814
+msgid "Hextone Gray 3 Density Scale"
+msgstr "Hextonegrå 3 tæthedsskala"
+
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:822
+msgid "Hextone Gray 2 Value"
+msgstr "Hextonegrå 2 værdi"
+
+#: src/main/print-escp2.c:829 src/main/print-escp2.c:830
+msgid "Hextone Gray 2 Transition"
+msgstr "Hextonegrå 2 overgang"
+
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:838
+msgid "Hextone Gray 2 Density Scale"
+msgstr "Hextonegrå 2 tæthedsskala"
+
+#: src/main/print-escp2.c:845
+msgid "Hextone Gray 1 Value"
+msgstr "Hextonegrå 1 værdi"
+
+#: src/main/print-escp2.c:846
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr "Hextonegrå 1 (lyseste) værdi"
+
+#: src/main/print-escp2.c:853
+msgid "Hextone Gray 1 Transition"
+msgstr "Hextonegrå 1 overgang"
+
+#: src/main/print-escp2.c:854
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr "Hextonegrå 1 (lyseste) overgang"
+
+#: src/main/print-escp2.c:861
+msgid "Hextone Gray 1 Density Scale"
+msgstr "Hextonegrå 1 tæthedsskala"
+
+#: src/main/print-escp2.c:862
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr "Hextonegrå 1 (lyseste) tæthedsskala"
+
+#: src/main/print-escp2.c:893
 msgid "Drying Time Per Page"
 msgstr "Tørretid pr. side"
 
-#: src/main/print-escp2.c:768
+#: src/main/print-escp2.c:894
 msgid "Set drying time per page"
 msgstr "Sæt tørretid pr. side"
 
-#: src/main/print-escp2.c:775
+#: src/main/print-escp2.c:901
 msgid "Drying Time Per Scan"
 msgstr "Tørretid pr. skan"
 
-#: src/main/print-escp2.c:776
+#: src/main/print-escp2.c:902
 msgid "Set drying time per scan"
 msgstr "Sæt tørretid pr. skan"
 
-#: src/main/print-escp2.c:783
+#: src/main/print-escp2.c:909
 msgid "Minimum Drying Time Per Scan"
 msgstr "Minimum tørretid pr. skan"
 
-#: src/main/print-escp2.c:784
+#: src/main/print-escp2.c:910
 msgid "Set minimum drying time per scan"
 msgstr "Sæt minimum tørretid pr. skan"
 
-#: src/main/print-escp2.c:799
+#: src/main/print-escp2.c:925
+msgid "Quality Enhancement"
+msgstr "Kvalitetsforbedring"
+
+#: src/main/print-escp2.c:926
+msgid "Enhance print quality by additional passes"
+msgstr "Øg udskriftskvalitet ved yderligere gennemløb"
+
+#: src/main/print-escp2.c:933
 msgid "Paper Thickness"
 msgstr "Papirtykkelse"
 
-#: src/main/print-escp2.c:800
+#: src/main/print-escp2.c:934
 msgid "Set printer paper thickness"
 msgstr "Sæt printerens papirtykkelse"
 
-#: src/main/print-escp2.c:807
+#: src/main/print-escp2.c:941
 msgid "Vacuum Intensity"
 msgstr "Vakuumintensitet"
 
-#: src/main/print-escp2.c:808
+#: src/main/print-escp2.c:942
 msgid "Set vacuum intensity (printer-specific)"
 msgstr "Sæt vakuumintensitet (printerspecifikt)"
 
-#: src/main/print-escp2.c:815
+#: src/main/print-escp2.c:949
 msgid "Feed Sequence"
 msgstr "Fødningsrækkefølge"
 
-#: src/main/print-escp2.c:816
+#: src/main/print-escp2.c:950
 msgid "Set paper feed sequence (printer-specific)"
 msgstr "Sæt papirfødningsrækkefølge (printerspecifikt)"
 
-#: src/main/print-escp2.c:823
+#: src/main/print-escp2.c:957
 msgid "Print Method"
 msgstr "Printmetode"
 
-#: src/main/print-escp2.c:824
+#: src/main/print-escp2.c:958
 msgid "Set print method (printer-specific)"
 msgstr "Sæt printmetode (printer specifikt)"
 
-#: src/main/print-escp2.c:831
+#: src/main/print-escp2.c:965
 msgid "Platen Gap"
 msgstr "Valse afstand"
 
-#: src/main/print-escp2.c:832
+#: src/main/print-escp2.c:966
 msgid "Set platen gap (printer-specific)"
 msgstr "Sæt valse afstand (printerspecifikt)"
 
-#: src/main/print-escp2.c:839
+#: src/main/print-escp2.c:973
 msgid "Feed Adjustment"
 msgstr "Fødningsjustering"
 
-#: src/main/print-escp2.c:840
-#, c-format
+#: src/main/print-escp2.c:975
+#, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr "Sæt papirfødningsjustering (0.01% units)"
 
-#: src/main/print-escp2.c:1992
+#: src/main/print-escp2.c:2197
 msgid "Full Manual Control"
 msgstr "Fuld manuel kontrol"
 
-#: src/main/print-escp2.c:1994
+#: src/main/print-escp2.c:2199
 msgid "Automatic Setting Control"
 msgstr "Automatisk indstillingskontrol"
 
-#: src/main/print-escp2.c:2208 src/cups/genppd.c:1484 src/cups/genppd.c:2059
+#: src/main/print-escp2.c:2413 src/cups/genppd.c:1517 src/cups/genppd.c:2093
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2415
 msgid "Bidirectional"
 msgstr "Tovejs"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2417
 msgid "Unidirectional"
 msgstr "Envejs"
 
-#: src/main/print-escp2.c:2243
+#: src/main/print-escp2.c:2448
 msgid "Alternate Fill"
 msgstr "Alternativ udfyldning"
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2450
 msgid "Ascending Fill"
 msgstr "Stigende udfyldning"
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2452
 msgid "Descending Fill"
 msgstr "Aftagende udfyldning"
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2454
 msgid "Ascending Double"
 msgstr "Stigende dobbelt"
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2456
 msgid "Nearest Neighbor Avoidance"
 msgstr "Vige udenom nærmeste nabo"
 
-#: src/main/print-escp2.c:2287
+#: src/main/print-escp2.c:2492
 msgid "Short Edge(Flip)"
 msgstr "Kort kant (vend)"
 
-#: src/main/print-escp2.c:2858
+#: src/main/print-escp2.c:3100
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Printeren understøtter ikke en ufiltreret enheds uddata ved dybde %d\n"
 
-#: src/main/print-escp2.c:4107 src/main/print-olympus.c:2472
+#: src/main/print-escp2.c:4355 src/main/print-olympus.c:2641
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr "Print indstillinger ikke kontrolleret, kan ikke printe.\n"
@@ -1724,361 +2430,378 @@ msgid "test print"
 msgstr "test print"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3205
-#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3217
-#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3233
-#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3255
-#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3276
-#: src/xml/xmli18n-tmp.h:3288 src/xml/xmli18n-tmp.h:3295
-#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3315
-#: src/xml/xmli18n-tmp.h:3327 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3368
-#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3380
-#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
-#: src/xml/xmli18n-tmp.h:3412 src/xml/xmli18n-tmp.h:3424
-#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3444
-#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3472
-#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3496
-#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3521
-#: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3544
-#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3556
-#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3581
-#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3598
-#: src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3754 src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:3809 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3863 src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:4058 src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:4163 src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:4227 src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:4335 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4467 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4594 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:4879 src/xml/xmli18n-tmp.h:4946
+#: src/xml/xmli18n-tmp.h:5000 src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:5243 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5365 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5512 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5667 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5784 src/xml/xmli18n-tmp.h:5805
+#: src/xml/xmli18n-tmp.h:5826
 msgid "Four Color Standard"
 msgstr "Fire farver standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3206
-#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3218
-#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3234
-#: src/xml/xmli18n-tmp.h:3244 src/xml/xmli18n-tmp.h:3251
-#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3268
-#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3289
-#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3306
-#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
-#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3354
-#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3377
-#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3389
-#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3413
-#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3435
-#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3455
-#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3485
-#: src/xml/xmli18n-tmp.h:3497 src/xml/xmli18n-tmp.h:3508
-#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3537
-#: src/xml/xmli18n-tmp.h:3545 src/xml/xmli18n-tmp.h:3549
-#: src/xml/xmli18n-tmp.h:3557 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3593
-#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3605
+#: src/xml/xmli18n-tmp.h:3759 src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3868 src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:4002 src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:4107 src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4472
+#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4817 src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5181 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5315 src/xml/xmli18n-tmp.h:5370
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5672
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5831
 msgid "Three Color Composite"
 msgstr "Tre farver sammensat"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3241
-#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3265
-#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3286
-#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
-#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3351
-#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3374
-#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3398
-#: src/xml/xmli18n-tmp.h:3410 src/xml/xmli18n-tmp.h:3422
-#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3452
-#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3470
-#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3494
-#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3519
-#: src/xml/xmli18n-tmp.h:3534 src/xml/xmli18n-tmp.h:3542
-#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3741 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4086 src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4933
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5421
+#: src/xml/xmli18n-tmp.h:5499 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5723
 msgid "Six Color Photo"
 msgstr "Seks farver foto"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3242
-#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3266
-#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3287
-#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3326
-#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3352
-#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3375
-#: src/xml/xmli18n-tmp.h:3387 src/xml/xmli18n-tmp.h:3399
-#: src/xml/xmli18n-tmp.h:3411 src/xml/xmli18n-tmp.h:3423
-#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3453
-#: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3483
-#: src/xml/xmli18n-tmp.h:3495 src/xml/xmli18n-tmp.h:3506
-#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3535
-#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3566
-#: src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3748 src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:3989 src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:4094 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4267 src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4940
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5661
+#: src/xml/xmli18n-tmp.h:5730
 msgid "Five Color Photo Composite"
 msgstr "Fem farver foto sammensat"
 
 #: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
-#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
-#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
-#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
-#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
-#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
-#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
-#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
-#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:849
-#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:963
-#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1077
-#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1170
-#: src/xml/xmli18n-tmp.h:1220 src/xml/xmli18n-tmp.h:1277
-#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1376
-#: src/xml/xmli18n-tmp.h:1439 src/xml/xmli18n-tmp.h:1502
-#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1619
-#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1739
-#: src/xml/xmli18n-tmp.h:1773
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1050
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1240
+#: src/xml/xmli18n-tmp.h:1335 src/xml/xmli18n-tmp.h:1449
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1580
+#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1862
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2200 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2297
 msgid "Plain Paper"
 msgstr "Almindeligt papir"
 
-#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
-#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
-#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
-#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
-#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
-#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
-#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
-#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
-#: src/xml/xmli18n-tmp.h:819 src/xml/xmli18n-tmp.h:858
-#: src/xml/xmli18n-tmp.h:915 src/xml/xmli18n-tmp.h:972
-#: src/xml/xmli18n-tmp.h:1029 src/xml/xmli18n-tmp.h:1086
-#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1176
-#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1286
-#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1385
-#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1508
-#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1628
-#: src/xml/xmli18n-tmp.h:1685 src/xml/xmli18n-tmp.h:1743
-#: src/xml/xmli18n-tmp.h:1779
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:101 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:365 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1160 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1740
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1871
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2136
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2267
+#: src/xml/xmli18n-tmp.h:2303
 msgid "Glossy Film"
 msgstr "Glittet film"
 
-#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
-#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
-#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
-#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
-#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
-#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
-#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
-#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
-#: src/xml/xmli18n-tmp.h:821 src/xml/xmli18n-tmp.h:861
-#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:975
-#: src/xml/xmli18n-tmp.h:1032 src/xml/xmli18n-tmp.h:1089
-#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1178
-#: src/xml/xmli18n-tmp.h:1232 src/xml/xmli18n-tmp.h:1289
-#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1388
-#: src/xml/xmli18n-tmp.h:1451 src/xml/xmli18n-tmp.h:1511
-#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1631
-#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1745
-#: src/xml/xmli18n-tmp.h:1781
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:845 src/xml/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:965 src/xml/xmli18n-tmp.h:1022
+#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1359
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1550
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1745 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2305
 msgid "Transparencies"
 msgstr "Transparenter"
 
-#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
-#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
-#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
-#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
-#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
-#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
-#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
-#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
-#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:823
-#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:921
-#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:1035
-#: src/xml/xmli18n-tmp.h:1092 src/xml/xmli18n-tmp.h:1142
-#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1235
-#: src/xml/xmli18n-tmp.h:1292 src/xml/xmli18n-tmp.h:1344
-#: src/xml/xmli18n-tmp.h:1391 src/xml/xmli18n-tmp.h:1454
-#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1577
-#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1691
-#: src/xml/xmli18n-tmp.h:1747 src/xml/xmli18n-tmp.h:1783
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:55 src/xml/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:151 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1024
+#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2215
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2307
 msgid "Envelopes"
 msgstr "Kuverter"
 
-#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
-#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
-#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
-#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
-#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
-#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
-#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
-#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
-#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:827
-#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:927
-#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:1041
-#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1146
-#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1241
-#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1348
-#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1460
-#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1583
-#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1697
-#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1787
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:1028
+#: src/xml/xmli18n-tmp.h:1085 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1275 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1556
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1665
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1834
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2076
+#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2311
 msgid "Matte Paper"
 msgstr "Mat papir"
 
-#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
-#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
-#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
-#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
-#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
-#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
-#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
-#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
-#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:831
-#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:933
-#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:1047
-#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1150
-#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1247
-#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1352
-#: src/xml/xmli18n-tmp.h:1403 src/xml/xmli18n-tmp.h:1466
-#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1589
-#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1703
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1791
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:167 src/xml/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:569
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1032
+#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1285 src/xml/xmli18n-tmp.h:1389
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1675
+#: src/xml/xmli18n-tmp.h:1770 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1889 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2012 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2227
+#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2315
 msgid "Inkjet Paper"
 msgstr "Inkjetpapir"
 
-#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
-#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
-#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
-#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
-#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
-#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
-#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
-#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
-#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:833
-#: src/xml/xmli18n-tmp.h:879 src/xml/xmli18n-tmp.h:936
-#: src/xml/xmli18n-tmp.h:993 src/xml/xmli18n-tmp.h:1050
-#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1152
-#: src/xml/xmli18n-tmp.h:1190 src/xml/xmli18n-tmp.h:1250
-#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1354
-#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1469
-#: src/xml/xmli18n-tmp.h:1529 src/xml/xmli18n-tmp.h:1592
-#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1706
-#: src/xml/xmli18n-tmp.h:1757 src/xml/xmli18n-tmp.h:1793
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:425 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:512 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1034
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1499 src/xml/xmli18n-tmp.h:1562
+#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1775 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1955
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2088
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2317
 msgid "Photo Quality Inkjet Paper"
 msgstr "Fotokvalitets inkjetpapir"
 
-#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
-#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
-#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
-#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
-#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
-#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
-#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
-#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
-#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:835
-#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:939
-#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:1053
-#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1154
-#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1253
-#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1356
-#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1472
-#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1595
-#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1709
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1795
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1036
+#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1200
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1504 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1842
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2233
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2319
 msgid "Photo Paper"
 msgstr "Fotopapir"
 
-#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
-#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
-#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
-#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
-#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
-#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
-#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
-#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
-#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:837
-#: src/xml/xmli18n-tmp.h:885 src/xml/xmli18n-tmp.h:942
-#: src/xml/xmli18n-tmp.h:999 src/xml/xmli18n-tmp.h:1056
-#: src/xml/xmli18n-tmp.h:1113 src/xml/xmli18n-tmp.h:1156
-#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1212
-#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1256
-#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1358
-#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1475
-#: src/xml/xmli18n-tmp.h:1535 src/xml/xmli18n-tmp.h:1598
-#: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1712
-#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1797
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:179 src/xml/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:518 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:869 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1038
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1407
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1566
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1622
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1844
+#: src/xml/xmli18n-tmp.h:1898 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2321
 msgid "Premium Glossy Photo Paper"
 msgstr "Førsteklasses glittet fotopapir"
 
-#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
-#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
-#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
-#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
-#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
-#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
-#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
-#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
-#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:841
-#: src/xml/xmli18n-tmp.h:891 src/xml/xmli18n-tmp.h:948
-#: src/xml/xmli18n-tmp.h:1005 src/xml/xmli18n-tmp.h:1062
-#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1160
-#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1262
-#: src/xml/xmli18n-tmp.h:1319 src/xml/xmli18n-tmp.h:1362
-#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1481
-#: src/xml/xmli18n-tmp.h:1541 src/xml/xmli18n-tmp.h:1604
-#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1718
-#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1801
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1042
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1419
+#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1570
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2027 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2242
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2325
 msgid "Premium Luster Photo Paper"
 msgstr "Førsteklasses blankt fotopapir"
 
-#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
-#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
-#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
-#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
-#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
-#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
-#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
-#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
-#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:843
-#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:951
-#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1065
-#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1162
-#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1265
-#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1368
-#: src/xml/xmli18n-tmp.h:1427 src/xml/xmli18n-tmp.h:1490
-#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1607
-#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1727
-#: src/xml/xmli18n-tmp.h:1767 src/xml/xmli18n-tmp.h:1803
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:91 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:191 src/xml/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:439 src/xml/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:787 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1044
+#: src/xml/xmli18n-tmp.h:1125 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1315 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1854
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2327
 msgid "Photo Quality Glossy Paper"
 msgstr "Fotokvalitets glittet papir"
 
-#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
-#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
-#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
-#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
-#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
-#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
-#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
-#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:897
-#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:1011
-#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1125
-#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1206
-#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1325
-#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1430
-#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1553
-#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1667
-#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1805
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1130
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1320
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1616
+#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1856 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2329
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Papir"
 
-#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
-#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
-#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
-#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
-#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
-#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
-#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
-#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
-#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:847
-#: src/xml/xmli18n-tmp.h:903 src/xml/xmli18n-tmp.h:960
-#: src/xml/xmli18n-tmp.h:1017 src/xml/xmli18n-tmp.h:1074
-#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1168
-#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1214
-#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1274
-#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1374
-#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1499
-#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1616
-#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1736
-#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1809
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:129
+#: src/xml/xmli18n-tmp.h:203 src/xml/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:542 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1048
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1443
+#: src/xml/xmli18n-tmp.h:1539 src/xml/xmli18n-tmp.h:1578
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1720
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1985
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2333
 msgid "Other"
 msgstr "Andet"
 
@@ -2094,52 +2817,56 @@ msgstr "Manuel fødning med pause"
 msgid "Manual without Pause"
 msgstr "Manuel fødning uden pause"
 
-#: src/main/print-olympus.c:279
+#: src/main/print-olympus.c:281
 msgid "Coated"
 msgstr "Coated"
 
-#: src/main/print-olympus.c:280 src/cups/genppd.c:1685 src/cups/genppd.c:1713
-#: src/cups/genppd.c:1745 src/cups/genppd.c:1800 src/cups/genppd.c:1846
-#: src/cups/genppd.c:2147 src/cups/genppd.c:2160 src/cups/genppd.c:2183
-#: src/cups/genppd.c:2204 src/cups/genppd.c:2221
+#: src/main/print-olympus.c:282 src/cups/genppd.c:1718 src/cups/genppd.c:1746
+#: src/cups/genppd.c:1778 src/cups/genppd.c:1833 src/cups/genppd.c:1879
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2194 src/cups/genppd.c:2217
+#: src/cups/genppd.c:2238 src/cups/genppd.c:2255
 msgid "None"
 msgstr "Ingen"
 
-#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
-#: src/main/print-olympus.c:1132
+#: src/main/print-olympus.c:998 src/main/print-olympus.c:1061
+#: src/main/print-olympus.c:1165
 msgid "Glossy"
 msgstr "Glittet"
 
-#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
-#: src/main/print-olympus.c:1133
+#: src/main/print-olympus.c:999 src/main/print-olympus.c:1062
+#: src/main/print-olympus.c:1166
 msgid "Texture"
 msgstr "Tekstur"
 
-#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
+#: src/main/print-olympus.c:1063 src/main/print-olympus.c:1167
 msgid "Matte"
 msgstr "Mat"
 
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
+#. TRANSLATORS: 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.
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1901
 msgid "Laminate Pattern"
 msgstr "Lamineret mønster"
 
-#: src/main/print-olympus.c:1770
+#: src/main/print-olympus.c:1936
 msgid "Adjust the cyan balance"
 msgstr "Justér cyanbalance"
 
-#: src/main/print-olympus.c:1778
+#: src/main/print-olympus.c:1944
 msgid "Adjust the magenta balance"
 msgstr "Justér magentabalance"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1952
 msgid "Adjust the yellow balance"
 msgstr "Justér gulbalance"
 
-#: src/main/print-olympus.c:1793
+#: src/main/print-olympus.c:1959
 msgid "Black Balance"
 msgstr "Sort balance"
 
-#: src/main/print-olympus.c:1794
+#: src/main/print-olympus.c:1960
 msgid "Adjust the black balance"
 msgstr "Justér sortbalance"
 
@@ -2171,7 +2898,7 @@ msgstr "Hurtigttørrende foto"
 msgid "Quick-dry Transparency"
 msgstr "Hurtigttørrende klar film"
 
-#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3687
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:5925
 msgid "Manual"
 msgstr "Manuelt"
 
@@ -2256,23 +2983,23 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:278 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3638
-#: src/xml/xmli18n-tmp.h:3647 src/xml/xmli18n-tmp.h:3656
-#: src/xml/xmli18n-tmp.h:3664
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5875
+#: src/xml/xmli18n-tmp.h:5884 src/xml/xmli18n-tmp.h:5893
+#: src/xml/xmli18n-tmp.h:5901
 msgid "Draft"
 msgstr "Kladde"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:3633 src/xml/xmli18n-tmp.h:3641
-#: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3658
-#: src/xml/xmli18n-tmp.h:3666
+#: src/xml/xmli18n-tmp.h:5870 src/xml/xmli18n-tmp.h:5878
+#: src/xml/xmli18n-tmp.h:5886 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5903
 msgid "High"
 msgstr "Høj"
 
 #: src/main/print-pcl.c:282 src/main/print-pcl.c:283
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3634
-#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3650
-#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3667
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5896 src/xml/xmli18n-tmp.h:5904
 msgid "Photo"
 msgstr "Foto"
 
@@ -2304,15 +3031,15 @@ msgstr "PPD fil modelnavn"
 msgid "None; please provide a PPD file"
 msgstr "Ingen; fremskaf en PPD fil"
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3671
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:5908
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3708
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:5946
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3823
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6061
 msgid "Custom"
 msgstr "Egendefineret"
 
@@ -2320,33 +3047,43 @@ msgstr "Egendefineret"
 msgid "Image dimensions must match paper dimensions"
 msgstr "Billedets størrelse skal passe til papirets størrelse"
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3629
-#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3654
+#: src/main/print-weave.c:1511
+msgid "Fatal error!"
+msgstr "Fatal fejl!"
+
+#: src/main/print-weave.c:1547
+msgid ""
+"Please report the above information to gimp-print-devel@lists.sourceforge.net"
+msgstr ""
+"Rapportér ovenstående information til gimp-print-devel@lists.sourceforge.net"
+
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:5866
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5891
 msgid "Fast Economy"
 msgstr "Hurtig økonomisk"
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3630
-#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3655
-#: src/xml/xmli18n-tmp.h:3663
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5900
 msgid "Economy"
 msgstr "Økonomisk"
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3635
-#: src/xml/xmli18n-tmp.h:3642 src/xml/xmli18n-tmp.h:3651
-#: src/xml/xmli18n-tmp.h:3660 src/xml/xmli18n-tmp.h:3668
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:5872
+#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
 msgid "Super Photo"
 msgstr "Super foto"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3636
-#: src/xml/xmli18n-tmp.h:3643 src/xml/xmli18n-tmp.h:3652
-#: src/xml/xmli18n-tmp.h:3661 src/xml/xmli18n-tmp.h:3669
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:5873
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5889
+#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5906
 msgid "Ultra Photo"
 msgstr "Ultra foto"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1326 src/cups/genppd.c:1989
-#: src/xml/xmli18n-tmp.h:3637 src/xml/xmli18n-tmp.h:3644
-#: src/xml/xmli18n-tmp.h:3653 src/xml/xmli18n-tmp.h:3662
-#: src/xml/xmli18n-tmp.h:3670
+#: src/main/generic-options.c:41 src/cups/genppd.c:1359 src/cups/genppd.c:2023
+#: src/xml/xmli18n-tmp.h:5874 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5899
+#: src/xml/xmli18n-tmp.h:5907
 msgid "Best"
 msgstr "Bedst"
 
@@ -3067,80 +3804,80 @@ msgstr "Ekstra 5"
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:960
+#: src/cups/genppd.c:993
 msgid "English"
 msgstr "Danish"
 
-#: src/cups/genppd.c:1159 src/cups/genppd.c:1175 src/cups/genppd.c:1934
-#: src/cups/genppd.c:1935
+#: src/cups/genppd.c:1192 src/cups/genppd.c:1208 src/cups/genppd.c:1968
+#: src/cups/genppd.c:1969
 msgid "Media Size"
 msgstr "Mediestørrelse"
 
-#: src/cups/genppd.c:1248 src/cups/genppd.c:1970
+#: src/cups/genppd.c:1281 src/cups/genppd.c:2004
 msgid "Color Model"
 msgstr "Farvemodel"
 
-#: src/cups/genppd.c:1275 src/cups/genppd.c:1972
+#: src/cups/genppd.c:1308 src/cups/genppd.c:2006
 msgid "Inverted Grayscale"
 msgstr "Inverteret gråtoneskala"
 
-#: src/cups/genppd.c:1285 src/cups/genppd.c:1976
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2010
 msgid "RGB Color"
 msgstr "RGB farver"
 
-#: src/cups/genppd.c:1292 src/cups/genppd.c:1977
+#: src/cups/genppd.c:1325 src/cups/genppd.c:2011
 msgid "CMY Color"
 msgstr "CMY farver"
 
-#: src/cups/genppd.c:1317 src/cups/genppd.c:1987
+#: src/cups/genppd.c:1350 src/cups/genppd.c:2021
 msgid "Color Precision"
 msgstr "Farvepræcision"
 
-#: src/cups/genppd.c:1573 src/cups/genppd.c:2080
+#: src/cups/genppd.c:1606 src/cups/genppd.c:2114
 msgid "Reverse"
 msgstr "Omvendt"
 
-#: src/cups/genppd.c:1590 src/cups/genppd.c:2096
+#: src/cups/genppd.c:1623 src/cups/genppd.c:2130
 msgid "2-Sided Printing"
 msgstr "2-sidet udskrivning"
 
-#: src/cups/genppd.c:1615 src/cups/genppd.c:2113
+#: src/cups/genppd.c:1648 src/cups/genppd.c:2147
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr "Formindsk side så den passer til kanter"
 
-#: src/cups/genppd.c:1620 src/cups/genppd.c:2114
+#: src/cups/genppd.c:1653 src/cups/genppd.c:2148
 msgid "Shrink (print the whole page)"
 msgstr "Formindsk (udskriv hele siden)"
 
-#: src/cups/genppd.c:1621 src/cups/genppd.c:2115
+#: src/cups/genppd.c:1654 src/cups/genppd.c:2149
 msgid "Crop (preserve dimensions)"
 msgstr "Beskær (bevar format)"
 
-#: src/cups/genppd.c:1622 src/cups/genppd.c:2116
+#: src/cups/genppd.c:1655 src/cups/genppd.c:2150
 msgid "Expand (use maximum page area)"
 msgstr "Udvid (brug hele arket)"
 
-#: src/cups/genppd.c:1716 src/cups/genppd.c:2162
+#: src/cups/genppd.c:1749 src/cups/genppd.c:2196
 msgid "No"
 msgstr "Nej"
 
-#: src/cups/genppd.c:1718 src/cups/genppd.c:2164
+#: src/cups/genppd.c:1751 src/cups/genppd.c:2198
 msgid "Yes"
 msgstr "Ja"
 
-#: src/cups/genppd.c:1757 src/cups/genppd.c:1820 src/cups/genppd.c:1864
-#: src/cups/genppd.c:2185 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+#: src/cups/genppd.c:1790 src/cups/genppd.c:1853 src/cups/genppd.c:1897
+#: src/cups/genppd.c:2219 src/cups/genppd.c:2249 src/cups/genppd.c:2266
 msgid "Value"
 msgstr "Værdi"
 
-#: src/cups/genppd.c:1762 src/cups/genppd.c:2189
+#: src/cups/genppd.c:1795 src/cups/genppd.c:2223
 msgid "Fine Adjustment"
 msgstr "Finjustering"
 
-#: src/cups/genppd.c:1805 src/cups/genppd.c:2209
+#: src/cups/genppd.c:1838 src/cups/genppd.c:2243
 #, c-format
 msgid "%.1f mm"
-msgstr ""
+msgstr "%.1f mm"
 
 #: src/escputil/escputil.c:70
 msgid "Escputil version "
@@ -3465,51 +4202,61 @@ msgstr ""
 "Kan ikke detektere printertype.\n"
 "Brug -m for at specificere din printermodel.\n"
 
-#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:383
-#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
-#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
-#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
-#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
-#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
-#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
-#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
-#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
-#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
-#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
-#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
-#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
-#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
-#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
-#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
-#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
-#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
-#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
-#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
-#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
-#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
-#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
-#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
-#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
-#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
-#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
-#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
-#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
-#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
-#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1503
-#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1509
-#: src/xml/xmli18n-tmp.h:1512 src/xml/xmli18n-tmp.h:1515
-#: src/xml/xmli18n-tmp.h:1518 src/xml/xmli18n-tmp.h:1521
-#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1527
-#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
-#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
-#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
-#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
-#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
-#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:2655
-#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2717
-#: src/xml/xmli18n-tmp.h:3045 src/xml/xmli18n-tmp.h:3252
-#: src/xml/xmli18n-tmp.h:3273 src/xml/xmli18n-tmp.h:3363
-#: src/xml/xmli18n-tmp.h:3531
+#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2001
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2010 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2025
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:4085 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4612 src/xml/xmli18n-tmp.h:5481
 msgid "Photo Black"
 msgstr "Foto sort"
 
@@ -3520,125 +4267,297 @@ msgid "Unknown"
 msgstr "Ukendt"
 
 #: src/escputil/escputil.c:1000 src/escputil/escputil.c:1289
-#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1921
-#: src/xml/xmli18n-tmp.h:1937 src/xml/xmli18n-tmp.h:2002
-#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2079
-#: src/xml/xmli18n-tmp.h:2105 src/xml/xmli18n-tmp.h:2119
-#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2173
-#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
-#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
-#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2293
-#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2346
-#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2418
-#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2445
-#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2469
-#: src/xml/xmli18n-tmp.h:2484 src/xml/xmli18n-tmp.h:2512
-#: src/xml/xmli18n-tmp.h:2525 src/xml/xmli18n-tmp.h:2564
-#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2626
-#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2746
-#: src/xml/xmli18n-tmp.h:2762 src/xml/xmli18n-tmp.h:2843
-#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2895
-#: src/xml/xmli18n-tmp.h:2912 src/xml/xmli18n-tmp.h:2946
-#: src/xml/xmli18n-tmp.h:3001 src/xml/xmli18n-tmp.h:3015
-#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3122
-#: src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2461 src/xml/xmli18n-tmp.h:2526
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2683 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2711 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3101 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3661
+#: src/xml/xmli18n-tmp.h:3678 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3750 src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:3782 src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:3932 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3964 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4388 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:4639 src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:4875 src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4936
+#: src/xml/xmli18n-tmp.h:4942 src/xml/xmli18n-tmp.h:4968
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5339 src/xml/xmli18n-tmp.h:5348
+#: src/xml/xmli18n-tmp.h:5355 src/xml/xmli18n-tmp.h:5361
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5417
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5430
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5477 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5502
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5536 src/xml/xmli18n-tmp.h:5544
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5557
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5657 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5719
+#: src/xml/xmli18n-tmp.h:5726 src/xml/xmli18n-tmp.h:5732
+#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5779
 msgid "Light Cyan"
 msgstr "Lys cyan"
 
 #: src/escputil/escputil.c:1001 src/escputil/escputil.c:1290
-#: src/xml/xmli18n-tmp.h:1906 src/xml/xmli18n-tmp.h:1922
-#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:2003
-#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2080
-#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2120
-#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2174
-#: src/xml/xmli18n-tmp.h:2188 src/xml/xmli18n-tmp.h:2201
-#: src/xml/xmli18n-tmp.h:2214 src/xml/xmli18n-tmp.h:2227
-#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2294
-#: src/xml/xmli18n-tmp.h:2309 src/xml/xmli18n-tmp.h:2347
-#: src/xml/xmli18n-tmp.h:2360 src/xml/xmli18n-tmp.h:2419
-#: src/xml/xmli18n-tmp.h:2432 src/xml/xmli18n-tmp.h:2446
-#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2470
-#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2513
-#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2565
-#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2627
-#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2748
-#: src/xml/xmli18n-tmp.h:2761 src/xml/xmli18n-tmp.h:2844
-#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2896
-#: src/xml/xmli18n-tmp.h:2913 src/xml/xmli18n-tmp.h:2947
-#: src/xml/xmli18n-tmp.h:3000 src/xml/xmli18n-tmp.h:3014
-#: src/xml/xmli18n-tmp.h:3028 src/xml/xmli18n-tmp.h:3123
-#: src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2446
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2527
+#: src/xml/xmli18n-tmp.h:2541 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2644
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2698
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2751
+#: src/xml/xmli18n-tmp.h:2803 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2956 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2994
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3381
+#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3662
+#: src/xml/xmli18n-tmp.h:3746 src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:3778 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3934 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3966 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:4265 src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:4390 src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:4428 src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4452
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4465
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4512 src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4586 src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:4641 src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4903
+#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4970
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:5044 src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5168
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5241 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5334
+#: src/xml/xmli18n-tmp.h:5341 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5363
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5419
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5471
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5504
+#: src/xml/xmli18n-tmp.h:5510 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5652
+#: src/xml/xmli18n-tmp.h:5659 src/xml/xmli18n-tmp.h:5665
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5721
+#: src/xml/xmli18n-tmp.h:5728 src/xml/xmli18n-tmp.h:5734
+#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5781
 msgid "Light Magenta"
 msgstr "Lys magenta"
 
-#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2433
-#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:3002
-#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3030
+#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3679 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4409 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:4566 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4605 src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4664 src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5376 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5450
+#: src/xml/xmli18n-tmp.h:5475 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5533 src/xml/xmli18n-tmp.h:5542
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5678 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5717
+#: src/xml/xmli18n-tmp.h:5747 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5777
 msgid "Light Black"
 msgstr "Lys sort"
 
-#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:384
-#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
-#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
-#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
-#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
-#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
-#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
-#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
-#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
-#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
-#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
-#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
-#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
-#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
-#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
-#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
-#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
-#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
-#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
-#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
-#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
-#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
-#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
-#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
-#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
-#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
-#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
-#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
-#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
-#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
-#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1504
-#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1510
-#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1516
-#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1522
-#: src/xml/xmli18n-tmp.h:1525 src/xml/xmli18n-tmp.h:1528
-#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1534
-#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1540
-#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1546
-#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1552
-#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1558
-#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:2654
-#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2716
-#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3264
-#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3371
-#: src/xml/xmli18n-tmp.h:3539
+#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:508 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:532 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:538 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:562 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:568 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
+#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
+#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
+#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
+#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
+#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
+#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
+#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
+#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
+#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
+#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
+#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2011 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2026
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2032
+#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2038
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:4044 src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:5530
 msgid "Matte Black"
 msgstr "Mat sort"
 
-#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:2658
-#: src/xml/xmli18n-tmp.h:2702 src/xml/xmli18n-tmp.h:2720
-#: src/xml/xmli18n-tmp.h:3048
+#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3995 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4006 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4020 src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:4106 src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Gloss Optimizer"
 msgstr "Glans forbedrer"
 
-#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:2760
-#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3013
-#: src/xml/xmli18n-tmp.h:3027
+#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3676
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4616 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5534 src/xml/xmli18n-tmp.h:5573
 msgid "Light Light Black"
 msgstr "Lys lys-sort"
 
 #: src/escputil/escputil.c:1010 src/escputil/escputil.c:1029
-#: src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:4099 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4189
 msgid "Orange"
 msgstr "Orange"
 
@@ -3774,7 +4693,7 @@ msgstr "Fejl: Bagsidelåg åben\n"
 #: src/escputil/escputil.c:1124
 #, c-format
 msgid "Error: CD Tray Out\n"
-msgstr "Fejl: CD-skuffe tom\n"
+msgstr "Fejl: cd-skuffe tom\n"
 
 #: src/escputil/escputil.c:1127
 #, c-format
@@ -4296,7879 +5215,7920 @@ msgstr "Udskriver..."
 #: src/xml/xmli18n-tmp.h:68 src/xml/xmli18n-tmp.h:70 src/xml/xmli18n-tmp.h:72
 #: src/xml/xmli18n-tmp.h:74 src/xml/xmli18n-tmp.h:76 src/xml/xmli18n-tmp.h:78
 #: src/xml/xmli18n-tmp.h:80 src/xml/xmli18n-tmp.h:82 src/xml/xmli18n-tmp.h:84
-#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:92
-#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
-#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
-#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
-#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
-#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
-#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
-#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
-#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
-#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
-#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
-#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
-#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
-#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
-#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
-#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
-#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
-#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
-#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
-#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
-#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
-#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
-#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
-#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
-#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
-#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
-#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
-#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
-#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
-#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
-#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
-#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
-#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
-#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
-#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
-#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
-#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
-#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
-#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
-#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
-#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
-#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
-#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
-#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
-#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
-#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
-#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
-#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
-#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
-#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
-#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
-#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
-#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
-#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
-#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
-#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
-#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
-#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
-#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
-#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
-#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
-#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
-#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
-#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
-#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
-#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
-#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
-#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
-#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
-#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
-#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
-#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
-#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
-#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
-#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
-#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
-#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
-#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
-#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
-#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
-#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
-#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
-#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
-#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
-#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
-#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
-#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
-#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
-#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
-#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
-#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
-#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
-#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
-#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
-#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
-#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
-#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:92 src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:102 src/xml/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:106 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:114 src/xml/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:118 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:126 src/xml/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:130 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:136 src/xml/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:144 src/xml/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:168 src/xml/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:192 src/xml/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:216 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:232 src/xml/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:240 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:256 src/xml/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:264 src/xml/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:304 src/xml/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:312 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:320 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:328 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:336 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:344 src/xml/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:352 src/xml/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:384 src/xml/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:408 src/xml/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:412 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:432 src/xml/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:444 src/xml/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:448 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:468 src/xml/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:484 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:642 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:698 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:714 src/xml/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:722 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:738 src/xml/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:746 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:764 src/xml/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:780 src/xml/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:804 src/xml/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:814
 #: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:818
 #: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:822
 #: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:826
 #: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:830
-#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:834
-#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:838
-#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:842
-#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:846
-#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:850
-#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
-#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
-#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
-#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
-#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
-#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
-#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
-#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:898
-#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
-#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
-#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
-#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
-#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
-#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
-#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
-#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
-#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
-#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
-#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
-#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
-#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
-#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
-#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
-#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
-#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
-#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
-#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
-#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1018
-#: src/xml/xmli18n-tmp.h:1021 src/xml/xmli18n-tmp.h:1024
-#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1030
-#: src/xml/xmli18n-tmp.h:1033 src/xml/xmli18n-tmp.h:1036
-#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1042
-#: src/xml/xmli18n-tmp.h:1045 src/xml/xmli18n-tmp.h:1048
-#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1054
-#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1060
-#: src/xml/xmli18n-tmp.h:1063 src/xml/xmli18n-tmp.h:1066
-#: src/xml/xmli18n-tmp.h:1069 src/xml/xmli18n-tmp.h:1072
-#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1078
-#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1084
-#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1090
-#: src/xml/xmli18n-tmp.h:1093 src/xml/xmli18n-tmp.h:1096
-#: src/xml/xmli18n-tmp.h:1099 src/xml/xmli18n-tmp.h:1102
-#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1108
-#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1114
-#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1120
-#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1126
-#: src/xml/xmli18n-tmp.h:1129 src/xml/xmli18n-tmp.h:1132
-#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
-#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
-#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
-#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
-#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
-#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
-#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
-#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
-#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
-#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
-#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
-#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
-#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
-#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1189
-#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1193
-#: src/xml/xmli18n-tmp.h:1195 src/xml/xmli18n-tmp.h:1197
-#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1201
-#: src/xml/xmli18n-tmp.h:1203 src/xml/xmli18n-tmp.h:1205
-#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1209
-#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1221
-#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
-#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
-#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
-#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
-#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
-#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
-#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
-#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
-#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
-#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
-#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
-#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
-#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
-#: src/xml/xmli18n-tmp.h:1302 src/xml/xmli18n-tmp.h:1305
-#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1311
-#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1317
-#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1323
-#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1329
-#: src/xml/xmli18n-tmp.h:1332 src/xml/xmli18n-tmp.h:1335
-#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
-#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1343
-#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1347
-#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1351
-#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1355
-#: src/xml/xmli18n-tmp.h:1357 src/xml/xmli18n-tmp.h:1359
-#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1363
-#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1367
-#: src/xml/xmli18n-tmp.h:1369 src/xml/xmli18n-tmp.h:1371
-#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1375
-#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1566
-#: src/xml/xmli18n-tmp.h:1569 src/xml/xmli18n-tmp.h:1572
-#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1578
-#: src/xml/xmli18n-tmp.h:1581 src/xml/xmli18n-tmp.h:1584
-#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1590
-#: src/xml/xmli18n-tmp.h:1593 src/xml/xmli18n-tmp.h:1596
-#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1602
-#: src/xml/xmli18n-tmp.h:1605 src/xml/xmli18n-tmp.h:1608
-#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1614
-#: src/xml/xmli18n-tmp.h:1617 src/xml/xmli18n-tmp.h:1620
-#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1626
-#: src/xml/xmli18n-tmp.h:1629 src/xml/xmli18n-tmp.h:1632
-#: src/xml/xmli18n-tmp.h:1635 src/xml/xmli18n-tmp.h:1638
-#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1644
-#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
-#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
-#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
-#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
-#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
-#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
-#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
-#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
-#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
-#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
-#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
-#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
-#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
-#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
-#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:1778
-#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1782
-#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1786
-#: src/xml/xmli18n-tmp.h:1788 src/xml/xmli18n-tmp.h:1790
-#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1794
-#: src/xml/xmli18n-tmp.h:1796 src/xml/xmli18n-tmp.h:1798
-#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1802
-#: src/xml/xmli18n-tmp.h:1804 src/xml/xmli18n-tmp.h:1806
-#: src/xml/xmli18n-tmp.h:1808 src/xml/xmli18n-tmp.h:1810
-#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3204
-#: src/xml/xmli18n-tmp.h:3210 src/xml/xmli18n-tmp.h:3216
-#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3232
-#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3250
-#: src/xml/xmli18n-tmp.h:3294 src/xml/xmli18n-tmp.h:3302
-#: src/xml/xmli18n-tmp.h:3304 src/xml/xmli18n-tmp.h:3312
-#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3379
-#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
-#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3421
-#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3441
-#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3469
-#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3555
-#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3597
-#: src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:1017
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1025
+#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1035 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1047 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1056
+#: src/xml/xmli18n-tmp.h:1061 src/xml/xmli18n-tmp.h:1066
+#: src/xml/xmli18n-tmp.h:1071 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1086
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1096
+#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1116
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1126
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1136
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1161 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1181 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1206
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1216
+#: src/xml/xmli18n-tmp.h:1221 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1236
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1246
+#: src/xml/xmli18n-tmp.h:1251 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1261 src/xml/xmli18n-tmp.h:1266
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1281 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1291 src/xml/xmli18n-tmp.h:1296
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1311 src/xml/xmli18n-tmp.h:1316
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1326
+#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1336
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1378 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1414 src/xml/xmli18n-tmp.h:1420
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1432
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1450 src/xml/xmli18n-tmp.h:1455
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1465
+#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1480 src/xml/xmli18n-tmp.h:1485
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1540 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1551 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1583 src/xml/xmli18n-tmp.h:1585
+#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1603 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1607 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1646
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1666
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1676
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1716
+#: src/xml/xmli18n-tmp.h:1721 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1736
+#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1835
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1843
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1851
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:2049
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2057
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2065
+#: src/xml/xmli18n-tmp.h:2069 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2113
+#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2129
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2137
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2153
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2161
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2185
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2264
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2272
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2276
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2282 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2286 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2296
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2300
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2308
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2314 src/xml/xmli18n-tmp.h:2316
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2324
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:3787 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3895 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:4223 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5579
+#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5825
 msgid "EPSON Standard Inks"
 msgstr "Epson standard blæk"
 
-#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:405
 msgid "Bright White Paper"
 msgstr "Lyst hvidt papir"
 
-#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
-#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
-#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
-#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
-#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
-#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
-#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
-#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:817
-#: src/xml/xmli18n-tmp.h:855 src/xml/xmli18n-tmp.h:912
-#: src/xml/xmli18n-tmp.h:969 src/xml/xmli18n-tmp.h:1026
-#: src/xml/xmli18n-tmp.h:1083 src/xml/xmli18n-tmp.h:1136
-#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1226
-#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1338
-#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1445
-#: src/xml/xmli18n-tmp.h:1505 src/xml/xmli18n-tmp.h:1568
-#: src/xml/xmli18n-tmp.h:1625 src/xml/xmli18n-tmp.h:1682
-#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1777
-#: src/xml/xmli18n-tmp.h:3675
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:139 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:959 src/xml/xmli18n-tmp.h:1018
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1155
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1546
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1931
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:5912
 msgid "Postcard"
 msgstr "Postkort"
 
-#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
-#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
-#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
-#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
-#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
-#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
-#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
-#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:825
-#: src/xml/xmli18n-tmp.h:867 src/xml/xmli18n-tmp.h:924
-#: src/xml/xmli18n-tmp.h:981 src/xml/xmli18n-tmp.h:1038
-#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1144
-#: src/xml/xmli18n-tmp.h:1182 src/xml/xmli18n-tmp.h:1238
-#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1346
-#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1457
-#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1580
-#: src/xml/xmli18n-tmp.h:1637 src/xml/xmli18n-tmp.h:1694
-#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1785
+#: src/xml/xmli18n-tmp.h:13 src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:155 src/xml/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:415 src/xml/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:851 src/xml/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1026
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1175
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1554
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1832
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2309
 msgid "Back Light Film"
 msgstr "Baglys film"
 
-#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
-#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
-#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
-#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
-#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
-#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
-#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
-#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:829
-#: src/xml/xmli18n-tmp.h:873 src/xml/xmli18n-tmp.h:930
-#: src/xml/xmli18n-tmp.h:987 src/xml/xmli18n-tmp.h:1044
-#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1148
-#: src/xml/xmli18n-tmp.h:1186 src/xml/xmli18n-tmp.h:1244
-#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1350
-#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1463
-#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1586
-#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1700
-#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1789
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:419 src/xml/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:857 src/xml/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1030
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1383
+#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1558
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2313
 msgid "Matte Paper Heavyweight"
 msgstr "Heavyweight mat papir"
 
-#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
-#: src/xml/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:421
 msgid "Premium Presentation Paper Matte"
 msgstr "Førsteklasses præsentationspapir mat"
 
-#: src/xml/xmli18n-tmp.h:27
-msgid "Premium Glossy Photo Paper 170 wt"
-msgstr "Førsteklasses blankt fotopapir 170 gram"
-
-#: src/xml/xmli18n-tmp.h:29
-msgid "Premium Glossy Photo Paper 250 wt"
-msgstr "Førsteklasses blankt fotopapir 250 gram"
-
-#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
-#: src/xml/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:431
 msgid "Ultra Glossy Photo Paper"
 msgstr "Højglans fotopapir"
 
-#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
-#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
-#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
-#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
-#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
-#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
-#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
-#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:839
-#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:945
-#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1059
-#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1158
-#: src/xml/xmli18n-tmp.h:1196 src/xml/xmli18n-tmp.h:1259
-#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1360
-#: src/xml/xmli18n-tmp.h:1415 src/xml/xmli18n-tmp.h:1478
-#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1601
-#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1715
-#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1210
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1413
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1568
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1695
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1964
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2176 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2287 src/xml/xmli18n-tmp.h:2323
 msgid "Premium Semigloss Photo Paper"
 msgstr "Førsteklasses silkemat fotopapir"
 
-#: src/xml/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:437
+msgid "Ultra Premium Photo Paper Luster"
+msgstr "Ultra førsteklasses blankt fotopapir"
+
+#: src/xml/xmli18n-tmp.h:37
+msgid "CD or DVD"
+msgstr "Cd eller dvd"
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:93 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1230
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1437
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2331
+msgid "ColorLife Paper"
+msgstr "ColorLife papir"
+
+#: src/xml/xmli18n-tmp.h:73
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Førsteklasses blankt fotopapir 170 gram"
+
+#: src/xml/xmli18n-tmp.h:75
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "Førsteklasses blankt fotopapir 250 gram"
+
+#: src/xml/xmli18n-tmp.h:81
 msgid "Premium Semigloss Photo Paper 170 wt"
 msgstr "Førsteklasses silkemat fotopapir 170 gram"
 
-#: src/xml/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:83
 msgid "Premium Semigloss Photo Paper 250 wt"
 msgstr "Førsteklasses silkemat fotopapir 250 gram"
 
-#: src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:87
 msgid "Premium Luster Photo Paper 250 wt"
 msgstr "Førsteklasses blankt fotopapir 250 gram"
 
-#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
-#: src/xml/xmli18n-tmp.h:334
-msgid "Ultra Premium Photo Paper Luster"
-msgstr "Ultra førsteklasses blankt fotopapir"
-
-#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
-#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
-#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
-#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
-#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
-#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
-#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
-#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:845
-#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:957
-#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1071
-#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1166
-#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1271
-#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1372
-#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1496
-#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1613
-#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1733
-#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1807
-msgid "ColorLife Paper"
-msgstr "ColorLife papir"
-
-#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
-#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
-#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
-#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
-#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
-#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
-#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
-#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
-#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
-#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
-#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
-#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
-#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
-#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
-#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
-#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
-#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
-#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
-#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
-#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
-#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
-#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
-#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
-#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
-#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
-#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
-#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
-#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
-#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
-#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
-#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
-#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
-#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
-#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
-#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
-#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
-#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
-#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
-#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
-#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
-#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
-#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
-#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
-#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
-#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
-#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
-#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:851
-#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:857
-#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:863
-#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:869
-#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:875
-#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:881
-#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:887
-#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:893
-#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:899
-#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:905
-#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:911
-#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:917
-#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:923
-#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:929
-#: src/xml/xmli18n-tmp.h:932 src/xml/xmli18n-tmp.h:935
-#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:941
-#: src/xml/xmli18n-tmp.h:944 src/xml/xmli18n-tmp.h:947
-#: src/xml/xmli18n-tmp.h:950 src/xml/xmli18n-tmp.h:953
-#: src/xml/xmli18n-tmp.h:956 src/xml/xmli18n-tmp.h:959
-#: src/xml/xmli18n-tmp.h:962 src/xml/xmli18n-tmp.h:965
-#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:971
-#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:977
-#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:983
-#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:989
-#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:995
-#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1001
-#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1007
-#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1013
-#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1019
-#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1025
-#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1031
-#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1037
-#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1043
-#: src/xml/xmli18n-tmp.h:1046 src/xml/xmli18n-tmp.h:1049
-#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1055
-#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1061
-#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1067
-#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1073
-#: src/xml/xmli18n-tmp.h:1076 src/xml/xmli18n-tmp.h:1079
-#: src/xml/xmli18n-tmp.h:1082 src/xml/xmli18n-tmp.h:1085
-#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1091
-#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1097
-#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1103
-#: src/xml/xmli18n-tmp.h:1106 src/xml/xmli18n-tmp.h:1109
-#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1115
-#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1121
-#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1127
-#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1133
-#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1225
-#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1231
-#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1237
-#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1243
-#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1249
-#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1255
-#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1261
-#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1267
-#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1273
-#: src/xml/xmli18n-tmp.h:1276 src/xml/xmli18n-tmp.h:1279
-#: src/xml/xmli18n-tmp.h:1282 src/xml/xmli18n-tmp.h:1285
-#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1291
-#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1297
-#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1303
-#: src/xml/xmli18n-tmp.h:1306 src/xml/xmli18n-tmp.h:1309
-#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1315
-#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1321
-#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1327
-#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1333
-#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1567
-#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1573
-#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1579
-#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1585
-#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1591
-#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1597
-#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1603
-#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1609
-#: src/xml/xmli18n-tmp.h:1612 src/xml/xmli18n-tmp.h:1615
-#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1621
-#: src/xml/xmli18n-tmp.h:1624 src/xml/xmli18n-tmp.h:1627
-#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1633
-#: src/xml/xmli18n-tmp.h:1636 src/xml/xmli18n-tmp.h:1639
-#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1645
-#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1651
-#: src/xml/xmli18n-tmp.h:1654 src/xml/xmli18n-tmp.h:1657
-#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1663
-#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1669
-#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1675
-#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3223
-#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3231
-#: src/xml/xmli18n-tmp.h:3238 src/xml/xmli18n-tmp.h:3239
-#: src/xml/xmli18n-tmp.h:3300 src/xml/xmli18n-tmp.h:3301
-#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3311
-#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3396
-#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3408
-#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3420
-#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3432
-#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3440
-#: src/xml/xmli18n-tmp.h:3479 src/xml/xmli18n-tmp.h:3480
-#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3492
-#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3554
-#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:133 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:149 src/xml/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:173 src/xml/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:197 src/xml/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:205 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:221 src/xml/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:229 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:245 src/xml/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:253 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:261 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:269 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:277 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:285 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:293 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:301 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:309 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:317 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:325 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:333 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:341 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:349 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:357 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:619 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:643 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:667 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:691 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:707 src/xml/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:715 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:731 src/xml/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:739 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:755 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1062
+#: src/xml/xmli18n-tmp.h:1067 src/xml/xmli18n-tmp.h:1072
+#: src/xml/xmli18n-tmp.h:1077 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1092
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1102
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1112
+#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1122
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1132
+#: src/xml/xmli18n-tmp.h:1137 src/xml/xmli18n-tmp.h:1142
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1157 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1177 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1192
+#: src/xml/xmli18n-tmp.h:1197 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1212
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1222
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1242
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1252
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1272
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1287 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1297 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1327 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1385 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1445 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1461
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1516 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1647
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1657
+#: src/xml/xmli18n-tmp.h:1662 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1677
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1687
+#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1742 src/xml/xmli18n-tmp.h:1747
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1767
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1807
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2090 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2098 src/xml/xmli18n-tmp.h:2102
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2118
+#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2126
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2162 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2190
+#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:3884 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:4779 src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:4845 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4919
+#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4980
+#: src/xml/xmli18n-tmp.h:4986 src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5209 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5276
+#: src/xml/xmli18n-tmp.h:5277 src/xml/xmli18n-tmp.h:5283
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5607 src/xml/xmli18n-tmp.h:5633
+#: src/xml/xmli18n-tmp.h:5634 src/xml/xmli18n-tmp.h:5640
 msgid "Quadtone"
-msgstr "FireTone grå"
-
-#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
-#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
-#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
-#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
-#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:852
-#: src/xml/xmli18n-tmp.h:909 src/xml/xmli18n-tmp.h:966
-#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1080
-#: src/xml/xmli18n-tmp.h:1172 src/xml/xmli18n-tmp.h:1223
-#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1336
-#: src/xml/xmli18n-tmp.h:1379 src/xml/xmli18n-tmp.h:1442
-#: src/xml/xmli18n-tmp.h:1565 src/xml/xmli18n-tmp.h:1622
-#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1775
+msgstr "Quadtone"
+
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:142 src/xml/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:150 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:174 src/xml/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:198 src/xml/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:214 src/xml/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:222 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:238 src/xml/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:246 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:262 src/xml/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:302 src/xml/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:310 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:318 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:326 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:334 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:342 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:350 src/xml/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:636 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:660 src/xml/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:708 src/xml/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:716 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:732 src/xml/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:756 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1103
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1123
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1158 src/xml/xmli18n-tmp.h:1163
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1183
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1193
+#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1213
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1223
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1238 src/xml/xmli18n-tmp.h:1243
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1253
+#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1283
+#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1313
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1333
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1362 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1374 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1462
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1472
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1487 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1502
+#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:1532
+#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1542
+#: src/xml/xmli18n-tmp.h:1633 src/xml/xmli18n-tmp.h:1638
+#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1648
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1658
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1713 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1728
+#: src/xml/xmli18n-tmp.h:1733 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1768
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2071
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2095
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2115 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2123 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2139 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2183
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2191
+#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2199
+msgid "MISQuadtone"
+msgstr "MIS Quadtone"
+
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1150 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2299
 msgid "Plain Paper Fast Load"
 msgstr "Almindeligt papir hurtigindføring"
 
-#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
-#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
-#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1364
-#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1484
-#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1970 src/xml/xmli18n-tmp.h:2030
+#: src/xml/xmli18n-tmp.h:2245
 msgid "Archival Matte Paper"
 msgstr "Arkivfast mat papir"
 
-#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
-#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
-#: src/xml/xmli18n-tmp.h:1202 src/xml/xmli18n-tmp.h:1366
-#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1487
-#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:881 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2248
 msgid "Watercolor Paper - Radiant White"
 msgstr "Vandfarvepapir - strålende hvidt"
 
-#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
-#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
-#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
-#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
-#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
-#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
-#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
-#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
-#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
-#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
-#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1377
-#: src/xml/xmli18n-tmp.h:1380 src/xml/xmli18n-tmp.h:1383
-#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1389
-#: src/xml/xmli18n-tmp.h:1392 src/xml/xmli18n-tmp.h:1395
-#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1401
-#: src/xml/xmli18n-tmp.h:1404 src/xml/xmli18n-tmp.h:1407
-#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1413
-#: src/xml/xmli18n-tmp.h:1416 src/xml/xmli18n-tmp.h:1419
-#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1425
-#: src/xml/xmli18n-tmp.h:1428 src/xml/xmli18n-tmp.h:1431
-#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1437
-#: src/xml/xmli18n-tmp.h:1440 src/xml/xmli18n-tmp.h:1443
-#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1449
-#: src/xml/xmli18n-tmp.h:1452 src/xml/xmli18n-tmp.h:1455
-#: src/xml/xmli18n-tmp.h:1458 src/xml/xmli18n-tmp.h:1461
-#: src/xml/xmli18n-tmp.h:1464 src/xml/xmli18n-tmp.h:1467
-#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1473
-#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1479
-#: src/xml/xmli18n-tmp.h:1482 src/xml/xmli18n-tmp.h:1485
-#: src/xml/xmli18n-tmp.h:1488 src/xml/xmli18n-tmp.h:1491
-#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1497
-#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1677
-#: src/xml/xmli18n-tmp.h:1680 src/xml/xmli18n-tmp.h:1683
-#: src/xml/xmli18n-tmp.h:1686 src/xml/xmli18n-tmp.h:1689
-#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1695
-#: src/xml/xmli18n-tmp.h:1698 src/xml/xmli18n-tmp.h:1701
-#: src/xml/xmli18n-tmp.h:1704 src/xml/xmli18n-tmp.h:1707
-#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1713
-#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1719
-#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1725
-#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1731
-#: src/xml/xmli18n-tmp.h:1734 src/xml/xmli18n-tmp.h:1737
-#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3503
-#: src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:1863
+#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1881
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1893
+#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1905
+#: src/xml/xmli18n-tmp.h:1908 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1923
+#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:1950 src/xml/xmli18n-tmp.h:1953
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1968 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1983
+#: src/xml/xmli18n-tmp.h:1986 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2204 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2255
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5645
 msgid "UltraChrome Photo Black"
 msgstr "UltraChrome foto sort"
 
-#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
-#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
-#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
-#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
-#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
-#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
-#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
-#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
-#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
-#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
-#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1378
-#: src/xml/xmli18n-tmp.h:1381 src/xml/xmli18n-tmp.h:1384
-#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1390
-#: src/xml/xmli18n-tmp.h:1393 src/xml/xmli18n-tmp.h:1396
-#: src/xml/xmli18n-tmp.h:1399 src/xml/xmli18n-tmp.h:1402
-#: src/xml/xmli18n-tmp.h:1405 src/xml/xmli18n-tmp.h:1408
-#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1414
-#: src/xml/xmli18n-tmp.h:1417 src/xml/xmli18n-tmp.h:1420
-#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1426
-#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1432
-#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1438
-#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1444
-#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1450
-#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1456
-#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1462
-#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1468
-#: src/xml/xmli18n-tmp.h:1471 src/xml/xmli18n-tmp.h:1474
-#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1480
-#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1486
-#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1492
-#: src/xml/xmli18n-tmp.h:1495 src/xml/xmli18n-tmp.h:1498
-#: src/xml/xmli18n-tmp.h:1501 src/xml/xmli18n-tmp.h:1678
-#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1684
-#: src/xml/xmli18n-tmp.h:1687 src/xml/xmli18n-tmp.h:1690
-#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1696
-#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1702
-#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1708
-#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1714
-#: src/xml/xmli18n-tmp.h:1717 src/xml/xmli18n-tmp.h:1720
-#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1726
-#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1732
-#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1738
-#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3517
-#: src/xml/xmli18n-tmp.h:3577
+#: src/xml/xmli18n-tmp.h:835 src/xml/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:841 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1879 src/xml/xmli18n-tmp.h:1882
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1894
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1909 src/xml/xmli18n-tmp.h:1912
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1924
+#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1954
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1969 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1984
+#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2208
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2229 src/xml/xmli18n-tmp.h:2232
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2238
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2244
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2253 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2259 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5714
 msgid "UltraChrome Matte Black"
 msgstr "UltraChrome mat sort"
 
-#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1826
-#: src/xml/xmli18n-tmp.h:1839 src/xml/xmli18n-tmp.h:1852
-#: src/xml/xmli18n-tmp.h:1907 src/xml/xmli18n-tmp.h:1923
-#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1952
-#: src/xml/xmli18n-tmp.h:1965 src/xml/xmli18n-tmp.h:2054
-#: src/xml/xmli18n-tmp.h:2081 src/xml/xmli18n-tmp.h:2146
-#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
-#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
-#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2348
-#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2407
-#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2899
-#: src/xml/xmli18n-tmp.h:2916 src/xml/xmli18n-tmp.h:3142
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1139
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1154 src/xml/xmli18n-tmp.h:1159
+#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1179
+#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1199
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1214 src/xml/xmli18n-tmp.h:1219
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1229
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1244 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1259
+#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1274 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1289
+#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1309
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1329
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1423
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1429
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1447
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1634
+#: src/xml/xmli18n-tmp.h:1639 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1664
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1764
+#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1784
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1799 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1819
+msgid "MIS Hextone"
+msgstr "MIS Hextone"
+
+#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1463 src/xml/xmli18n-tmp.h:1468
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1478
+#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1508
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1533 src/xml/xmli18n-tmp.h:1538
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4858 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:5289
+msgid "Hextone"
+msgstr "Hextone"
+
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2489 src/xml/xmli18n-tmp.h:2578
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2713 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2752
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2885 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:3051 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3665
 msgid "360 x 90 DPI Fast Economy"
 msgstr "360 x 90 DPI hurtig økonomisk"
 
-#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1828
-#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1853
-#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1879
-#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
-#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1940
-#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1966
-#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2055
-#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2133
-#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2175
-#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
-#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
-#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2336
-#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
-#: src/xml/xmli18n-tmp.h:2408 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2699
+#: src/xml/xmli18n-tmp.h:2714 src/xml/xmli18n-tmp.h:2727
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2886
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:3052
 msgid "180 DPI Economy"
 msgstr "180 DPI økonomisk"
 
-#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1830
-#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1854
-#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1880
-#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
-#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1941
-#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1967
-#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
-#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2134
-#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2176
-#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
-#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
-#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2337
-#: src/xml/xmli18n-tmp.h:2350 src/xml/xmli18n-tmp.h:2363
-#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
-#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2434
-#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2459
-#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2529
-#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2601
-#: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2703
-#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2735
-#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2768
-#: src/xml/xmli18n-tmp.h:2872 src/xml/xmli18n-tmp.h:2884
-#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2917
-#: src/xml/xmli18n-tmp.h:2961 src/xml/xmli18n-tmp.h:3007
-#: src/xml/xmli18n-tmp.h:3021 src/xml/xmli18n-tmp.h:3035
-#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3126
-#: src/xml/xmli18n-tmp.h:3143
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2404
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2658
+#: src/xml/xmli18n-tmp.h:2672 src/xml/xmli18n-tmp.h:2700
+#: src/xml/xmli18n-tmp.h:2715 src/xml/xmli18n-tmp.h:2728
+#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2754
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2919 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3053
+#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3125
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3292
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3530
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3649
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3684
 msgid "360 x 180 DPI Draft"
 msgstr "360 x 180 DPI kladde"
 
-#: src/xml/xmli18n-tmp.h:1818 src/xml/xmli18n-tmp.h:1831
-#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1855
-#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1881
-#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
-#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1942
-#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1968
-#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2135
-#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2392 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2418 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2479 src/xml/xmli18n-tmp.h:2492
+#: src/xml/xmli18n-tmp.h:2581 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2862 src/xml/xmli18n-tmp.h:2934
 msgid "360 DPI High Quality"
 msgstr "360 DPI høj kvalitet"
 
-#: src/xml/xmli18n-tmp.h:1819 src/xml/xmli18n-tmp.h:1832
-#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1856
-#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1882
-#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
-#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1943
-#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1969
-#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1992
-#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2020
-#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
-#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
-#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2096
-#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2123
-#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2149
-#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2177
-#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2205
-#: src/xml/xmli18n-tmp.h:2218 src/xml/xmli18n-tmp.h:2231
-#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2254
-#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
-#: src/xml/xmli18n-tmp.h:2297 src/xml/xmli18n-tmp.h:2312
-#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2339
-#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
-#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2385
-#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2411
-#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2435
-#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2460
-#: src/xml/xmli18n-tmp.h:2473 src/xml/xmli18n-tmp.h:2488
-#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2516
-#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2541
-#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2591
-#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
-#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2645
-#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2675
-#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2704
-#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2736
-#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2769
-#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2808
-#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2833
-#: src/xml/xmli18n-tmp.h:2847 src/xml/xmli18n-tmp.h:2861
-#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2885
-#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2918
-#: src/xml/xmli18n-tmp.h:2935 src/xml/xmli18n-tmp.h:2950
-#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2987
-#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3022
-#: src/xml/xmli18n-tmp.h:3036 src/xml/xmli18n-tmp.h:3050
-#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3081
-#: src/xml/xmli18n-tmp.h:3098 src/xml/xmli18n-tmp.h:3113
-#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2369 src/xml/xmli18n-tmp.h:2380
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2406
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2493
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2544
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
+#: src/xml/xmli18n-tmp.h:2582 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2729
+#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2806
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2836
+#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
+#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3012
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3040
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3184 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3424 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3485 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3573
+#: src/xml/xmli18n-tmp.h:3587 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3650 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3685
 msgid "360 DPI"
 msgstr "360 DPI"
 
-#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1833
-#: src/xml/xmli18n-tmp.h:1846 src/xml/xmli18n-tmp.h:1857
-#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1883
-#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1912
-#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1944
-#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1970
-#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1993
-#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2021
-#: src/xml/xmli18n-tmp.h:2033 src/xml/xmli18n-tmp.h:2045
-#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
-#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2097
-#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2124
-#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2150
-#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2178
-#: src/xml/xmli18n-tmp.h:2193 src/xml/xmli18n-tmp.h:2206
-#: src/xml/xmli18n-tmp.h:2219 src/xml/xmli18n-tmp.h:2232
-#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2255
-#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
-#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2313
-#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2340
-#: src/xml/xmli18n-tmp.h:2352 src/xml/xmli18n-tmp.h:2365
-#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2386
-#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2412
-#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2436
-#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2461
-#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2489
-#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2517
-#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2542
-#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2567
-#: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2592
-#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2616
-#: src/xml/xmli18n-tmp.h:2631 src/xml/xmli18n-tmp.h:2646
-#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2676
-#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2705
-#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2737
-#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2770
-#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2809
-#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2834
-#: src/xml/xmli18n-tmp.h:2848 src/xml/xmli18n-tmp.h:2862
-#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2886
-#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2919
-#: src/xml/xmli18n-tmp.h:2936 src/xml/xmli18n-tmp.h:2951
-#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2988
-#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3023
-#: src/xml/xmli18n-tmp.h:3037 src/xml/xmli18n-tmp.h:3051
-#: src/xml/xmli18n-tmp.h:3066 src/xml/xmli18n-tmp.h:3083
-#: src/xml/xmli18n-tmp.h:3099 src/xml/xmli18n-tmp.h:3114
-#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:2344 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2452 src/xml/xmli18n-tmp.h:2468
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2494
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2557 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:2594
+#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2648
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2674
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2807
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2837
+#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
+#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3013
+#: src/xml/xmli18n-tmp.h:3026 src/xml/xmli18n-tmp.h:3041
+#: src/xml/xmli18n-tmp.h:3055 src/xml/xmli18n-tmp.h:3066
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3140
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3170
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3229
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3333
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3358
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3385
+#: src/xml/xmli18n-tmp.h:3397 src/xml/xmli18n-tmp.h:3409
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3442
+#: src/xml/xmli18n-tmp.h:3459 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3574
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3637
+#: src/xml/xmli18n-tmp.h:3651 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3686
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1834
-#: src/xml/xmli18n-tmp.h:1847 src/xml/xmli18n-tmp.h:1858
-#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1884
-#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1913
-#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1945
-#: src/xml/xmli18n-tmp.h:1958 src/xml/xmli18n-tmp.h:1971
-#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:1994
-#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2022
-#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2046
-#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2071
-#: src/xml/xmli18n-tmp.h:2086 src/xml/xmli18n-tmp.h:2098
-#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2125
-#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2151
-#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2179
-#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2207
-#: src/xml/xmli18n-tmp.h:2220 src/xml/xmli18n-tmp.h:2233
-#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2256
-#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
-#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2314
-#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2341
-#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
-#: src/xml/xmli18n-tmp.h:2376 src/xml/xmli18n-tmp.h:2387
-#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2413
-#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2437
-#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2462
-#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2490
-#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2518
-#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2543
-#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
-#: src/xml/xmli18n-tmp.h:2580 src/xml/xmli18n-tmp.h:2593
-#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2617
-#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
-#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2677
-#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2706
-#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2738
-#: src/xml/xmli18n-tmp.h:2753 src/xml/xmli18n-tmp.h:2771
-#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2810
-#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2835
-#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
-#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2887
-#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2921
-#: src/xml/xmli18n-tmp.h:2937 src/xml/xmli18n-tmp.h:2952
-#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2990
-#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3024
-#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3052
-#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3085
-#: src/xml/xmli18n-tmp.h:3100 src/xml/xmli18n-tmp.h:3115
-#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:2345 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2469
+#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2546
+#: src/xml/xmli18n-tmp.h:2558 src/xml/xmli18n-tmp.h:2570
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2595
+#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2622
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2675
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2731
+#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2808
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2838
+#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2890
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2922 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3014
+#: src/xml/xmli18n-tmp.h:3027 src/xml/xmli18n-tmp.h:3042
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3067
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3186 src/xml/xmli18n-tmp.h:3201
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3334
+#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3359
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3444
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3475
+#: src/xml/xmli18n-tmp.h:3489 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3533 src/xml/xmli18n-tmp.h:3547
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3652 src/xml/xmli18n-tmp.h:3669
+#: src/xml/xmli18n-tmp.h:3687
 msgid "720 DPI"
 msgstr "720 DPI"
 
-#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
-#: src/xml/xmli18n-tmp.h:1978 src/xml/xmli18n-tmp.h:2004
-#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2030
-#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2067
-#: src/xml/xmli18n-tmp.h:2094 src/xml/xmli18n-tmp.h:2107
-#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2161
-#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2252
-#: src/xml/xmli18n-tmp.h:2280 src/xml/xmli18n-tmp.h:2295
-#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2323
-#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
-#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2486
-#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2552
-#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2613
-#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
-#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2686
-#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2806
-#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2831
-#: src/xml/xmli18n-tmp.h:2845 src/xml/xmli18n-tmp.h:2859
-#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2948
-#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3080
-#: src/xml/xmli18n-tmp.h:3097 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2554
+#: src/xml/xmli18n-tmp.h:2566 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2804 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2834 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3076
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3382
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3586 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3634
 msgid "360 x 120 DPI Economy"
 msgstr "360 x 120 DPI økonomisk"
 
-#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1842
-#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2005
-#: src/xml/xmli18n-tmp.h:2019 src/xml/xmli18n-tmp.h:2031
-#: src/xml/xmli18n-tmp.h:2043 src/xml/xmli18n-tmp.h:2068
-#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
-#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2162
-#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2253
-#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2296
-#: src/xml/xmli18n-tmp.h:2311 src/xml/xmli18n-tmp.h:2324
-#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2384
-#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2487
-#: src/xml/xmli18n-tmp.h:2500 src/xml/xmli18n-tmp.h:2553
-#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2614
-#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2644
-#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2687
-#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2807
-#: src/xml/xmli18n-tmp.h:2820 src/xml/xmli18n-tmp.h:2832
-#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
-#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2949
-#: src/xml/xmli18n-tmp.h:3112
+#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2555
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2632
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3077
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3211
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3383
+#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3635
 msgid "360 x 240 DPI Draft"
 msgstr "360 x 240 DPI kladde"
 
-#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1872
-#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1898
-#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1930
-#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1959
-#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:1995
-#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2023
-#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2047
-#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2087
-#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2112
-#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2139
-#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2166
-#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2328
-#: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2388
-#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2557
-#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2922
-#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2991
-#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3086
+#: src/xml/xmli18n-tmp.h:2383 src/xml/xmli18n-tmp.h:2396
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2422
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2470 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2507 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2704 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:3057 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3118 src/xml/xmli18n-tmp.h:3445
+#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3514
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3609
 msgid "720 DPI High Quality"
 msgstr "720 DPI høj kvalitet"
 
-#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1873
-#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1899
-#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1931
-#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1984
-#: src/xml/xmli18n-tmp.h:1996 src/xml/xmli18n-tmp.h:2010
-#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2036
-#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2061
-#: src/xml/xmli18n-tmp.h:2073 src/xml/xmli18n-tmp.h:2088
-#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2127
-#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2153
-#: src/xml/xmli18n-tmp.h:2167 src/xml/xmli18n-tmp.h:2181
-#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2208
-#: src/xml/xmli18n-tmp.h:2221 src/xml/xmli18n-tmp.h:2234
-#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2257
-#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2285
-#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2315
-#: src/xml/xmli18n-tmp.h:2329 src/xml/xmli18n-tmp.h:2354
-#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2389
-#: src/xml/xmli18n-tmp.h:2399 src/xml/xmli18n-tmp.h:2425
-#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2451
-#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
-#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2504
-#: src/xml/xmli18n-tmp.h:2519 src/xml/xmli18n-tmp.h:2534
-#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2558
-#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2605
-#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2633
-#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2663
-#: src/xml/xmli18n-tmp.h:2678 src/xml/xmli18n-tmp.h:2691
-#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2725
-#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2754
-#: src/xml/xmli18n-tmp.h:2772 src/xml/xmli18n-tmp.h:2787
-#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2811
-#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2836
-#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
-#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2888
-#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2923
-#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2953
-#: src/xml/xmli18n-tmp.h:2968 src/xml/xmli18n-tmp.h:2978
-#: src/xml/xmli18n-tmp.h:2992 src/xml/xmli18n-tmp.h:3011
-#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3039
-#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
-#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3101
-#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3130
-#: src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:2384 src/xml/xmli18n-tmp.h:2397
+#: src/xml/xmli18n-tmp.h:2410 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2548 src/xml/xmli18n-tmp.h:2560
+#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2691 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2794 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2839
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2923 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3105
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3129
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3231 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3311
+#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3335
+#: src/xml/xmli18n-tmp.h:3348 src/xml/xmli18n-tmp.h:3360
+#: src/xml/xmli18n-tmp.h:3372 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3427 src/xml/xmli18n-tmp.h:3446
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3576 src/xml/xmli18n-tmp.h:3593
+#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3688
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1874
-#: src/xml/xmli18n-tmp.h:1887 src/xml/xmli18n-tmp.h:1900
-#: src/xml/xmli18n-tmp.h:1916 src/xml/xmli18n-tmp.h:1932
-#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1985
-#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2011
-#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2037
-#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2062
-#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2089
-#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2128
-#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2154
-#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2182
-#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2258
-#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
-#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2316
-#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2390
-#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2559
-#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2634
-#: src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2385 src/xml/xmli18n-tmp.h:2398
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2535
+#: src/xml/xmli18n-tmp.h:2549 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2782
+#: src/xml/xmli18n-tmp.h:2795 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3388
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 720 DPI højeste kvalitet"
 
-#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1960
-#: src/xml/xmli18n-tmp.h:2100 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2902
 msgid "720 DPI Highest Quality"
 msgstr "720 DPI højeste kvalitet"
 
-#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2259
-#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
-#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2317
-#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2477
-#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2505
-#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2606
-#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2635
-#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2740
-#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2866
-#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2796 src/xml/xmli18n-tmp.h:2811
+#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3216 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3412
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2260
-#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
-#: src/xml/xmli18n-tmp.h:2303 src/xml/xmli18n-tmp.h:2318
-#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2771 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2812
+#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:3160 src/xml/xmli18n-tmp.h:3390
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 x 720 DPI højeste kvalitet"
 
-#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2439
-#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2493
-#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2546
-#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2582
-#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2620
-#: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2664
-#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
-#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2726
-#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2755
-#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2789
-#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2812
-#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2878
-#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
-#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2939
-#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2969
-#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2994
-#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
-#: src/xml/xmli18n-tmp.h:3088 src/xml/xmli18n-tmp.h:3102
-#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3131
-#: src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2963
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3070
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3106
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3297 src/xml/xmli18n-tmp.h:3313
+#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
+#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3401
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3492
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3577 src/xml/xmli18n-tmp.h:3594
+#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3671 src/xml/xmli18n-tmp.h:3689
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2426
-#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2452
-#: src/xml/xmli18n-tmp.h:2464 src/xml/xmli18n-tmp.h:2479
-#: src/xml/xmli18n-tmp.h:2494 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2547
-#: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2583
-#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2621
-#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2665
-#: src/xml/xmli18n-tmp.h:2680 src/xml/xmli18n-tmp.h:2694
-#: src/xml/xmli18n-tmp.h:2709 src/xml/xmli18n-tmp.h:2727
-#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2756
-#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2790
-#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2813
-#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2837
-#: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2879
-#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
-#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2940
-#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2970
-#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2995
-#: src/xml/xmli18n-tmp.h:3012 src/xml/xmli18n-tmp.h:3026
-#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3055
-#: src/xml/xmli18n-tmp.h:3072 src/xml/xmli18n-tmp.h:3089
-#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3118
-#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3071
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3107
+#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3251
+#: src/xml/xmli18n-tmp.h:3266 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3298 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3324 src/xml/xmli18n-tmp.h:3337
+#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3374 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3463
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3535 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3563 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3612
+#: src/xml/xmli18n-tmp.h:3626 src/xml/xmli18n-tmp.h:3641
+#: src/xml/xmli18n-tmp.h:3655 src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:3690
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:4374
 msgid "Dark Yellow"
 msgstr "Mørk gul"
 
-#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2584
-#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2711
-#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2743
-#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2776
-#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2908
-#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2972
-#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3057
-#: src/xml/xmli18n-tmp.h:3074 src/xml/xmli18n-tmp.h:3091
-#: src/xml/xmli18n-tmp.h:3105 src/xml/xmli18n-tmp.h:3134
-#: src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3108
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3267
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3495
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3614
+#: src/xml/xmli18n-tmp.h:3628 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3692
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/xml/xmli18n-tmp.h:2666 src/xml/xmli18n-tmp.h:2681
-#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2728
-#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2775
-#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2814
-#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2838
-#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2926
-#: src/xml/xmli18n-tmp.h:2941 src/xml/xmli18n-tmp.h:2971
-#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
-#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
-#: src/xml/xmli18n-tmp.h:3090 src/xml/xmli18n-tmp.h:3104
-#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3133
-#: src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3190 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3234 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3325 src/xml/xmli18n-tmp.h:3338
+#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3362
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3505
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3613
+#: src/xml/xmli18n-tmp.h:3627 src/xml/xmli18n-tmp.h:3642
+#: src/xml/xmli18n-tmp.h:3656 src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:3691
 msgid "5760 x 1440 DPI"
 msgstr "5760 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2712
-#: src/xml/xmli18n-tmp.h:2730 src/xml/xmli18n-tmp.h:2759
-#: src/xml/xmli18n-tmp.h:2777 src/xml/xmli18n-tmp.h:2909
-#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2973
-#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3058
-#: src/xml/xmli18n-tmp.h:3075 src/xml/xmli18n-tmp.h:3092
-#: src/xml/xmli18n-tmp.h:3106 src/xml/xmli18n-tmp.h:3135
-#: src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3301 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3496
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3615
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
 msgid "5760 x 2880 DPI"
 msgstr "5760 x 2880 DPI"
 
-#: src/xml/xmli18n-tmp.h:2798 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3502
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI vendt om"
 
-#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2965
-#: src/xml/xmli18n-tmp.h:2989 src/xml/xmli18n-tmp.h:3067
-#: src/xml/xmli18n-tmp.h:3084
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:3607
 msgid "720 x 360 DPI Enhanced"
 msgstr "720 x 360 DPI forbedret"
 
-#: src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:3479
 msgid "Black 1"
 msgstr "Sort 1"
 
-#: src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3480
 msgid "Black 2"
 msgstr "Sort 2"
 
-#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3065
-#: src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3605
 msgid "360 DPI Enhanced"
 msgstr "360 DPI forbedret"
 
-#: src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3516
 msgid "1440 x 720 DPI High Quality"
 msgstr "1440 x 720 DPI høj kvalitet"
 
-#: src/xml/xmli18n-tmp.h:3153
-#, fuzzy
-msgid "Lower Front Tray"
-msgstr "Front bakke"
+#: src/xml/xmli18n-tmp.h:3677
+msgid "Vivid Light Magenta"
+msgstr "Livlig lys magenta"
 
-#: src/xml/xmli18n-tmp.h:3154
-#, fuzzy
-msgid "Upper Front Tray"
-msgstr "Front bakke"
+#: src/xml/xmli18n-tmp.h:3682
+msgid "Vivid Magenta"
+msgstr "Livlig magenta"
+
+#: src/xml/xmli18n-tmp.h:3694
+msgid "Main Tray"
+msgstr "Hovedbakke"
+
+#: src/xml/xmli18n-tmp.h:3695
+msgid "Photo Tray"
+msgstr "Fotobakke"
 
-#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3160
-#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3176
-#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3186
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3725 src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:3732
 msgid "Print to CD"
-msgstr "Udskriv på Cd"
+msgstr "Udskriv på cd"
 
-#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3181
-#: src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:3730
 msgid "Rear Tray"
 msgstr "Bagerste bakke"
 
-#: src/xml/xmli18n-tmp.h:3157 src/xml/xmli18n-tmp.h:3182
-#: src/xml/xmli18n-tmp.h:3185
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:3731
 msgid "Front Tray"
-msgstr "Front bakke"
+msgstr "Frontbakke"
 
-#: src/xml/xmli18n-tmp.h:3159 src/xml/xmli18n-tmp.h:3164
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3705
 msgid "Manual Feed"
 msgstr "Manuel fødning"
 
-#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3709
 msgid "Roll Feed (cut each page)"
 msgstr "Rulle fødning (skær efter hver side)"
 
-#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3710
 msgid "Roll Feed (do not cut)"
 msgstr "Rulle fødning (ingen afskæring)"
 
-#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3171
-#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3180
-#: src/xml/xmli18n-tmp.h:3193
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3716 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3739
 msgid "Roll Feed"
 msgstr "Rulle fødning"
 
-#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3714 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3723
 msgid "Manual Sheet Guide"
 msgstr "Manuel ark guide"
 
-#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3715 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3724
 msgid "Manual Feed (Front)"
 msgstr "Manuel fødning (front)"
 
-#: src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3733
 msgid "Photo Board"
 msgstr "Foto plade"
 
-#: src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3734
 msgid "Cut Sheet Bin 1"
 msgstr "Tilskårne ark, bakke 1"
 
-#: src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3735
 msgid "Cut Sheet Bin 2"
 msgstr "Tilskårne ark, bakke 2"
 
-#: src/xml/xmli18n-tmp.h:3190
+#: src/xml/xmli18n-tmp.h:3736
 msgid "Cut Sheet Autoselect"
 msgstr "Automatisk valg af bakke"
 
-#: src/xml/xmli18n-tmp.h:3191
+#: src/xml/xmli18n-tmp.h:3737
 msgid "Manual Selection"
 msgstr "Manuel udvælgelse"
 
-#: src/xml/xmli18n-tmp.h:3199 src/xml/xmli18n-tmp.h:3207
-#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3219
-#: src/xml/xmli18n-tmp.h:3227 src/xml/xmli18n-tmp.h:3235
-#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3257
-#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3278
-#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3297
-#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3317
-#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3342
-#: src/xml/xmli18n-tmp.h:3356 src/xml/xmli18n-tmp.h:3382
-#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
-#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3426
-#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3446
-#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3474
-#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3498
-#: src/xml/xmli18n-tmp.h:3510 src/xml/xmli18n-tmp.h:3524
-#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3558
-#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:3584
-#: src/xml/xmli18n-tmp.h:3594 src/xml/xmli18n-tmp.h:3600
-#: src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3763 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3872 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:4067 src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4172 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4236 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:4754 src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5102 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5679 src/xml/xmli18n-tmp.h:5748
+#: src/xml/xmli18n-tmp.h:5793 src/xml/xmli18n-tmp.h:5814
+#: src/xml/xmli18n-tmp.h:5835
 msgid "One Color Raw"
 msgstr "En farve ufiltreret"
 
-#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3208
-#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3220
-#: src/xml/xmli18n-tmp.h:3228 src/xml/xmli18n-tmp.h:3236
-#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3259
-#: src/xml/xmli18n-tmp.h:3270 src/xml/xmli18n-tmp.h:3280
-#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3298
-#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3318
-#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3344
-#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3383
-#: src/xml/xmli18n-tmp.h:3391 src/xml/xmli18n-tmp.h:3403
-#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3427
-#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3447
-#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3475
-#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3499
-#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3526
-#: src/xml/xmli18n-tmp.h:3551 src/xml/xmli18n-tmp.h:3559
-#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3586
-#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3601
-#: src/xml/xmli18n-tmp.h:3607
+#: src/xml/xmli18n-tmp.h:3765 src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4484 src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:4756 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5321
+#: src/xml/xmli18n-tmp.h:5382 src/xml/xmli18n-tmp.h:5451
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5795 src/xml/xmli18n-tmp.h:5816
+#: src/xml/xmli18n-tmp.h:5837
 msgid "Three Color Raw"
 msgstr "Tre farver ufiltreret"
 
-#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
-#: src/xml/xmli18n-tmp.h:3215 src/xml/xmli18n-tmp.h:3221
-#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3237
-#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3271
-#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3299
-#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3319
-#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3345
-#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3384
-#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
-#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3428
-#: src/xml/xmli18n-tmp.h:3438 src/xml/xmli18n-tmp.h:3448
-#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3463
-#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3476
-#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3500
-#: src/xml/xmli18n-tmp.h:3513 src/xml/xmli18n-tmp.h:3527
-#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3560
-#: src/xml/xmli18n-tmp.h:3573 src/xml/xmli18n-tmp.h:3587
-#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3602
-#: src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:3824 src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5325
+#: src/xml/xmli18n-tmp.h:5386 src/xml/xmli18n-tmp.h:5455
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5757
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5841
 msgid "Four Color Raw"
 msgstr "Fire farver ufiltreret"
 
-#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3248
-#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
-#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3360
-#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
-#: src/xml/xmli18n-tmp.h:3417 src/xml/xmli18n-tmp.h:3429
-#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3459
-#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3501 src/xml/xmli18n-tmp.h:3514
-#: src/xml/xmli18n-tmp.h:3528 src/xml/xmli18n-tmp.h:3574
-#: src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4424 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:5066 src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:5196 src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5391
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5762
 msgid "Five Color Raw"
 msgstr "Fem farver ufiltreret"
 
-#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3249
-#: src/xml/xmli18n-tmp.h:3272 src/xml/xmli18n-tmp.h:3293
-#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3333
-#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3361
-#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
-#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3430
-#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3460
-#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3478
-#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3502
-#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3529
-#: src/xml/xmli18n-tmp.h:3575 src/xml/xmli18n-tmp.h:3589
+#: src/xml/xmli18n-tmp.h:3780 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:4078 src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:4430 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4972
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5150 src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5336
+#: src/xml/xmli18n-tmp.h:5397 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5768
 msgid "Six Color Raw"
 msgstr "Seks farver ufiltreret"
 
-#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3919 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:4781 src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:4795 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4921
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:4996
+#: src/xml/xmli18n-tmp.h:5023 src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:5226 src/xml/xmli18n-tmp.h:5279
+#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5603 src/xml/xmli18n-tmp.h:5609
+#: src/xml/xmli18n-tmp.h:5636 src/xml/xmli18n-tmp.h:5642
+msgid "Gray 3"
+msgstr "Grå 3"
+
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4782 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4796 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4916 src/xml/xmli18n-tmp.h:4922
+#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4983
+#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5286 src/xml/xmli18n-tmp.h:5294
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5643
+msgid "Gray 2"
+msgstr "Grå 2"
+
+#: src/xml/xmli18n-tmp.h:3855 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:4856 src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:4931 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4998
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:5214 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5611
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5644
+msgid "Gray 1"
+msgstr "Grå 1"
+
+# MIS - fermstiller af farvepatroner.
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4985 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5606 src/xml/xmli18n-tmp.h:5639
+msgid "MIS Quadtone"
+msgstr "MIS Quadtone"
+
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4114
 msgid "One Color Raw Enhanced Gloss"
 msgstr "En farve ufiltreret forbedret glans"
 
-#: src/xml/xmli18n-tmp.h:3260 src/xml/xmli18n-tmp.h:3281
+#: src/xml/xmli18n-tmp.h:4016 src/xml/xmli18n-tmp.h:4121
 msgid "Three Color Raw Gloss"
 msgstr "Fire farver ufiltreret, glans "
 
-#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3282
+#: src/xml/xmli18n-tmp.h:4021 src/xml/xmli18n-tmp.h:4126
 msgid "Four Color Raw Gloss"
 msgstr "Fire farver ufiltreret, glans"
 
-#: src/xml/xmli18n-tmp.h:3262 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4132
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Seks farver forbedret glans ufiltreret"
 
-#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:4035 src/xml/xmli18n-tmp.h:4140
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Syv farver forbedret glans ufiltreret"
 
-#: src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:4141
+msgid "MatteBlack"
+msgstr "Matsort"
+
+#: src/xml/xmli18n-tmp.h:4224
 msgid "Default Black"
 msgstr "Standard sort"
 
-#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
-#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3365
-#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3504
-#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3533
-#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3564
-#: src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4446 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4573 src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:5344
+#: src/xml/xmli18n-tmp.h:5413 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Seven Color Photo"
 msgstr "Syv farver foto"
 
-#: src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:4315
 msgid "Six Color Enhanced Composite"
 msgstr "Seks farver forbedret sammensat"
 
-#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3348
-#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3516
-#: src/xml/xmli18n-tmp.h:3530 src/xml/xmli18n-tmp.h:3576
-#: src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:4368 src/xml/xmli18n-tmp.h:4437
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:5404
+#: src/xml/xmli18n-tmp.h:5473 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5775
 msgid "Seven Color Raw"
 msgstr "Syv farver ufiltreret"
 
-#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3355
-#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3523
-#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5745
 msgid "Two Level Grayscale"
 msgstr "To-niveau gråskala"
 
-#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3357
-#: src/xml/xmli18n-tmp.h:3511 src/xml/xmli18n-tmp.h:3525
-#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:4412 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5448
+#: src/xml/xmli18n-tmp.h:5681 src/xml/xmli18n-tmp.h:5750
 msgid "Two Color Raw"
 msgstr "To farver ufiltreret"
 
-#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3372
-#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3540
+#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5531
 msgid "Eight Color Photo"
 msgstr "Otte farver foto"
 
-#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3378
-#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:4652 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5570
 msgid "Eight Color Raw"
 msgstr "Otte farver ufiltreret"
 
-#: src/xml/xmli18n-tmp.h:3462 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:5288
+msgid "MIS Six Tone"
+msgstr "MIS Sixtone"
+
+#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:4994
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5291
+msgid "Gray 5"
+msgstr "Grå 5"
+
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:4928 src/xml/xmli18n-tmp.h:4995
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5292
+msgid "Gray 4"
+msgstr "Grå 4"
+
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5145
 msgid "Four Color Photo"
 msgstr "Fire farver foto"
 
-#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3615
-#: src/xml/xmli18n-tmp.h:3621
+#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5852
+#: src/xml/xmli18n-tmp.h:5858
 msgid "Interleave"
 msgstr "Udjævning"
 
-#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3616
-#: src/xml/xmli18n-tmp.h:3622
+#: src/xml/xmli18n-tmp.h:5848 src/xml/xmli18n-tmp.h:5853
+#: src/xml/xmli18n-tmp.h:5859
 msgid "Full Overlap"
 msgstr "Fuld overlapning"
 
-#: src/xml/xmli18n-tmp.h:3612 src/xml/xmli18n-tmp.h:3617
-#: src/xml/xmli18n-tmp.h:3623
+#: src/xml/xmli18n-tmp.h:5849 src/xml/xmli18n-tmp.h:5854
+#: src/xml/xmli18n-tmp.h:5860
 msgid "Four Pass"
 msgstr "Fire gennemløb"
 
-#: src/xml/xmli18n-tmp.h:3613 src/xml/xmli18n-tmp.h:3618
-#: src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5855
+#: src/xml/xmli18n-tmp.h:5861
 msgid "Full Overlap 2"
 msgstr "Fuld overlapning 2"
 
-#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:5862
 msgid "Interleave 2"
 msgstr "Udjævning 2"
 
-#: src/xml/xmli18n-tmp.h:3626
+#: src/xml/xmli18n-tmp.h:5863
 msgid "Eight Pass"
 msgstr "Otte gennemløb"
 
-#: src/xml/xmli18n-tmp.h:3628
+#: src/xml/xmli18n-tmp.h:5865
 msgid "On"
 msgstr "Tændt"
 
-#: src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:5909
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:5910
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:3674
+#: src/xml/xmli18n-tmp.h:5911
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:3679
+#: src/xml/xmli18n-tmp.h:5916
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:3680
+#: src/xml/xmli18n-tmp.h:5917
 msgid "3 1/2 x5"
 msgstr "3 1/2 x5"
 
-#: src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:5918
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:3682
+#: src/xml/xmli18n-tmp.h:5919
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 fotopapir (riv-af kanter)"
 
-#: src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:5920
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr "Epson L fotopapir (riv-af kanter)"
+
+#: src/xml/xmli18n-tmp.h:5921
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:3684
+#: src/xml/xmli18n-tmp.h:5922
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:3685
+#: src/xml/xmli18n-tmp.h:5923
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:3686
+#: src/xml/xmli18n-tmp.h:5924
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:3688
+#: src/xml/xmli18n-tmp.h:5926
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:3689
+#: src/xml/xmli18n-tmp.h:5927
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/xml/xmli18n-tmp.h:3690
+#: src/xml/xmli18n-tmp.h:5928
 msgid "Engineering C 17x22"
 msgstr "Engineering C 17x22"
 
-#: src/xml/xmli18n-tmp.h:3691
+#: src/xml/xmli18n-tmp.h:5929
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:3692
+#: src/xml/xmli18n-tmp.h:5930
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:3693
+#: src/xml/xmli18n-tmp.h:5931
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:3694
+#: src/xml/xmli18n-tmp.h:5932
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:3695
+#: src/xml/xmli18n-tmp.h:5933
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:3696
+#: src/xml/xmli18n-tmp.h:5934
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:3697
+#: src/xml/xmli18n-tmp.h:5935
 msgid "22x30"
 msgstr "22x30"
 
-#: src/xml/xmli18n-tmp.h:3698
+#: src/xml/xmli18n-tmp.h:5936
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:3699
+#: src/xml/xmli18n-tmp.h:5937
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/xml/xmli18n-tmp.h:3700
+#: src/xml/xmli18n-tmp.h:5938
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:5939
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:3702
+#: src/xml/xmli18n-tmp.h:5940
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:3703
+#: src/xml/xmli18n-tmp.h:5941
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:5942
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:3705
+#: src/xml/xmli18n-tmp.h:5943
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:3706
+#: src/xml/xmli18n-tmp.h:5944
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:3707
+#: src/xml/xmli18n-tmp.h:5945
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:3709
+#: src/xml/xmli18n-tmp.h:5947
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:3710
+#: src/xml/xmli18n-tmp.h:5948
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:5949
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:5950
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:3713
+#: src/xml/xmli18n-tmp.h:5951
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:3714
+#: src/xml/xmli18n-tmp.h:5952
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:3715
+#: src/xml/xmli18n-tmp.h:5953
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:3716
+#: src/xml/xmli18n-tmp.h:5954
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:5955
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:5956
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:5957
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:5958
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:5959
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:3722
+#: src/xml/xmli18n-tmp.h:5960
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:3723
+#: src/xml/xmli18n-tmp.h:5961
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:3724
+#: src/xml/xmli18n-tmp.h:5962
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:3725
+#: src/xml/xmli18n-tmp.h:5963
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:3726
+#: src/xml/xmli18n-tmp.h:5964
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:5965
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:5966
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:5967
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:3730
+#: src/xml/xmli18n-tmp.h:5968
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:3731
+#: src/xml/xmli18n-tmp.h:5969
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:3732
+#: src/xml/xmli18n-tmp.h:5970
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:3733
+#: src/xml/xmli18n-tmp.h:5971
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:3734
+#: src/xml/xmli18n-tmp.h:5972
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:3735
+#: src/xml/xmli18n-tmp.h:5973
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:3736
+#: src/xml/xmli18n-tmp.h:5974
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:3737
+#: src/xml/xmli18n-tmp.h:5975
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5976
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3739
+#: src/xml/xmli18n-tmp.h:5977
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:5978
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:3741
+#: src/xml/xmli18n-tmp.h:5979
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:5980
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:3743
+#: src/xml/xmli18n-tmp.h:5981
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:5982
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:5983
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:3746
+#: src/xml/xmli18n-tmp.h:5984
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:3747
+#: src/xml/xmli18n-tmp.h:5985
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:3748
+#: src/xml/xmli18n-tmp.h:5986
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:5987
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:3750
+#: src/xml/xmli18n-tmp.h:5988
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:3751
+#: src/xml/xmli18n-tmp.h:5989
 msgid "C0 landscape"
 msgstr "C0 tværformat"
 
-#: src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:5990
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:5991
 msgid "C1 landscape"
 msgstr "C1 tværformat"
 
-#: src/xml/xmli18n-tmp.h:3754
+#: src/xml/xmli18n-tmp.h:5992
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:3755
+#: src/xml/xmli18n-tmp.h:5993
 msgid "C2 landscape"
 msgstr "C2 tværformat"
 
-#: src/xml/xmli18n-tmp.h:3756
+#: src/xml/xmli18n-tmp.h:5994
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:5995
 msgid "C3 landscape"
 msgstr "C3 tværformat"
 
-#: src/xml/xmli18n-tmp.h:3758
+#: src/xml/xmli18n-tmp.h:5996
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:3759
+#: src/xml/xmli18n-tmp.h:5997
 msgid "C4 landscape"
 msgstr "C4 tværformat"
 
-#: src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:5998
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:3761
+#: src/xml/xmli18n-tmp.h:5999
 msgid "C5 landscape"
 msgstr "C5 tværformat"
 
-#: src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:6000
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:3763
+#: src/xml/xmli18n-tmp.h:6001
 msgid "B6-C4 landscape"
 msgstr "B6-C4 tværformat"
 
-#: src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:6002
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:3765
+#: src/xml/xmli18n-tmp.h:6003
 msgid "C6 landscape"
 msgstr "C6 tværformat"
 
-#: src/xml/xmli18n-tmp.h:3766
+#: src/xml/xmli18n-tmp.h:6004
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:6005
 msgid "DL landscape"
 msgstr "DL tværformat"
 
-#: src/xml/xmli18n-tmp.h:3768
+#: src/xml/xmli18n-tmp.h:6006
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:3769
+#: src/xml/xmli18n-tmp.h:6007
 msgid "C7-6 landscape"
 msgstr "C7-6 tværformat"
 
-#: src/xml/xmli18n-tmp.h:3770
+#: src/xml/xmli18n-tmp.h:6008
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:6009
 msgid "C7 landscape"
 msgstr "C7 tværformat"
 
-#: src/xml/xmli18n-tmp.h:3772
+#: src/xml/xmli18n-tmp.h:6010
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:6011
 msgid "C8 landscape"
 msgstr "C8 tværformat"
 
-#: src/xml/xmli18n-tmp.h:3774
+#: src/xml/xmli18n-tmp.h:6012
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:3775
+#: src/xml/xmli18n-tmp.h:6013
 msgid "C9 landscape"
 msgstr "C9 tværformat"
 
-#: src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:6014
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:6015
 msgid "C10 landscape"
 msgstr "C10 tværformat"
 
-#: src/xml/xmli18n-tmp.h:3778
+#: src/xml/xmli18n-tmp.h:6016
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:3779
+#: src/xml/xmli18n-tmp.h:6017
 msgid "ArchA transposed"
 msgstr "ArchA vendt"
 
-#: src/xml/xmli18n-tmp.h:3780
+#: src/xml/xmli18n-tmp.h:6018
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:6019
 msgid "ArchB transposed"
 msgstr "ArchB vendt"
 
-#: src/xml/xmli18n-tmp.h:3782
+#: src/xml/xmli18n-tmp.h:6020
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:6021
 msgid "ArchC transposed"
 msgstr "ArchC vendt"
 
-#: src/xml/xmli18n-tmp.h:3784
+#: src/xml/xmli18n-tmp.h:6022
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:6023
 msgid "ArchD transposed"
 msgstr "ArchD vendt"
 
-#: src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:6024
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:3787
+#: src/xml/xmli18n-tmp.h:6025
 msgid "ArchE transposed"
 msgstr "ArchE vendt"
 
-#: src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:6026
 msgid "American foolscap"
 msgstr "American foolscap"
 
-#: src/xml/xmli18n-tmp.h:3789
+#: src/xml/xmli18n-tmp.h:6027
 msgid "European foolscap"
 msgstr "European foolscap"
 
-#: src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:6028
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:6029
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:3792
+#: src/xml/xmli18n-tmp.h:6030
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:6031
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/xml/xmli18n-tmp.h:3794
+#: src/xml/xmli18n-tmp.h:6032
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:3795
+#: src/xml/xmli18n-tmp.h:6033
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:6034
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:6035
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:6036
 msgid "Small paperback"
 msgstr "Small paperback"
 
-#: src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:6037
 msgid "Penguin small paperback"
 msgstr "Penguin small paperback"
 
-#: src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:6038
 msgid "Penguin large paperback"
 msgstr "Penguin large paperback"
 
-#: src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:6039
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/xml/xmli18n-tmp.h:3802
+#: src/xml/xmli18n-tmp.h:6040
 msgid "Hagaki Card"
 msgstr "Hagaki Card"
 
-#: src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:6041
 msgid "Oufuku Card"
 msgstr "Oufuku Card"
 
-#: src/xml/xmli18n-tmp.h:3804
+#: src/xml/xmli18n-tmp.h:6042
 msgid "Japanese long envelope #3"
 msgstr "Japanese lang kuvert #3"
 
-#: src/xml/xmli18n-tmp.h:3805
+#: src/xml/xmli18n-tmp.h:6043
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japanese lang kuvert #3 tværformat"
 
-#: src/xml/xmli18n-tmp.h:3806
+#: src/xml/xmli18n-tmp.h:6044
 msgid "Japanese long envelope #4"
 msgstr "Japanese lang kuvert #4"
 
-#: src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:6045
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japanese lang kuvert #4 tværformat"
 
-#: src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:6046
 msgid "Japanese Kaku envelope #4"
 msgstr "Japanese Kaku kuvert #4"
 
-#: src/xml/xmli18n-tmp.h:3809
+#: src/xml/xmli18n-tmp.h:6047
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japanese Kaku kuvert #4 tværformat"
 
-#: src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:6048
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:6049
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10 tværformat"
 
-#: src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:6050
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/xml/xmli18n-tmp.h:3813
+#: src/xml/xmli18n-tmp.h:6051
 msgid "Monarch Envelope"
 msgstr "Monarch kuvert"
 
-#: src/xml/xmli18n-tmp.h:3814
+#: src/xml/xmli18n-tmp.h:6052
 msgid "Monarch Envelope landscape"
 msgstr "Monarch kuvert tværformat"
 
-#: src/xml/xmli18n-tmp.h:3815
+#: src/xml/xmli18n-tmp.h:6053
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/xml/xmli18n-tmp.h:3816
+#: src/xml/xmli18n-tmp.h:6054
 msgid "4x7"
 msgstr "4x7"
 
-#: src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:6055
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/xml/xmli18n-tmp.h:3818
+#: src/xml/xmli18n-tmp.h:6056
 msgid "Card"
 msgstr "Card"
 
-#: src/xml/xmli18n-tmp.h:3819
+#: src/xml/xmli18n-tmp.h:6057
 msgid "Wide Postcard"
 msgstr "Wide Postcard"
 
-#: src/xml/xmli18n-tmp.h:3820
+#: src/xml/xmli18n-tmp.h:6058
 msgid "Chilean Office"
 msgstr "Chilean Office"
 
-#: src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:6059
 msgid "Chilean Double Letter"
 msgstr "Chilean Double Letter"
 
-#: src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:6060
 msgid "Chilean Double Office"
 msgstr "Chilean Double Office"
 
-#: src/xml/xmli18n-tmp.h:3824
+#: src/xml/xmli18n-tmp.h:6062
 msgid "89 mm Roll Paper"
 msgstr "89 mm rulle papir"
 
-#: src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:6063
 msgid "4 Inch Roll Paper"
 msgstr "4 tommer rulle papir"
 
-#: src/xml/xmli18n-tmp.h:3826
+#: src/xml/xmli18n-tmp.h:6064
 msgid "5 Inch Roll Paper"
 msgstr "5 tommer rulle papir"
 
-#: src/xml/xmli18n-tmp.h:3827
+#: src/xml/xmli18n-tmp.h:6065
 msgid "210 mm Roll Paper"
 msgstr "210mm rulle papir"
 
-#: src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:6066
 msgid "13 Inch Roll Paper"
 msgstr "13 tommer rulle papir"
 
-#: src/xml/xmli18n-tmp.h:3829
+#: src/xml/xmli18n-tmp.h:6067
 msgid "17 Inch Roll Paper"
 msgstr "17 tommer rulle papir"
 
-#: src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:6068
 msgid "22 Inch Roll Paper"
 msgstr "22 tommer rulle papir"
 
-#: src/xml/xmli18n-tmp.h:3831
+#: src/xml/xmli18n-tmp.h:6069
 msgid "24 Inch Roll Paper"
 msgstr "24 tommer rulle papir"
 
-#: src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:6070
 msgid "36 Inch Roll Paper"
 msgstr "36 tommer rulle papir"
 
-#: src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:6071
 msgid "44 Inch Roll Paper"
 msgstr "44 tommer rulle papir"
 
-#: src/xml/xmli18n-tmp.h:3834
+#: src/xml/xmli18n-tmp.h:6072
 msgid "60 Inch Roll Paper"
 msgstr "60 tommer rulle papir"
 
-#: src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:6073
 msgid "64 Inch Roll Paper"
 msgstr "64 tommer rulle papir"
 
-#: src/xml/xmli18n-tmp.h:3836
+#: src/xml/xmli18n-tmp.h:6074
 msgid "PostScript Level 1"
 msgstr "Postscript Level 1"
 
-#: src/xml/xmli18n-tmp.h:3837
+#: src/xml/xmli18n-tmp.h:6075
 msgid "PostScript Level 2"
 msgstr "Postscript Level 2"
 
-#: src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:6076
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:6077
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:6078
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:6079
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:6080
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:6081
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/xml/xmli18n-tmp.h:3844
+#: src/xml/xmli18n-tmp.h:6082
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:6083
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/xml/xmli18n-tmp.h:3846
+#: src/xml/xmli18n-tmp.h:6084
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:3847
+#: src/xml/xmli18n-tmp.h:6085
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/xml/xmli18n-tmp.h:3848
+#: src/xml/xmli18n-tmp.h:6086
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:6087
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/xml/xmli18n-tmp.h:3850
+#: src/xml/xmli18n-tmp.h:6088
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:6089
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:6090
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/xml/xmli18n-tmp.h:3853
+#: src/xml/xmli18n-tmp.h:6091
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/xml/xmli18n-tmp.h:3854
+#: src/xml/xmli18n-tmp.h:6092
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/xml/xmli18n-tmp.h:3855
+#: src/xml/xmli18n-tmp.h:6093
 msgid "Canon BJC-5100"
 msgstr "Canon BJC-5100"
 
-#: src/xml/xmli18n-tmp.h:3856
+#: src/xml/xmli18n-tmp.h:6094
 msgid "Canon BJC-5500"
 msgstr "Canon BJC-5500"
 
-#: src/xml/xmli18n-tmp.h:3857
+#: src/xml/xmli18n-tmp.h:6095
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/xml/xmli18n-tmp.h:3858
+#: src/xml/xmli18n-tmp.h:6096
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:6097
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:6098
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:6099
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:6100
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/xml/xmli18n-tmp.h:3863
+#: src/xml/xmli18n-tmp.h:6101
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:6102
 msgid "Canon BJC-8500"
 msgstr "Canon BJC-8500"
 
-#: src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:6103
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:6104
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/xml/xmli18n-tmp.h:3867
+#: src/xml/xmli18n-tmp.h:6105
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/xml/xmli18n-tmp.h:3868
+#: src/xml/xmli18n-tmp.h:6106
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:3869
+#: src/xml/xmli18n-tmp.h:6107
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:3870
+#: src/xml/xmli18n-tmp.h:6108
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:6109
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:3872
+#: src/xml/xmli18n-tmp.h:6110
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/xml/xmli18n-tmp.h:3873
+#: src/xml/xmli18n-tmp.h:6111
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:3874
+#: src/xml/xmli18n-tmp.h:6112
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:6113
 msgid "Canon PIXMA iP2000"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:6114
 msgid "Canon PIXMA iP3000"
 msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:3877
+#: src/xml/xmli18n-tmp.h:6115
 msgid "Canon PIXMA iP3100"
 msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:3878
+#: src/xml/xmli18n-tmp.h:6116
 msgid "Canon PIXMA iP4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:6117
 msgid "Canon PIXMA iP4100"
 msgstr "Canon PIXMA iP4100"
 
-#: src/xml/xmli18n-tmp.h:3880
+#: src/xml/xmli18n-tmp.h:6118
 msgid "Canon PIXMA iP4200"
 msgstr "Canon PIXMA iP4200"
 
-#: src/xml/xmli18n-tmp.h:3881
+#: src/xml/xmli18n-tmp.h:6119
 msgid "Canon PIXMA iP4300"
 msgstr "Canon PIXMA iP4300"
 
-#: src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:6120
 msgid "Canon PIXMA iP4500"
 msgstr "Canon PIXMA iP4500"
 
-#: src/xml/xmli18n-tmp.h:3883
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6121
 msgid "Canon PIXMA iP4600"
-msgstr "Canon PIXMA iP4000"
+msgstr "Canon PIXMA iP4600"
 
-#: src/xml/xmli18n-tmp.h:3884
+#: src/xml/xmli18n-tmp.h:6122
 msgid "Canon PIXMA iP5000"
 msgstr "Canon PIXMA iP5000"
 
-#: src/xml/xmli18n-tmp.h:3885
+#: src/xml/xmli18n-tmp.h:6123
 msgid "Canon PIXMA iP5200"
 msgstr "Canon PIXMA iP5200"
 
-#: src/xml/xmli18n-tmp.h:3886
+#: src/xml/xmli18n-tmp.h:6124
 msgid "Canon PIXMA iP5300"
 msgstr "Canon PIXMA iP5300"
 
-#: src/xml/xmli18n-tmp.h:3887
+#: src/xml/xmli18n-tmp.h:6125
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:3888
+#: src/xml/xmli18n-tmp.h:6126
 msgid "Canon PIXMA iP6700"
 msgstr "Canon PIXMA iP6700"
 
-#: src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:6127
 msgid "Canon PIXMA iP8500"
 msgstr "Canon PIXMA iP8500"
 
-#: src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:6128
+#, fuzzy
+msgid "Canon PIXMA iX4000"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6129
 msgid "Canon PIXMA iX5000"
 msgstr "Canon PIXMA iX5000"
 
-#: src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:6130
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:6131
 msgid "Canon PIXMA MP150"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:6132
 msgid "Canon PIXMA MP160"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:6133
 msgid "Canon PIXMA MP170"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:3895
+#: src/xml/xmli18n-tmp.h:6134
 msgid "Canon PIXMA MP180"
 msgstr "Canon PIXMA MP180"
 
-#: src/xml/xmli18n-tmp.h:3896
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6135
 msgid "Canon PIXMA MP220"
-msgstr "Canon PIXMA MP520"
+msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:3897
+#: src/xml/xmli18n-tmp.h:6136
 msgid "Canon PIXMA MP500"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:6137
 msgid "Canon PIXMA MP520"
 msgstr "Canon PIXMA MP520"
 
-#: src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:6138
 msgid "Canon PIXMA MP610"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:3900
+#: src/xml/xmli18n-tmp.h:6139
 msgid "Canon PIXMA MP700"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:6140
 msgid "Canon PIXMA MP710"
 msgstr "Canon PIXMA MP710"
 
-#: src/xml/xmli18n-tmp.h:3902
+#: src/xml/xmli18n-tmp.h:6141
 msgid "Canon PIXMA MP730"
 msgstr "Canon PIXMA MP730"
 
-#: src/xml/xmli18n-tmp.h:3903
+#: src/xml/xmli18n-tmp.h:6142
 msgid "Canon PIXMA MP740"
 msgstr "Canon PIXMA MP740"
 
-#: src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:6143
 msgid "Canon PIXMA MP750"
 msgstr "Canon PIXMA MP750"
 
-#: src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:6144
 msgid "Canon PIXMA MP760"
 msgstr "Canon PIXMA MP760"
 
-#: src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:6145
 msgid "Canon PIXMA MP770"
 msgstr "Canon PIXMA MP770"
 
-#: src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:6146
 msgid "Canon PIXMA MP780"
 msgstr "Canon PIXMA MP780"
 
-#: src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:6147
 msgid "Canon PIXMA MP790"
 msgstr "Canon PIXMA MP790"
 
-#: src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:6148
 msgid "Canon PIXMA MP830"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:3910
+#: src/xml/xmli18n-tmp.h:6149
 msgid "Canon PIXUS iP3100"
 msgstr "Canon PIXUS iP3100"
 
-#: src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:6150
 msgid "Canon PIXUS iP4100"
 msgstr "Canon PIXUS iP4100"
 
-#: src/xml/xmli18n-tmp.h:3912
+#: src/xml/xmli18n-tmp.h:6151
 msgid "Canon i80"
 msgstr "Canon i80"
 
-#: src/xml/xmli18n-tmp.h:3913
+#: src/xml/xmli18n-tmp.h:6152
 msgid "Canon i560"
 msgstr "Canon i560"
 
-#: src/xml/xmli18n-tmp.h:3914
+#: src/xml/xmli18n-tmp.h:6153
 msgid "Canon i850"
 msgstr "Canon i850"
 
-#: src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:6154
 msgid "Canon i860"
 msgstr "Canon i860"
 
-#: src/xml/xmli18n-tmp.h:3916
+#: src/xml/xmli18n-tmp.h:6155
 msgid "Canon i865"
 msgstr "Canon i865"
 
-#: src/xml/xmli18n-tmp.h:3917
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6156
 msgid "Epson Artisan 700"
-msgstr "Epson E 700"
+msgstr "Epson Artisan 700"
 
-#: src/xml/xmli18n-tmp.h:3918
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6157
 msgid "Epson Artisan 800"
-msgstr "Epson Stylus C80"
+msgstr "Epson Artisan 800"
 
-#: src/xml/xmli18n-tmp.h:3919
+#: src/xml/xmli18n-tmp.h:6158
 msgid "Epson B-300"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:3920
+#: src/xml/xmli18n-tmp.h:6159
 msgid "Epson B-308"
 msgstr "Epson B-308"
 
-#: src/xml/xmli18n-tmp.h:3921
+#: src/xml/xmli18n-tmp.h:6160
 msgid "Epson B-500DN"
 msgstr "Epson B-500DN"
 
-#: src/xml/xmli18n-tmp.h:3922
+#: src/xml/xmli18n-tmp.h:6161
 msgid "Epson B-508DN"
 msgstr "Epson B-508DN"
 
-#: src/xml/xmli18n-tmp.h:3923
+#: src/xml/xmli18n-tmp.h:6162
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:3924
+#: src/xml/xmli18n-tmp.h:6163
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:6164
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:6165
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:6166
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:6167
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:6168
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:6169
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:6170
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/xml/xmli18n-tmp.h:3932
+#: src/xml/xmli18n-tmp.h:6171
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:6172
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:3934
+#: src/xml/xmli18n-tmp.h:6173
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/xml/xmli18n-tmp.h:3935
+#: src/xml/xmli18n-tmp.h:6174
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:6175
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:3937
+#: src/xml/xmli18n-tmp.h:6176
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:6177
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/xml/xmli18n-tmp.h:3939
+#: src/xml/xmli18n-tmp.h:6178
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:6179
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:6180
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:3942
+#: src/xml/xmli18n-tmp.h:6181
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:3943
+#: src/xml/xmli18n-tmp.h:6182
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:6183
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:6184
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3946
+#: src/xml/xmli18n-tmp.h:6185
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:3947
+#: src/xml/xmli18n-tmp.h:6186
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:3948
+#: src/xml/xmli18n-tmp.h:6187
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/xml/xmli18n-tmp.h:3949
+#: src/xml/xmli18n-tmp.h:6188
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:6189
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/xml/xmli18n-tmp.h:3951
+#: src/xml/xmli18n-tmp.h:6190
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:6191
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/xml/xmli18n-tmp.h:3953
+#: src/xml/xmli18n-tmp.h:6192
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:6193
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C79"
 
-#: src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:6194
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3956
+#: src/xml/xmli18n-tmp.h:6195
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:3957
+#: src/xml/xmli18n-tmp.h:6196
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/xml/xmli18n-tmp.h:3958
+#: src/xml/xmli18n-tmp.h:6197
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/xml/xmli18n-tmp.h:3959
+#: src/xml/xmli18n-tmp.h:6198
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/xml/xmli18n-tmp.h:3960
+#: src/xml/xmli18n-tmp.h:6199
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:6200
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C87"
 
-#: src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:6201
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:6202
 msgid "Epson Stylus C110"
 msgstr "Epson Stylus C110"
 
-#: src/xml/xmli18n-tmp.h:3964
+#: src/xml/xmli18n-tmp.h:6203
 msgid "Epson Stylus C120"
 msgstr "Epson Stylus C120"
 
-#: src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:6204
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3966
+#: src/xml/xmli18n-tmp.h:6205
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/xml/xmli18n-tmp.h:3967
+#: src/xml/xmli18n-tmp.h:6206
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:6207
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:6208
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/xml/xmli18n-tmp.h:3970
+#: src/xml/xmli18n-tmp.h:6209
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:6210
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:3972
+#: src/xml/xmli18n-tmp.h:6211
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:6212
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:6213
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:3975
+#: src/xml/xmli18n-tmp.h:6214
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:6215
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:6216
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:6217
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:3979
+#: src/xml/xmli18n-tmp.h:6218
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:6219
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:3981
+#: src/xml/xmli18n-tmp.h:6220
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:3982
+#: src/xml/xmli18n-tmp.h:6221
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:3983
+#: src/xml/xmli18n-tmp.h:6222
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:3984
+#: src/xml/xmli18n-tmp.h:6223
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:6224
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:6225
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:3987
+#: src/xml/xmli18n-tmp.h:6226
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:6227
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:3989
+#: src/xml/xmli18n-tmp.h:6228
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:6229
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:6230
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:3992
+#: src/xml/xmli18n-tmp.h:6231
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:3993
+#: src/xml/xmli18n-tmp.h:6232
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:6233
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:3995
+#: src/xml/xmli18n-tmp.h:6234
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:3996
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6235
 msgid "Epson Stylus Office B30"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus Office B30"
 
-#: src/xml/xmli18n-tmp.h:3997
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6236
 msgid "Epson Stylus Office B33"
-msgstr "Epson Stylus C43"
+msgstr "Epson Stylus Office B33"
 
-#: src/xml/xmli18n-tmp.h:3998
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6237
 msgid "Epson Stylus Office B40W"
-msgstr "Epson Stylus C40"
+msgstr "Epson Stylus Office B40W"
 
-#: src/xml/xmli18n-tmp.h:3999
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6238
 msgid "Epson Stylus Office T30"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus Office T30"
 
-#: src/xml/xmli18n-tmp.h:4000
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6239
 msgid "Epson Stylus Office T33"
-msgstr "Epson Stylus C43"
+msgstr "Epson Stylus Office T33"
 
-#: src/xml/xmli18n-tmp.h:4001
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6240
 msgid "Epson Stylus Office T40W"
-msgstr "Epson Stylus C40"
+msgstr "Epson Stylus Office T40W"
 
-#: src/xml/xmli18n-tmp.h:4002
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6241
 msgid "Epson Stylus Office BX300F"
-msgstr "Epson Stylus CX3100"
+msgstr "Epson Stylus Office BX300F"
 
-#: src/xml/xmli18n-tmp.h:4003
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6242
 msgid "Epson Stylus Office BX600FW"
-msgstr "Epson Stylus CX3600"
+msgstr "Epson Stylus Office BX600FW"
 
-#: src/xml/xmli18n-tmp.h:4004
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6243
 msgid "Epson Stylus Office SX600FW"
-msgstr "Epson Stylus CX3600"
+msgstr "Epson Stylus Office SX600FW"
 
-#: src/xml/xmli18n-tmp.h:4005
-#, fuzzy
-msgid "Epson Stylus Offixe TX300F"
-msgstr "Epson Stylus CX3100"
+#: src/xml/xmli18n-tmp.h:6244
+msgid "Epson Stylus Office TX300F"
+msgstr "Epson Stylus Office TX300F"
 
-#: src/xml/xmli18n-tmp.h:4006
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6245
 msgid "Epson Stylus Office TX600FW"
-msgstr "Epson Stylus CX3600"
+msgstr "Epson Stylus Office TX600FW"
 
-#: src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:6246
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:4008
+#: src/xml/xmli18n-tmp.h:6247
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4009
+#: src/xml/xmli18n-tmp.h:6248
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:6249
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:6250
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:6251
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4013
+#: src/xml/xmli18n-tmp.h:6252
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4014
+#: src/xml/xmli18n-tmp.h:6253
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:6254
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:4016
+#: src/xml/xmli18n-tmp.h:6255
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:6256
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:6257
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/xml/xmli18n-tmp.h:4019
+#: src/xml/xmli18n-tmp.h:6258
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:4020
+#: src/xml/xmli18n-tmp.h:6259
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/xml/xmli18n-tmp.h:4021
+#: src/xml/xmli18n-tmp.h:6260
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:4022
+#: src/xml/xmli18n-tmp.h:6261
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:4023
+#: src/xml/xmli18n-tmp.h:6262
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:4024
+#: src/xml/xmli18n-tmp.h:6263
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:6264
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:6265
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:4027
+#: src/xml/xmli18n-tmp.h:6266
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:6267
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:6268
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:6269
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:4031
+#: src/xml/xmli18n-tmp.h:6270
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:6271
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4033
+#: src/xml/xmli18n-tmp.h:6272
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4034
+#: src/xml/xmli18n-tmp.h:6273
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4035
+#: src/xml/xmli18n-tmp.h:6274
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1400"
 
-#: src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:6275
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 1410"
 
-#: src/xml/xmli18n-tmp.h:4037
+#: src/xml/xmli18n-tmp.h:6276
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:4038
+#: src/xml/xmli18n-tmp.h:6277
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:4039
+#: src/xml/xmli18n-tmp.h:6278
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:6279
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:4041
+#: src/xml/xmli18n-tmp.h:6280
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:6281
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:6282
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R230"
 
-#: src/xml/xmli18n-tmp.h:4044
+#: src/xml/xmli18n-tmp.h:6283
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R240"
 
-#: src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:6284
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo R245"
 
-#: src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:6285
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R260"
 
-#: src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:6286
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo R265"
 
-#: src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:6287
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo R270"
 
-#: src/xml/xmli18n-tmp.h:4049
+#: src/xml/xmli18n-tmp.h:6288
 msgid "Epson Stylus Photo R280"
 msgstr "Epson Stylus Photo R280"
 
-#: src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:6289
 msgid "Epson Stylus Photo R285"
 msgstr "Epson Stylus Photo R285"
 
-#: src/xml/xmli18n-tmp.h:4051
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6290
 msgid "Epson Stylus Photo R290"
-msgstr "Epson Stylus Photo 1290"
+msgstr "Epson Stylus Photo R290"
 
-#: src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:6291
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:4053
+#: src/xml/xmli18n-tmp.h:6292
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/xml/xmli18n-tmp.h:4054
+#: src/xml/xmli18n-tmp.h:6293
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:6294
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/xml/xmli18n-tmp.h:4056
+#: src/xml/xmli18n-tmp.h:6295
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R350"
 
-#: src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:6296
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R360"
 
-#: src/xml/xmli18n-tmp.h:4058
+#: src/xml/xmli18n-tmp.h:6297
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R380"
 
-#: src/xml/xmli18n-tmp.h:4059
+#: src/xml/xmli18n-tmp.h:6298
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R390"
 
-#: src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:6299
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:6300
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:4062
+#: src/xml/xmli18n-tmp.h:6301
 msgid "Epson Stylus Photo R1900"
 msgstr "Epson Stylus Photo R1900"
 
-#: src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:6302
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:4064
+#: src/xml/xmli18n-tmp.h:6303
+msgid "Epson Stylus Photo R2880"
+msgstr "Epson Stylus Photo R2880"
+
+#: src/xml/xmli18n-tmp.h:6304
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:4065
+#: src/xml/xmli18n-tmp.h:6305
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:6306
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4067
+#: src/xml/xmli18n-tmp.h:6307
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:6308
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4069
+#: src/xml/xmli18n-tmp.h:6309
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:6310
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX560"
 
-#: src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:6311
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX580"
 
-#: src/xml/xmli18n-tmp.h:4072
+#: src/xml/xmli18n-tmp.h:6312
 msgid "Epson Stylus Photo RX585"
 msgstr "Epson Stylus Photo RX585"
 
-#: src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:6313
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX590"
 
-#: src/xml/xmli18n-tmp.h:4074
+#: src/xml/xmli18n-tmp.h:6314
 msgid "Epson Stylus Photo RX595"
 msgstr "Epson Stylus Photo RX595"
 
-#: src/xml/xmli18n-tmp.h:4075
+#: src/xml/xmli18n-tmp.h:6315
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:4076
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6316
 msgid "Epson Stylus Photo RX610"
-msgstr "Epson Stylus Photo RX510"
+msgstr "Epson Stylus Photo RX610"
 
-#: src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:6317
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/xml/xmli18n-tmp.h:4078
+#: src/xml/xmli18n-tmp.h:6318
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:6319
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX640"
 
-#: src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:6320
 msgid "Epson Stylus Photo RX680"
 msgstr "Epson Stylus Photo RX680"
 
-#: src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:6321
 msgid "Epson Stylus Photo RX685"
 msgstr "Epson Stylus Photo RX685"
 
-#: src/xml/xmli18n-tmp.h:4082
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6322
 msgid "Epson Stylus Photo RX690"
-msgstr "Epson Stylus Photo RX560"
+msgstr "Epson Stylus Photo RX690"
 
-#: src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:6323
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:4084
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6324
 msgid "Epson Stylus Photo TX700W"
-msgstr "Epson Stylus Photo RX700"
+msgstr "Epson Stylus Photo TX700W"
 
-#: src/xml/xmli18n-tmp.h:4085
-#, fuzzy
-msgid "Epson Stylus Photo TX800W"
-msgstr "Epson Stylus Photo R800"
+#: src/xml/xmli18n-tmp.h:6325
+msgid "Epson Stylus Photo TX800FW"
+msgstr "Epson Stylus Photo TX800FW"
 
-#: src/xml/xmli18n-tmp.h:4086
+#: src/xml/xmli18n-tmp.h:6326
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:4087
+#: src/xml/xmli18n-tmp.h:6327
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:4088
+#: src/xml/xmli18n-tmp.h:6328
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4089
+#: src/xml/xmli18n-tmp.h:6329
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:6330
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:4091
+#: src/xml/xmli18n-tmp.h:6331
 msgid "Epson Stylus Pro 7800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:6332
 msgid "Epson Stylus Pro 7880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:4093
+#: src/xml/xmli18n-tmp.h:6333
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4094
+#: src/xml/xmli18n-tmp.h:6334
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:6335
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:6336
 msgid "Epson Stylus Pro 9800"
 msgstr "Epson Stylus Pro 9800"
 
-#: src/xml/xmli18n-tmp.h:4097
+#: src/xml/xmli18n-tmp.h:6337
 msgid "Epson Stylus Pro 9880"
 msgstr "Epson Stylus Pro 9880"
 
-#: src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:6338
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4099
+#: src/xml/xmli18n-tmp.h:6339
 msgid "Epson Stylus Pro 11880"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:6340
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:6341
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:6342
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:6343
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:6344
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:6345
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:6346
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:6347
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:6348
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:6349
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:4110
+#: src/xml/xmli18n-tmp.h:6350
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:6351
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:6352
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4113
+#: src/xml/xmli18n-tmp.h:6353
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Epson Stylus CX4400"
 msgstr "Epson Stylus CX4400"
 
-#: src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:6355
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/xml/xmli18n-tmp.h:4116
+#: src/xml/xmli18n-tmp.h:6356
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:6357
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/xml/xmli18n-tmp.h:4118
+#: src/xml/xmli18n-tmp.h:6358
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/xml/xmli18n-tmp.h:4119
+#: src/xml/xmli18n-tmp.h:6359
 msgid "Epson Stylus CX4900"
 msgstr "Epson Stylus CX4900"
 
-#: src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:6360
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX5000"
 
-#: src/xml/xmli18n-tmp.h:4121
+#: src/xml/xmli18n-tmp.h:6361
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX5000F"
 
-#: src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:6362
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:6363
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/xml/xmli18n-tmp.h:4124
+#: src/xml/xmli18n-tmp.h:6364
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:6365
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/xml/xmli18n-tmp.h:4126
+#: src/xml/xmli18n-tmp.h:6366
 msgid "Epson Stylus CX5500"
 msgstr "Epson Stylus CX5500"
 
-#: src/xml/xmli18n-tmp.h:4127
+#: src/xml/xmli18n-tmp.h:6367
 msgid "Epson Stylus CX5600"
 msgstr "Epson Stylus CX5600"
 
-#: src/xml/xmli18n-tmp.h:4128
+#: src/xml/xmli18n-tmp.h:6368
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/xml/xmli18n-tmp.h:4129
+#: src/xml/xmli18n-tmp.h:6369
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:6370
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX6000"
 
-#: src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:6371
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:6372
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:6373
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:6374
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:6375
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX7000F"
 
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:6376
 msgid "Epson Stylus CX7400"
 msgstr "Epson Stylus CX7400"
 
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:6377
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:6378
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:6379
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:6380
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:4141
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6381
 msgid "Epson Stylus CX9300F"
-msgstr "Epson Stylus CX3100"
+msgstr "Epson Stylus CX9300F"
 
-#: src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:6382
 msgid "Epson Stylus CX9400"
 msgstr "Epson Stylus CX9400"
 
-#: src/xml/xmli18n-tmp.h:4143
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6383
 msgid "Epson Stylus CX9400F"
-msgstr "Epson Stylus CX9400"
+msgstr "Epson Stylus CX9400F"
 
-#: src/xml/xmli18n-tmp.h:4144
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6384
 msgid "Epson Stylus CX9475F"
-msgstr "Epson Stylus C45"
+msgstr "Epson Stylus CX9475F"
 
-#: src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:6385
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:6386
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:6387
 msgid "Epson Stylus D92"
 msgstr "Epson Stylus D92"
 
-#: src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:6388
 msgid "Epson Stylus D120"
 msgstr "Epson Stylus D120"
 
-#: src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:6389
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:6390
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:6391
+msgid "Epson Stylus DX4000"
+msgstr "Epson Stylus DX4000"
+
+#: src/xml/xmli18n-tmp.h:6392
 msgid "Epson Stylus DX4050"
 msgstr "Epson Stylus DX4050"
 
-#: src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:6393
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:6394
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:4154
+#: src/xml/xmli18n-tmp.h:6395
 msgid "Epson Stylus DX4400"
 msgstr "Epson Stylus DX4400"
 
-#: src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:6396
 msgid "Epson Stylus DX4450"
 msgstr "Epson Stylus DX4450"
 
-#: src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:6397
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/xml/xmli18n-tmp.h:4157
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6398
 msgid "Epson Stylus DX4850"
-msgstr "Epson Stylus DX3850"
+msgstr "Epson Stylus DX4850"
 
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:6399
 msgid "Epson Stylus DX7000F"
 msgstr "Epson Stylus DX7000F"
 
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:6400
 msgid "Epson Stylus DX7400"
 msgstr "Epson Stylus DX7400"
 
-#: src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:6401
 msgid "Epson Stylus DX7450"
 msgstr "Epson Stylus DX7450"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:6402
 msgid "Epson Stylus DX8400"
 msgstr "Epson Stylus DX8400"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:6403
 msgid "Epson Stylus DX8450"
 msgstr "Epson Stylus DX8450"
 
-#: src/xml/xmli18n-tmp.h:4163
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6404
 msgid "Epson Stylus DX9400F"
-msgstr "Epson Stylus CX9400"
+msgstr "Epson Stylus DX9400F"
 
-#: src/xml/xmli18n-tmp.h:4164
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6405
 msgid "Epson Stylus NX100"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus NX100"
 
-#: src/xml/xmli18n-tmp.h:4165
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6406
 msgid "Epson Stylus NX105"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:4166
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6407
 msgid "Epson Stylus NX200"
-msgstr "Epson Stylus CX3200"
+msgstr "Epson Stylus NX200"
 
-#: src/xml/xmli18n-tmp.h:4167
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6408
 msgid "Epson Stylus NX300"
-msgstr "Epson Stylus CX3100"
+msgstr "Epson Stylus NX300"
 
-#: src/xml/xmli18n-tmp.h:4168
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6409
 msgid "Epson Stylus NX400"
-msgstr "Epson Stylus CX4100"
+msgstr "Epson Stylus NX400"
 
-#: src/xml/xmli18n-tmp.h:4169
-#, fuzzy
-msgid "Epson Stylus PX700FW"
-msgstr "Epson Stylus CX7000F"
+#: src/xml/xmli18n-tmp.h:6410
+msgid "Epson Stylus PX700W"
+msgstr "Epson Stylus PX700W"
 
-#: src/xml/xmli18n-tmp.h:4170
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6411
 msgid "Epson Stylus PX800FW"
-msgstr "Epson Stylus CX3800"
+msgstr "Epson Stylus PX800FW"
 
-#: src/xml/xmli18n-tmp.h:4171
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6412
 msgid "Epson Stylus S20"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus S20"
 
-#: src/xml/xmli18n-tmp.h:4172
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6413
 msgid "Epson Stylus SX100"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:4173
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6414
 msgid "Epson Stylus SX105"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:4174
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6415
 msgid "Epson Stylus SX200"
-msgstr "Epson Stylus CX3200"
+msgstr "Epson Stylus SX200"
 
-#: src/xml/xmli18n-tmp.h:4175
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6416
 msgid "Epson Stylus SX205"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus SX205"
 
-#: src/xml/xmli18n-tmp.h:4176
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6417
 msgid "Epson Stylus SX400"
-msgstr "Epson Stylus CX4100"
+msgstr "Epson Stylus SX400"
 
-#: src/xml/xmli18n-tmp.h:4177
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6418
 msgid "Epson Stylus SX405"
-msgstr "Epson Stylus DX4050"
+msgstr "Epson Stylus SX405"
 
-#: src/xml/xmli18n-tmp.h:4178
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6419
 msgid "Epson Stylus T20"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:4179
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6420
 msgid "Epson Stylus TX100"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:4180
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6421
 msgid "Epson Stylus TX101"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus TX101"
 
-#: src/xml/xmli18n-tmp.h:4181
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6422
 msgid "Epson Stylus TX102"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus TX102"
 
-#: src/xml/xmli18n-tmp.h:4182
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6423
 msgid "Epson Stylus TX103"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus TX103"
 
-#: src/xml/xmli18n-tmp.h:4183
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6424
 msgid "Epson Stylus TX104"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus TX104"
 
-#: src/xml/xmli18n-tmp.h:4184
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6425
 msgid "Epson Stylus TX105"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus TX105"
 
-#: src/xml/xmli18n-tmp.h:4185
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6426
 msgid "Epson Stylus TX106"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus TX106"
 
-#: src/xml/xmli18n-tmp.h:4186
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6427
 msgid "Epson Stylus TX109"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus TX109"
 
-#: src/xml/xmli18n-tmp.h:4187
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6428
 msgid "Epson Stylus TX200"
-msgstr "Epson Stylus CX3200"
+msgstr "Epson Stylus TX200"
 
-#: src/xml/xmli18n-tmp.h:4188
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6429
 msgid "Epson Stylus TX400"
-msgstr "Epson Stylus CX4100"
+msgstr "Epson Stylus TX400"
 
-#: src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:6430
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:6431
 msgid "Epson PictureMate Dash"
 msgstr "Epson PictureMate Dash"
 
-#: src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:6432
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/xml/xmli18n-tmp.h:4192
+#: src/xml/xmli18n-tmp.h:6433
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate Flash"
 
-#: src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:6434
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate Pal"
 
-#: src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:6435
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate Snap"
 
-#: src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:6436
 msgid "Epson PictureMate 100"
 msgstr "Epson PictureMate 100"
 
-#: src/xml/xmli18n-tmp.h:4196
+#: src/xml/xmli18n-tmp.h:6437
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate 200"
 
-#: src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:6438
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate 210"
 
-#: src/xml/xmli18n-tmp.h:4198
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6439
 msgid "Epson PictureMate 215"
-msgstr "Epson PictureMate 210"
+msgstr "Epson PictureMate 215"
 
-#: src/xml/xmli18n-tmp.h:4199
+#: src/xml/xmli18n-tmp.h:6440
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate 240"
 
-#: src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:6441
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate 250"
 
-#: src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:6442
 msgid "Epson PictureMate 260"
 msgstr "Epson PictureMate 260"
 
-#: src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:6443
 msgid "Epson PictureMate 270"
 msgstr "Epson PictureMate 270"
 
-#: src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate 280"
 
-#: src/xml/xmli18n-tmp.h:4204
+#: src/xml/xmli18n-tmp.h:6445
 msgid "Epson PictureMate 290"
 msgstr "Epson PictureMate 290"
 
-#: src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:6446
 msgid "Epson PictureMate 500"
 msgstr "Epson PictureMate 500"
 
-#: src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:6447
 msgid "Epson PictureMate 2005"
 msgstr "Epson PictureMate 2005"
 
-#: src/xml/xmli18n-tmp.h:4207
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6448
 msgid "Epson WorkForce 30"
-msgstr "Epson E 300"
+msgstr "Epson WorkForce 30"
 
-#: src/xml/xmli18n-tmp.h:4208
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6449
 msgid "Epson WorkForce 40"
-msgstr "Epson Stylus Color 400"
+msgstr "Epson WorkForce 40"
 
-#: src/xml/xmli18n-tmp.h:4209
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6450
 msgid "Epson WorkForce 500"
-msgstr "Epson E 500"
+msgstr "Epson WorkForce 500"
 
-#: src/xml/xmli18n-tmp.h:4210
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6451
 msgid "Epson WorkForce 600"
-msgstr "Epson Stylus Color 600"
+msgstr "Epson WorkForce 600"
 
-#: src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:6452
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/xml/xmli18n-tmp.h:4212
+#: src/xml/xmli18n-tmp.h:6453
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:6454
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:6455
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4215
+#: src/xml/xmli18n-tmp.h:6456
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:4216
+#: src/xml/xmli18n-tmp.h:6457
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:6458
 msgid "Epson E 300"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:6459
 msgid "Epson E 500"
 msgstr "Epson E 500"
 
-#: src/xml/xmli18n-tmp.h:4219
+#: src/xml/xmli18n-tmp.h:6460
 msgid "Epson E 520"
 msgstr "Epson E 520"
 
-#: src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:6461
 msgid "Epson E 700"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:6462
 msgid "Epson E 720"
 msgstr "Epson E 720"
 
-#: src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:6463
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:6464
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/xml/xmli18n-tmp.h:4224
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6465
 msgid "Epson EP 801A"
-msgstr "Epson PX A650"
+msgstr "Epson EP 801A"
 
-#: src/xml/xmli18n-tmp.h:4225
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6466
 msgid "Epson EP 901A"
-msgstr "Epson PX A650"
+msgstr "Epson EP 901A"
 
-#: src/xml/xmli18n-tmp.h:4226
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6467
 msgid "Epson EP 901F"
-msgstr "Epson PX A650"
+msgstr "Epson EP 901F"
 
-#: src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:6468
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:4228
+#: src/xml/xmli18n-tmp.h:6469
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4229
+#: src/xml/xmli18n-tmp.h:6470
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:6471
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:6472
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/xml/xmli18n-tmp.h:4232
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6473
 msgid "Epson ME 300"
-msgstr "Epson E 300"
+msgstr "Epson ME 300"
 
-#: src/xml/xmli18n-tmp.h:4233
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6474
 msgid "Epson ME Office 70"
-msgstr "Epson E 700"
+msgstr "Epson ME Office 70"
 
-#: src/xml/xmli18n-tmp.h:4234
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6475
 msgid "Epson ME Office 80W"
-msgstr "Epson PM 780C"
+msgstr "Epson ME Office 80W"
 
-#: src/xml/xmli18n-tmp.h:4235
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6476
 msgid "Epson ME Office 360"
-msgstr "Epson E 700"
+msgstr "Epson ME Office 360"
 
-#: src/xml/xmli18n-tmp.h:4236
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6477
 msgid "Epson ME Office 700FW"
-msgstr "Epson E 700"
+msgstr "Epson ME Office 700FW"
 
-#: src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:6478
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/xml/xmli18n-tmp.h:4238
+#: src/xml/xmli18n-tmp.h:6479
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:6480
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:6481
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:6482
 msgid "Epson PM 670C"
 msgstr "Epson PM 670C"
 
-#: src/xml/xmli18n-tmp.h:4242
+#: src/xml/xmli18n-tmp.h:6483
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:4243
+#: src/xml/xmli18n-tmp.h:6484
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:6485
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:6486
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/xml/xmli18n-tmp.h:4246
+#: src/xml/xmli18n-tmp.h:6487
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:6488
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:6490
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/xml/xmli18n-tmp.h:4251
+#: src/xml/xmli18n-tmp.h:6492
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:4253
+#: src/xml/xmli18n-tmp.h:6494
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/xml/xmli18n-tmp.h:4254
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:6496
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:6497
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:6498
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:6499
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/xml/xmli18n-tmp.h:4259
+#: src/xml/xmli18n-tmp.h:6500
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/xml/xmli18n-tmp.h:4260
+#: src/xml/xmli18n-tmp.h:6501
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:6502
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/xml/xmli18n-tmp.h:4262
+#: src/xml/xmli18n-tmp.h:6503
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/xml/xmli18n-tmp.h:4263
+#: src/xml/xmli18n-tmp.h:6504
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/xml/xmli18n-tmp.h:4264
+#: src/xml/xmli18n-tmp.h:6505
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/xml/xmli18n-tmp.h:4265
+#: src/xml/xmli18n-tmp.h:6506
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:6507
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:6508
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:6509
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:6510
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:6511
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:6512
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:6513
 msgid "Epson PM A820"
 msgstr "Epson PM A820"
 
-#: src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:6514
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:4274
+#: src/xml/xmli18n-tmp.h:6515
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/xml/xmli18n-tmp.h:4275
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6516
 msgid "Epson PM A940"
-msgstr "Epson PM 940C"
+msgstr "Epson PM A940"
 
-#: src/xml/xmli18n-tmp.h:4276
+#: src/xml/xmli18n-tmp.h:6517
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:6518
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:6519
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:6520
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:6521
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:6522
 msgid "Epson PM D870"
 msgstr "Epson PM D870"
 
-#: src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:6523
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:6524
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:6525
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/xml/xmli18n-tmp.h:4285
+#: src/xml/xmli18n-tmp.h:6526
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/xml/xmli18n-tmp.h:4286
+#: src/xml/xmli18n-tmp.h:6527
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:6528
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:6529
 msgid "Epson PM G850"
 msgstr "Epson PM G850"
 
-#: src/xml/xmli18n-tmp.h:4289
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6530
 msgid "Epson PM T960"
-msgstr "Epson PM 670C"
+msgstr "Epson PM T960"
 
-#: src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:6531
 msgid "Epson PM G4500"
 msgstr "Epson PM G4500"
 
-#: src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:6532
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4292
+#: src/xml/xmli18n-tmp.h:6533
 msgid "Epson Offirio PX B300"
 msgstr "Epson Offirio PX B300"
 
-#: src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:6534
 msgid "Epson Offirio PX B500"
 msgstr "Epson Offirio PX B500"
 
-#: src/xml/xmli18n-tmp.h:4294
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6535
 msgid "Epson PX 101"
-msgstr "Epson PX A650"
+msgstr "Epson PX 101"
 
-#: src/xml/xmli18n-tmp.h:4295
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6536
 msgid "Epson PX 201"
-msgstr "Epson PX G920"
+msgstr "Epson PX 201"
 
-#: src/xml/xmli18n-tmp.h:4296
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6537
 msgid "Epson PX 401A"
-msgstr "Epson PX A650"
+msgstr "Epson PX 401A"
 
-#: src/xml/xmli18n-tmp.h:4297
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6538
 msgid "Epson PX 601F"
-msgstr "Epson PX A650"
+msgstr "Epson PX 601F"
 
-#: src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:6539
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:4299
+#: src/xml/xmli18n-tmp.h:6540
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:6541
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:6542
 msgid "Epson PX G5300"
 msgstr "Epson PX G5300"
 
-#: src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:6543
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:6544
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/xml/xmli18n-tmp.h:4305
+#: src/xml/xmli18n-tmp.h:6546
 msgid "Epson PX V780"
 msgstr "Epson PX V780"
 
-#: src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:6547
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/xml/xmli18n-tmp.h:4307
+#: src/xml/xmli18n-tmp.h:6548
+msgid "Epson PX G5600"
+msgstr "Epson PX G5600"
+
+#: src/xml/xmli18n-tmp.h:6549
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/xml/xmli18n-tmp.h:4308
+#: src/xml/xmli18n-tmp.h:6550
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/xml/xmli18n-tmp.h:4309
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/xml/xmli18n-tmp.h:4310
+#: src/xml/xmli18n-tmp.h:6552
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:6553
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:6554
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/xml/xmli18n-tmp.h:4313
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:6556
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/xml/xmli18n-tmp.h:4315
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:6559
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:6560
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:6561
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:6562
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:6563
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:6564
 msgid "Brother DCP-8045D"
 msgstr "Brother DCP-8045D"
 
-#: src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:6565
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:4324
+#: src/xml/xmli18n-tmp.h:6566
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:6567
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/xml/xmli18n-tmp.h:4326
+#: src/xml/xmli18n-tmp.h:6568
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:4327
+#: src/xml/xmli18n-tmp.h:6569
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:6570
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:6571
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Brother HL-1430"
 msgstr "Brother HL-1430"
 
-#: src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:6576
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Brother HL-1450"
 msgstr "Brother HL-1450"
 
-#: src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Brother HL-1470N"
 msgstr "Brother HL-1470N"
 
-#: src/xml/xmli18n-tmp.h:4337
+#: src/xml/xmli18n-tmp.h:6579
 msgid "Brother HL-1650"
 msgstr "Brother HL-1650"
 
-#: src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:6580
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:6581
 msgid "Brother HL-1670N"
 msgstr "Brother HL-1670N"
 
-#: src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:6582
 msgid "Brother HL-1850"
 msgstr "Brother HL-1850"
 
-#: src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:6583
 msgid "Brother HL-1870N"
 msgstr "Brother HL-1870N"
 
-#: src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:6584
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:6585
 msgid "Brother HL-2460"
 msgstr "Brother HL-2460"
 
-#: src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:6586
 msgid "Brother HL-2460N"
 msgstr "Brother HL-2460N"
 
-#: src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:6587
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/xml/xmli18n-tmp.h:4346
+#: src/xml/xmli18n-tmp.h:6588
 msgid "Brother HL-5030"
 msgstr "Brother HL-5030"
 
-#: src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:6589
 msgid "Brother HL-5040"
 msgstr "Brother HL-5040"
 
-#: src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:6590
 msgid "Brother HL-5050"
 msgstr "Brother HL-5050"
 
-#: src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:6591
 msgid "Brother HL-5070N"
 msgstr "Brother HL-5070N"
 
-#: src/xml/xmli18n-tmp.h:4350
+#: src/xml/xmli18n-tmp.h:6592
 msgid "Brother HL-5140"
 msgstr "Brother HL-5140"
 
-#: src/xml/xmli18n-tmp.h:4351
+#: src/xml/xmli18n-tmp.h:6593
 msgid "Brother HL-5150D"
 msgstr "Brother HL-5150D"
 
-#: src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:6594
 msgid "Brother HL-5170DN"
 msgstr "Brother HL-5170DN"
 
-#: src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:6595
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:4354
+#: src/xml/xmli18n-tmp.h:6596
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:6597
 msgid "Brother HL-7050"
 msgstr "Brother HL-7050"
 
-#: src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:6598
 msgid "Brother HL-7050N"
 msgstr "Brother HL-7050N"
 
-#: src/xml/xmli18n-tmp.h:4357
+#: src/xml/xmli18n-tmp.h:6599
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/xml/xmli18n-tmp.h:4358
+#: src/xml/xmli18n-tmp.h:6600
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:6601
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:6602
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:6603
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:6604
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:6605
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:6606
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:6607
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:6608
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:6609
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:6610
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:6611
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:6612
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:6613
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:6614
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/xml/xmli18n-tmp.h:4373
+#: src/xml/xmli18n-tmp.h:6615
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/xml/xmli18n-tmp.h:4374
+#: src/xml/xmli18n-tmp.h:6616
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:6617
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/xml/xmli18n-tmp.h:4376
+#: src/xml/xmli18n-tmp.h:6618
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:6619
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:6620
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:6621
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:6622
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:6623
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:6624
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:6625
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/xml/xmli18n-tmp.h:4384
+#: src/xml/xmli18n-tmp.h:6626
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:4385
+#: src/xml/xmli18n-tmp.h:6627
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:4386
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:4387
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:6630
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/xml/xmli18n-tmp.h:4389
+#: src/xml/xmli18n-tmp.h:6631
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/xml/xmli18n-tmp.h:4392
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Epson EPL-N2050"
 msgstr "Epson EPL-N2050"
 
-#: src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Epson EPL-N2050+"
 msgstr "Epson EPL-N2050+"
 
-#: src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:6636
 msgid "Epson EPL-N2050PS"
 msgstr "Epson EPL-N2050PS"
 
-#: src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:6637
 msgid "Epson EPL-N2050PS+"
 msgstr "Epson EPL-N2050PS+"
 
-#: src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:6638
 msgid "Epson EPL-N2120"
 msgstr "Epson EPL-N2120"
 
-#: src/xml/xmli18n-tmp.h:4397
+#: src/xml/xmli18n-tmp.h:6639
 msgid "Epson EPL-N2500"
 msgstr "Epson EPL-N2500"
 
-#: src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:6640
 msgid "Epson EPL-N2500PS"
 msgstr "Epson EPL-N2500PS"
 
-#: src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:6641
 msgid "Epson EPL-N2750"
 msgstr "Epson EPL-N2750"
 
-#: src/xml/xmli18n-tmp.h:4400
+#: src/xml/xmli18n-tmp.h:6642
 msgid "Epson EPL-N2750PS"
 msgstr "Epson EPL-N2750PS"
 
-#: src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:6643
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/xml/xmli18n-tmp.h:4403
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:6646
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:6647
 msgid "Generic PCL 4 Printer"
 msgstr "Generic PCL 4 Printer"
 
-#: src/xml/xmli18n-tmp.h:4406
+#: src/xml/xmli18n-tmp.h:6648
 msgid "Generic PCL 4 LF Printer"
 msgstr "Generic PCL 4 LF Printer"
 
-#: src/xml/xmli18n-tmp.h:4407
+#: src/xml/xmli18n-tmp.h:6649
 msgid "Generic PCL 5 Printer"
 msgstr "Generic PCL 5 Printer"
 
-#: src/xml/xmli18n-tmp.h:4408
+#: src/xml/xmli18n-tmp.h:6650
 msgid "Generic PCL 5 LF Printer"
 msgstr "Generic PCL 5 LF Printer"
 
-#: src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:6651
 msgid "Generic PCL 5c Printer"
 msgstr "Generic PCL 5c Printer"
 
-#: src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Generic PCL 5c LF Printer"
 msgstr "Generic PCL 5c LF Printer"
 
-#: src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:6653
 msgid "Generic PCL 5e Printer"
 msgstr "Generic PCL 5e Printer"
 
-#: src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:6654
 msgid "Generic PCL 5e LF Printer"
 msgstr "Generic PCL 5e LF Printer"
 
-#: src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Generic PCL 6/PCL XL Printer"
 
-#: src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Generic PCL 6/PCL XL LF Printer"
 
-#: src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:6657
 msgid "Gestetner 10512"
 msgstr "Gestetner 10512"
 
-#: src/xml/xmli18n-tmp.h:4416
+#: src/xml/xmli18n-tmp.h:6658
 msgid "Gestetner 2212"
 msgstr "Gestetner 2212"
 
-#: src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:6659
 msgid "Gestetner 2712"
 msgstr "Gestetner 2712"
 
-#: src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:6660
 msgid "Gestetner 3212"
 msgstr "Gestetner 3212"
 
-#: src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:6661
 msgid "Gestetner 3502"
 msgstr "Gestetner 3502"
 
-#: src/xml/xmli18n-tmp.h:4420
-msgid "Gestetner 3532"
-msgstr "Gestetner 3532"
-
-#: src/xml/xmli18n-tmp.h:4421
-msgid "Gestetner 4235g"
-msgstr "Gestetner 4235g"
+#: src/xml/xmli18n-tmp.h:6662
+msgid "Gestetner 3532/4235g"
+msgstr "Gestetner 3532/4235g"
 
-#: src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:6663
 msgid "Gestetner 4502"
 msgstr "Gestetner 4502"
 
-#: src/xml/xmli18n-tmp.h:4423
-msgid "Gestetner 4532"
-msgstr "Gestetner 4532"
-
-#: src/xml/xmli18n-tmp.h:4424
-msgid "Gestetner 4245g"
-msgstr "Gestetner 4245g"
+#: src/xml/xmli18n-tmp.h:6664
+msgid "Gestetner 4532/4245g"
+msgstr "Gestetner 4532/4245g"
 
-#: src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:6665
 msgid "Gestetner 6002"
 msgstr "Gestetner 6002"
 
-#: src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:6666
 msgid "Gestetner 7502"
 msgstr "Gestetner 7502"
 
-#: src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Gestetner 9002"
 msgstr "Gestetner 9002"
 
-#: src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:6668
 msgid "Gestetner DSm415"
 msgstr "Gestetner DSm415"
 
-#: src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:6669
 msgid "Gestetner DSm615"
 msgstr "Gestetner DSm615"
 
-#: src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:6670
 msgid "Gestetner DSm616"
 msgstr "Gestetner DSm616"
 
-#: src/xml/xmli18n-tmp.h:4431
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Gestetner DSm618"
 msgstr "Gestetner DSm618"
 
-#: src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:6672
 msgid "Gestetner DSm618d"
 msgstr "Gestetner DSm618d"
 
-#: src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:6673
 msgid "Gestetner DSm620"
 msgstr "Gestetner DSm620"
 
-#: src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:6674
 msgid "Gestetner DSm620d"
 msgstr "Gestetner DSm620d"
 
-#: src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:6675
 msgid "Gestetner DSm622"
 msgstr "Gestetner DSm622"
 
-#: src/xml/xmli18n-tmp.h:4436
+#: src/xml/xmli18n-tmp.h:6676
 msgid "Gestetner DSm627"
 msgstr "Gestetner DSm627"
 
-#: src/xml/xmli18n-tmp.h:4437
-msgid "Gestetner DSm635"
-msgstr "Gestetner DSm635"
+#: src/xml/xmli18n-tmp.h:6677
+msgid "Gestetner DSm635/635G"
+msgstr "Gestetner DSm635/635G"
 
-#: src/xml/xmli18n-tmp.h:4438
-msgid "Gestetner DSm635G"
-msgstr "Gestetner DSm635G"
+#: src/xml/xmli18n-tmp.h:6678
+msgid "Gestetner DSm645/645G"
+msgstr "Gestetner DSm645/645G"
 
-#: src/xml/xmli18n-tmp.h:4439
-msgid "Gestetner DSm645"
-msgstr "Gestetner DSm645"
-
-#: src/xml/xmli18n-tmp.h:4440
-msgid "Gestetner DS645G"
-msgstr "Gestetner DS645G"
-
-#: src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:6679
 msgid "Gestetner DSm651"
 msgstr "Gestetner DSm651"
 
-#: src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:6680
 msgid "Gestetner DSm660"
 msgstr "Gestetner DSm660"
 
-#: src/xml/xmli18n-tmp.h:4443
+#: src/xml/xmli18n-tmp.h:6681
 msgid "Gestetner DSm675"
 msgstr "Gestetner DSm675"
 
-#: src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:6682
 msgid "Gestetner DSm725"
 msgstr "Gestetner DSm725"
 
-#: src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:6683
 msgid "Gestetner DSm730"
 msgstr "Gestetner DSm730"
 
-#: src/xml/xmli18n-tmp.h:4446
-msgid "Gestetner DSm735"
-msgstr "Gestetner DSm735"
-
-#: src/xml/xmli18n-tmp.h:4447
-msgid "Gestetner DSm735G"
-msgstr "Gestetner DSm735G"
-
-#: src/xml/xmli18n-tmp.h:4448
-msgid "Gestetner DSm745"
-msgstr "Gestetner DSm745"
-
-#: src/xml/xmli18n-tmp.h:4449
-msgid "Gestetner DSm745G"
-msgstr "Gestetner DSm745G"
-
-#: src/xml/xmli18n-tmp.h:4450
-msgid "Gestetner MP1100"
-msgstr "Gestetner MP1100"
-
-#: src/xml/xmli18n-tmp.h:4451
-msgid "Gestetner DSm7110"
-msgstr "Gestetner DSm7110"
-
-#: src/xml/xmli18n-tmp.h:4452
-msgid "Gestetner MP1350"
-msgstr "Gestetner MP1350"
-
-#: src/xml/xmli18n-tmp.h:4453
-msgid "Gestetner DSm7135"
-msgstr "Gestetner DSm7135"
-
-#: src/xml/xmli18n-tmp.h:4454
-msgid "Gestetner MP1600"
-msgstr "Gestetner MP1600"
-
-#: src/xml/xmli18n-tmp.h:4455
-msgid "Gestetner DSm716"
-msgstr "Gestetner DSm716"
-
-#: src/xml/xmli18n-tmp.h:4456
-msgid "Gestetner MP2000"
-msgstr "Gestetner MP2000"
-
-#: src/xml/xmli18n-tmp.h:4457
-msgid "Gestetner DSm721d"
-msgstr "Gestetner DSm721d"
-
-#: src/xml/xmli18n-tmp.h:4458
-msgid "Gestetner MP2500"
-msgstr "Gestetner MP2500"
-
-#: src/xml/xmli18n-tmp.h:4459
-msgid "Gestetner DSm625"
-msgstr "Gestetner DSm625"
+#: src/xml/xmli18n-tmp.h:6684
+msgid "Gestetner DSm735/735G"
+msgstr "Gestetner DSm735/735G"
 
-#: src/xml/xmli18n-tmp.h:4460
-msgid "Gestetner MP3500"
-msgstr "Gestetner MP3500"
+#: src/xml/xmli18n-tmp.h:6685
+msgid "Gestetner DSm745/745G"
+msgstr "Gestetner DSm745/745G"
 
-#: src/xml/xmli18n-tmp.h:4461
-msgid "Gestetner DSm735e"
-msgstr "Gestetner DSm735e"
+#: src/xml/xmli18n-tmp.h:6686
+msgid "Gestetner MP1100/DSm7110"
+msgstr "Gestetner MP1100/DSm7110"
 
-#: src/xml/xmli18n-tmp.h:4462
-msgid "Gestetner MP4500"
-msgstr "Gestetner MP4500"
+#: src/xml/xmli18n-tmp.h:6687
+msgid "Gestetner MP1350/DSm7135"
+msgstr "Gestetner MP1350/DSm7135"
 
-#: src/xml/xmli18n-tmp.h:4463
-msgid "Gestetner DSm745e"
-msgstr "Gestetner DSm745e"
+#: src/xml/xmli18n-tmp.h:6688
+msgid "Gestetner MP1600/DSm716"
+msgstr "Gestetner MP1600/DSm716"
 
-#: src/xml/xmli18n-tmp.h:4464
-msgid "Gestetner MP5500"
-msgstr "Gestetner MP5500"
+#: src/xml/xmli18n-tmp.h:6689
+msgid "Gestetner MP2000/DSm721d"
+msgstr "Gestetner MP2000/DSm721d"
 
-#: src/xml/xmli18n-tmp.h:4465
-msgid "Gestetner DSm755"
-msgstr "Gestetner DSm755"
+#: src/xml/xmli18n-tmp.h:6690
+msgid "Gestetner MP2500/DSm625"
+msgstr "Gestetner MP2500/DSm625"
 
-#: src/xml/xmli18n-tmp.h:4466
-msgid "Gestetner MP6500"
-msgstr "Gestetner MP6500"
+#: src/xml/xmli18n-tmp.h:6691
+msgid "Gestetner MP3500/DSm735e"
+msgstr "Gestetner MP3500/DSm735e"
 
-#: src/xml/xmli18n-tmp.h:4467
-msgid "Gestetner DSm765"
-msgstr "Gestetner DSm765"
+#: src/xml/xmli18n-tmp.h:6692
+msgid "Gestetner MP4500/DSm745e"
+msgstr "Gestetner MP4500/DSm745e"
 
-#: src/xml/xmli18n-tmp.h:4468
-msgid "Gestetner MP7500"
-msgstr "Gestetner MP7500"
+#: src/xml/xmli18n-tmp.h:6693
+msgid "Gestetner MP5500/DSm755"
+msgstr "Gestetner MP5500/DSm755"
 
-#: src/xml/xmli18n-tmp.h:4469
-msgid "Gestetner DSm775"
-msgstr "Gestetner DSm775"
+#: src/xml/xmli18n-tmp.h:6694
+msgid "Gestetner MP6500/DSm765"
+msgstr "Gestetner MP6500/DSm765"
 
-#: src/xml/xmli18n-tmp.h:4470
-msgid "Gestetner MP9000"
-msgstr "Gestetner MP9000"
+#: src/xml/xmli18n-tmp.h:6695
+msgid "Gestetner MP7500/DSm775"
+msgstr "Gestetner MP7500/DSm775"
 
-#: src/xml/xmli18n-tmp.h:4471
-msgid "Gestetner DSm790"
-msgstr "Gestetner DSm790"
+#: src/xml/xmli18n-tmp.h:6696
+msgid "Gestetner MP9000/DSm790"
+msgstr "Gestetner MP9000/DSm790"
 
-#: src/xml/xmli18n-tmp.h:4472
-msgid "Gestetner MP 161"
-msgstr "Gestetner MP 161"
+#: src/xml/xmli18n-tmp.h:6697
+msgid "Gestetner MP 161/DSm416"
+msgstr "Gestetner MP 161/DSm416"
 
-#: src/xml/xmli18n-tmp.h:4473
-msgid "Gestetner DSm416"
-msgstr "Gestetner DSm416"
+#: src/xml/xmli18n-tmp.h:6698
+msgid "Gestetner MP 2510/DSm725e"
+msgstr "Gestetner MP 2510/DSm725e"
 
-#: src/xml/xmli18n-tmp.h:4474
-msgid "Gestetner MP 2510"
-msgstr "Gestetner MP 2510"
-
-#: src/xml/xmli18n-tmp.h:4475
-msgid "Gestetner DSm725e"
-msgstr "Gestetner DSm725e"
-
-#: src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:6699
 msgid "Gestetner MP 2550"
 msgstr "Gestetner MP 2550"
 
-#: src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:6700
 msgid "Gestetner MP 2550B"
 msgstr "Gestetner MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:4478
-msgid "Gestetner MP 3010"
-msgstr "Gestetner MP 3010"
+#: src/xml/xmli18n-tmp.h:6701
+msgid "Gestetner MP 3010/DSm730e"
+msgstr "Gestetner MP 3010/DSm730e"
 
-#: src/xml/xmli18n-tmp.h:4479
-msgid "Gestetner DSm730e"
-msgstr "Gestetner DSm730e"
-
-#: src/xml/xmli18n-tmp.h:4480
+#: src/xml/xmli18n-tmp.h:6702
 msgid "Gestetner MP 3350"
 msgstr "Gestetner MP 3350"
 
-#: src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:6703
 msgid "Gestetner MP 3350B"
 msgstr "Gestetner MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:6704
 msgid "Gestetner MP 4000"
 msgstr "Gestetner MP 4000"
 
-#: src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:6705
 msgid "Gestetner MP 4000B"
 msgstr "Gestetner MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Gestetner MP 5000"
 msgstr "Gestetner MP 5000"
 
-#: src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:6707
 msgid "Gestetner MP 5000B"
 msgstr "Gestetner MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:6708
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:6709
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:6710
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/xml/xmli18n-tmp.h:4489
+#: src/xml/xmli18n-tmp.h:6711
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:6712
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:6713
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/xml/xmli18n-tmp.h:4492
+#: src/xml/xmli18n-tmp.h:6714
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:6715
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:6716
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/xml/xmli18n-tmp.h:4495
+#: src/xml/xmli18n-tmp.h:6717
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/xml/xmli18n-tmp.h:4496
+#: src/xml/xmli18n-tmp.h:6718
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/xml/xmli18n-tmp.h:4497
+#: src/xml/xmli18n-tmp.h:6719
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:6720
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:6721
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:6722
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:6723
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:6724
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:6725
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:6726
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:6727
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:4506
+#: src/xml/xmli18n-tmp.h:6728
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:6729
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:4508
+#: src/xml/xmli18n-tmp.h:6730
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/xml/xmli18n-tmp.h:4509
+#: src/xml/xmli18n-tmp.h:6731
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:4510
+#: src/xml/xmli18n-tmp.h:6732
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:6733
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:6734
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:6735
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:6736
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:6737
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:6738
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:6739
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:4518
+#: src/xml/xmli18n-tmp.h:6740
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:6741
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:6742
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:6743
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:6744
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:4523
+#: src/xml/xmli18n-tmp.h:6745
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:6746
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:6747
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:6748
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:6749
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/xml/xmli18n-tmp.h:4528
+#: src/xml/xmli18n-tmp.h:6750
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/xml/xmli18n-tmp.h:4529
+#: src/xml/xmli18n-tmp.h:6751
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/xml/xmli18n-tmp.h:4530
+#: src/xml/xmli18n-tmp.h:6752
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:6753
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/xml/xmli18n-tmp.h:4532
+#: src/xml/xmli18n-tmp.h:6754
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:6755
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:6756
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:6757
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:6758
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:6759
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:6760
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/xml/xmli18n-tmp.h:4539
+#: src/xml/xmli18n-tmp.h:6761
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/xml/xmli18n-tmp.h:4540
+#: src/xml/xmli18n-tmp.h:6762
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/xml/xmli18n-tmp.h:4541
+#: src/xml/xmli18n-tmp.h:6763
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/xml/xmli18n-tmp.h:4542
+#: src/xml/xmli18n-tmp.h:6764
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/xml/xmli18n-tmp.h:4543
+#: src/xml/xmli18n-tmp.h:6765
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:6766
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:6767
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/xml/xmli18n-tmp.h:4546
+#: src/xml/xmli18n-tmp.h:6768
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:6769
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:6770
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:6771
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:6772
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:6773
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/xml/xmli18n-tmp.h:4552
+#: src/xml/xmli18n-tmp.h:6774
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:6775
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:6776
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:6777
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:6778
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:6779
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:6780
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:6781
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:6782
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:6783
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:6784
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:6785
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:6786
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:6787
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:6788
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/xml/xmli18n-tmp.h:4567
+#: src/xml/xmli18n-tmp.h:6789
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/xml/xmli18n-tmp.h:4568
+#: src/xml/xmli18n-tmp.h:6790
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:6791
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/xml/xmli18n-tmp.h:4570
+#: src/xml/xmli18n-tmp.h:6792
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/xml/xmli18n-tmp.h:4571
+#: src/xml/xmli18n-tmp.h:6793
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:6794
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:6795
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:6796
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:6797
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:6798
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:6799
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:6800
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:6801
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:6802
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:6803
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/xml/xmli18n-tmp.h:4582
+#: src/xml/xmli18n-tmp.h:6804
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/xml/xmli18n-tmp.h:4583
+#: src/xml/xmli18n-tmp.h:6805
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/xml/xmli18n-tmp.h:4584
+#: src/xml/xmli18n-tmp.h:6806
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/xml/xmli18n-tmp.h:4585
+#: src/xml/xmli18n-tmp.h:6807
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:6808
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:6809
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:6810
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:6811
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:6812
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:6813
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:6814
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:4593
+#: src/xml/xmli18n-tmp.h:6815
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/xml/xmli18n-tmp.h:4594
+#: src/xml/xmli18n-tmp.h:6816
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:6817
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:6818
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/xml/xmli18n-tmp.h:4597
+#: src/xml/xmli18n-tmp.h:6819
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:6820
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:6821
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:6822
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:6823
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/xml/xmli18n-tmp.h:4602
+#: src/xml/xmli18n-tmp.h:6824
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:6825
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:6826
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:6827
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:6828
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:4607
+#: src/xml/xmli18n-tmp.h:6829
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:6830
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/xml/xmli18n-tmp.h:4609
+#: src/xml/xmli18n-tmp.h:6831
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/xml/xmli18n-tmp.h:4610
+#: src/xml/xmli18n-tmp.h:6832
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:6833
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:6834
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4613
+#: src/xml/xmli18n-tmp.h:6835
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:6836
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:6837
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:6838
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:6839
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:6840
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:6841
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:6842
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:6843
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:6844
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:6845
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4624
+#: src/xml/xmli18n-tmp.h:6846
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/xml/xmli18n-tmp.h:4625
+#: src/xml/xmli18n-tmp.h:6847
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:6848
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/xml/xmli18n-tmp.h:4627
+#: src/xml/xmli18n-tmp.h:6849
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/xml/xmli18n-tmp.h:4628
+#: src/xml/xmli18n-tmp.h:6850
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:6851
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:6852
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:6853
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 1022"
 
-#: src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:6854
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:6855
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:6856
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:6857
 msgid "HP LaserJet 1160"
 msgstr "HP LaserJet 1160"
 
-#: src/xml/xmli18n-tmp.h:4636
+#: src/xml/xmli18n-tmp.h:6858
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:4637
+#: src/xml/xmli18n-tmp.h:6859
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/xml/xmli18n-tmp.h:4638
+#: src/xml/xmli18n-tmp.h:6860
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:6861
 msgid "HP LaserJet 1320"
 msgstr "HP LaserJet 1320"
 
-#: src/xml/xmli18n-tmp.h:4640
+#: src/xml/xmli18n-tmp.h:6862
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:6863
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:6864
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:6865
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:4644
+#: src/xml/xmli18n-tmp.h:6866
 msgid "HP LaserJet 2410"
 msgstr "HP LaserJet 2410"
 
-#: src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:6867
 msgid "HP LaserJet 2420"
 msgstr "HP LaserJet 2420"
 
-#: src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:6868
 msgid "HP LaserJet 2430"
 msgstr "HP LaserJet 2430"
 
-#: src/xml/xmli18n-tmp.h:4647
+#: src/xml/xmli18n-tmp.h:6869
 msgid "HP LaserJet 3015"
 msgstr "HP LaserJet 3015"
 
-#: src/xml/xmli18n-tmp.h:4648
+#: src/xml/xmli18n-tmp.h:6870
 msgid "HP LaserJet 3020"
 msgstr "HP LaserJet 3020"
 
-#: src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:6871
 msgid "HP LaserJet 3030"
 msgstr "HP LaserJet 3030"
 
-#: src/xml/xmli18n-tmp.h:4650
+#: src/xml/xmli18n-tmp.h:6872
 msgid "HP LaserJet 3050"
 msgstr "HP LaserJet 3050"
 
-#: src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:6873
 msgid "HP LaserJet 3052"
 msgstr "HP LaserJet 3052"
 
-#: src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:6874
 msgid "HP LaserJet 3055"
 msgstr "HP LaserJet 3055"
 
-#: src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:6875
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:6876
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:6877
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:6878
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:6879
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:6880
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:6881
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/xml/xmli18n-tmp.h:4660
+#: src/xml/xmli18n-tmp.h:6882
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:6883
 msgid "HP LaserJet 3380"
 msgstr "HP LaserJet 3380"
 
-#: src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:6884
 msgid "HP LaserJet 3390"
 msgstr "HP LaserJet 3390"
 
-#: src/xml/xmli18n-tmp.h:4663
+#: src/xml/xmli18n-tmp.h:6885
 msgid "HP LaserJet 3392"
 msgstr "HP LaserJet 3392"
 
-#: src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:6886
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:6887
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:6888
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/xml/xmli18n-tmp.h:4667
+#: src/xml/xmli18n-tmp.h:6889
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:6890
 msgid "HP LaserJet 4240"
 msgstr "HP LaserJet 4240"
 
-#: src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:6891
 msgid "HP LaserJet 4250"
 msgstr "HP LaserJet 4250"
 
-#: src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:6892
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/xml/xmli18n-tmp.h:4671
+#: src/xml/xmli18n-tmp.h:6893
 msgid "HP LaserJet 4345 mfp"
 msgstr "HP LaserJet 4345 mfp"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:6894
 msgid "HP LaserJet 4350"
 msgstr "HP LaserJet 4350"
 
-#: src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:6895
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:6896
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:6897
 msgid "HP LaserJet 5200"
 msgstr "HP LaserJet 5200"
 
-#: src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:6898
 msgid "HP LaserJet 5200L"
 msgstr "HP LaserJet 5200L"
 
-#: src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:6899
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:6900
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:6901
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/xml/xmli18n-tmp.h:4680
+#: src/xml/xmli18n-tmp.h:6902
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:6903
 msgid "HP LaserJet 9040"
 msgstr "HP LaserJet 9040"
 
-#: src/xml/xmli18n-tmp.h:4682
+#: src/xml/xmli18n-tmp.h:6904
 msgid "HP LaserJet 9040 MFP"
 msgstr "HP LaserJet 9040 MFP"
 
-#: src/xml/xmli18n-tmp.h:4683
+#: src/xml/xmli18n-tmp.h:6905
 msgid "HP LaserJet 9050"
 msgstr "HP LaserJet 9050"
 
-#: src/xml/xmli18n-tmp.h:4684
+#: src/xml/xmli18n-tmp.h:6906
 msgid "HP LaserJet 9050 MFP"
 msgstr "HP LaserJet 9050 MFP"
 
-#: src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:6907
 msgid "HP LaserJet M3027 MFP"
 msgstr "HP LaserJet M3027 MFP"
 
-#: src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:6908
 msgid "HP LaserJet M3035 MFP"
 msgstr "HP LaserJet M3035 MFP"
 
-#: src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:6909
 msgid "HP LaserJet M4345 MFP"
 msgstr "HP LaserJet M4345 MFP"
 
-#: src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:6910
 msgid "HP LaserJet M5025 MFP"
 msgstr "HP LaserJet M5025 MFP"
 
-#: src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:6911
 msgid "HP LaserJet M5035 MFP"
 msgstr "HP LaserJet M5035 MFP"
 
-#: src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:6912
 msgid "HP LaserJet P2010"
 msgstr "HP LaserJet P2010"
 
-#: src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:6913
 msgid "HP LaserJet P2015"
 msgstr "HP LaserJet P2015"
 
-#: src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:6914
 msgid "HP LaserJet P3004"
 msgstr "HP LaserJet P3004"
 
-#: src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:6915
 msgid "HP LaserJet P3005"
 msgstr "HP LaserJet P3005"
 
-#: src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:6916
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/xml/xmli18n-tmp.h:4695
+#: src/xml/xmli18n-tmp.h:6917
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:6918
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:6919
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:6920
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:6921
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/xml/xmli18n-tmp.h:4700
+#: src/xml/xmli18n-tmp.h:6922
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:6923
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:6924
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/xml/xmli18n-tmp.h:4703
+#: src/xml/xmli18n-tmp.h:6925
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:6926
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:6927
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/xml/xmli18n-tmp.h:4706
+#: src/xml/xmli18n-tmp.h:6928
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/xml/xmli18n-tmp.h:4707
+#: src/xml/xmli18n-tmp.h:6929
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:6930
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:6931
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/xml/xmli18n-tmp.h:4710
+#: src/xml/xmli18n-tmp.h:6932
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:6933
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:6934
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:6935
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:6936
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:6937
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:6938
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:6939
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/xml/xmli18n-tmp.h:4718
+#: src/xml/xmli18n-tmp.h:6940
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:6941
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:6942
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/xml/xmli18n-tmp.h:4721
+#: src/xml/xmli18n-tmp.h:6943
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:6944
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:6945
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:6946
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/xml/xmli18n-tmp.h:4725
+#: src/xml/xmli18n-tmp.h:6947
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:6948
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:6949
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/xml/xmli18n-tmp.h:4728
+#: src/xml/xmli18n-tmp.h:6950
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/xml/xmli18n-tmp.h:4729
+#: src/xml/xmli18n-tmp.h:6951
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:6952
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:6953
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/xml/xmli18n-tmp.h:4732
+#: src/xml/xmli18n-tmp.h:6954
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:6955
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:6956
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:6957
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:6958
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:6959
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:6960
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/xml/xmli18n-tmp.h:4739
+#: src/xml/xmli18n-tmp.h:6961
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/xml/xmli18n-tmp.h:4740
+#: src/xml/xmli18n-tmp.h:6962
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/xml/xmli18n-tmp.h:4741
+#: src/xml/xmli18n-tmp.h:6963
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/xml/xmli18n-tmp.h:4742
+#: src/xml/xmli18n-tmp.h:6964
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:6965
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:6966
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/xml/xmli18n-tmp.h:4745
+#: src/xml/xmli18n-tmp.h:6967
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:6968
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:6969
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:6970
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/xml/xmli18n-tmp.h:4749
+#: src/xml/xmli18n-tmp.h:6971
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:6972
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:6973
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/xml/xmli18n-tmp.h:4752
+#: src/xml/xmli18n-tmp.h:6974
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:6975
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:6976
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/xml/xmli18n-tmp.h:4755
+#: src/xml/xmli18n-tmp.h:6977
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:6978
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:6979
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:6980
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/xml/xmli18n-tmp.h:4759
+#: src/xml/xmli18n-tmp.h:6981
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/xml/xmli18n-tmp.h:4760
+#: src/xml/xmli18n-tmp.h:6982
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:6983
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/xml/xmli18n-tmp.h:4762
+#: src/xml/xmli18n-tmp.h:6984
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:6985
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:6986
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/xml/xmli18n-tmp.h:4765
+#: src/xml/xmli18n-tmp.h:6987
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:6988
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:6989
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:6990
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:6991
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:6992
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:6993
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/xml/xmli18n-tmp.h:4772
+#: src/xml/xmli18n-tmp.h:6994
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:6995
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/xml/xmli18n-tmp.h:4774
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Infotec 4353 MF"
 msgstr "Infotec 4353 MF"
 
-#: src/xml/xmli18n-tmp.h:4775
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Infotec 4452 MF"
 msgstr "Infotec 4452 MF"
 
-#: src/xml/xmli18n-tmp.h:4776
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:6999
 msgid "Infotec IS2022"
 msgstr "Infotec IS2022"
 
-#: src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:7000
 msgid "Infotec IS2027"
 msgstr "Infotec IS2027"
 
-#: src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Infotec IS2032"
 msgstr "Infotec IS2032"
 
-#: src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:7002
 msgid "Infotec IS2035"
 msgstr "Infotec IS2035"
 
-#: src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:7003
 msgid "Infotec IS2045"
 msgstr "Infotec IS2045"
 
-#: src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:7004
 msgid "Infotec IS2090"
 msgstr "Infotec IS2090"
 
-#: src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:7005
 msgid "Infotec IS2105"
 msgstr "Infotec IS2105"
 
-#: src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:7006
 msgid "Infotec IS 2015"
 msgstr "Infotec IS 2015"
 
-#: src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:7007
 msgid "Infotec IS 2018"
 msgstr "Infotec IS 2018"
 
-#: src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:7008
 msgid "Infotec IS 2018D"
 msgstr "Infotec IS 2018D"
 
-#: src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:7009
 msgid "Infotec IS 2060"
 msgstr "Infotec IS 2060"
 
-#: src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:7010
 msgid "Infotec IS 2075"
 msgstr "Infotec IS 2075"
 
-#: src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:7011
 msgid "Infotec IS 2122"
 msgstr "Infotec IS 2122"
 
-#: src/xml/xmli18n-tmp.h:4790
+#: src/xml/xmli18n-tmp.h:7012
 msgid "Infotec IS 2127"
 msgstr "Infotec IS 2127"
 
-#: src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:7013
 msgid "Infotec IS 2132"
 msgstr "Infotec IS 2132"
 
-#: src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:7014
 msgid "Infotec IS 2135"
 msgstr "Infotec IS 2135"
 
-#: src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:7015
 msgid "Infotec IS 2145"
 msgstr "Infotec IS 2145"
 
-#: src/xml/xmli18n-tmp.h:4794
+#: src/xml/xmli18n-tmp.h:7016
 msgid "Infotec IS 2151"
 msgstr "Infotec IS 2151"
 
-#: src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:7017
 msgid "Infotec IS 2160"
 msgstr "Infotec IS 2160"
 
-#: src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:7018
 msgid "Infotec IS 2175"
 msgstr "Infotec IS 2175"
 
-#: src/xml/xmli18n-tmp.h:4797
+#: src/xml/xmli18n-tmp.h:7019
 msgid "Infotec IS 2215"
 msgstr "Infotec IS 2215"
 
-#: src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:7020
 msgid "Infotec IS 2216"
 msgstr "Infotec IS 2216"
 
-#: src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:7021
 msgid "Infotec IS 2220"
 msgstr "Infotec IS 2220"
 
-#: src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:7022
 msgid "Infotec IS 2220D"
 msgstr "Infotec IS 2220D"
 
-#: src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:7023
 msgid "Infotec IS 2225"
 msgstr "Infotec IS 2225"
 
-#: src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Infotec IS 2230"
 msgstr "Infotec IS 2230"
 
-#: src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:7025
 msgid "Infotec IS 2235"
 msgstr "Infotec IS 2235"
 
-#: src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:7026
 msgid "Infotec IS 2245"
 msgstr "Infotec IS 2245"
 
-#: src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:7027
 msgid "Infotec IS 2255"
 msgstr "Infotec IS 2255"
 
-#: src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:7028
 msgid "Infotec IS 2265"
 msgstr "Infotec IS 2265"
 
-#: src/xml/xmli18n-tmp.h:4807
+#: src/xml/xmli18n-tmp.h:7029
 msgid "Infotec IS 2275"
 msgstr "Infotec IS 2275"
 
-#: src/xml/xmli18n-tmp.h:4808
+#: src/xml/xmli18n-tmp.h:7030
 msgid "Infotec IS 2316"
 msgstr "Infotec IS 2316"
 
-#: src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:7031
 msgid "Infotec IS 2320"
 msgstr "Infotec IS 2320"
 
-#: src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:7032
 msgid "Infotec IS 2325"
 msgstr "Infotec IS 2325"
 
-#: src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Infotec IS 2416"
 msgstr "Infotec IS 2416"
 
-#: src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:7034
 msgid "Infotec IS 2425"
 msgstr "Infotec IS 2425"
 
-#: src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:7035
 msgid "Infotec IS 2430"
 msgstr "Infotec IS 2430"
 
-#: src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Infotec IS 2435"
 msgstr "Infotec IS 2435"
 
-#: src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:7037
 msgid "Infotec IS 2445"
 msgstr "Infotec IS 2445"
 
-#: src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Infotec IS 3090"
 msgstr "Infotec IS 3090"
 
-#: src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:7039
 msgid "Infotec IS 3110"
 msgstr "Infotec IS 3110"
 
-#: src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:7040
 msgid "Infotec IS 3135"
 msgstr "Infotec IS 3135"
 
-#: src/xml/xmli18n-tmp.h:4819
+#: src/xml/xmli18n-tmp.h:7041
 msgid "Infotec MP 2550"
 msgstr "Infotec MP 2550"
 
-#: src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:7042
 msgid "Infotec MP 2550B"
 msgstr "Infotec MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:7043
 msgid "Infotec MP 3350"
 msgstr "Infotec MP 3350"
 
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:7044
 msgid "Infotec MP 3350B"
 msgstr "Infotec MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:7045
 msgid "Infotec MP 4000"
 msgstr "Infotec MP 4000"
 
-#: src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:7046
 msgid "Infotec MP 4000B"
 msgstr "Infotec MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:7047
 msgid "Infotec MP 5000"
 msgstr "Infotec MP 5000"
 
-#: src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:7048
 msgid "Infotec MP 5000B"
 msgstr "Infotec MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:7049
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:7050
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:7051
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:4830
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:7057
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:4837
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:4840
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:4842
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:4852
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/xml/xmli18n-tmp.h:4853
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/xml/xmli18n-tmp.h:4854
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/xml/xmli18n-tmp.h:4855
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:4866
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/xml/xmli18n-tmp.h:4867
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/xml/xmli18n-tmp.h:4873
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Lanier 5622"
 msgstr "Lanier 5622"
 
-#: src/xml/xmli18n-tmp.h:4874
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Lanier 5627"
 msgstr "Lanier 5627"
 
-#: src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Lanier 5632"
 msgstr "Lanier 5632"
 
-#: src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Lanier 5635"
 msgstr "Lanier 5635"
 
-#: src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Lanier 5645"
 msgstr "Lanier 5645"
 
-#: src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Lanier LD0105"
 msgstr "Lanier LD0105"
 
-#: src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Lanier LD015"
 msgstr "Lanier LD015"
 
-#: src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Lanier LD035"
 msgstr "Lanier LD035"
 
-#: src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Lanier LD045"
 msgstr "Lanier LD045"
 
-#: src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Lanier LD060"
 msgstr "Lanier LD060"
 
-#: src/xml/xmli18n-tmp.h:4883
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Lanier LD075"
 msgstr "Lanier LD075"
 
-#: src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Lanier LD090"
 msgstr "Lanier LD090"
 
-#: src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Lanier LD115"
 msgstr "Lanier LD115"
 
-#: src/xml/xmli18n-tmp.h:4886
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Lanier LD116"
 msgstr "Lanier LD116"
 
-#: src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Lanier LD118"
 msgstr "Lanier LD118"
 
-#: src/xml/xmli18n-tmp.h:4888
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Lanier LD118d"
 msgstr "Lanier LD118d"
 
-#: src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Lanier LD120"
 msgstr "Lanier LD120"
 
-#: src/xml/xmli18n-tmp.h:4890
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Lanier LD120d"
 msgstr "Lanier LD120d"
 
-#: src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Lanier LD122"
 msgstr "Lanier LD122"
 
-#: src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Lanier LD127"
 msgstr "Lanier LD127"
 
-#: src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Lanier LD132"
 msgstr "Lanier LD132"
 
-#: src/xml/xmli18n-tmp.h:4894
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Lanier LD135"
 msgstr "Lanier LD135"
 
-#: src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Lanier LD145"
 msgstr "Lanier LD145"
 
-#: src/xml/xmli18n-tmp.h:4896
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Lanier LD151"
 msgstr "Lanier LD151"
 
-#: src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Lanier LD160"
 msgstr "Lanier LD160"
 
-#: src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Lanier LD175"
 msgstr "Lanier LD175"
 
-#: src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Lanier LD225"
 msgstr "Lanier LD225"
 
-#: src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Lanier LD230"
 msgstr "Lanier LD230"
 
-#: src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Lanier LD235"
 msgstr "Lanier LD235"
 
-#: src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Lanier LD245"
 msgstr "Lanier LD245"
 
-#: src/xml/xmli18n-tmp.h:4903
-msgid "Lanier MP 2500"
-msgstr "Lanier MP 2500"
-
-#: src/xml/xmli18n-tmp.h:4904
-msgid "Lanier LD125"
-msgstr "Lanier LD125"
-
-#: src/xml/xmli18n-tmp.h:4905
-msgid "Lanier MP 1100"
-msgstr "Lanier MP 1100"
-
-#: src/xml/xmli18n-tmp.h:4906
-msgid "Lanier LD1100"
-msgstr "Lanier LD1100"
-
-#: src/xml/xmli18n-tmp.h:4907
-msgid "Lanier MP 1350"
-msgstr "Lanier MP 1350"
-
-#: src/xml/xmli18n-tmp.h:4908
-msgid "Lanier LD1135"
-msgstr "Lanier LD1135"
-
-#: src/xml/xmli18n-tmp.h:4909
-msgid "Lanier MP 1600"
-msgstr "Lanier MP 1600"
-
-#: src/xml/xmli18n-tmp.h:4910
-msgid "Lanier LD316"
-msgstr "Lanier LD316"
-
-#: src/xml/xmli18n-tmp.h:4911
-msgid "Lanier MP 161"
-msgstr "Lanier MP 161"
-
-#: src/xml/xmli18n-tmp.h:4912
-msgid "Lanier LD016"
-msgstr "Lanier LD016"
-
-#: src/xml/xmli18n-tmp.h:4913
-msgid "Lanier MP 2000"
-msgstr "Lanier MP 2000"
-
-#: src/xml/xmli18n-tmp.h:4914
-msgid "Lanier LD320d"
-msgstr "Lanier LD320d"
-
-#: src/xml/xmli18n-tmp.h:4915
-msgid "Lanier MP 2510"
-msgstr "Lanier MP 2510"
+#: src/xml/xmli18n-tmp.h:7125
+msgid "Lanier MP2500/LD125"
+msgstr "Lanier MP2500/LD125"
 
-#: src/xml/xmli18n-tmp.h:4916
-msgid "Lanier LD325"
-msgstr "Lanier LD325"
+#: src/xml/xmli18n-tmp.h:7126
+msgid "Lanier MP 1100/LD1100"
+msgstr "Lanier MP 1100/LD1100"
 
-#: src/xml/xmli18n-tmp.h:4917
-msgid "Lanier MP 2550B"
-msgstr "Lanier MP 2550B"
+#: src/xml/xmli18n-tmp.h:7127
+msgid "Lanier MP 1350/LD1135"
+msgstr "Lanier MP 1350/LD1135"
 
-#: src/xml/xmli18n-tmp.h:4918
-msgid "Lanier LD425B"
-msgstr "Lanier LD425B"
+#: src/xml/xmli18n-tmp.h:7128
+msgid "Lanier MP 1600/LD316"
+msgstr "Lanier MP 1600/LD316"
 
-#: src/xml/xmli18n-tmp.h:4919
-msgid "Lanier MP 2550"
-msgstr "Lanier MP 2550"
+#: src/xml/xmli18n-tmp.h:7129
+msgid "Lanier MP 161/LD016"
+msgstr "Lanier MP 161/LD016"
 
-#: src/xml/xmli18n-tmp.h:4920
-msgid "Lanier LD425"
-msgstr "Lanier LD425"
+#: src/xml/xmli18n-tmp.h:7130
+msgid "Lanier MP 2000/LD320d"
+msgstr "Lanier MP 2000/LD320d"
 
-#: src/xml/xmli18n-tmp.h:4921
-msgid "Lanier MP 3010"
-msgstr "Lanier MP 3010"
+#: src/xml/xmli18n-tmp.h:7131
+msgid "Lanier MP 2510/LD325"
+msgstr "Lanier MP 2510/LD325"
 
-#: src/xml/xmli18n-tmp.h:4922
-msgid "Lanier LD330"
-msgstr "Lanier LD330"
+#: src/xml/xmli18n-tmp.h:7132
+msgid "Lanier MP 2550B/LD425B"
+msgstr "Lanier MP 2550B/LD425B"
 
-#: src/xml/xmli18n-tmp.h:4923
-msgid "Lanier MP 3350B"
-msgstr "Lanier MP 3350B"
+#: src/xml/xmli18n-tmp.h:7133
+msgid "Lanier MP 2550/LD425"
+msgstr "Lanier MP 2550/LD425"
 
-#: src/xml/xmli18n-tmp.h:4924
-msgid "Lanier LD433B"
-msgstr "Lanier LD433B"
+#: src/xml/xmli18n-tmp.h:7134
+msgid "Lanier MP 3010/LD330"
+msgstr "Lanier MP 3010/LD330"
 
-#: src/xml/xmli18n-tmp.h:4925
-msgid "Lanier MP 3350"
-msgstr "Lanier MP 3350"
+#: src/xml/xmli18n-tmp.h:7135
+msgid "Lanier MP 3350B/LD433B"
+msgstr "Lanier MP 3350B/LD433B"
 
-#: src/xml/xmli18n-tmp.h:4926
-msgid "Lanier LD433"
-msgstr "Lanier LD433"
+#: src/xml/xmli18n-tmp.h:7136
+msgid "Lanier MP 3350/LD433"
+msgstr "Lanier MP 3350/LD433"
 
-#: src/xml/xmli18n-tmp.h:4927
-msgid "Lanier MP 3500"
-msgstr "Lanier MP 3500"
+#: src/xml/xmli18n-tmp.h:7137
+msgid "Lanier MP 3500/LD335"
+msgstr "Lanier MP 3500/LD335"
 
-#: src/xml/xmli18n-tmp.h:4928
-msgid "Lanier LD335"
-msgstr "Lanier LD335"
+#: src/xml/xmli18n-tmp.h:7138
+msgid "Lanier MP 4000B/LD040B"
+msgstr "Lanier MP 4000B/LD040B"
 
-#: src/xml/xmli18n-tmp.h:4929
-msgid "Lanier MP 4000B"
-msgstr "Lanier MP 4000B"
+#: src/xml/xmli18n-tmp.h:7139
+msgid "Lanier MP 4000/LD040"
+msgstr "Lanier MP 4000/LD040"
 
-#: src/xml/xmli18n-tmp.h:4930
-msgid "Lanier LD040B"
-msgstr "Lanier LD040B"
+#: src/xml/xmli18n-tmp.h:7140
+msgid "Lanier MP 4500/LD345"
+msgstr "Lanier MP 4500/LD345"
 
-#: src/xml/xmli18n-tmp.h:4931
-msgid "Lanier MP 4000"
-msgstr "Lanier MP 4000"
+#: src/xml/xmli18n-tmp.h:7141
+msgid "Lanier MP 5000B/LD050B"
+msgstr "Lanier MP 5000B/LD050B"
 
-#: src/xml/xmli18n-tmp.h:4932
-msgid "Lanier LD040"
-msgstr "Lanier LD040"
+#: src/xml/xmli18n-tmp.h:7142
+msgid "Lanier MP 5000/LD050"
+msgstr "Lanier MP 5000/LD050"
 
-#: src/xml/xmli18n-tmp.h:4933
-msgid "Lanier MP 4500"
-msgstr "Lanier MP 4500"
+#: src/xml/xmli18n-tmp.h:7143
+msgid "Lanier MP 5500/LD255"
+msgstr "Lanier MP 5500/LD255"
 
-#: src/xml/xmli18n-tmp.h:4934
-msgid "Lanier LD345"
-msgstr "Lanier LD345"
+#: src/xml/xmli18n-tmp.h:7144
+msgid "Lanier MP 6500/LD265"
+msgstr "Lanier MP 6500/LD265"
 
-#: src/xml/xmli18n-tmp.h:4935
-msgid "Lanier MP 5000B"
-msgstr "Lanier MP 5000B"
+#: src/xml/xmli18n-tmp.h:7145
+msgid "Lanier MP 7500/LD275"
+msgstr "Lanier MP 7500/LD275"
 
-#: src/xml/xmli18n-tmp.h:4936
-msgid "Lanier LD050B"
-msgstr "Lanier LD050B"
+#: src/xml/xmli18n-tmp.h:7146
+msgid "Lanier MP 9000/LD190"
+msgstr "Lanier MP 9000/LD190"
 
-#: src/xml/xmli18n-tmp.h:4937
-msgid "Lanier MP 5000"
-msgstr "Lanier MP 5000"
-
-#: src/xml/xmli18n-tmp.h:4938
-msgid "Lanier LD050"
-msgstr "Lanier LD050"
-
-#: src/xml/xmli18n-tmp.h:4939
-msgid "Lanier MP 5500"
-msgstr "Lanier MP 5500"
-
-#: src/xml/xmli18n-tmp.h:4940
-msgid "Lanier LD255"
-msgstr "Lanier LD255"
-
-#: src/xml/xmli18n-tmp.h:4941
-msgid "Lanier MP 6500"
-msgstr "Lanier MP 6500"
-
-#: src/xml/xmli18n-tmp.h:4942
-msgid "Lanier LD265"
-msgstr "Lanier LD265"
-
-#: src/xml/xmli18n-tmp.h:4943
-msgid "Lanier MP 7500"
-msgstr "Lanier MP 7500"
-
-#: src/xml/xmli18n-tmp.h:4944
-msgid "Lanier LD275"
-msgstr "Lanier LD275"
-
-#: src/xml/xmli18n-tmp.h:4945
-msgid "Lanier MP 9000"
-msgstr "Lanier MP 9000"
-
-#: src/xml/xmli18n-tmp.h:4946
-msgid "Lanier LD190"
-msgstr "Lanier LD190"
-
-#: src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:7148
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/xml/xmli18n-tmp.h:4950
+#: src/xml/xmli18n-tmp.h:7150
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E220"
 
-#: src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:7151
 msgid "Lexmark Optra E321"
 msgstr "Lexmark Optra E321"
 
-#: src/xml/xmli18n-tmp.h:4952
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Lexmark Optra E323"
 msgstr "Lexmark Optra E323"
 
-#: src/xml/xmli18n-tmp.h:4953
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:7155
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/xml/xmli18n-tmp.h:4960
+#: src/xml/xmli18n-tmp.h:7160
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:7161
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:7162
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/xml/xmli18n-tmp.h:4963
+#: src/xml/xmli18n-tmp.h:7163
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:7164
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:7165
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/xml/xmli18n-tmp.h:4966
-msgid "NRG 10515"
-msgstr "NRG 10515"
-
-#: src/xml/xmli18n-tmp.h:4967
-msgid "NRG 10518"
-msgstr "NRG 10518"
-
-#: src/xml/xmli18n-tmp.h:4968
-msgid "NRG 10512"
-msgstr "NRG 10512"
-
-#: src/xml/xmli18n-tmp.h:4969
-msgid "NRG 2205"
-msgstr "NRG 2205"
-
-#: src/xml/xmli18n-tmp.h:4970
-msgid "NRG 2238"
-msgstr "NRG 2238"
-
-#: src/xml/xmli18n-tmp.h:4971
-msgid "NRG 2212"
-msgstr "NRG 2212"
+#: src/xml/xmli18n-tmp.h:7166
+msgid "NRG 10515/10518/10512"
+msgstr "NRG 10515/10518/10512"
 
-#: src/xml/xmli18n-tmp.h:4972
-msgid "NRG 2705"
-msgstr "NRG 2705"
+#: src/xml/xmli18n-tmp.h:7167
+msgid "NRG 2205/2238/2212"
+msgstr "NRG 2205/2238/2212"
 
-#: src/xml/xmli18n-tmp.h:4973
-msgid "NRG 2738"
-msgstr "NRG 2738"
+#: src/xml/xmli18n-tmp.h:7168
+msgid "NRG 2705/2738/2712"
+msgstr "NRG 2705/2738/2712"
 
-#: src/xml/xmli18n-tmp.h:4974
-msgid "NRG 2712"
-msgstr "NRG 2712"
+#: src/xml/xmli18n-tmp.h:7169
+msgid "NRG 3205/3238/3212"
+msgstr "NRG 3205/3238/3212"
 
-#: src/xml/xmli18n-tmp.h:4975
-msgid "NRG 3205"
-msgstr "NRG 3205"
+#: src/xml/xmli18n-tmp.h:7170
+msgid "NRG 3525/3508/3502"
+msgstr "NRG 3525/3508/3502"
 
-#: src/xml/xmli18n-tmp.h:4976
-msgid "NRG 3238"
-msgstr "NRG 3238"
+#: src/xml/xmli18n-tmp.h:7171
+msgid "NRG 3545/3518/3532"
+msgstr "NRG 3545/3518/3532"
 
-#: src/xml/xmli18n-tmp.h:4977
-msgid "NRG 3212"
-msgstr "NRG 3212"
+#: src/xml/xmli18n-tmp.h:7172
+msgid "NRG 4525/4508/4502"
+msgstr "NRG 4525/4508/4502"
 
-#: src/xml/xmli18n-tmp.h:4978
-msgid "NRG 3525"
-msgstr "NRG 3525"
+#: src/xml/xmli18n-tmp.h:7173
+msgid "NRG 4545/4518/4532"
+msgstr "NRG 4545/4518/4532"
 
-#: src/xml/xmli18n-tmp.h:4979
-msgid "NRG 3508"
-msgstr "NRG 3508"
+#: src/xml/xmli18n-tmp.h:7174
+msgid "NRG 6002/6005/6008"
+msgstr "NRG 6002/6005/6008"
 
-#: src/xml/xmli18n-tmp.h:4980
-msgid "NRG 3502"
-msgstr "NRG 3502"
+#: src/xml/xmli18n-tmp.h:7175
+msgid "NRG 7502/7505/7508"
+msgstr "NRG 7502/7505/7508"
 
-#: src/xml/xmli18n-tmp.h:4981
-msgid "NRG 3545"
-msgstr "NRG 3545"
+#: src/xml/xmli18n-tmp.h:7176
+msgid "NRG 9005/9008/9002"
+msgstr "NRG 9005/9008/9002"
 
-#: src/xml/xmli18n-tmp.h:4982
-msgid "NRG 3518"
-msgstr "NRG 3518"
-
-#: src/xml/xmli18n-tmp.h:4983
-msgid "NRG 3532"
-msgstr "NRG 3532"
-
-#: src/xml/xmli18n-tmp.h:4984
-msgid "NRG 4525"
-msgstr "NRG 4525"
-
-#: src/xml/xmli18n-tmp.h:4985
-msgid "NRG 4508"
-msgstr "NRG 4508"
-
-#: src/xml/xmli18n-tmp.h:4986
-msgid "NRG 4502"
-msgstr "NRG 4502"
-
-#: src/xml/xmli18n-tmp.h:4987
-msgid "NRG 4545"
-msgstr "NRG 4545"
-
-#: src/xml/xmli18n-tmp.h:4988
-msgid "NRG 4518"
-msgstr "NRG 4518"
-
-#: src/xml/xmli18n-tmp.h:4989
-msgid "NRG 4532"
-msgstr "NRG 4532"
-
-#: src/xml/xmli18n-tmp.h:4990
-msgid "NRG 6002"
-msgstr "NRG 6002"
-
-#: src/xml/xmli18n-tmp.h:4991
-msgid "NRG 6005"
-msgstr "NRG 6005"
-
-#: src/xml/xmli18n-tmp.h:4992
-msgid "NRG 6008"
-msgstr "NRG 6008"
-
-#: src/xml/xmli18n-tmp.h:4993
-msgid "NRG 7502"
-msgstr "NRG 7502"
-
-#: src/xml/xmli18n-tmp.h:4994
-msgid "NRG 7505"
-msgstr "NRG 7505"
-
-#: src/xml/xmli18n-tmp.h:4995
-msgid "NRG 7508"
-msgstr "NRG 7508"
-
-#: src/xml/xmli18n-tmp.h:4996
-msgid "NRG 9005"
-msgstr "NRG 9005"
-
-#: src/xml/xmli18n-tmp.h:4997
-msgid "NRG 9008"
-msgstr "NRG 9008"
-
-#: src/xml/xmli18n-tmp.h:4998
-msgid "NRG 9002"
-msgstr "NRG 9002"
-
-#: src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:7177
 msgid "NRG DSm415"
 msgstr "NRG DSm415"
 
-#: src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:7178
 msgid "NRG DSm615"
 msgstr "NRG DSm615"
 
-#: src/xml/xmli18n-tmp.h:5001
+#: src/xml/xmli18n-tmp.h:7179
 msgid "NRG DSm616"
 msgstr "NRG DSm616"
 
-#: src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:7180
 msgid "NRG DSm618"
 msgstr "NRG DSm618"
 
-#: src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:7181
 msgid "NRG DSm618d"
 msgstr "NRG DSm618d"
 
-#: src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:7182
 msgid "NRG DSm620"
 msgstr "NRG DSm620"
 
-#: src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:7183
 msgid "NRG DSm620d"
 msgstr "NRG DSm620d"
 
-#: src/xml/xmli18n-tmp.h:5006
+#: src/xml/xmli18n-tmp.h:7184
 msgid "NRG DSm622"
 msgstr "NRG DSm622"
 
-#: src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:7185
 msgid "NRG DSm627"
 msgstr "NRG DSm627"
 
-#: src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:7186
 msgid "NRG DSm632"
 msgstr "NRG DSm632"
 
-#: src/xml/xmli18n-tmp.h:5009
+#: src/xml/xmli18n-tmp.h:7187
 msgid "NRG DSm635"
 msgstr "NRG DSm635"
 
-#: src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:7188
 msgid "NRG DSm645"
 msgstr "NRG DSm645"
 
-#: src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:7189
 msgid "NRG DSm651"
 msgstr "NRG DSm651"
 
-#: src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:7190
 msgid "NRG DSm660"
 msgstr "NRG DSm660"
 
-#: src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:7191
 msgid "NRG DSm675"
 msgstr "NRG DSm675"
 
-#: src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:7192
 msgid "NRG DSm725"
 msgstr "NRG DSm725"
 
-#: src/xml/xmli18n-tmp.h:5015
+#: src/xml/xmli18n-tmp.h:7193
 msgid "NRG DSm730"
 msgstr "NRG DSm730"
 
-#: src/xml/xmli18n-tmp.h:5016
+#: src/xml/xmli18n-tmp.h:7194
 msgid "NRG DSm735"
 msgstr "NRG DSm735"
 
-#: src/xml/xmli18n-tmp.h:5017
+#: src/xml/xmli18n-tmp.h:7195
 msgid "NRG DSm745"
 msgstr "NRG DSm745"
 
-#: src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:7196
 msgid "NRG MP 1100"
 msgstr "NRG MP 1100"
 
-#: src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:7197
 msgid "NRG MP 1350"
 msgstr "NRG MP 1350"
 
-#: src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:7198
 msgid "NRG MP 1600"
 msgstr "NRG MP 1600"
 
-#: src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:7199
 msgid "NRG MP 161"
 msgstr "NRG MP 161"
 
-#: src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:7200
 msgid "NRG MP 2000"
 msgstr "NRG MP 2000"
 
-#: src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:7201
 msgid "NRG MP 2500"
 msgstr "NRG MP 2500"
 
-#: src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:7202
 msgid "NRG MP 2510"
 msgstr "NRG MP 2510"
 
-#: src/xml/xmli18n-tmp.h:5025
+#: src/xml/xmli18n-tmp.h:7203
 msgid "NRG MP 2550"
 msgstr "NRG MP 2550"
 
-#: src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:7204
 msgid "NRG MP 2550B"
 msgstr "NRG MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:7205
 msgid "NRG MP 3010"
 msgstr "NRG MP 3010"
 
-#: src/xml/xmli18n-tmp.h:5028
+#: src/xml/xmli18n-tmp.h:7206
 msgid "NRG MP 3350"
 msgstr "NRG MP 3350"
 
-#: src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:7207
 msgid "NRG MP 3350B"
 msgstr "NRG MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:7208
 msgid "NRG MP 3500"
 msgstr "NRG MP 3500"
 
-#: src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:7209
 msgid "NRG MP 4000"
 msgstr "NRG MP 4000"
 
-#: src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:7210
 msgid "NRG MP 4000B"
 msgstr "NRG MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:5033
+#: src/xml/xmli18n-tmp.h:7211
 msgid "NRG MP 4500"
 msgstr "NRG MP 4500"
 
-#: src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:7212
 msgid "NRG MP 5000"
 msgstr "NRG MP 5000"
 
-#: src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:7213
 msgid "NRG MP 5000B"
 msgstr "NRG MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:7214
 msgid "NRG MP 5500"
 msgstr "NRG MP 5500"
 
-#: src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:7215
 msgid "NRG MP 6500"
 msgstr "NRG MP 6500"
 
-#: src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:7216
 msgid "NRG MP 7500"
 msgstr "NRG MP 7500"
 
-#: src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:7217
 msgid "NRG MP 9000"
 msgstr "NRG MP 9000"
 
-#: src/xml/xmli18n-tmp.h:5040
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Oki OL400"
 msgstr "Oki OL400"
 
-#: src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Oki OL400e"
 msgstr "Oki OL400e"
 
-#: src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Oki OL400ex"
 msgstr "Oki OL400ex"
 
-#: src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Oki OL410e"
 msgstr "Oki OL410e"
 
-#: src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Oki OL600e"
 msgstr "Oki OL600e"
 
-#: src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Oki OL610e/S"
 msgstr "Oki OL610e/S"
 
-#: src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Oki OL800"
 msgstr "Oki OL800"
 
-#: src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Oki OL810ex"
 msgstr "Oki OL810ex"
 
-#: src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Oki Okipage 6e"
 msgstr "Oki Okipage 6e"
 
-#: src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Oki Okipage 6ex"
 msgstr "Oki Okipage 6ex"
 
-#: src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Oki Okipage 8p"
 msgstr "Oki Okipage 8p"
 
-#: src/xml/xmli18n-tmp.h:5051
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Oki Okipage 10e"
 msgstr "Oki Okipage 10e"
 
-#: src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Oki Okipage 10ex"
 msgstr "Oki Okipage 10ex"
 
-#: src/xml/xmli18n-tmp.h:5053
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Oki Okipage 14ex"
 msgstr "Oki Okipage 14ex"
 
-#: src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:7232
 msgid "Oki Super 6e"
 msgstr "Oki Super 6e"
 
-#: src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:7234
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:7235
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/xml/xmli18n-tmp.h:5060
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/xml/xmli18n-tmp.h:5062
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5063
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Ricoh Aficio 1022"
 msgstr "Ricoh Aficio 1022"
 
-#: src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:7242
 msgid "Ricoh Aficio 1027"
 msgstr "Ricoh Aficio 1027"
 
-#: src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:7243
 msgid "Ricoh Aficio 1032"
 msgstr "Ricoh Aficio 1032"
 
-#: src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:7244
 msgid "Ricoh Aficio 1035"
 msgstr "Ricoh Aficio 1035"
 
-#: src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:7245
 msgid "Ricoh Aficio 1045"
 msgstr "Ricoh Aficio 1045"
 
-#: src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:7246
 msgid "Ricoh Aficio 1060"
 msgstr "Ricoh Aficio 1060"
 
-#: src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:7247
 msgid "Ricoh Aficio 1075"
 msgstr "Ricoh Aficio 1075"
 
-#: src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:7248
 msgid "Ricoh Aficio 1515"
 msgstr "Ricoh Aficio 1515"
 
-#: src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:7249
 msgid "Ricoh Aficio 2015"
 msgstr "Ricoh Aficio 2015"
 
-#: src/xml/xmli18n-tmp.h:5072
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Ricoh Aficio 2016"
 msgstr "Ricoh Aficio 2016"
 
-#: src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Ricoh Aficio 2018"
 msgstr "Ricoh Aficio 2018"
 
-#: src/xml/xmli18n-tmp.h:5074
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Ricoh Aficio 2018D"
 msgstr "Ricoh Aficio 2018D"
 
-#: src/xml/xmli18n-tmp.h:5075
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Ricoh Aficio 2020"
 msgstr "Ricoh Aficio 2020"
 
-#: src/xml/xmli18n-tmp.h:5076
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Ricoh Aficio 2020D"
 msgstr "Ricoh Aficio 2020D"
 
-#: src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:7255
 msgid "Ricoh Aficio 2022"
 msgstr "Ricoh Aficio 2022"
 
-#: src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Ricoh Aficio 2027"
 msgstr "Ricoh Aficio 2027"
 
-#: src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Ricoh Aficio 2032"
 msgstr "Ricoh Aficio 2032"
 
-#: src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:7258
 msgid "Ricoh Aficio 2035"
 msgstr "Ricoh Aficio 2035"
 
-#: src/xml/xmli18n-tmp.h:5081
+#: src/xml/xmli18n-tmp.h:7259
 msgid "Ricoh Aficio 2035e"
 msgstr "Ricoh Aficio 2035e"
 
-#: src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Ricoh Aficio 2045"
 msgstr "Ricoh Aficio 2045"
 
-#: src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Ricoh Aficio 2045e"
 msgstr "Ricoh Aficio 2045e"
 
-#: src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Ricoh Aficio 2051"
 msgstr "Ricoh Aficio 2051"
 
-#: src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:7263
 msgid "Ricoh Aficio 2060"
 msgstr "Ricoh Aficio 2060"
 
-#: src/xml/xmli18n-tmp.h:5086
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Ricoh Aficio 2075"
 msgstr "Ricoh Aficio 2075"
 
-#: src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Ricoh Aficio 2090"
 msgstr "Ricoh Aficio 2090"
 
-#: src/xml/xmli18n-tmp.h:5088
+#: src/xml/xmli18n-tmp.h:7266
 msgid "Ricoh Aficio 2105"
 msgstr "Ricoh Aficio 2105"
 
-#: src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:7267
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5090
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Ricoh Aficio 3025"
 msgstr "Ricoh Aficio 3025"
 
-#: src/xml/xmli18n-tmp.h:5091
+#: src/xml/xmli18n-tmp.h:7269
 msgid "Ricoh Aficio 3030"
 msgstr "Ricoh Aficio 3030"
 
-#: src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:7270
 msgid "Ricoh Aficio 3035"
 msgstr "Ricoh Aficio 3035"
 
-#: src/xml/xmli18n-tmp.h:5093
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Ricoh Aficio 3045"
 msgstr "Ricoh Aficio 3045"
 
-#: src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Ricoh Aficio MP 1100"
 msgstr "Ricoh Aficio MP 1100"
 
-#: src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Ricoh Aficio MP 1350"
 msgstr "Ricoh Aficio MP 1350"
 
-#: src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Ricoh Aficio MP 1600"
 msgstr "Ricoh Aficio MP 1600"
 
-#: src/xml/xmli18n-tmp.h:5099
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Ricoh Aficio MP 161"
 msgstr "Ricoh Aficio MP 161"
 
-#: src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Ricoh Aficio MP 2000"
 msgstr "Ricoh Aficio MP 2000"
 
-#: src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Ricoh Aficio MP 2500"
 msgstr "Ricoh Aficio MP 2500"
 
-#: src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Ricoh Aficio MP 2510"
 msgstr "Ricoh Aficio MP 2510"
 
-#: src/xml/xmli18n-tmp.h:5103
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Ricoh Aficio MP 2550"
 msgstr "Ricoh Aficio MP 2550"
 
-#: src/xml/xmli18n-tmp.h:5104
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Ricoh Aficio MP 2550B"
 msgstr "Ricoh Aficio MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Ricoh Aficio MP 3010"
 msgstr "Ricoh Aficio MP 3010"
 
-#: src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:7284
 msgid "Ricoh Aficio MP 3350"
 msgstr "Ricoh Aficio MP 3350"
 
-#: src/xml/xmli18n-tmp.h:5107
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Ricoh Aficio MP 3350B"
 msgstr "Ricoh Aficio MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:5108
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Ricoh Aficio MP 3500"
 msgstr "Ricoh Aficio MP 3500"
 
-#: src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Ricoh Aficio MP 4000"
 msgstr "Ricoh Aficio MP 4000"
 
-#: src/xml/xmli18n-tmp.h:5110
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Ricoh Aficio MP 4000B"
 msgstr "Ricoh Aficio MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Ricoh Aficio MP 4500"
 msgstr "Ricoh Aficio MP 4500"
 
-#: src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Ricoh Aficio MP 5000"
 msgstr "Ricoh Aficio MP 5000"
 
-#: src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Ricoh Aficio MP 5000B"
 msgstr "Ricoh Aficio MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Ricoh Aficio MP 5500"
 msgstr "Ricoh Aficio MP 5500"
 
-#: src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Ricoh Aficio MP 6500"
 msgstr "Ricoh Aficio MP 6500"
 
-#: src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Ricoh Aficio MP 7500"
 msgstr "Ricoh Aficio MP 7500"
 
-#: src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Ricoh Aficio MP 9000"
 msgstr "Ricoh Aficio MP 9000"
 
-#: src/xml/xmli18n-tmp.h:5118
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Samsung ML-1250"
 msgstr "Samsung ML-1250"
 
-#: src/xml/xmli18n-tmp.h:5120
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Samsung ML-1450"
 msgstr "Samsung ML-1450"
 
-#: src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Samsung ML-1450PS"
 msgstr "Samsung ML-1450PS"
 
-#: src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Samsung ML-1650"
 msgstr "Samsung ML-1650"
 
-#: src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Samsung ML-1651N"
 msgstr "Samsung ML-1651N"
 
-#: src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Samsung ML-1750"
 msgstr "Samsung ML-1750"
 
-#: src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Samsung ML-2150"
 msgstr "Samsung ML-2150"
 
-#: src/xml/xmli18n-tmp.h:5126
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Samsung ML-2150PS"
 msgstr "Samsung ML-2150PS"
 
-#: src/xml/xmli18n-tmp.h:5127
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Samsung ML-2151N"
 msgstr "Samsung ML-2151N"
 
-#: src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Samsung ML-2151NPS"
 msgstr "Samsung ML-2151NPS"
 
-#: src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Samsung ML-2152W"
 msgstr "Samsung ML-2152W"
 
-#: src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Samsung ML-2152WPS"
 msgstr "Samsung ML-2152WPS"
 
-#: src/xml/xmli18n-tmp.h:5131
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Samsung ML-2250"
 msgstr "Samsung ML-2250"
 
-#: src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Samsung ML-2550"
 msgstr "Samsung ML-2550"
 
-#: src/xml/xmli18n-tmp.h:5133
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Samsung ML-2551N"
 msgstr "Samsung ML-2551N"
 
-#: src/xml/xmli18n-tmp.h:5134
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Samsung ML-2552W"
 msgstr "Samsung ML-2552W"
 
-#: src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/xml/xmli18n-tmp.h:5138
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Samsung ML-7300"
 msgstr "Samsung ML-7300"
 
-#: src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Samsung ML-7300N"
 msgstr "Samsung ML-7300N"
 
-#: src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/xml/xmli18n-tmp.h:5146
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/xml/xmli18n-tmp.h:5147
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Savin 2522"
 msgstr "Savin 2522"
 
-#: src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Savin 2527"
 msgstr "Savin 2527"
 
-#: src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Savin 2532"
 msgstr "Savin 2532"
 
-#: src/xml/xmli18n-tmp.h:5150
-msgid "Savin 2535"
-msgstr "Savin 2535"
-
-#: src/xml/xmli18n-tmp.h:5151
-msgid "Savin 2235"
-msgstr "Savin 2235"
-
-#: src/xml/xmli18n-tmp.h:5152
-msgid "Savin 2545"
-msgstr "Savin 2545"
+#: src/xml/xmli18n-tmp.h:7328
+msgid "Savin 2535/2235"
+msgstr "Savin 2535/2235"
 
-#: src/xml/xmli18n-tmp.h:5153
-msgid "Savin 2245"
-msgstr "Savin 2245"
+#: src/xml/xmli18n-tmp.h:7329
+msgid "Savin 2545/2245"
+msgstr "Savin 2545/2245"
 
-#: src/xml/xmli18n-tmp.h:5154
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Savin 2560"
 msgstr "Savin 2560"
 
-#: src/xml/xmli18n-tmp.h:5155
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Savin 2575"
 msgstr "Savin 2575"
 
-#: src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Savin 3515"
 msgstr "Savin 3515"
 
-#: src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Savin 40105"
 msgstr "Savin 40105"
 
-#: src/xml/xmli18n-tmp.h:5158
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Savin 4015"
 msgstr "Savin 4015"
 
-#: src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Savin 4018"
 msgstr "Savin 4018"
 
-#: src/xml/xmli18n-tmp.h:5160
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Savin 4018d"
 msgstr "Savin 4018d"
 
-#: src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Savin 4022"
 msgstr "Savin 4022"
 
-#: src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Savin 4027"
 msgstr "Savin 4027"
 
-#: src/xml/xmli18n-tmp.h:5163
-msgid "Savin 4035"
-msgstr "Savin 4035"
-
-#: src/xml/xmli18n-tmp.h:5164
-msgid "Savin 4135g"
-msgstr "Savin 4135g"
-
-#: src/xml/xmli18n-tmp.h:5165
-msgid "Savin 4035e"
-msgstr "Savin 4035e"
+#: src/xml/xmli18n-tmp.h:7339
+msgid "Savin 4035/4135g"
+msgstr "Savin 4035/4135g"
 
-#: src/xml/xmli18n-tmp.h:5166
-msgid "Savin 4135eG"
-msgstr "Savin 4135eG"
+#: src/xml/xmli18n-tmp.h:7340
+msgid "Savin 4035e/4135eG"
+msgstr "Savin 4035e/4135eG"
 
-#: src/xml/xmli18n-tmp.h:5167
-msgid "Savin 4045"
-msgstr "Savin 4045"
+#: src/xml/xmli18n-tmp.h:7341
+msgid "Savin 4045/4145g"
+msgstr "Savin 4045/4145g"
 
-#: src/xml/xmli18n-tmp.h:5168
-msgid "Savin 4145g"
-msgstr "Savin 4145g"
+#: src/xml/xmli18n-tmp.h:7342
+msgid "Savin 4045e/4145eG"
+msgstr "Savin 4045e/4145eG"
 
-#: src/xml/xmli18n-tmp.h:5169
-msgid "Savin 4045e"
-msgstr "Savin 4045e"
-
-#: src/xml/xmli18n-tmp.h:5170
-msgid "Savin 4145eG"
-msgstr "Savin 4145eG"
-
-#: src/xml/xmli18n-tmp.h:5171
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Savin 4051"
 msgstr "Savin 4051"
 
-#: src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Savin 4060"
 msgstr "Savin 4060"
 
-#: src/xml/xmli18n-tmp.h:5173
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Savin 4075"
 msgstr "Savin 4075"
 
-#: src/xml/xmli18n-tmp.h:5174
+#: src/xml/xmli18n-tmp.h:7346
 msgid "Savin 4090"
 msgstr "Savin 4090"
 
-#: src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Savin 7025"
 msgstr "Savin 7025"
 
-#: src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:7348
 msgid "Savin 8016"
 msgstr "Savin 8016"
 
-#: src/xml/xmli18n-tmp.h:5177
+#: src/xml/xmli18n-tmp.h:7349
 msgid "Savin 8020"
 msgstr "Savin 8020"
 
-#: src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Savin 8020d"
 msgstr "Savin 8020d"
 
-#: src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Savin 8025"
 msgstr "Savin 8025"
 
-#: src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Savin 8025e"
 msgstr "Savin 8025e"
 
-#: src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:7353
 msgid "Savin 8030"
 msgstr "Savin 8030"
 
-#: src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Savin 8030e"
 msgstr "Savin 8030e"
 
-#: src/xml/xmli18n-tmp.h:5183
-msgid "Savin 8035"
-msgstr "Savin 8035"
+#: src/xml/xmli18n-tmp.h:7355
+msgid "Savin 8035/8035g"
+msgstr "Savin 8035/8035g"
 
-#: src/xml/xmli18n-tmp.h:5184
-msgid "Savin 8035g"
-msgstr "Savin 8035g"
-
-#: src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Savin 8035e"
 msgstr "Savin 8035e"
 
-#: src/xml/xmli18n-tmp.h:5186
-msgid "Savin 8045"
-msgstr "Savin 8045"
-
-#: src/xml/xmli18n-tmp.h:5187
-msgid "Savin 8045g"
-msgstr "Savin 8045g"
+#: src/xml/xmli18n-tmp.h:7357
+msgid "Savin 8045/8045g"
+msgstr "Savin 8045/8045g"
 
-#: src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Savin 8045e"
 msgstr "Savin 8045e"
 
-#: src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Savin 8055"
 msgstr "Savin 8055"
 
-#: src/xml/xmli18n-tmp.h:5190
+#: src/xml/xmli18n-tmp.h:7360
 msgid "Savin 8065"
 msgstr "Savin 8065"
 
-#: src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Savin 8075"
 msgstr "Savin 8075"
 
-#: src/xml/xmli18n-tmp.h:5192
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Savin 8090"
 msgstr "Savin 8090"
 
-#: src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Savin 8110"
 msgstr "Savin 8110"
 
-#: src/xml/xmli18n-tmp.h:5194
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Savin 8135"
 msgstr "Savin 8135"
 
-#: src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Savin 816"
 msgstr "Savin 816"
 
-#: src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Savin 9016"
 msgstr "Savin 9016"
 
-#: src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Savin 9021d"
 msgstr "Savin 9021d"
 
-#: src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Savin 9025"
 msgstr "Savin 9025"
 
-#: src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Savin 9025b"
 msgstr "Savin 9025b"
 
-#: src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:7370
 msgid "Savin 9033"
 msgstr "Savin 9033"
 
-#: src/xml/xmli18n-tmp.h:5201
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Savin 9033b"
 msgstr "Savin 9033b"
 
-#: src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Savin 9040"
 msgstr "Savin 9040"
 
-#: src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:7373
 msgid "Savin 9040b"
 msgstr "Savin 9040b"
 
-#: src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:7374
 msgid "Savin 9050"
 msgstr "Savin 9050"
 
-#: src/xml/xmli18n-tmp.h:5205
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Savin 9050b"
 msgstr "Savin 9050b"
 
-#: src/xml/xmli18n-tmp.h:5206
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Sharp AR-M257"
 msgstr "Sharp AR-M257"
 
-#: src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:7379
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/xml/xmli18n-tmp.h:5211
+#: src/xml/xmli18n-tmp.h:7381
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/xml/xmli18n-tmp.h:5212
+#: src/xml/xmli18n-tmp.h:7382
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/xml/xmli18n-tmp.h:5213
+#: src/xml/xmli18n-tmp.h:7383
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/xml/xmli18n-tmp.h:5216
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/xml/xmli18n-tmp.h:5221
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox WorkCentre M118"
 
-#: src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Compaq IJ1200"
 msgstr "Compaq IJ1200"
 
-#: src/xml/xmli18n-tmp.h:5224
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Lexmark X73"
 msgstr "Lexmark X73"
 
-#: src/xml/xmli18n-tmp.h:5225
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:5227
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:5230
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:7404
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/xml/xmli18n-tmp.h:5236
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:7409
 msgid "Olympus P-S100"
 msgstr "Olympus P-S100"
 
-#: src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:7410
 msgid "Canon CP-10"
 msgstr "Canon CP-10"
 
-#: src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/xml/xmli18n-tmp.h:5244
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Canon SELPHY-CP-400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:5247
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Canon SELPHY-CP-500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Canon SELPHY-CP-510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:5249
+#: src/xml/xmli18n-tmp.h:7419
+msgid "Canon SELPHY-CP-520"
+msgstr "Canon SELPHY-CP-520"
+
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Canon SELPHY-CP-600"
 msgstr "Canon SELPHY-CP-600"
 
-#: src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Canon SELPHY-CP-710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Canon SELPHY-CP-720"
 msgstr "Canon SELPHY-CP-720"
 
-#: src/xml/xmli18n-tmp.h:5252
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Canon SELPHY-CP-730"
 msgstr "Canon SELPHY-CP-730"
 
-#: src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Canon SELPHY-CP-740"
 msgstr "Canon SELPHY-CP-740"
 
-#: src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Canon SELPHY-CP-750"
 msgstr "Canon SELPHY-CP-750"
 
-#: src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Canon SELPHY ES1"
 msgstr "Canon SELPHY ES1"
 
-#: src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Canon SELPHY ES2"
 msgstr "Canon SELPHY ES2"
 
-#: src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Canon SELPHY ES20"
 msgstr "Canon SELPHY ES20"
 
-#: src/xml/xmli18n-tmp.h:5258
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Sony DPP-EX5"
 msgstr "Sony DPP-EX5"
 
-#: src/xml/xmli18n-tmp.h:5259
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Sony DPP-EX7"
 msgstr "Sony DPP-EX7"
 
-#: src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR100"
 
-#: src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:7434
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm FinePix-NX-500"
 
-#: src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:7438
 msgid "Shinko CHC-S9045"
 msgstr "Shinko CHC-S9045"
 
-#: src/xml/xmli18n-tmp.h:5268
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Dai Nippon Printing DS40"
+msgstr "Dai Nippon Printing DS40"
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Dai Nippon Printing DS80"
+msgstr "Dai Nippon Printing DS80"
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "RAW DATA 16 bit"
 msgstr "RAW DATA 16 bit"
 
-#: src/xml/xmli18n-tmp.h:5269
+#: src/xml/xmli18n-tmp.h:7442
 msgid "RAW DATA 8 bit"
 msgstr "RAW DATA 8 bit"
diff --git a/po/de.gmo b/po/de.gmo
index 9452220..9eb0e51 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 49d03ea..81bf9ae 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: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-21 22:25-0500\n"
+"POT-Creation-Date: 2009-07-26 19:14-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"
@@ -18,7 +18,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2109 src/main/print-pcl.c:1779
+#: src/main/print-escp2.c:2314 src/main/print-pcl.c:1779
 #, fuzzy
 msgid "Default"
 msgstr "Zurücksetzen"
@@ -98,15 +98,15 @@ msgstr "Empfindlichkeit:"
 
 #: src/main/dither-main.c:91 src/main/print-canon.c:300
 #: src/main/print-canon.c:308 src/main/print-canon.c:316
-#: src/main/print-canon.c:324 src/main/print-escp2.c:439
-#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
-#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-canon.c:324 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: 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-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:1769
-#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
-#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1935
+#: src/main/print-olympus.c:1943 src/main/print-olympus.c:1951
+#: src/main/print-olympus.c:1959 src/main/print-pcl.c:1324
 #: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
 #: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
@@ -167,7 +167,7 @@ msgid "Dither algorithm"
 msgstr "Raster Algorythmus"
 
 #: src/main/print-canon.c:199 src/main/print-escp2.c:165
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1866
 #: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
@@ -185,8 +185,8 @@ msgstr "Größe"
 #: src/main/print-escp2.c:254 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:1704 src/main/print-olympus.c:1710
-#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-olympus.c:1866 src/main/print-olympus.c:1872
+#: src/main/print-olympus.c:1878 src/main/print-olympus.c:1884
 #: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
 #: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
 #: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
@@ -196,32 +196,32 @@ msgid "Basic Printer Setup"
 msgstr "Drucker Einstellungen"
 
 #: src/main/print-canon.c:200 src/main/print-escp2.c:166
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1867
 #: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Größe des Papiers "
 
 #: src/main/print-canon.c:205 src/main/print-escp2.c:171
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1259 src/cups/genppd.c:1339 src/cups/genppd.c:2001
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1872
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1372 src/cups/genppd.c:2035
 msgid "Media Type"
 msgstr "Medium Type"
 
 #: src/main/print-canon.c:206 src/main/print-escp2.c:172
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1873
 #: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
 #: src/main/print-canon.c:211 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
-#: src/main/print-pcl.c:1265 src/cups/genppd.c:1368 src/cups/genppd.c:2020
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1878
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1401 src/cups/genppd.c:2054
 msgid "Media Source"
 msgstr "Medium Quelle"
 
 #: src/main/print-canon.c:212 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1879
 #: src/main/print-pcl.c:1266
 #, fuzzy
 msgid "Source (input slot) of the media"
@@ -259,8 +259,8 @@ msgstr ""
 #: src/main/print-canon.c:235 src/main/print-canon.c:241
 #: src/main/print-canon.c:253 src/main/print-escp2.c:207
 #: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1906
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
@@ -275,25 +275,25 @@ msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:247 src/main/print-escp2.c:219
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
-#: src/main/print-pcl.c:1277 src/cups/genppd.c:1446 src/cups/genppd.c:2056
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1884
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1479 src/cups/genppd.c:2090
 msgid "Resolution"
 msgstr "Auflösung"
 
 #: src/main/print-canon.c:248 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1723
+#: src/main/print-olympus.c:1885
 msgid "Resolution and quality of the print"
 msgstr "Auflösung und Druckqualität"
 
 #: src/main/print-canon.c:253 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tintentype"
 
 #: src/main/print-canon.c:254 src/main/print-escp2.c:231
 #: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
+#: src/main/print-olympus.c:1891 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Tintenart im Drucker"
@@ -311,17 +311,18 @@ msgstr ""
 #: 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-escp2.c:320 src/main/print-escp2.c:767
-#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
-#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
-#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
-#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:893 src/main/print-escp2.c:901
+#: src/main/print-escp2.c:909 src/main/print-escp2.c:925
+#: src/main/print-escp2.c:933 src/main/print-escp2.c:941
+#: src/main/print-escp2.c:949 src/main/print-escp2.c:957
+#: src/main/print-escp2.c:965 src/main/print-escp2.c:973
 #: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:265 src/main/print-escp2.c:326
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-canon.c:265 src/main/print-escp2.c:332
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1912
 #: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
@@ -329,16 +330,16 @@ msgstr "Druckermodel:"
 
 #: src/main/print-canon.c:265 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:326
-#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-color.c:208 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1912 src/main/print-pcl.c:1295
 #: src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Normalpapier"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:327
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-canon.c:266 src/main/print-escp2.c:333
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1913
 #: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
@@ -367,56 +368,56 @@ msgstr "720 DPI höchste Qualität"
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:300 src/main/print-escp2.c:439
+#: src/main/print-canon.c:300 src/main/print-escp2.c:445
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:301 src/main/print-escp2.c:446
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-canon.c:308 src/main/print-escp2.c:447
+#: src/main/print-canon.c:308 src/main/print-escp2.c:453
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:309 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-canon.c:316 src/main/print-escp2.c:455
+#: src/main/print-canon.c:316 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:317 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-canon.c:324 src/main/print-escp2.c:463
+#: src/main/print-canon.c:324 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 #, fuzzy
 msgid "Black Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-canon.c:325 src/main/print-escp2.c:464
+#: src/main/print-canon.c:325 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Stellen sie die Cyan-Balance ein"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:333
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:541 src/main/print-escp2.c:542
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 #, fuzzy
@@ -424,29 +425,36 @@ msgid "Light Cyan Transition"
 msgstr "helles Cyan"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:340
-#: src/main/print-canon.c:348 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
-#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
-#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
-#: src/main/print-pcl.c:1364
+#: src/main/print-canon.c:348 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:541
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:557
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:573
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:589
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:605
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:621
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:637
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:653
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:669
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:685
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:701
+#: src/main/print-escp2.c:709 src/main/print-escp2.c:717
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:733
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:749
+#: src/main/print-escp2.c:757 src/main/print-escp2.c:765
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:781
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:797
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:813
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:829
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:845
+#: src/main/print-escp2.c:853 src/main/print-escp2.c:861
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:340 src/main/print-canon.c:341
-#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
+#: src/main/print-escp2.c:573 src/main/print-escp2.c:574
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #, fuzzy
@@ -458,14 +466,14 @@ msgstr "helles Magenta"
 msgid "Light Yellow Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-canon.c:368 src/main/print-escp2.c:2283
-#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3609
-#: src/xml/xmli18n-tmp.h:3614 src/xml/xmli18n-tmp.h:3620
-#: src/xml/xmli18n-tmp.h:3627
+#: src/main/print-canon.c:368 src/main/print-escp2.c:2488
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5851 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5864
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:369 src/main/print-escp2.c:2285
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2490
 #: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
@@ -474,67 +482,68 @@ msgstr ""
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:646 src/main/print-escp2.c:2005
-#: src/xml/xmli18n-tmp.h:3676
+#: src/main/print-canon.c:646 src/main/print-escp2.c:2210
+#: src/xml/xmli18n-tmp.h:5913
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:648 src/main/print-escp2.c:2007
-#: src/xml/xmli18n-tmp.h:3677
+#: src/main/print-canon.c:648 src/main/print-escp2.c:2212
+#: src/xml/xmli18n-tmp.h:5914
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:650 src/main/print-escp2.c:2009
-#: src/xml/xmli18n-tmp.h:3678
+#: src/main/print-canon.c:650 src/main/print-escp2.c:2214
+#: src/xml/xmli18n-tmp.h:5915
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Auto"
 
-#: src/main/print-canon.c:673 src/main/print-escp2.c:2034
-#: src/cups/genppd.c:1323 src/cups/genppd.c:1572 src/cups/genppd.c:1988
-#: src/cups/genppd.c:2079
+#: src/main/print-canon.c:673 src/main/print-escp2.c:2239
+#: src/cups/genppd.c:1356 src/cups/genppd.c:1605 src/cups/genppd.c:2022
+#: src/cups/genppd.c:2113
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:675 src/main/print-escp2.c:2036
+#: src/main/print-canon.c:675 src/main/print-escp2.c:2241
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Drucke in Datei?"
 
-#: src/main/print-canon.c:790 src/main/print-escp2.c:2447
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-canon.c:790 src/main/print-escp2.c:2652
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2167
 #: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
 #: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Farbe"
 
-#: src/main/print-canon.c:792 src/main/print-escp2.c:2449
+#: src/main/print-canon.c:792 src/main/print-escp2.c:2654
 #: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
 #: src/main/print-ps.c:331 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
 msgstr "Schwarz-Weiß"
 
-#: src/main/print-canon.c:831 src/main/print-escp2.c:2089
+#: src/main/print-canon.c:831 src/main/print-escp2.c:2294
 #: src/main/print-pcl.c:1797 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Ausgabeart:"
 
-#: src/main/print-canon.c:833 src/main/print-escp2.c:2131
-#: src/main/print-escp2.c:2229 src/main/print-escp2.c:2241
+#: src/main/print-canon.c:833 src/main/print-escp2.c:2336
+#: src/main/print-escp2.c:2434 src/main/print-escp2.c:2446
 #: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
 #: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
-#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1215
-#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1219
-#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
-#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3170
-#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3177
-#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3461
-#: src/xml/xmli18n-tmp.h:3464 src/xml/xmli18n-tmp.h:3632
-#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3648
-#: src/xml/xmli18n-tmp.h:3657 src/xml/xmli18n-tmp.h:3665
+#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1627 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3713 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3722 src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5902
 msgid "Standard"
 msgstr "Standard"
 
@@ -573,7 +582,7 @@ msgid "Pre-Dithered"
 msgstr "Drucken"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1268 src/cups/genppd.c:1971
+#: src/cups/genppd.c:1301 src/cups/genppd.c:2005
 msgid "Grayscale"
 msgstr "Graustufen"
 
@@ -590,11 +599,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1299 src/cups/genppd.c:1978
+#: src/main/print-color.c:129 src/cups/genppd.c:1332 src/cups/genppd.c:2012
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1306 src/cups/genppd.c:1979
+#: src/main/print-color.c:131 src/cups/genppd.c:1339 src/cups/genppd.c:2013
 msgid "KCMY"
 msgstr ""
 
@@ -660,7 +669,7 @@ msgid "Output image type"
 msgstr "Ausgabeart:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338
 msgid "Raw Channels"
 msgstr ""
 
@@ -730,56 +739,208 @@ msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
 #: src/escputil/escputil.c:997 src/escputil/escputil.c:1017
-#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:1812
-#: src/xml/xmli18n-tmp.h:1823 src/xml/xmli18n-tmp.h:1836
-#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1863
-#: src/xml/xmli18n-tmp.h:1876 src/xml/xmli18n-tmp.h:1889
-#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1918
-#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1949
-#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1975
-#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:1999
-#: src/xml/xmli18n-tmp.h:2013 src/xml/xmli18n-tmp.h:2027
-#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2051
-#: src/xml/xmli18n-tmp.h:2064 src/xml/xmli18n-tmp.h:2076
-#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2102
-#: src/xml/xmli18n-tmp.h:2116 src/xml/xmli18n-tmp.h:2130
-#: src/xml/xmli18n-tmp.h:2143 src/xml/xmli18n-tmp.h:2156
-#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2184
-#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2210
-#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2236
-#: src/xml/xmli18n-tmp.h:2249 src/xml/xmli18n-tmp.h:2262
-#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2290
-#: src/xml/xmli18n-tmp.h:2305 src/xml/xmli18n-tmp.h:2320
-#: src/xml/xmli18n-tmp.h:2332 src/xml/xmli18n-tmp.h:2343
-#: src/xml/xmli18n-tmp.h:2356 src/xml/xmli18n-tmp.h:2369
-#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2392
-#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2415
-#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2442
-#: src/xml/xmli18n-tmp.h:2454 src/xml/xmli18n-tmp.h:2466
-#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2496
-#: src/xml/xmli18n-tmp.h:2509 src/xml/xmli18n-tmp.h:2522
-#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
-#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2574
-#: src/xml/xmli18n-tmp.h:2586 src/xml/xmli18n-tmp.h:2598
-#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2623
-#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2653
-#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2683
-#: src/xml/xmli18n-tmp.h:2697 src/xml/xmli18n-tmp.h:2715
-#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2745
-#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
-#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2803
-#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2828
-#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2854
-#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2881
-#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2915
-#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2943
-#: src/xml/xmli18n-tmp.h:2959 src/xml/xmli18n-tmp.h:2976
-#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:3004
-#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3032
-#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3062
-#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3093
-#: src/xml/xmli18n-tmp.h:3107 src/xml/xmli18n-tmp.h:3125
-#: src/xml/xmli18n-tmp.h:3141
+#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2387
+#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2413
+#: src/xml/xmli18n-tmp.h:2426 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2499
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2551
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2575
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2708
+#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2786
+#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2814
+#: src/xml/xmli18n-tmp.h:2829 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2893
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2966
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3005 src/xml/xmli18n-tmp.h:3020
+#: src/xml/xmli18n-tmp.h:3033 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3061 src/xml/xmli18n-tmp.h:3073
+#: src/xml/xmli18n-tmp.h:3085 src/xml/xmli18n-tmp.h:3098
+#: src/xml/xmli18n-tmp.h:3110 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3377
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3616
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3648
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3766 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3775 src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:3794 src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:3805 src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3869 src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:3880 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3902 src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:3913 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:3948 src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:3970 src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:3983 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4023 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4064 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4075 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4088 src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:4103 src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:4118 src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:4143 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:4203 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4275 src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4309 src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4356 src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4421
+#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4449
+#: src/xml/xmli18n-tmp.h:4456 src/xml/xmli18n-tmp.h:4462
+#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4485 src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:4551 src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:4694 src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4717 src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:4818 src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:4829 src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4885 src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4935
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:5041 src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:5052 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:5121 src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5165
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5182 src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:5193 src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:5271 src/xml/xmli18n-tmp.h:5299
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5327 src/xml/xmli18n-tmp.h:5331
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5347
+#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5367 src/xml/xmli18n-tmp.h:5371
+#: src/xml/xmli18n-tmp.h:5383 src/xml/xmli18n-tmp.h:5388
+#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5440
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5461 src/xml/xmli18n-tmp.h:5468
+#: src/xml/xmli18n-tmp.h:5476 src/xml/xmli18n-tmp.h:5486
+#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5514
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5525
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5543
+#: src/xml/xmli18n-tmp.h:5550 src/xml/xmli18n-tmp.h:5556
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5574 src/xml/xmli18n-tmp.h:5582
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5592
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5625
+#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5649
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5662
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5690
+#: src/xml/xmli18n-tmp.h:5694 src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5731
+#: src/xml/xmli18n-tmp.h:5738 src/xml/xmli18n-tmp.h:5742
+#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5759
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5770
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5807
+#: src/xml/xmli18n-tmp.h:5811 src/xml/xmli18n-tmp.h:5817
+#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5828
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5843
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -790,56 +951,208 @@ msgstr "Stellen sie die Cyan-Balance ein"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
 #: src/escputil/escputil.c:998 src/escputil/escputil.c:1018
-#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:1813
-#: src/xml/xmli18n-tmp.h:1824 src/xml/xmli18n-tmp.h:1837
-#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1864
-#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1890
-#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1919
-#: src/xml/xmli18n-tmp.h:1935 src/xml/xmli18n-tmp.h:1950
-#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1976
-#: src/xml/xmli18n-tmp.h:1988 src/xml/xmli18n-tmp.h:2000
-#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2028
-#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2052
-#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2077
-#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2103
-#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2131
-#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2157
-#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2185
-#: src/xml/xmli18n-tmp.h:2198 src/xml/xmli18n-tmp.h:2211
-#: src/xml/xmli18n-tmp.h:2224 src/xml/xmli18n-tmp.h:2237
-#: src/xml/xmli18n-tmp.h:2250 src/xml/xmli18n-tmp.h:2263
-#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2291
-#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2321
-#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2344
-#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2370
-#: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2393
-#: src/xml/xmli18n-tmp.h:2405 src/xml/xmli18n-tmp.h:2416
-#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2443
-#: src/xml/xmli18n-tmp.h:2455 src/xml/xmli18n-tmp.h:2467
-#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2497
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2523
-#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2575
-#: src/xml/xmli18n-tmp.h:2587 src/xml/xmli18n-tmp.h:2599
-#: src/xml/xmli18n-tmp.h:2611 src/xml/xmli18n-tmp.h:2624
-#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
-#: src/xml/xmli18n-tmp.h:2670 src/xml/xmli18n-tmp.h:2684
-#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2714
-#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2747
-#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2780
-#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
-#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2829
-#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2855
-#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2882
-#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2914
-#: src/xml/xmli18n-tmp.h:2931 src/xml/xmli18n-tmp.h:2944
-#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2975
-#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:3005
-#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3033
-#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3060
-#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3094
-#: src/xml/xmli18n-tmp.h:3108 src/xml/xmli18n-tmp.h:3124
-#: src/xml/xmli18n-tmp.h:3140
+#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2361
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2388
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2414
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2459 src/xml/xmli18n-tmp.h:2474
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2512 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2552
+#: src/xml/xmli18n-tmp.h:2564 src/xml/xmli18n-tmp.h:2576
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2787
+#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2815
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2868
+#: src/xml/xmli18n-tmp.h:2881 src/xml/xmli18n-tmp.h:2894
+#: src/xml/xmli18n-tmp.h:2905 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:2967
+#: src/xml/xmli18n-tmp.h:2979 src/xml/xmli18n-tmp.h:2991
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3062 src/xml/xmli18n-tmp.h:3074
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3099
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3135 src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:3163 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3353
+#: src/xml/xmli18n-tmp.h:3365 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
+#: src/xml/xmli18n-tmp.h:3420 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3542 src/xml/xmli18n-tmp.h:3556
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3600 src/xml/xmli18n-tmp.h:3617
+#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3647
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3751 src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:3784 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3795 src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:3806 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3837 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3903 src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3939 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3960 src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:3972 src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:3984 src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:3999 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:4039 src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:4104 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:4170 src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4194 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:4230 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:4276 src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4311 src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4338 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:4401 src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:4427 src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:4442 src/xml/xmli18n-tmp.h:4451
+#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4464
+#: src/xml/xmli18n-tmp.h:4470 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4486 src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:4511 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:4809 src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4909 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:5007 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5018 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5111 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5123 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5148 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:5240 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5250 src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:5261 src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5301
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5313
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5349
+#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5401
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5441
+#: src/xml/xmli18n-tmp.h:5453 src/xml/xmli18n-tmp.h:5458
+#: src/xml/xmli18n-tmp.h:5463 src/xml/xmli18n-tmp.h:5470
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5496 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5527
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5552 src/xml/xmli18n-tmp.h:5558
+#: src/xml/xmli18n-tmp.h:5564 src/xml/xmli18n-tmp.h:5568
+#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5593
+#: src/xml/xmli18n-tmp.h:5598 src/xml/xmli18n-tmp.h:5616
+#: src/xml/xmli18n-tmp.h:5620 src/xml/xmli18n-tmp.h:5626
+#: src/xml/xmli18n-tmp.h:5631 src/xml/xmli18n-tmp.h:5651
+#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
+#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5674
+#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5720
+#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5733
+#: src/xml/xmli18n-tmp.h:5739 src/xml/xmli18n-tmp.h:5743
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5818
+#: src/xml/xmli18n-tmp.h:5823 src/xml/xmli18n-tmp.h:5829
+#: src/xml/xmli18n-tmp.h:5833 src/xml/xmli18n-tmp.h:5839
+#: src/xml/xmli18n-tmp.h:5844
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -850,56 +1163,208 @@ msgstr "Stellen sie die Magenta-Balance ein"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
 #: src/escputil/escputil.c:999 src/escputil/escputil.c:1019
-#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:1814
-#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
-#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1865
-#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1891
-#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1920
-#: src/xml/xmli18n-tmp.h:1936 src/xml/xmli18n-tmp.h:1951
-#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1977
-#: src/xml/xmli18n-tmp.h:1989 src/xml/xmli18n-tmp.h:2001
-#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2029
-#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2053
-#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2078
-#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2104
-#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
-#: src/xml/xmli18n-tmp.h:2145 src/xml/xmli18n-tmp.h:2158
-#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2186
-#: src/xml/xmli18n-tmp.h:2199 src/xml/xmli18n-tmp.h:2212
-#: src/xml/xmli18n-tmp.h:2225 src/xml/xmli18n-tmp.h:2238
-#: src/xml/xmli18n-tmp.h:2251 src/xml/xmli18n-tmp.h:2264
-#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2292
-#: src/xml/xmli18n-tmp.h:2307 src/xml/xmli18n-tmp.h:2322
-#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
-#: src/xml/xmli18n-tmp.h:2358 src/xml/xmli18n-tmp.h:2371
-#: src/xml/xmli18n-tmp.h:2382 src/xml/xmli18n-tmp.h:2394
-#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2417
-#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2444
-#: src/xml/xmli18n-tmp.h:2456 src/xml/xmli18n-tmp.h:2468
-#: src/xml/xmli18n-tmp.h:2483 src/xml/xmli18n-tmp.h:2498
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2524
-#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2551
-#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2576
-#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
-#: src/xml/xmli18n-tmp.h:2612 src/xml/xmli18n-tmp.h:2625
-#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2651
-#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2685
-#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2713
-#: src/xml/xmli18n-tmp.h:2734 src/xml/xmli18n-tmp.h:2749
-#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2779
-#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2805
-#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2830
-#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2856
-#: src/xml/xmli18n-tmp.h:2871 src/xml/xmli18n-tmp.h:2883
-#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2910
-#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2945
-#: src/xml/xmli18n-tmp.h:2960 src/xml/xmli18n-tmp.h:2974
-#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3006
-#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3034
-#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3061
-#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3095
-#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3120
-#: src/xml/xmli18n-tmp.h:3136
+#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2389
+#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2444
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2475
+#: src/xml/xmli18n-tmp.h:2488 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2513 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2565 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2602
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2762
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2788
+#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2816
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2846
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2906 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3022
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3048
+#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3075
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3124
+#: src/xml/xmli18n-tmp.h:3136 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3175
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3315 src/xml/xmli18n-tmp.h:3329
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3433
+#: src/xml/xmli18n-tmp.h:3455 src/xml/xmli18n-tmp.h:3468
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3497
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3601 src/xml/xmli18n-tmp.h:3618
+#: src/xml/xmli18n-tmp.h:3632 src/xml/xmli18n-tmp.h:3643
+#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3747 src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3834 src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:3844 src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:3867 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:3900 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3910 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3935 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:3967 src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:3979 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4005 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4062 src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4110 src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:4124 src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4167 src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:4272 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:4321 src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:4334 src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4367 src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4471
+#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4505 src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4549 src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:4562 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4580 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4602 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:4678 src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:4691 src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4770 src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4893 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4904 src/xml/xmli18n-tmp.h:4911
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:4971 src/xml/xmli18n-tmp.h:4978
+#: src/xml/xmli18n-tmp.h:5004 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5050 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5071 src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:5097 src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:5142 src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:5169 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5184
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5257 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5318
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5358
+#: src/xml/xmli18n-tmp.h:5364 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5385
+#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5438
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5454
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5465
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5511
+#: src/xml/xmli18n-tmp.h:5516 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5547 src/xml/xmli18n-tmp.h:5554
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5584 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5617 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5632
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5687
+#: src/xml/xmli18n-tmp.h:5692 src/xml/xmli18n-tmp.h:5698
+#: src/xml/xmli18n-tmp.h:5705 src/xml/xmli18n-tmp.h:5713
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5729
+#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
+#: src/xml/xmli18n-tmp.h:5744 src/xml/xmli18n-tmp.h:5756
+#: src/xml/xmli18n-tmp.h:5761 src/xml/xmli18n-tmp.h:5767
+#: src/xml/xmli18n-tmp.h:5774 src/xml/xmli18n-tmp.h:5782
+#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5792
+#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5803
+#: src/xml/xmli18n-tmp.h:5809 src/xml/xmli18n-tmp.h:5813
+#: src/xml/xmli18n-tmp.h:5819 src/xml/xmli18n-tmp.h:5824
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5845
 msgid "Yellow"
 msgstr "Gelb"
 
@@ -910,9 +1375,17 @@ msgstr "Stellen sie die Gelb-Balance ein"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
 #: src/escputil/escputil.c:1006 src/escputil/escputil.c:1025
-#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2700
-#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2795
-#: src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:4041 src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:4056 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4091 src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:4155 src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5155
 msgid "Red"
 msgstr ""
 
@@ -932,8 +1405,13 @@ msgstr "Stellen sie die Magenta-Balance ein"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
 #: src/escputil/escputil.c:1007 src/escputil/escputil.c:1026
-#: src/xml/xmli18n-tmp.h:2657 src/xml/xmli18n-tmp.h:2701
-#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4051 src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:4084 src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:5156
 msgid "Blue"
 msgstr ""
 
@@ -945,53 +1423,183 @@ msgstr "Stellen sie die Cyan-Balance ein"
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
 #: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1016 src/escputil/escputil.c:1285
-#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
-#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
-#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1875
-#: src/xml/xmli18n-tmp.h:1888 src/xml/xmli18n-tmp.h:1901
-#: src/xml/xmli18n-tmp.h:1917 src/xml/xmli18n-tmp.h:1933
-#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1961
-#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1986
-#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2012
-#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2038
-#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2063
-#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2090
-#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2115
-#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2142
-#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2169
-#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
-#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
-#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2248
-#: src/xml/xmli18n-tmp.h:2261 src/xml/xmli18n-tmp.h:2274
-#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2304
-#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2331
-#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
-#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
-#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2403
-#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2420
-#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2441
-#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2465
-#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2495
-#: src/xml/xmli18n-tmp.h:2508 src/xml/xmli18n-tmp.h:2521
-#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
-#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2573
-#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2597
-#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2622
-#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2672
-#: src/xml/xmli18n-tmp.h:2682 src/xml/xmli18n-tmp.h:2731
-#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2764
-#: src/xml/xmli18n-tmp.h:2781 src/xml/xmli18n-tmp.h:2794
-#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2815
-#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2839
-#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2868
-#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2894
-#: src/xml/xmli18n-tmp.h:2911 src/xml/xmli18n-tmp.h:2929
-#: src/xml/xmli18n-tmp.h:2942 src/xml/xmli18n-tmp.h:2977
-#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:3003
-#: src/xml/xmli18n-tmp.h:3017 src/xml/xmli18n-tmp.h:3031
-#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3079
-#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3110
-#: src/xml/xmli18n-tmp.h:3121 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2372
+#: src/xml/xmli18n-tmp.h:2386 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2457
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2510
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2536
+#: src/xml/xmli18n-tmp.h:2550 src/xml/xmli18n-tmp.h:2562
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2599 src/xml/xmli18n-tmp.h:2614
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2639
+#: src/xml/xmli18n-tmp.h:2653 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2965
+#: src/xml/xmli18n-tmp.h:2977 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3019
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3060 src/xml/xmli18n-tmp.h:3072
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3133 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3196
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3526
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3680 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3755 src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:3804 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3819 src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:3831 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3846 src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3873 src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:3924 src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:3943 src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:4022 src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4059 src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:4142 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4164 src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:4179 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:4255 src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4289 src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:4308 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4413 src/xml/xmli18n-tmp.h:4420
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4455
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4507 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:4565 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:4604 src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:4702 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:4733 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:4786 src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4920 src/xml/xmli18n-tmp.h:4926
+#: src/xml/xmli18n-tmp.h:4934 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:4973 src/xml/xmli18n-tmp.h:4981
+#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:4993
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:5047 src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5151
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5186
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5223 src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5270
+#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5284
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5320
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5337
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5375
+#: src/xml/xmli18n-tmp.h:5378 src/xml/xmli18n-tmp.h:5380
+#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5435
+#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5447
+#: src/xml/xmli18n-tmp.h:5449 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5474
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5492
+#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5571
+#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5590
+#: src/xml/xmli18n-tmp.h:5596 src/xml/xmli18n-tmp.h:5602
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5614
+#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5629
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5655
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5680 src/xml/xmli18n-tmp.h:5682
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5700
+#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5716
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5749
+#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5769 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5794
+#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5806
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5836
+#: src/xml/xmli18n-tmp.h:5842
 msgid "Black"
 msgstr "Schwarz"
 
@@ -1000,7 +1608,7 @@ msgstr "Schwarz"
 msgid "Adjust the black gamma"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1769
+#: src/main/print-color.c:322 src/main/print-olympus.c:1935
 msgid "Cyan Balance"
 msgstr ""
 
@@ -1015,7 +1623,7 @@ msgstr "Graustufen"
 msgid "Adjust the cyan gray balance"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1777
+#: src/main/print-color.c:330 src/main/print-olympus.c:1943
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
@@ -1025,7 +1633,7 @@ msgstr "Magenta"
 msgid "Adjust the magenta gray balance"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1785
+#: src/main/print-color.c:338 src/main/print-olympus.c:1951
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Stellen sie die Gelb-Balance ein"
@@ -1057,11 +1665,11 @@ msgstr "Tintentype"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
-#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
-#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
-#: src/main/print-escp2.c:759
+#: src/main/print-escp2.c:344 src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356 src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368 src/main/print-escp2.c:374
+#: src/main/print-escp2.c:869 src/main/print-escp2.c:877
+#: src/main/print-escp2.c:885
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Ausgabeart:"
@@ -1070,27 +1678,27 @@ msgstr "Ausgabeart:"
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:743
+#: src/main/print-color.c:365 src/main/print-escp2.c:869
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:744
+#: src/main/print-color.c:366 src/main/print-escp2.c:870
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:751
+#: src/main/print-color.c:373 src/main/print-escp2.c:877
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:752
+#: src/main/print-color.c:374 src/main/print-escp2.c:878
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:759
+#: src/main/print-color.c:381 src/main/print-escp2.c:885
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:760
+#: src/main/print-color.c:382 src/main/print-escp2.c:886
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -1361,11 +1969,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1906
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1907
 msgid "Print without borders"
 msgstr ""
 
@@ -1378,7 +1986,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:266 src/main/print-escp2.c:267
-#: src/cups/genppd.c:1567 src/cups/genppd.c:2078
+#: src/cups/genppd.c:1600 src/cups/genppd.c:2112
 #, fuzzy
 msgid "Output Order"
 msgstr "Ausgabeart:"
@@ -1423,382 +2031,498 @@ msgstr ""
 
 #: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 #, fuzzy
+msgid "Raw Channel Names"
+msgstr "Abbruch"
+
+#: src/main/print-escp2.c:326 src/main/print-escp2.c:327
+#, fuzzy
 msgid "Channel Names"
 msgstr "Abbruch"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:339
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:344
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Cyan"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:345
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Magenta"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:351
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Gelb"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:357
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362
 #, fuzzy
 msgid "Blue Map"
 msgstr "Schwarz-Weiß"
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:363
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368
 #, fuzzy
 msgid "Orange Map"
 msgstr "Cyan"
 
-#: src/main/print-escp2.c:363
+#: src/main/print-escp2.c:369
 #, fuzzy
 msgid "Adjust the orange map"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:374
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:369
+#: src/main/print-escp2.c:375
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-escp2.c:471
+#: src/main/print-escp2.c:477
 #, fuzzy
 msgid "Red Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:478
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:485
 #, fuzzy
 msgid "Blue Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:486
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:493
 #, fuzzy
 msgid "Orange Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-escp2.c:488
+#: src/main/print-escp2.c:494
 #, fuzzy
 msgid "Adjust the orange density"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:501
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Glossy Film"
 
-#: src/main/print-escp2.c:496
+#: src/main/print-escp2.c:502
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:509
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:504
+#: src/main/print-escp2.c:510
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:517
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:512
+#: src/main/print-escp2.c:518
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:525
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:520
+#: src/main/print-escp2.c:526
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:534
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:550
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
+#: src/main/print-escp2.c:557 src/main/print-escp2.c:558
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "helles Magenta"
 
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:566
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "helles Magenta"
 
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:582
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "Gelb"
 
-#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
+#: src/main/print-escp2.c:589 src/main/print-escp2.c:590
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:598
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "Gelb"
 
-#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
+#: src/main/print-escp2.c:605 src/main/print-escp2.c:606
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:630
 #, fuzzy
 msgid "Gray Value"
 msgstr "Graustufen"
 
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
-#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:614
+#: src/main/print-escp2.c:637 src/main/print-escp2.c:638
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
+#: src/main/print-escp2.c:621 src/main/print-escp2.c:622
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:646
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "Graustufen"
 
-#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
+#: src/main/print-escp2.c:653 src/main/print-escp2.c:654
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:726
 #, fuzzy
 msgid "Light Gray Value"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
-#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:662
+#: src/main/print-escp2.c:733 src/main/print-escp2.c:734
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
-#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
+#: src/main/print-escp2.c:669 src/main/print-escp2.c:670
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:742
 #, fuzzy
 msgid "Light Gray Density Scale"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:678
 #, fuzzy
 msgid "Dark Gray Value"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
+#: src/main/print-escp2.c:685 src/main/print-escp2.c:686
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:694
 #, fuzzy
 msgid "Dark Gray Density Scale"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:701
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "Graustufen"
 
-#: src/main/print-escp2.c:696
+#: src/main/print-escp2.c:702
 #, fuzzy
 msgid "Medium Gray Value"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:709
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:704
+#: src/main/print-escp2.c:710
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:717
 #, fuzzy
 msgid "Mid Gray Density Scale"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:712
+#: src/main/print-escp2.c:718
 #, fuzzy
 msgid "Medium Gray Density Scale"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:767
+#: src/main/print-escp2.c:749
+#, fuzzy
+msgid "Hextone Gray 5 Value"
+msgstr "Graustufen"
+
+#: src/main/print-escp2.c:750
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:757
+#, fuzzy
+msgid "Hextone Gray 5 Transition"
+msgstr "helles Cyan"
+
+#: src/main/print-escp2.c:758
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr "helles Cyan"
+
+#: src/main/print-escp2.c:765
+#, fuzzy
+msgid "Hextone Gray 5 Density Scale"
+msgstr "Graustufen"
+
+#: src/main/print-escp2.c:766
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr "helles Cyan"
+
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:774
+#, fuzzy
+msgid "Hextone Gray 4 Value"
+msgstr "Graustufen"
+
+#: src/main/print-escp2.c:781 src/main/print-escp2.c:782
+#, fuzzy
+msgid "Hextone Gray 4 Transition"
+msgstr "helles Cyan"
+
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:790
+#, fuzzy
+msgid "Hextone Gray 4 Density Scale"
+msgstr "Graustufen"
+
+#: src/main/print-escp2.c:797 src/main/print-escp2.c:798
+#, fuzzy
+msgid "Hextone Gray 3 Value"
+msgstr "Graustufen"
+
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:806
+#, fuzzy
+msgid "Hextone Gray 3 Transition"
+msgstr "helles Cyan"
+
+#: src/main/print-escp2.c:813 src/main/print-escp2.c:814
+#, fuzzy
+msgid "Hextone Gray 3 Density Scale"
+msgstr "Graustufen"
+
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:822
+#, fuzzy
+msgid "Hextone Gray 2 Value"
+msgstr "Graustufen"
+
+#: src/main/print-escp2.c:829 src/main/print-escp2.c:830
+#, fuzzy
+msgid "Hextone Gray 2 Transition"
+msgstr "helles Cyan"
+
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:838
+#, fuzzy
+msgid "Hextone Gray 2 Density Scale"
+msgstr "Graustufen"
+
+#: src/main/print-escp2.c:845
+#, fuzzy
+msgid "Hextone Gray 1 Value"
+msgstr "Graustufen"
+
+#: src/main/print-escp2.c:846
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:853
+#, fuzzy
+msgid "Hextone Gray 1 Transition"
+msgstr "helles Cyan"
+
+#: src/main/print-escp2.c:854
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr "helles Magenta"
+
+#: src/main/print-escp2.c:861
+#, fuzzy
+msgid "Hextone Gray 1 Density Scale"
+msgstr "Graustufen"
+
+#: src/main/print-escp2.c:862
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr "helles Magenta"
+
+#: src/main/print-escp2.c:893
 msgid "Drying Time Per Page"
 msgstr ""
 
-#: src/main/print-escp2.c:768
+#: src/main/print-escp2.c:894
 msgid "Set drying time per page"
 msgstr ""
 
-#: src/main/print-escp2.c:775
+#: src/main/print-escp2.c:901
 msgid "Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:776
+#: src/main/print-escp2.c:902
 msgid "Set drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:783
+#: src/main/print-escp2.c:909
 msgid "Minimum Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:784
+#: src/main/print-escp2.c:910
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:799
+#: src/main/print-escp2.c:925
+msgid "Quality Enhancement"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Enhance print quality by additional passes"
+msgstr ""
+
+#: src/main/print-escp2.c:933
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "Größe"
 
-#: src/main/print-escp2.c:800
+#: src/main/print-escp2.c:934
 #, fuzzy
 msgid "Set printer paper thickness"
 msgstr "Zurücksetzen"
 
-#: src/main/print-escp2.c:807
+#: src/main/print-escp2.c:941
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-escp2.c:808
+#: src/main/print-escp2.c:942
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:815
+#: src/main/print-escp2.c:949
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:816
+#: src/main/print-escp2.c:950
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:823
+#: src/main/print-escp2.c:957
 #, fuzzy
 msgid "Print Method"
 msgstr "Druckermodel:"
 
-#: src/main/print-escp2.c:824
+#: src/main/print-escp2.c:958
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:831
+#: src/main/print-escp2.c:965
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Normalpapier"
 
-#: src/main/print-escp2.c:832
+#: src/main/print-escp2.c:966
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:839
+#: src/main/print-escp2.c:973
 msgid "Feed Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:840
-#, c-format
+#: src/main/print-escp2.c:975
+#, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:1992
+#: src/main/print-escp2.c:2197
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Ausgabeart:"
 
-#: src/main/print-escp2.c:1994
+#: src/main/print-escp2.c:2199
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2208 src/cups/genppd.c:1484 src/cups/genppd.c:2059
+#: src/main/print-escp2.c:2413 src/cups/genppd.c:1517 src/cups/genppd.c:2093
 #, fuzzy
 msgid "Automatic"
 msgstr "Größe"
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2415
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2417
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:2243
+#: src/main/print-escp2.c:2448
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2450
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2452
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2454
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2456
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2287
+#: src/main/print-escp2.c:2492
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:2858
+#: src/main/print-escp2.c:3100
 #, 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:4107 src/main/print-olympus.c:2472
+#: src/main/print-escp2.c:4355 src/main/print-olympus.c:2641
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr "Ungeprüfte Druckoptionen; drucken nicht möglich.\n"
@@ -1852,361 +2576,378 @@ msgid "test print"
 msgstr "Probeausdruck"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3205
-#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3217
-#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3233
-#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3255
-#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3276
-#: src/xml/xmli18n-tmp.h:3288 src/xml/xmli18n-tmp.h:3295
-#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3315
-#: src/xml/xmli18n-tmp.h:3327 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3368
-#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3380
-#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
-#: src/xml/xmli18n-tmp.h:3412 src/xml/xmli18n-tmp.h:3424
-#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3444
-#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3472
-#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3496
-#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3521
-#: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3544
-#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3556
-#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3581
-#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3598
-#: src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3754 src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:3809 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3863 src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:4058 src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:4163 src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:4227 src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:4335 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4467 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4594 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:4879 src/xml/xmli18n-tmp.h:4946
+#: src/xml/xmli18n-tmp.h:5000 src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:5243 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5365 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5512 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5667 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5784 src/xml/xmli18n-tmp.h:5805
+#: src/xml/xmli18n-tmp.h:5826
 msgid "Four Color Standard"
 msgstr "Vier Farben Standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3206
-#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3218
-#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3234
-#: src/xml/xmli18n-tmp.h:3244 src/xml/xmli18n-tmp.h:3251
-#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3268
-#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3289
-#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3306
-#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
-#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3354
-#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3377
-#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3389
-#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3413
-#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3435
-#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3455
-#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3485
-#: src/xml/xmli18n-tmp.h:3497 src/xml/xmli18n-tmp.h:3508
-#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3537
-#: src/xml/xmli18n-tmp.h:3545 src/xml/xmli18n-tmp.h:3549
-#: src/xml/xmli18n-tmp.h:3557 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3593
-#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3605
+#: src/xml/xmli18n-tmp.h:3759 src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3868 src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:4002 src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:4107 src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4472
+#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4817 src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5181 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5315 src/xml/xmli18n-tmp.h:5370
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5672
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5831
 msgid "Three Color Composite"
 msgstr "Aus drei Farben gemischt"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3241
-#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3265
-#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3286
-#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
-#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3351
-#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3374
-#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3398
-#: src/xml/xmli18n-tmp.h:3410 src/xml/xmli18n-tmp.h:3422
-#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3452
-#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3470
-#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3494
-#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3519
-#: src/xml/xmli18n-tmp.h:3534 src/xml/xmli18n-tmp.h:3542
-#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3741 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4086 src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4933
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5421
+#: src/xml/xmli18n-tmp.h:5499 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5723
 msgid "Six Color Photo"
 msgstr "Sechs Farben Foto"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3242
-#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3266
-#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3287
-#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3326
-#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3352
-#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3375
-#: src/xml/xmli18n-tmp.h:3387 src/xml/xmli18n-tmp.h:3399
-#: src/xml/xmli18n-tmp.h:3411 src/xml/xmli18n-tmp.h:3423
-#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3453
-#: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3483
-#: src/xml/xmli18n-tmp.h:3495 src/xml/xmli18n-tmp.h:3506
-#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3535
-#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3566
-#: src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3748 src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:3989 src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:4094 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4267 src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4940
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5661
+#: src/xml/xmli18n-tmp.h:5730
 msgid "Five Color Photo Composite"
 msgstr "Foto aus fünf Farben gemischt "
 
 #: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
-#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
-#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
-#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
-#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
-#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
-#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
-#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
-#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:849
-#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:963
-#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1077
-#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1170
-#: src/xml/xmli18n-tmp.h:1220 src/xml/xmli18n-tmp.h:1277
-#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1376
-#: src/xml/xmli18n-tmp.h:1439 src/xml/xmli18n-tmp.h:1502
-#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1619
-#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1739
-#: src/xml/xmli18n-tmp.h:1773
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1050
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1240
+#: src/xml/xmli18n-tmp.h:1335 src/xml/xmli18n-tmp.h:1449
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1580
+#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1862
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2200 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2297
 msgid "Plain Paper"
 msgstr "Normalpapier"
 
-#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
-#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
-#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
-#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
-#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
-#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
-#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
-#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
-#: src/xml/xmli18n-tmp.h:819 src/xml/xmli18n-tmp.h:858
-#: src/xml/xmli18n-tmp.h:915 src/xml/xmli18n-tmp.h:972
-#: src/xml/xmli18n-tmp.h:1029 src/xml/xmli18n-tmp.h:1086
-#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1176
-#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1286
-#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1385
-#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1508
-#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1628
-#: src/xml/xmli18n-tmp.h:1685 src/xml/xmli18n-tmp.h:1743
-#: src/xml/xmli18n-tmp.h:1779
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:101 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:365 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1160 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1740
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1871
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2136
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2267
+#: src/xml/xmli18n-tmp.h:2303
 msgid "Glossy Film"
 msgstr "Glossy Film"
 
-#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
-#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
-#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
-#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
-#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
-#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
-#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
-#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
-#: src/xml/xmli18n-tmp.h:821 src/xml/xmli18n-tmp.h:861
-#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:975
-#: src/xml/xmli18n-tmp.h:1032 src/xml/xmli18n-tmp.h:1089
-#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1178
-#: src/xml/xmli18n-tmp.h:1232 src/xml/xmli18n-tmp.h:1289
-#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1388
-#: src/xml/xmli18n-tmp.h:1451 src/xml/xmli18n-tmp.h:1511
-#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1631
-#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1745
-#: src/xml/xmli18n-tmp.h:1781
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:845 src/xml/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:965 src/xml/xmli18n-tmp.h:1022
+#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1359
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1550
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1745 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2305
 msgid "Transparencies"
 msgstr "Folie"
 
-#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
-#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
-#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
-#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
-#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
-#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
-#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
-#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
-#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:823
-#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:921
-#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:1035
-#: src/xml/xmli18n-tmp.h:1092 src/xml/xmli18n-tmp.h:1142
-#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1235
-#: src/xml/xmli18n-tmp.h:1292 src/xml/xmli18n-tmp.h:1344
-#: src/xml/xmli18n-tmp.h:1391 src/xml/xmli18n-tmp.h:1454
-#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1577
-#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1691
-#: src/xml/xmli18n-tmp.h:1747 src/xml/xmli18n-tmp.h:1783
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:55 src/xml/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:151 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1024
+#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2215
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2307
 msgid "Envelopes"
 msgstr "Umschlag"
 
-#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
-#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
-#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
-#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
-#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
-#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
-#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
-#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
-#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:827
-#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:927
-#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:1041
-#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1146
-#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1241
-#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1348
-#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1460
-#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1583
-#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1697
-#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1787
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:1028
+#: src/xml/xmli18n-tmp.h:1085 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1275 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1556
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1665
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1834
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2076
+#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2311
 msgid "Matte Paper"
 msgstr "Mattes Papier"
 
-#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
-#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
-#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
-#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
-#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
-#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
-#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
-#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
-#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:831
-#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:933
-#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:1047
-#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1150
-#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1247
-#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1352
-#: src/xml/xmli18n-tmp.h:1403 src/xml/xmli18n-tmp.h:1466
-#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1589
-#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1703
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1791
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:167 src/xml/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:569
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1032
+#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1285 src/xml/xmli18n-tmp.h:1389
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1675
+#: src/xml/xmli18n-tmp.h:1770 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1889 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2012 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2227
+#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2315
 msgid "Inkjet Paper"
 msgstr "Inkjet Papier"
 
-#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
-#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
-#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
-#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
-#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
-#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
-#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
-#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
-#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:833
-#: src/xml/xmli18n-tmp.h:879 src/xml/xmli18n-tmp.h:936
-#: src/xml/xmli18n-tmp.h:993 src/xml/xmli18n-tmp.h:1050
-#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1152
-#: src/xml/xmli18n-tmp.h:1190 src/xml/xmli18n-tmp.h:1250
-#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1354
-#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1469
-#: src/xml/xmli18n-tmp.h:1529 src/xml/xmli18n-tmp.h:1592
-#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1706
-#: src/xml/xmli18n-tmp.h:1757 src/xml/xmli18n-tmp.h:1793
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:425 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:512 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1034
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1499 src/xml/xmli18n-tmp.h:1562
+#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1775 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1955
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2088
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2317
 msgid "Photo Quality Inkjet Paper"
 msgstr "Photo Quality Inkjet Papier"
 
-#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
-#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
-#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
-#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
-#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
-#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
-#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
-#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
-#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:835
-#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:939
-#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:1053
-#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1154
-#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1253
-#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1356
-#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1472
-#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1595
-#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1709
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1795
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1036
+#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1200
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1504 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1842
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2233
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2319
 msgid "Photo Paper"
 msgstr "Foto Papier"
 
-#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
-#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
-#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
-#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
-#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
-#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
-#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
-#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
-#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:837
-#: src/xml/xmli18n-tmp.h:885 src/xml/xmli18n-tmp.h:942
-#: src/xml/xmli18n-tmp.h:999 src/xml/xmli18n-tmp.h:1056
-#: src/xml/xmli18n-tmp.h:1113 src/xml/xmli18n-tmp.h:1156
-#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1212
-#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1256
-#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1358
-#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1475
-#: src/xml/xmli18n-tmp.h:1535 src/xml/xmli18n-tmp.h:1598
-#: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1712
-#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1797
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:179 src/xml/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:518 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:869 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1038
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1407
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1566
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1622
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1844
+#: src/xml/xmli18n-tmp.h:1898 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2321
 msgid "Premium Glossy Photo Paper"
 msgstr "Premium Glossy Foto Papier"
 
-#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
-#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
-#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
-#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
-#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
-#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
-#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
-#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
-#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:841
-#: src/xml/xmli18n-tmp.h:891 src/xml/xmli18n-tmp.h:948
-#: src/xml/xmli18n-tmp.h:1005 src/xml/xmli18n-tmp.h:1062
-#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1160
-#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1262
-#: src/xml/xmli18n-tmp.h:1319 src/xml/xmli18n-tmp.h:1362
-#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1481
-#: src/xml/xmli18n-tmp.h:1541 src/xml/xmli18n-tmp.h:1604
-#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1718
-#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1801
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1042
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1419
+#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1570
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2027 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2242
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2325
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Glanz Foto Papier"
 
-#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
-#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
-#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
-#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
-#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
-#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
-#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
-#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
-#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:843
-#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:951
-#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1065
-#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1162
-#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1265
-#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1368
-#: src/xml/xmli18n-tmp.h:1427 src/xml/xmli18n-tmp.h:1490
-#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1607
-#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1727
-#: src/xml/xmli18n-tmp.h:1767 src/xml/xmli18n-tmp.h:1803
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:91 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:191 src/xml/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:439 src/xml/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:787 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1044
+#: src/xml/xmli18n-tmp.h:1125 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1315 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1854
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2327
 msgid "Photo Quality Glossy Paper"
 msgstr "Photo Quality Glossy Papier"
 
-#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
-#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
-#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
-#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
-#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
-#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
-#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
-#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:897
-#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:1011
-#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1125
-#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1206
-#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1325
-#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1430
-#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1553
-#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1667
-#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1805
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1130
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1320
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1616
+#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1856 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2329
 msgid "Ilford Heavy Paper"
 msgstr "Ilford schweres Papier"
 
-#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
-#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
-#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
-#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
-#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
-#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
-#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
-#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
-#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:847
-#: src/xml/xmli18n-tmp.h:903 src/xml/xmli18n-tmp.h:960
-#: src/xml/xmli18n-tmp.h:1017 src/xml/xmli18n-tmp.h:1074
-#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1168
-#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1214
-#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1274
-#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1374
-#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1499
-#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1616
-#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1736
-#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1809
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:129
+#: src/xml/xmli18n-tmp.h:203 src/xml/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:542 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1048
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1443
+#: src/xml/xmli18n-tmp.h:1539 src/xml/xmli18n-tmp.h:1578
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1720
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1985
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2333
 msgid "Other"
 msgstr "Anderes"
 
@@ -2222,58 +2963,62 @@ msgstr "Handeinzug mit Pause"
 msgid "Manual without Pause"
 msgstr "Handeinzug ohne Pause"
 
-#: src/main/print-olympus.c:279
+#: src/main/print-olympus.c:281
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:280 src/cups/genppd.c:1685 src/cups/genppd.c:1713
-#: src/cups/genppd.c:1745 src/cups/genppd.c:1800 src/cups/genppd.c:1846
-#: src/cups/genppd.c:2147 src/cups/genppd.c:2160 src/cups/genppd.c:2183
-#: src/cups/genppd.c:2204 src/cups/genppd.c:2221
+#: src/main/print-olympus.c:282 src/cups/genppd.c:1718 src/cups/genppd.c:1746
+#: src/cups/genppd.c:1778 src/cups/genppd.c:1833 src/cups/genppd.c:1879
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2194 src/cups/genppd.c:2217
+#: src/cups/genppd.c:2238 src/cups/genppd.c:2255
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
-#: src/main/print-olympus.c:1132
+#: src/main/print-olympus.c:998 src/main/print-olympus.c:1061
+#: src/main/print-olympus.c:1165
 #, fuzzy
 msgid "Glossy"
 msgstr "Glossy Film"
 
-#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
-#: src/main/print-olympus.c:1133
+#: src/main/print-olympus.c:999 src/main/print-olympus.c:1062
+#: src/main/print-olympus.c:1166
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
+#: src/main/print-olympus.c:1063 src/main/print-olympus.c:1167
 #, fuzzy
 msgid "Matte"
 msgstr "Mattes Papier"
 
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
+#. TRANSLATORS: 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.
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1901
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1770
+#: src/main/print-olympus.c:1936
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-olympus.c:1778
+#: src/main/print-olympus.c:1944
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1952
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-olympus.c:1793
+#: src/main/print-olympus.c:1959
 #, fuzzy
 msgid "Black Balance"
 msgstr "Schwarz-Weiß"
 
-#: src/main/print-olympus.c:1794
+#: src/main/print-olympus.c:1960
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Stellen sie die Cyan-Balance ein"
@@ -2306,7 +3051,7 @@ msgstr "Schnelltrocknendes Glossy"
 msgid "Quick-dry Transparency"
 msgstr "Schnelltrocknende Folie"
 
-#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3687
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:5925
 msgid "Manual"
 msgstr "Manuell"
 
@@ -2391,24 +3136,24 @@ msgid "2400x600 DPI"
 msgstr "2400×600 DPI"
 
 #: src/main/print-pcl.c:278 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3638
-#: src/xml/xmli18n-tmp.h:3647 src/xml/xmli18n-tmp.h:3656
-#: src/xml/xmli18n-tmp.h:3664
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5875
+#: src/xml/xmli18n-tmp.h:5884 src/xml/xmli18n-tmp.h:5893
+#: src/xml/xmli18n-tmp.h:5901
 msgid "Draft"
 msgstr ""
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:3633 src/xml/xmli18n-tmp.h:3641
-#: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3658
-#: src/xml/xmli18n-tmp.h:3666
+#: src/xml/xmli18n-tmp.h:5870 src/xml/xmli18n-tmp.h:5878
+#: src/xml/xmli18n-tmp.h:5886 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5903
 #, fuzzy
 msgid "High"
 msgstr "Höhe:"
 
 #: src/main/print-pcl.c:282 src/main/print-pcl.c:283
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3634
-#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3650
-#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3667
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5896 src/xml/xmli18n-tmp.h:5904
 #, fuzzy
 msgid "Photo"
 msgstr "Foto"
@@ -2444,15 +3189,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3671
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:5908
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3708
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:5946
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3823
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6061
 #, fuzzy
 msgid "Custom"
 msgstr "Auto"
@@ -2461,35 +3206,44 @@ msgstr "Auto"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3629
-#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3654
+#: src/main/print-weave.c:1511
+msgid "Fatal error!"
+msgstr ""
+
+#: src/main/print-weave.c:1547
+msgid ""
+"Please report the above information to gimp-print-devel@lists.sourceforge.net"
+msgstr ""
+
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:5866
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5891
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3630
-#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3655
-#: src/xml/xmli18n-tmp.h:3663
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5900
 msgid "Economy"
 msgstr ""
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3635
-#: src/xml/xmli18n-tmp.h:3642 src/xml/xmli18n-tmp.h:3651
-#: src/xml/xmli18n-tmp.h:3660 src/xml/xmli18n-tmp.h:3668
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:5872
+#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
 #, fuzzy
 msgid "Super Photo"
 msgstr "Sieben Farb Foto"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3636
-#: src/xml/xmli18n-tmp.h:3643 src/xml/xmli18n-tmp.h:3652
-#: src/xml/xmli18n-tmp.h:3661 src/xml/xmli18n-tmp.h:3669
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:5873
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5889
+#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5906
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Sechs Farben Foto"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1326 src/cups/genppd.c:1989
-#: src/xml/xmli18n-tmp.h:3637 src/xml/xmli18n-tmp.h:3644
-#: src/xml/xmli18n-tmp.h:3653 src/xml/xmli18n-tmp.h:3662
-#: src/xml/xmli18n-tmp.h:3670
+#: src/main/generic-options.c:41 src/cups/genppd.c:1359 src/cups/genppd.c:2023
+#: src/xml/xmli18n-tmp.h:5874 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5899
+#: src/xml/xmli18n-tmp.h:5907
 msgid "Best"
 msgstr ""
 
@@ -3255,81 +4009,81 @@ msgstr ""
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:960
+#: src/cups/genppd.c:993
 msgid "English"
 msgstr "German"
 
-#: src/cups/genppd.c:1159 src/cups/genppd.c:1175 src/cups/genppd.c:1934
-#: src/cups/genppd.c:1935
+#: src/cups/genppd.c:1192 src/cups/genppd.c:1208 src/cups/genppd.c:1968
+#: src/cups/genppd.c:1969
 #, fuzzy
 msgid "Media Size"
 msgstr "Papier Größe:"
 
-#: src/cups/genppd.c:1248 src/cups/genppd.c:1970
+#: src/cups/genppd.c:1281 src/cups/genppd.c:2004
 #, fuzzy
 msgid "Color Model"
 msgstr "Farbe"
 
-#: src/cups/genppd.c:1275 src/cups/genppd.c:1972
+#: src/cups/genppd.c:1308 src/cups/genppd.c:2006
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "Graustufen"
 
-#: src/cups/genppd.c:1285 src/cups/genppd.c:1976
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2010
 #, fuzzy
 msgid "RGB Color"
 msgstr "Farbe"
 
-#: src/cups/genppd.c:1292 src/cups/genppd.c:1977
+#: src/cups/genppd.c:1325 src/cups/genppd.c:2011
 msgid "CMY Color"
 msgstr "CMY Farbe"
 
-#: src/cups/genppd.c:1317 src/cups/genppd.c:1987
+#: src/cups/genppd.c:1350 src/cups/genppd.c:2021
 msgid "Color Precision"
 msgstr ""
 
-#: src/cups/genppd.c:1573 src/cups/genppd.c:2080
+#: src/cups/genppd.c:1606 src/cups/genppd.c:2114
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:1590 src/cups/genppd.c:2096
+#: src/cups/genppd.c:1623 src/cups/genppd.c:2130
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:1615 src/cups/genppd.c:2113
+#: src/cups/genppd.c:1648 src/cups/genppd.c:2147
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1620 src/cups/genppd.c:2114
+#: src/cups/genppd.c:1653 src/cups/genppd.c:2148
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1621 src/cups/genppd.c:2115
+#: src/cups/genppd.c:1654 src/cups/genppd.c:2149
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1622 src/cups/genppd.c:2116
+#: src/cups/genppd.c:1655 src/cups/genppd.c:2150
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1716 src/cups/genppd.c:2162
+#: src/cups/genppd.c:1749 src/cups/genppd.c:2196
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1718 src/cups/genppd.c:2164
+#: src/cups/genppd.c:1751 src/cups/genppd.c:2198
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1757 src/cups/genppd.c:1820 src/cups/genppd.c:1864
-#: src/cups/genppd.c:2185 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+#: src/cups/genppd.c:1790 src/cups/genppd.c:1853 src/cups/genppd.c:1897
+#: src/cups/genppd.c:2219 src/cups/genppd.c:2249 src/cups/genppd.c:2266
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1762 src/cups/genppd.c:2189
+#: src/cups/genppd.c:1795 src/cups/genppd.c:2223
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/cups/genppd.c:1805 src/cups/genppd.c:2209
+#: src/cups/genppd.c:1838 src/cups/genppd.c:2243
 #, c-format
 msgid "%.1f mm"
 msgstr ""
@@ -3653,51 +4407,61 @@ msgstr ""
 "Kann den Druckertype nicht feststellen.\n"
 "Bitte nutzen sie die -m Option um das Model mitzuteilen.\n"
 
-#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:383
-#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
-#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
-#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
-#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
-#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
-#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
-#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
-#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
-#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
-#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
-#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
-#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
-#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
-#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
-#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
-#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
-#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
-#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
-#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
-#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
-#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
-#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
-#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
-#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
-#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
-#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
-#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
-#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
-#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
-#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1503
-#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1509
-#: src/xml/xmli18n-tmp.h:1512 src/xml/xmli18n-tmp.h:1515
-#: src/xml/xmli18n-tmp.h:1518 src/xml/xmli18n-tmp.h:1521
-#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1527
-#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
-#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
-#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
-#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
-#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
-#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:2655
-#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2717
-#: src/xml/xmli18n-tmp.h:3045 src/xml/xmli18n-tmp.h:3252
-#: src/xml/xmli18n-tmp.h:3273 src/xml/xmli18n-tmp.h:3363
-#: src/xml/xmli18n-tmp.h:3531
+#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2001
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2010 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2025
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:4085 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4612 src/xml/xmli18n-tmp.h:5481
 #, fuzzy
 msgid "Photo Black"
 msgstr "Foto Papier"
@@ -3709,131 +4473,303 @@ msgid "Unknown"
 msgstr ""
 
 #: src/escputil/escputil.c:1000 src/escputil/escputil.c:1289
-#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1921
-#: src/xml/xmli18n-tmp.h:1937 src/xml/xmli18n-tmp.h:2002
-#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2079
-#: src/xml/xmli18n-tmp.h:2105 src/xml/xmli18n-tmp.h:2119
-#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2173
-#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
-#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
-#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2293
-#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2346
-#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2418
-#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2445
-#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2469
-#: src/xml/xmli18n-tmp.h:2484 src/xml/xmli18n-tmp.h:2512
-#: src/xml/xmli18n-tmp.h:2525 src/xml/xmli18n-tmp.h:2564
-#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2626
-#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2746
-#: src/xml/xmli18n-tmp.h:2762 src/xml/xmli18n-tmp.h:2843
-#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2895
-#: src/xml/xmli18n-tmp.h:2912 src/xml/xmli18n-tmp.h:2946
-#: src/xml/xmli18n-tmp.h:3001 src/xml/xmli18n-tmp.h:3015
-#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3122
-#: src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2461 src/xml/xmli18n-tmp.h:2526
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2683 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2711 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3101 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3661
+#: src/xml/xmli18n-tmp.h:3678 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3750 src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:3782 src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:3932 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3964 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4388 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:4639 src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:4875 src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4936
+#: src/xml/xmli18n-tmp.h:4942 src/xml/xmli18n-tmp.h:4968
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5339 src/xml/xmli18n-tmp.h:5348
+#: src/xml/xmli18n-tmp.h:5355 src/xml/xmli18n-tmp.h:5361
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5417
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5430
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5477 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5502
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5536 src/xml/xmli18n-tmp.h:5544
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5557
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5657 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5719
+#: src/xml/xmli18n-tmp.h:5726 src/xml/xmli18n-tmp.h:5732
+#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5779
 #, fuzzy
 msgid "Light Cyan"
 msgstr "helles Cyan"
 
 #: src/escputil/escputil.c:1001 src/escputil/escputil.c:1290
-#: src/xml/xmli18n-tmp.h:1906 src/xml/xmli18n-tmp.h:1922
-#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:2003
-#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2080
-#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2120
-#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2174
-#: src/xml/xmli18n-tmp.h:2188 src/xml/xmli18n-tmp.h:2201
-#: src/xml/xmli18n-tmp.h:2214 src/xml/xmli18n-tmp.h:2227
-#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2294
-#: src/xml/xmli18n-tmp.h:2309 src/xml/xmli18n-tmp.h:2347
-#: src/xml/xmli18n-tmp.h:2360 src/xml/xmli18n-tmp.h:2419
-#: src/xml/xmli18n-tmp.h:2432 src/xml/xmli18n-tmp.h:2446
-#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2470
-#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2513
-#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2565
-#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2627
-#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2748
-#: src/xml/xmli18n-tmp.h:2761 src/xml/xmli18n-tmp.h:2844
-#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2896
-#: src/xml/xmli18n-tmp.h:2913 src/xml/xmli18n-tmp.h:2947
-#: src/xml/xmli18n-tmp.h:3000 src/xml/xmli18n-tmp.h:3014
-#: src/xml/xmli18n-tmp.h:3028 src/xml/xmli18n-tmp.h:3123
-#: src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2446
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2527
+#: src/xml/xmli18n-tmp.h:2541 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2644
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2698
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2751
+#: src/xml/xmli18n-tmp.h:2803 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2956 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2994
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3381
+#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3662
+#: src/xml/xmli18n-tmp.h:3746 src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:3778 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3934 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3966 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:4265 src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:4390 src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:4428 src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4452
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4465
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4512 src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4586 src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:4641 src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4903
+#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4970
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:5044 src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5168
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5241 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5334
+#: src/xml/xmli18n-tmp.h:5341 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5363
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5419
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5471
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5504
+#: src/xml/xmli18n-tmp.h:5510 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5652
+#: src/xml/xmli18n-tmp.h:5659 src/xml/xmli18n-tmp.h:5665
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5721
+#: src/xml/xmli18n-tmp.h:5728 src/xml/xmli18n-tmp.h:5734
+#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5781
 #, fuzzy
 msgid "Light Magenta"
 msgstr "helles Magenta"
 
-#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2433
-#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:3002
-#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3030
+#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3679 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4409 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:4566 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4605 src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4664 src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5376 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5450
+#: src/xml/xmli18n-tmp.h:5475 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5533 src/xml/xmli18n-tmp.h:5542
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5678 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5717
+#: src/xml/xmli18n-tmp.h:5747 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5777
 #, fuzzy
 msgid "Light Black"
 msgstr "Schwarz"
 
-#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:384
-#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
-#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
-#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
-#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
-#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
-#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
-#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
-#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
-#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
-#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
-#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
-#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
-#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
-#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
-#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
-#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
-#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
-#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
-#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
-#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
-#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
-#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
-#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
-#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
-#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
-#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
-#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
-#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
-#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
-#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1504
-#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1510
-#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1516
-#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1522
-#: src/xml/xmli18n-tmp.h:1525 src/xml/xmli18n-tmp.h:1528
-#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1534
-#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1540
-#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1546
-#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1552
-#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1558
-#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:2654
-#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2716
-#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3264
-#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3371
-#: src/xml/xmli18n-tmp.h:3539
+#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:508 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:532 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:538 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:562 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:568 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
+#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
+#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
+#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
+#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
+#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
+#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
+#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
+#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
+#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
+#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
+#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2011 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2026
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2032
+#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2038
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:4044 src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:5530
 #, fuzzy
 msgid "Matte Black"
 msgstr "Mattes Papier"
 
-#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:2658
-#: src/xml/xmli18n-tmp.h:2702 src/xml/xmli18n-tmp.h:2720
-#: src/xml/xmli18n-tmp.h:3048
+#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3995 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4006 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4020 src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:4106 src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4148
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Glossy Film"
 
-#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:2760
-#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3013
-#: src/xml/xmli18n-tmp.h:3027
+#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3676
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4616 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5534 src/xml/xmli18n-tmp.h:5573
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Schwarz"
 
 #: src/escputil/escputil.c:1010 src/escputil/escputil.c:1029
-#: src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:4099 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4189
 #, fuzzy
 msgid "Orange"
 msgstr "Größe"
@@ -4492,7999 +5428,8129 @@ msgstr "Drucken..."
 #: src/xml/xmli18n-tmp.h:68 src/xml/xmli18n-tmp.h:70 src/xml/xmli18n-tmp.h:72
 #: src/xml/xmli18n-tmp.h:74 src/xml/xmli18n-tmp.h:76 src/xml/xmli18n-tmp.h:78
 #: src/xml/xmli18n-tmp.h:80 src/xml/xmli18n-tmp.h:82 src/xml/xmli18n-tmp.h:84
-#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:92
-#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
-#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
-#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
-#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
-#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
-#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
-#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
-#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
-#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
-#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
-#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
-#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
-#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
-#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
-#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
-#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
-#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
-#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
-#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
-#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
-#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
-#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
-#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
-#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
-#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
-#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
-#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
-#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
-#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
-#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
-#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
-#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
-#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
-#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
-#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
-#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
-#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
-#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
-#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
-#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
-#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
-#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
-#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
-#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
-#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
-#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
-#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
-#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
-#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
-#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
-#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
-#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
-#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
-#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
-#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
-#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
-#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
-#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
-#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
-#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
-#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
-#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
-#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
-#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
-#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
-#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
-#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
-#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
-#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
-#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
-#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
-#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
-#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
-#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
-#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
-#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
-#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
-#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
-#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
-#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
-#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
-#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
-#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
-#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
-#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
-#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
-#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
-#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
-#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
-#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
-#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
-#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
-#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
-#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
-#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
-#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:92 src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:102 src/xml/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:106 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:114 src/xml/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:118 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:126 src/xml/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:130 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:136 src/xml/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:144 src/xml/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:168 src/xml/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:192 src/xml/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:216 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:232 src/xml/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:240 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:256 src/xml/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:264 src/xml/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:304 src/xml/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:312 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:320 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:328 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:336 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:344 src/xml/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:352 src/xml/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:384 src/xml/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:408 src/xml/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:412 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:432 src/xml/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:444 src/xml/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:448 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:468 src/xml/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:484 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:642 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:698 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:714 src/xml/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:722 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:738 src/xml/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:746 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:764 src/xml/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:780 src/xml/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:804 src/xml/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:814
 #: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:818
 #: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:822
 #: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:826
 #: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:830
-#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:834
-#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:838
-#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:842
-#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:846
-#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:850
-#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
-#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
-#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
-#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
-#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
-#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
-#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
-#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:898
-#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
-#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
-#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
-#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
-#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
-#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
-#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
-#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
-#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
-#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
-#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
-#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
-#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
-#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
-#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
-#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
-#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
-#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
-#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
-#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1018
-#: src/xml/xmli18n-tmp.h:1021 src/xml/xmli18n-tmp.h:1024
-#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1030
-#: src/xml/xmli18n-tmp.h:1033 src/xml/xmli18n-tmp.h:1036
-#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1042
-#: src/xml/xmli18n-tmp.h:1045 src/xml/xmli18n-tmp.h:1048
-#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1054
-#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1060
-#: src/xml/xmli18n-tmp.h:1063 src/xml/xmli18n-tmp.h:1066
-#: src/xml/xmli18n-tmp.h:1069 src/xml/xmli18n-tmp.h:1072
-#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1078
-#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1084
-#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1090
-#: src/xml/xmli18n-tmp.h:1093 src/xml/xmli18n-tmp.h:1096
-#: src/xml/xmli18n-tmp.h:1099 src/xml/xmli18n-tmp.h:1102
-#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1108
-#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1114
-#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1120
-#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1126
-#: src/xml/xmli18n-tmp.h:1129 src/xml/xmli18n-tmp.h:1132
-#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
-#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
-#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
-#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
-#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
-#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
-#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
-#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
-#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
-#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
-#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
-#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
-#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
-#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1189
-#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1193
-#: src/xml/xmli18n-tmp.h:1195 src/xml/xmli18n-tmp.h:1197
-#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1201
-#: src/xml/xmli18n-tmp.h:1203 src/xml/xmli18n-tmp.h:1205
-#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1209
-#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1221
-#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
-#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
-#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
-#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
-#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
-#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
-#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
-#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
-#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
-#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
-#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
-#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
-#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
-#: src/xml/xmli18n-tmp.h:1302 src/xml/xmli18n-tmp.h:1305
-#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1311
-#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1317
-#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1323
-#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1329
-#: src/xml/xmli18n-tmp.h:1332 src/xml/xmli18n-tmp.h:1335
-#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
-#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1343
-#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1347
-#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1351
-#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1355
-#: src/xml/xmli18n-tmp.h:1357 src/xml/xmli18n-tmp.h:1359
-#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1363
-#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1367
-#: src/xml/xmli18n-tmp.h:1369 src/xml/xmli18n-tmp.h:1371
-#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1375
-#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1566
-#: src/xml/xmli18n-tmp.h:1569 src/xml/xmli18n-tmp.h:1572
-#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1578
-#: src/xml/xmli18n-tmp.h:1581 src/xml/xmli18n-tmp.h:1584
-#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1590
-#: src/xml/xmli18n-tmp.h:1593 src/xml/xmli18n-tmp.h:1596
-#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1602
-#: src/xml/xmli18n-tmp.h:1605 src/xml/xmli18n-tmp.h:1608
-#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1614
-#: src/xml/xmli18n-tmp.h:1617 src/xml/xmli18n-tmp.h:1620
-#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1626
-#: src/xml/xmli18n-tmp.h:1629 src/xml/xmli18n-tmp.h:1632
-#: src/xml/xmli18n-tmp.h:1635 src/xml/xmli18n-tmp.h:1638
-#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1644
-#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
-#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
-#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
-#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
-#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
-#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
-#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
-#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
-#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
-#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
-#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
-#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
-#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
-#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
-#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:1778
-#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1782
-#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1786
-#: src/xml/xmli18n-tmp.h:1788 src/xml/xmli18n-tmp.h:1790
-#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1794
-#: src/xml/xmli18n-tmp.h:1796 src/xml/xmli18n-tmp.h:1798
-#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1802
-#: src/xml/xmli18n-tmp.h:1804 src/xml/xmli18n-tmp.h:1806
-#: src/xml/xmli18n-tmp.h:1808 src/xml/xmli18n-tmp.h:1810
-#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3204
-#: src/xml/xmli18n-tmp.h:3210 src/xml/xmli18n-tmp.h:3216
-#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3232
-#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3250
-#: src/xml/xmli18n-tmp.h:3294 src/xml/xmli18n-tmp.h:3302
-#: src/xml/xmli18n-tmp.h:3304 src/xml/xmli18n-tmp.h:3312
-#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3379
-#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
-#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3421
-#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3441
-#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3469
-#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3555
-#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3597
-#: src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:1017
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1025
+#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1035 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1047 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1056
+#: src/xml/xmli18n-tmp.h:1061 src/xml/xmli18n-tmp.h:1066
+#: src/xml/xmli18n-tmp.h:1071 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1086
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1096
+#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1116
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1126
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1136
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1161 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1181 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1206
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1216
+#: src/xml/xmli18n-tmp.h:1221 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1236
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1246
+#: src/xml/xmli18n-tmp.h:1251 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1261 src/xml/xmli18n-tmp.h:1266
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1281 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1291 src/xml/xmli18n-tmp.h:1296
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1311 src/xml/xmli18n-tmp.h:1316
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1326
+#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1336
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1378 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1414 src/xml/xmli18n-tmp.h:1420
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1432
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1450 src/xml/xmli18n-tmp.h:1455
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1465
+#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1480 src/xml/xmli18n-tmp.h:1485
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1540 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1551 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1583 src/xml/xmli18n-tmp.h:1585
+#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1603 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1607 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1646
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1666
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1676
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1716
+#: src/xml/xmli18n-tmp.h:1721 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1736
+#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1835
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1843
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1851
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:2049
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2057
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2065
+#: src/xml/xmli18n-tmp.h:2069 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2113
+#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2129
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2137
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2153
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2161
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2185
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2264
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2272
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2276
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2282 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2286 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2296
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2300
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2308
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2314 src/xml/xmli18n-tmp.h:2316
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2324
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:3787 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3895 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:4223 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5579
+#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5825
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Bright White Paper"
 msgstr "Mattes Papier"
 
-#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
-#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
-#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
-#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
-#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
-#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
-#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
-#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:817
-#: src/xml/xmli18n-tmp.h:855 src/xml/xmli18n-tmp.h:912
-#: src/xml/xmli18n-tmp.h:969 src/xml/xmli18n-tmp.h:1026
-#: src/xml/xmli18n-tmp.h:1083 src/xml/xmli18n-tmp.h:1136
-#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1226
-#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1338
-#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1445
-#: src/xml/xmli18n-tmp.h:1505 src/xml/xmli18n-tmp.h:1568
-#: src/xml/xmli18n-tmp.h:1625 src/xml/xmli18n-tmp.h:1682
-#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1777
-#: src/xml/xmli18n-tmp.h:3675
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:139 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:959 src/xml/xmli18n-tmp.h:1018
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1155
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1546
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1931
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:5912
 msgid "Postcard"
 msgstr "Postkarte"
 
-#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
-#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
-#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
-#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
-#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
-#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
-#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
-#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:825
-#: src/xml/xmli18n-tmp.h:867 src/xml/xmli18n-tmp.h:924
-#: src/xml/xmli18n-tmp.h:981 src/xml/xmli18n-tmp.h:1038
-#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1144
-#: src/xml/xmli18n-tmp.h:1182 src/xml/xmli18n-tmp.h:1238
-#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1346
-#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1457
-#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1580
-#: src/xml/xmli18n-tmp.h:1637 src/xml/xmli18n-tmp.h:1694
-#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1785
+#: src/xml/xmli18n-tmp.h:13 src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:155 src/xml/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:415 src/xml/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:851 src/xml/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1026
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1175
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1554
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1832
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2309
 msgid "Back Light Film"
 msgstr "Durchlichtfolie"
 
-#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
-#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
-#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
-#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
-#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
-#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
-#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
-#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:829
-#: src/xml/xmli18n-tmp.h:873 src/xml/xmli18n-tmp.h:930
-#: src/xml/xmli18n-tmp.h:987 src/xml/xmli18n-tmp.h:1044
-#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1148
-#: src/xml/xmli18n-tmp.h:1186 src/xml/xmli18n-tmp.h:1244
-#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1350
-#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1463
-#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1586
-#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1700
-#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1789
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:419 src/xml/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:857 src/xml/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1030
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1383
+#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1558
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2313
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Mattes Papier"
 
-#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
-#: src/xml/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:421
 #, fuzzy
 msgid "Premium Presentation Paper Matte"
 msgstr "Premium Glanz Foto Papier"
 
-#: src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:431
 #, fuzzy
-msgid "Premium Glossy Photo Paper 170 wt"
+msgid "Ultra Glossy Photo Paper"
+msgstr "Glossy Foto Papier"
+
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1210
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1413
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1568
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1695
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1964
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2176 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2287 src/xml/xmli18n-tmp.h:2323
+#, fuzzy
+msgid "Premium Semigloss Photo Paper"
 msgstr "Premium Glossy Foto Papier"
 
-#: src/xml/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:437
 #, fuzzy
-msgid "Premium Glossy Photo Paper 250 wt"
+msgid "Ultra Premium Photo Paper Luster"
 msgstr "Premium Glossy Foto Papier"
 
-#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
-#: src/xml/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:37
+msgid "CD or DVD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:93 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1230
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1437
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2331
 #, fuzzy
-msgid "Ultra Glossy Photo Paper"
-msgstr "Glossy Foto Papier"
+msgid "ColorLife Paper"
+msgstr "Normalpapier"
 
-#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
-#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
-#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
-#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
-#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
-#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
-#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
-#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:839
-#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:945
-#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1059
-#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1158
-#: src/xml/xmli18n-tmp.h:1196 src/xml/xmli18n-tmp.h:1259
-#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1360
-#: src/xml/xmli18n-tmp.h:1415 src/xml/xmli18n-tmp.h:1478
-#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1601
-#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1715
-#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:73
 #, fuzzy
-msgid "Premium Semigloss Photo Paper"
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Premium Glossy Foto Papier"
+
+#: src/xml/xmli18n-tmp.h:75
+#, fuzzy
+msgid "Premium Glossy Photo Paper 250 wt"
 msgstr "Premium Glossy Foto Papier"
 
-#: src/xml/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:81
 #, fuzzy
 msgid "Premium Semigloss Photo Paper 170 wt"
 msgstr "Premium Glossy Foto Papier"
 
-#: src/xml/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:83
 #, fuzzy
 msgid "Premium Semigloss Photo Paper 250 wt"
 msgstr "Premium Glossy Foto Papier"
 
-#: src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:87
 #, fuzzy
 msgid "Premium Luster Photo Paper 250 wt"
 msgstr "Premium Glanz Foto Papier"
 
-#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
-#: src/xml/xmli18n-tmp.h:334
-#, fuzzy
-msgid "Ultra Premium Photo Paper Luster"
-msgstr "Premium Glossy Foto Papier"
-
-#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
-#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
-#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
-#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
-#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
-#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
-#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
-#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:845
-#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:957
-#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1071
-#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1166
-#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1271
-#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1372
-#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1496
-#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1613
-#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1733
-#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1807
-#, fuzzy
-msgid "ColorLife Paper"
-msgstr "Normalpapier"
-
-#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
-#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
-#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
-#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
-#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
-#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
-#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
-#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
-#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
-#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
-#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
-#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
-#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
-#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
-#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
-#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
-#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
-#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
-#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
-#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
-#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
-#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
-#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
-#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
-#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
-#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
-#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
-#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
-#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
-#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
-#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
-#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
-#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
-#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
-#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
-#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
-#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
-#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
-#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
-#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
-#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
-#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
-#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
-#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
-#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
-#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
-#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:851
-#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:857
-#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:863
-#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:869
-#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:875
-#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:881
-#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:887
-#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:893
-#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:899
-#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:905
-#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:911
-#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:917
-#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:923
-#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:929
-#: src/xml/xmli18n-tmp.h:932 src/xml/xmli18n-tmp.h:935
-#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:941
-#: src/xml/xmli18n-tmp.h:944 src/xml/xmli18n-tmp.h:947
-#: src/xml/xmli18n-tmp.h:950 src/xml/xmli18n-tmp.h:953
-#: src/xml/xmli18n-tmp.h:956 src/xml/xmli18n-tmp.h:959
-#: src/xml/xmli18n-tmp.h:962 src/xml/xmli18n-tmp.h:965
-#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:971
-#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:977
-#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:983
-#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:989
-#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:995
-#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1001
-#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1007
-#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1013
-#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1019
-#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1025
-#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1031
-#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1037
-#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1043
-#: src/xml/xmli18n-tmp.h:1046 src/xml/xmli18n-tmp.h:1049
-#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1055
-#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1061
-#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1067
-#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1073
-#: src/xml/xmli18n-tmp.h:1076 src/xml/xmli18n-tmp.h:1079
-#: src/xml/xmli18n-tmp.h:1082 src/xml/xmli18n-tmp.h:1085
-#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1091
-#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1097
-#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1103
-#: src/xml/xmli18n-tmp.h:1106 src/xml/xmli18n-tmp.h:1109
-#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1115
-#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1121
-#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1127
-#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1133
-#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1225
-#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1231
-#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1237
-#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1243
-#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1249
-#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1255
-#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1261
-#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1267
-#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1273
-#: src/xml/xmli18n-tmp.h:1276 src/xml/xmli18n-tmp.h:1279
-#: src/xml/xmli18n-tmp.h:1282 src/xml/xmli18n-tmp.h:1285
-#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1291
-#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1297
-#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1303
-#: src/xml/xmli18n-tmp.h:1306 src/xml/xmli18n-tmp.h:1309
-#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1315
-#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1321
-#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1327
-#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1333
-#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1567
-#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1573
-#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1579
-#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1585
-#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1591
-#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1597
-#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1603
-#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1609
-#: src/xml/xmli18n-tmp.h:1612 src/xml/xmli18n-tmp.h:1615
-#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1621
-#: src/xml/xmli18n-tmp.h:1624 src/xml/xmli18n-tmp.h:1627
-#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1633
-#: src/xml/xmli18n-tmp.h:1636 src/xml/xmli18n-tmp.h:1639
-#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1645
-#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1651
-#: src/xml/xmli18n-tmp.h:1654 src/xml/xmli18n-tmp.h:1657
-#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1663
-#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1669
-#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1675
-#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3223
-#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3231
-#: src/xml/xmli18n-tmp.h:3238 src/xml/xmli18n-tmp.h:3239
-#: src/xml/xmli18n-tmp.h:3300 src/xml/xmli18n-tmp.h:3301
-#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3311
-#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3396
-#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3408
-#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3420
-#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3432
-#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3440
-#: src/xml/xmli18n-tmp.h:3479 src/xml/xmli18n-tmp.h:3480
-#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3492
-#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3554
-#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:133 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:149 src/xml/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:173 src/xml/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:197 src/xml/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:205 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:221 src/xml/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:229 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:245 src/xml/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:253 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:261 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:269 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:277 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:285 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:293 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:301 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:309 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:317 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:325 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:333 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:341 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:349 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:357 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:619 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:643 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:667 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:691 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:707 src/xml/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:715 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:731 src/xml/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:739 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:755 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1062
+#: src/xml/xmli18n-tmp.h:1067 src/xml/xmli18n-tmp.h:1072
+#: src/xml/xmli18n-tmp.h:1077 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1092
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1102
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1112
+#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1122
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1132
+#: src/xml/xmli18n-tmp.h:1137 src/xml/xmli18n-tmp.h:1142
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1157 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1177 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1192
+#: src/xml/xmli18n-tmp.h:1197 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1212
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1222
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1242
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1252
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1272
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1287 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1297 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1327 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1385 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1445 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1461
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1516 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1647
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1657
+#: src/xml/xmli18n-tmp.h:1662 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1677
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1687
+#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1742 src/xml/xmli18n-tmp.h:1747
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1767
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1807
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2090 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2098 src/xml/xmli18n-tmp.h:2102
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2118
+#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2126
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2162 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2190
+#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:3884 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:4779 src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:4845 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4919
+#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4980
+#: src/xml/xmli18n-tmp.h:4986 src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5209 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5276
+#: src/xml/xmli18n-tmp.h:5277 src/xml/xmli18n-tmp.h:5283
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5607 src/xml/xmli18n-tmp.h:5633
+#: src/xml/xmli18n-tmp.h:5634 src/xml/xmli18n-tmp.h:5640
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
-#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
-#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
-#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
-#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:852
-#: src/xml/xmli18n-tmp.h:909 src/xml/xmli18n-tmp.h:966
-#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1080
-#: src/xml/xmli18n-tmp.h:1172 src/xml/xmli18n-tmp.h:1223
-#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1336
-#: src/xml/xmli18n-tmp.h:1379 src/xml/xmli18n-tmp.h:1442
-#: src/xml/xmli18n-tmp.h:1565 src/xml/xmli18n-tmp.h:1622
-#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1775
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:142 src/xml/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:150 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:174 src/xml/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:198 src/xml/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:214 src/xml/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:222 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:238 src/xml/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:246 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:262 src/xml/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:302 src/xml/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:310 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:318 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:326 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:334 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:342 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:350 src/xml/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:636 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:660 src/xml/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:708 src/xml/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:716 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:732 src/xml/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:756 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1103
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1123
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1158 src/xml/xmli18n-tmp.h:1163
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1183
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1193
+#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1213
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1223
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1238 src/xml/xmli18n-tmp.h:1243
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1253
+#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1283
+#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1313
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1333
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1362 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1374 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1462
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1472
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1487 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1502
+#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:1532
+#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1542
+#: src/xml/xmli18n-tmp.h:1633 src/xml/xmli18n-tmp.h:1638
+#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1648
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1658
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1713 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1728
+#: src/xml/xmli18n-tmp.h:1733 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1768
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2071
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2095
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2115 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2123 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2139 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2183
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2191
+#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2199
+#, fuzzy
+msgid "MISQuadtone"
+msgstr "Quadtone"
+
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1150 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2299
 msgid "Plain Paper Fast Load"
 msgstr "Normalpapier Schnelleinzug"
 
-#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
-#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
-#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1364
-#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1484
-#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1970 src/xml/xmli18n-tmp.h:2030
+#: src/xml/xmli18n-tmp.h:2245
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Mattes Papier"
 
-#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
-#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
-#: src/xml/xmli18n-tmp.h:1202 src/xml/xmli18n-tmp.h:1366
-#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1487
-#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:881 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2248
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
-#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
-#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
-#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
-#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
-#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
-#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
-#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
-#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
-#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
-#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1377
-#: src/xml/xmli18n-tmp.h:1380 src/xml/xmli18n-tmp.h:1383
-#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1389
-#: src/xml/xmli18n-tmp.h:1392 src/xml/xmli18n-tmp.h:1395
-#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1401
-#: src/xml/xmli18n-tmp.h:1404 src/xml/xmli18n-tmp.h:1407
-#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1413
-#: src/xml/xmli18n-tmp.h:1416 src/xml/xmli18n-tmp.h:1419
-#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1425
-#: src/xml/xmli18n-tmp.h:1428 src/xml/xmli18n-tmp.h:1431
-#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1437
-#: src/xml/xmli18n-tmp.h:1440 src/xml/xmli18n-tmp.h:1443
-#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1449
-#: src/xml/xmli18n-tmp.h:1452 src/xml/xmli18n-tmp.h:1455
-#: src/xml/xmli18n-tmp.h:1458 src/xml/xmli18n-tmp.h:1461
-#: src/xml/xmli18n-tmp.h:1464 src/xml/xmli18n-tmp.h:1467
-#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1473
-#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1479
-#: src/xml/xmli18n-tmp.h:1482 src/xml/xmli18n-tmp.h:1485
-#: src/xml/xmli18n-tmp.h:1488 src/xml/xmli18n-tmp.h:1491
-#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1497
-#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1677
-#: src/xml/xmli18n-tmp.h:1680 src/xml/xmli18n-tmp.h:1683
-#: src/xml/xmli18n-tmp.h:1686 src/xml/xmli18n-tmp.h:1689
-#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1695
-#: src/xml/xmli18n-tmp.h:1698 src/xml/xmli18n-tmp.h:1701
-#: src/xml/xmli18n-tmp.h:1704 src/xml/xmli18n-tmp.h:1707
-#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1713
-#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1719
-#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1725
-#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1731
-#: src/xml/xmli18n-tmp.h:1734 src/xml/xmli18n-tmp.h:1737
-#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3503
-#: src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:1863
+#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1881
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1893
+#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1905
+#: src/xml/xmli18n-tmp.h:1908 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1923
+#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:1950 src/xml/xmli18n-tmp.h:1953
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1968 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1983
+#: src/xml/xmli18n-tmp.h:1986 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2204 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2255
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5645
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Sechs Farben Foto"
 
-#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
-#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
-#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
-#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
-#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
-#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
-#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
-#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
-#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
-#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
-#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1378
-#: src/xml/xmli18n-tmp.h:1381 src/xml/xmli18n-tmp.h:1384
-#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1390
-#: src/xml/xmli18n-tmp.h:1393 src/xml/xmli18n-tmp.h:1396
-#: src/xml/xmli18n-tmp.h:1399 src/xml/xmli18n-tmp.h:1402
-#: src/xml/xmli18n-tmp.h:1405 src/xml/xmli18n-tmp.h:1408
-#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1414
-#: src/xml/xmli18n-tmp.h:1417 src/xml/xmli18n-tmp.h:1420
-#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1426
-#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1432
-#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1438
-#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1444
-#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1450
-#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1456
-#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1462
-#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1468
-#: src/xml/xmli18n-tmp.h:1471 src/xml/xmli18n-tmp.h:1474
-#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1480
-#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1486
-#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1492
-#: src/xml/xmli18n-tmp.h:1495 src/xml/xmli18n-tmp.h:1498
-#: src/xml/xmli18n-tmp.h:1501 src/xml/xmli18n-tmp.h:1678
-#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1684
-#: src/xml/xmli18n-tmp.h:1687 src/xml/xmli18n-tmp.h:1690
-#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1696
-#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1702
-#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1708
-#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1714
-#: src/xml/xmli18n-tmp.h:1717 src/xml/xmli18n-tmp.h:1720
-#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1726
-#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1732
-#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1738
-#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3517
-#: src/xml/xmli18n-tmp.h:3577
+#: src/xml/xmli18n-tmp.h:835 src/xml/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:841 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1879 src/xml/xmli18n-tmp.h:1882
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1894
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1909 src/xml/xmli18n-tmp.h:1912
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1924
+#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1954
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1969 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1984
+#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2208
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2229 src/xml/xmli18n-tmp.h:2232
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2238
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2244
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2253 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2259 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5714
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1826
-#: src/xml/xmli18n-tmp.h:1839 src/xml/xmli18n-tmp.h:1852
-#: src/xml/xmli18n-tmp.h:1907 src/xml/xmli18n-tmp.h:1923
-#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1952
-#: src/xml/xmli18n-tmp.h:1965 src/xml/xmli18n-tmp.h:2054
-#: src/xml/xmli18n-tmp.h:2081 src/xml/xmli18n-tmp.h:2146
-#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
-#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
-#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2348
-#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2407
-#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2899
-#: src/xml/xmli18n-tmp.h:2916 src/xml/xmli18n-tmp.h:3142
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1139
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1154 src/xml/xmli18n-tmp.h:1159
+#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1179
+#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1199
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1214 src/xml/xmli18n-tmp.h:1219
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1229
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1244 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1259
+#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1274 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1289
+#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1309
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1329
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1423
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1429
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1447
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1634
+#: src/xml/xmli18n-tmp.h:1639 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1664
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1764
+#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1784
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1799 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1819
+msgid "MIS Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1463 src/xml/xmli18n-tmp.h:1468
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1478
+#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1508
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1533 src/xml/xmli18n-tmp.h:1538
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4858 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:5289
+msgid "Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2489 src/xml/xmli18n-tmp.h:2578
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2713 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2752
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2885 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:3051 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3665
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1828
-#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1853
-#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1879
-#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
-#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1940
-#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1966
-#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2055
-#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2133
-#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2175
-#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
-#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
-#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2336
-#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
-#: src/xml/xmli18n-tmp.h:2408 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2699
+#: src/xml/xmli18n-tmp.h:2714 src/xml/xmli18n-tmp.h:2727
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2886
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:3052
 msgid "180 DPI Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1830
-#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1854
-#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1880
-#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
-#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1941
-#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1967
-#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
-#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2134
-#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2176
-#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
-#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
-#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2337
-#: src/xml/xmli18n-tmp.h:2350 src/xml/xmli18n-tmp.h:2363
-#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
-#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2434
-#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2459
-#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2529
-#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2601
-#: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2703
-#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2735
-#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2768
-#: src/xml/xmli18n-tmp.h:2872 src/xml/xmli18n-tmp.h:2884
-#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2917
-#: src/xml/xmli18n-tmp.h:2961 src/xml/xmli18n-tmp.h:3007
-#: src/xml/xmli18n-tmp.h:3021 src/xml/xmli18n-tmp.h:3035
-#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3126
-#: src/xml/xmli18n-tmp.h:3143
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2404
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2658
+#: src/xml/xmli18n-tmp.h:2672 src/xml/xmli18n-tmp.h:2700
+#: src/xml/xmli18n-tmp.h:2715 src/xml/xmli18n-tmp.h:2728
+#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2754
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2919 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3053
+#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3125
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3292
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3530
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3649
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3684
 #, fuzzy
 msgid "360 x 180 DPI Draft"
 msgstr "150×150 DPI"
 
-#: src/xml/xmli18n-tmp.h:1818 src/xml/xmli18n-tmp.h:1831
-#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1855
-#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1881
-#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
-#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1942
-#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1968
-#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2135
-#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2392 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2418 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2479 src/xml/xmli18n-tmp.h:2492
+#: src/xml/xmli18n-tmp.h:2581 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2862 src/xml/xmli18n-tmp.h:2934
 #, fuzzy
 msgid "360 DPI High Quality"
 msgstr "600 DPI hohe Qualität"
 
-#: src/xml/xmli18n-tmp.h:1819 src/xml/xmli18n-tmp.h:1832
-#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1856
-#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1882
-#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
-#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1943
-#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1969
-#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1992
-#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2020
-#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
-#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
-#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2096
-#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2123
-#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2149
-#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2177
-#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2205
-#: src/xml/xmli18n-tmp.h:2218 src/xml/xmli18n-tmp.h:2231
-#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2254
-#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
-#: src/xml/xmli18n-tmp.h:2297 src/xml/xmli18n-tmp.h:2312
-#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2339
-#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
-#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2385
-#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2411
-#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2435
-#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2460
-#: src/xml/xmli18n-tmp.h:2473 src/xml/xmli18n-tmp.h:2488
-#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2516
-#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2541
-#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2591
-#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
-#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2645
-#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2675
-#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2704
-#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2736
-#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2769
-#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2808
-#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2833
-#: src/xml/xmli18n-tmp.h:2847 src/xml/xmli18n-tmp.h:2861
-#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2885
-#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2918
-#: src/xml/xmli18n-tmp.h:2935 src/xml/xmli18n-tmp.h:2950
-#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2987
-#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3022
-#: src/xml/xmli18n-tmp.h:3036 src/xml/xmli18n-tmp.h:3050
-#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3081
-#: src/xml/xmli18n-tmp.h:3098 src/xml/xmli18n-tmp.h:3113
-#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2369 src/xml/xmli18n-tmp.h:2380
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2406
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2493
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2544
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
+#: src/xml/xmli18n-tmp.h:2582 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2729
+#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2806
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2836
+#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
+#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3012
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3040
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3184 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3424 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3485 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3573
+#: src/xml/xmli18n-tmp.h:3587 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3650 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3685
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
 
-#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1833
-#: src/xml/xmli18n-tmp.h:1846 src/xml/xmli18n-tmp.h:1857
-#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1883
-#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1912
-#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1944
-#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1970
-#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1993
-#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2021
-#: src/xml/xmli18n-tmp.h:2033 src/xml/xmli18n-tmp.h:2045
-#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
-#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2097
-#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2124
-#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2150
-#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2178
-#: src/xml/xmli18n-tmp.h:2193 src/xml/xmli18n-tmp.h:2206
-#: src/xml/xmli18n-tmp.h:2219 src/xml/xmli18n-tmp.h:2232
-#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2255
-#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
-#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2313
-#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2340
-#: src/xml/xmli18n-tmp.h:2352 src/xml/xmli18n-tmp.h:2365
-#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2386
-#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2412
-#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2436
-#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2461
-#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2489
-#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2517
-#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2542
-#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2567
-#: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2592
-#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2616
-#: src/xml/xmli18n-tmp.h:2631 src/xml/xmli18n-tmp.h:2646
-#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2676
-#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2705
-#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2737
-#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2770
-#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2809
-#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2834
-#: src/xml/xmli18n-tmp.h:2848 src/xml/xmli18n-tmp.h:2862
-#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2886
-#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2919
-#: src/xml/xmli18n-tmp.h:2936 src/xml/xmli18n-tmp.h:2951
-#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2988
-#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3023
-#: src/xml/xmli18n-tmp.h:3037 src/xml/xmli18n-tmp.h:3051
-#: src/xml/xmli18n-tmp.h:3066 src/xml/xmli18n-tmp.h:3083
-#: src/xml/xmli18n-tmp.h:3099 src/xml/xmli18n-tmp.h:3114
-#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:2344 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2452 src/xml/xmli18n-tmp.h:2468
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2494
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2557 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:2594
+#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2648
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2674
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2807
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2837
+#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
+#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3013
+#: src/xml/xmli18n-tmp.h:3026 src/xml/xmli18n-tmp.h:3041
+#: src/xml/xmli18n-tmp.h:3055 src/xml/xmli18n-tmp.h:3066
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3140
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3170
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3229
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3333
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3358
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3385
+#: src/xml/xmli18n-tmp.h:3397 src/xml/xmli18n-tmp.h:3409
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3442
+#: src/xml/xmli18n-tmp.h:3459 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3574
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3637
+#: src/xml/xmli18n-tmp.h:3651 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3686
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1834
-#: src/xml/xmli18n-tmp.h:1847 src/xml/xmli18n-tmp.h:1858
-#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1884
-#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1913
-#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1945
-#: src/xml/xmli18n-tmp.h:1958 src/xml/xmli18n-tmp.h:1971
-#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:1994
-#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2022
-#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2046
-#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2071
-#: src/xml/xmli18n-tmp.h:2086 src/xml/xmli18n-tmp.h:2098
-#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2125
-#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2151
-#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2179
-#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2207
-#: src/xml/xmli18n-tmp.h:2220 src/xml/xmli18n-tmp.h:2233
-#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2256
-#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
-#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2314
-#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2341
-#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
-#: src/xml/xmli18n-tmp.h:2376 src/xml/xmli18n-tmp.h:2387
-#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2413
-#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2437
-#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2462
-#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2490
-#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2518
-#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2543
-#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
-#: src/xml/xmli18n-tmp.h:2580 src/xml/xmli18n-tmp.h:2593
-#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2617
-#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
-#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2677
-#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2706
-#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2738
-#: src/xml/xmli18n-tmp.h:2753 src/xml/xmli18n-tmp.h:2771
-#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2810
-#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2835
-#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
-#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2887
-#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2921
-#: src/xml/xmli18n-tmp.h:2937 src/xml/xmli18n-tmp.h:2952
-#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2990
-#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3024
-#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3052
-#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3085
-#: src/xml/xmli18n-tmp.h:3100 src/xml/xmli18n-tmp.h:3115
-#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:2345 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2469
+#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2546
+#: src/xml/xmli18n-tmp.h:2558 src/xml/xmli18n-tmp.h:2570
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2595
+#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2622
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2675
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2731
+#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2808
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2838
+#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2890
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2922 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3014
+#: src/xml/xmli18n-tmp.h:3027 src/xml/xmli18n-tmp.h:3042
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3067
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3186 src/xml/xmli18n-tmp.h:3201
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3334
+#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3359
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3444
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3475
+#: src/xml/xmli18n-tmp.h:3489 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3533 src/xml/xmli18n-tmp.h:3547
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3652 src/xml/xmli18n-tmp.h:3669
+#: src/xml/xmli18n-tmp.h:3687
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
-#: src/xml/xmli18n-tmp.h:1978 src/xml/xmli18n-tmp.h:2004
-#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2030
-#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2067
-#: src/xml/xmli18n-tmp.h:2094 src/xml/xmli18n-tmp.h:2107
-#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2161
-#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2252
-#: src/xml/xmli18n-tmp.h:2280 src/xml/xmli18n-tmp.h:2295
-#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2323
-#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
-#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2486
-#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2552
-#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2613
-#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
-#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2686
-#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2806
-#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2831
-#: src/xml/xmli18n-tmp.h:2845 src/xml/xmli18n-tmp.h:2859
-#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2948
-#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3080
-#: src/xml/xmli18n-tmp.h:3097 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2554
+#: src/xml/xmli18n-tmp.h:2566 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2804 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2834 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3076
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3382
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3586 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3634
 #, fuzzy
 msgid "360 x 120 DPI Economy"
 msgstr "600×600 DPI monochrome"
 
-#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1842
-#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2005
-#: src/xml/xmli18n-tmp.h:2019 src/xml/xmli18n-tmp.h:2031
-#: src/xml/xmli18n-tmp.h:2043 src/xml/xmli18n-tmp.h:2068
-#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
-#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2162
-#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2253
-#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2296
-#: src/xml/xmli18n-tmp.h:2311 src/xml/xmli18n-tmp.h:2324
-#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2384
-#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2487
-#: src/xml/xmli18n-tmp.h:2500 src/xml/xmli18n-tmp.h:2553
-#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2614
-#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2644
-#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2687
-#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2807
-#: src/xml/xmli18n-tmp.h:2820 src/xml/xmli18n-tmp.h:2832
-#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
-#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2949
-#: src/xml/xmli18n-tmp.h:3112
+#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2555
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2632
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3077
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3211
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3383
+#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3635
 #, fuzzy
 msgid "360 x 240 DPI Draft"
 msgstr "600×600 DPI"
 
-#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1872
-#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1898
-#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1930
-#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1959
-#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:1995
-#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2023
-#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2047
-#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2087
-#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2112
-#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2139
-#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2166
-#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2328
-#: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2388
-#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2557
-#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2922
-#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2991
-#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3086
+#: src/xml/xmli18n-tmp.h:2383 src/xml/xmli18n-tmp.h:2396
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2422
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2470 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2507 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2704 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:3057 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3118 src/xml/xmli18n-tmp.h:3445
+#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3514
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3609
 #, fuzzy
 msgid "720 DPI High Quality"
 msgstr "1200 DPI hohe Qualität"
 
-#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1873
-#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1899
-#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1931
-#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1984
-#: src/xml/xmli18n-tmp.h:1996 src/xml/xmli18n-tmp.h:2010
-#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2036
-#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2061
-#: src/xml/xmli18n-tmp.h:2073 src/xml/xmli18n-tmp.h:2088
-#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2127
-#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2153
-#: src/xml/xmli18n-tmp.h:2167 src/xml/xmli18n-tmp.h:2181
-#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2208
-#: src/xml/xmli18n-tmp.h:2221 src/xml/xmli18n-tmp.h:2234
-#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2257
-#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2285
-#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2315
-#: src/xml/xmli18n-tmp.h:2329 src/xml/xmli18n-tmp.h:2354
-#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2389
-#: src/xml/xmli18n-tmp.h:2399 src/xml/xmli18n-tmp.h:2425
-#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2451
-#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
-#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2504
-#: src/xml/xmli18n-tmp.h:2519 src/xml/xmli18n-tmp.h:2534
-#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2558
-#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2605
-#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2633
-#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2663
-#: src/xml/xmli18n-tmp.h:2678 src/xml/xmli18n-tmp.h:2691
-#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2725
-#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2754
-#: src/xml/xmli18n-tmp.h:2772 src/xml/xmli18n-tmp.h:2787
-#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2811
-#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2836
-#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
-#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2888
-#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2923
-#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2953
-#: src/xml/xmli18n-tmp.h:2968 src/xml/xmli18n-tmp.h:2978
-#: src/xml/xmli18n-tmp.h:2992 src/xml/xmli18n-tmp.h:3011
-#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3039
-#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
-#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3101
-#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3130
-#: src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:2384 src/xml/xmli18n-tmp.h:2397
+#: src/xml/xmli18n-tmp.h:2410 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2548 src/xml/xmli18n-tmp.h:2560
+#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2691 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2794 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2839
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2923 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3105
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3129
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3231 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3311
+#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3335
+#: src/xml/xmli18n-tmp.h:3348 src/xml/xmli18n-tmp.h:3360
+#: src/xml/xmli18n-tmp.h:3372 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3427 src/xml/xmli18n-tmp.h:3446
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3576 src/xml/xmli18n-tmp.h:3593
+#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3688
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1874
-#: src/xml/xmli18n-tmp.h:1887 src/xml/xmli18n-tmp.h:1900
-#: src/xml/xmli18n-tmp.h:1916 src/xml/xmli18n-tmp.h:1932
-#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1985
-#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2011
-#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2037
-#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2062
-#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2089
-#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2128
-#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2154
-#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2182
-#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2258
-#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
-#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2316
-#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2390
-#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2559
-#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2634
-#: src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2385 src/xml/xmli18n-tmp.h:2398
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2535
+#: src/xml/xmli18n-tmp.h:2549 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2782
+#: src/xml/xmli18n-tmp.h:2795 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3388
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1200 DPI höchste Qualität"
 
-#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1960
-#: src/xml/xmli18n-tmp.h:2100 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2902
 #, fuzzy
 msgid "720 DPI Highest Quality"
 msgstr "1200 DPI höchste Qualität"
 
-#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2259
-#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
-#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2317
-#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2477
-#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2505
-#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2606
-#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2635
-#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2740
-#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2866
-#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2796 src/xml/xmli18n-tmp.h:2811
+#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3216 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3412
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2260
-#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
-#: src/xml/xmli18n-tmp.h:2303 src/xml/xmli18n-tmp.h:2318
-#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2771 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2812
+#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:3160 src/xml/xmli18n-tmp.h:3390
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1200 DPI höchste Qualität"
 
-#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2439
-#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2493
-#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2546
-#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2582
-#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2620
-#: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2664
-#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
-#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2726
-#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2755
-#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2789
-#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2812
-#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2878
-#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
-#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2939
-#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2969
-#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2994
-#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
-#: src/xml/xmli18n-tmp.h:3088 src/xml/xmli18n-tmp.h:3102
-#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3131
-#: src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2963
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3070
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3106
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3297 src/xml/xmli18n-tmp.h:3313
+#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
+#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3401
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3492
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3577 src/xml/xmli18n-tmp.h:3594
+#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3671 src/xml/xmli18n-tmp.h:3689
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2426
-#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2452
-#: src/xml/xmli18n-tmp.h:2464 src/xml/xmli18n-tmp.h:2479
-#: src/xml/xmli18n-tmp.h:2494 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2547
-#: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2583
-#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2621
-#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2665
-#: src/xml/xmli18n-tmp.h:2680 src/xml/xmli18n-tmp.h:2694
-#: src/xml/xmli18n-tmp.h:2709 src/xml/xmli18n-tmp.h:2727
-#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2756
-#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2790
-#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2813
-#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2837
-#: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2879
-#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
-#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2940
-#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2970
-#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2995
-#: src/xml/xmli18n-tmp.h:3012 src/xml/xmli18n-tmp.h:3026
-#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3055
-#: src/xml/xmli18n-tmp.h:3072 src/xml/xmli18n-tmp.h:3089
-#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3118
-#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3071
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3107
+#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3251
+#: src/xml/xmli18n-tmp.h:3266 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3298 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3324 src/xml/xmli18n-tmp.h:3337
+#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3374 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3463
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3535 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3563 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3612
+#: src/xml/xmli18n-tmp.h:3626 src/xml/xmli18n-tmp.h:3641
+#: src/xml/xmli18n-tmp.h:3655 src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:3690
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:4374
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Gelb"
 
-#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2584
-#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2711
-#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2743
-#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2776
-#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2908
-#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2972
-#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3057
-#: src/xml/xmli18n-tmp.h:3074 src/xml/xmli18n-tmp.h:3091
-#: src/xml/xmli18n-tmp.h:3105 src/xml/xmli18n-tmp.h:3134
-#: src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3108
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3267
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3495
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3614
+#: src/xml/xmli18n-tmp.h:3628 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3692
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2666 src/xml/xmli18n-tmp.h:2681
-#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2728
-#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2775
-#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2814
-#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2838
-#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2926
-#: src/xml/xmli18n-tmp.h:2941 src/xml/xmli18n-tmp.h:2971
-#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
-#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
-#: src/xml/xmli18n-tmp.h:3090 src/xml/xmli18n-tmp.h:3104
-#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3133
-#: src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3190 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3234 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3325 src/xml/xmli18n-tmp.h:3338
+#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3362
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3505
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3613
+#: src/xml/xmli18n-tmp.h:3627 src/xml/xmli18n-tmp.h:3642
+#: src/xml/xmli18n-tmp.h:3656 src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:3691
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2712
-#: src/xml/xmli18n-tmp.h:2730 src/xml/xmli18n-tmp.h:2759
-#: src/xml/xmli18n-tmp.h:2777 src/xml/xmli18n-tmp.h:2909
-#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2973
-#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3058
-#: src/xml/xmli18n-tmp.h:3075 src/xml/xmli18n-tmp.h:3092
-#: src/xml/xmli18n-tmp.h:3106 src/xml/xmli18n-tmp.h:3135
-#: src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3301 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3496
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3615
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2798 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3502
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2965
-#: src/xml/xmli18n-tmp.h:2989 src/xml/xmli18n-tmp.h:3067
-#: src/xml/xmli18n-tmp.h:3084
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:3607
 #, fuzzy
 msgid "720 x 360 DPI Enhanced"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:3479
 #, fuzzy
 msgid "Black 1"
 msgstr "Schwarz"
 
-#: src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3480
 #, fuzzy
 msgid "Black 2"
 msgstr "Schwarz"
 
-#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3065
-#: src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3605
 #, fuzzy
 msgid "360 DPI Enhanced"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3516
 #, fuzzy
 msgid "1440 x 720 DPI High Quality"
 msgstr "1200 DPI höchste Qualität"
 
-#: src/xml/xmli18n-tmp.h:3153
-msgid "Lower Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3677
+#, fuzzy
+msgid "Vivid Light Magenta"
+msgstr "helles Magenta"
 
-#: src/xml/xmli18n-tmp.h:3154
-msgid "Upper Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3682
+#, fuzzy
+msgid "Vivid Magenta"
+msgstr "Magenta"
+
+#: src/xml/xmli18n-tmp.h:3694
+#, fuzzy
+msgid "Main Tray"
+msgstr "Schacht"
+
+#: src/xml/xmli18n-tmp.h:3695
+#, fuzzy
+msgid "Photo Tray"
+msgstr "Foto"
 
-#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3160
-#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3176
-#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3186
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3725 src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:3732
 #, fuzzy
 msgid "Print to CD"
 msgstr "Drucke in Datei?"
 
-#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3181
-#: src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:3730
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Schacht"
 
-#: src/xml/xmli18n-tmp.h:3157 src/xml/xmli18n-tmp.h:3182
-#: src/xml/xmli18n-tmp.h:3185
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:3731
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3159 src/xml/xmli18n-tmp.h:3164
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3705
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manuell"
 
-#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3709
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3710
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3171
-#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3180
-#: src/xml/xmli18n-tmp.h:3193
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3716 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3739
 msgid "Roll Feed"
 msgstr "Vorschub"
 
-#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3714 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3723
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Manuell"
 
-#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3715 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3724
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Manuell"
 
-#: src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3733
 #, fuzzy
 msgid "Photo Board"
 msgstr "Foto Papier"
 
-#: src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3734
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3735
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3190
+#: src/xml/xmli18n-tmp.h:3736
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "autom. Auswahl"
 
-#: src/xml/xmli18n-tmp.h:3191
+#: src/xml/xmli18n-tmp.h:3737
 msgid "Manual Selection"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3199 src/xml/xmli18n-tmp.h:3207
-#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3219
-#: src/xml/xmli18n-tmp.h:3227 src/xml/xmli18n-tmp.h:3235
-#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3257
-#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3278
-#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3297
-#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3317
-#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3342
-#: src/xml/xmli18n-tmp.h:3356 src/xml/xmli18n-tmp.h:3382
-#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
-#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3426
-#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3446
-#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3474
-#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3498
-#: src/xml/xmli18n-tmp.h:3510 src/xml/xmli18n-tmp.h:3524
-#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3558
-#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:3584
-#: src/xml/xmli18n-tmp.h:3594 src/xml/xmli18n-tmp.h:3600
-#: src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3763 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3872 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:4067 src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4172 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4236 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:4754 src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5102 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5679 src/xml/xmli18n-tmp.h:5748
+#: src/xml/xmli18n-tmp.h:5793 src/xml/xmli18n-tmp.h:5814
+#: src/xml/xmli18n-tmp.h:5835
 msgid "One Color Raw"
 msgstr "einfarbige Rohausgabe"
 
-#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3208
-#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3220
-#: src/xml/xmli18n-tmp.h:3228 src/xml/xmli18n-tmp.h:3236
-#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3259
-#: src/xml/xmli18n-tmp.h:3270 src/xml/xmli18n-tmp.h:3280
-#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3298
-#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3318
-#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3344
-#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3383
-#: src/xml/xmli18n-tmp.h:3391 src/xml/xmli18n-tmp.h:3403
-#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3427
-#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3447
-#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3475
-#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3499
-#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3526
-#: src/xml/xmli18n-tmp.h:3551 src/xml/xmli18n-tmp.h:3559
-#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3586
-#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3601
-#: src/xml/xmli18n-tmp.h:3607
+#: src/xml/xmli18n-tmp.h:3765 src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4484 src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:4756 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5321
+#: src/xml/xmli18n-tmp.h:5382 src/xml/xmli18n-tmp.h:5451
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5795 src/xml/xmli18n-tmp.h:5816
+#: src/xml/xmli18n-tmp.h:5837
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
-#: src/xml/xmli18n-tmp.h:3215 src/xml/xmli18n-tmp.h:3221
-#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3237
-#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3271
-#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3299
-#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3319
-#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3345
-#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3384
-#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
-#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3428
-#: src/xml/xmli18n-tmp.h:3438 src/xml/xmli18n-tmp.h:3448
-#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3463
-#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3476
-#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3500
-#: src/xml/xmli18n-tmp.h:3513 src/xml/xmli18n-tmp.h:3527
-#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3560
-#: src/xml/xmli18n-tmp.h:3573 src/xml/xmli18n-tmp.h:3587
-#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3602
-#: src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:3824 src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5325
+#: src/xml/xmli18n-tmp.h:5386 src/xml/xmli18n-tmp.h:5455
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5757
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5841
 msgid "Four Color Raw"
 msgstr "vierfarbige Rohausgabe"
 
-#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3248
-#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
-#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3360
-#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
-#: src/xml/xmli18n-tmp.h:3417 src/xml/xmli18n-tmp.h:3429
-#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3459
-#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3501 src/xml/xmli18n-tmp.h:3514
-#: src/xml/xmli18n-tmp.h:3528 src/xml/xmli18n-tmp.h:3574
-#: src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4424 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:5066 src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:5196 src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5391
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5762
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3249
-#: src/xml/xmli18n-tmp.h:3272 src/xml/xmli18n-tmp.h:3293
-#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3333
-#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3361
-#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
-#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3430
-#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3460
-#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3478
-#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3502
-#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3529
-#: src/xml/xmli18n-tmp.h:3575 src/xml/xmli18n-tmp.h:3589
+#: src/xml/xmli18n-tmp.h:3780 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:4078 src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:4430 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4972
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5150 src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5336
+#: src/xml/xmli18n-tmp.h:5397 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5768
 msgid "Six Color Raw"
 msgstr "Sechsfarbige Rohausgabe"
 
-#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3919 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:4781 src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:4795 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4921
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:4996
+#: src/xml/xmli18n-tmp.h:5023 src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:5226 src/xml/xmli18n-tmp.h:5279
+#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5603 src/xml/xmli18n-tmp.h:5609
+#: src/xml/xmli18n-tmp.h:5636 src/xml/xmli18n-tmp.h:5642
+#, fuzzy
+msgid "Gray 3"
+msgstr "Schacht 3"
+
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4782 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4796 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4916 src/xml/xmli18n-tmp.h:4922
+#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4983
+#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5286 src/xml/xmli18n-tmp.h:5294
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5643
+#, fuzzy
+msgid "Gray 2"
+msgstr "Schacht 2"
+
+#: src/xml/xmli18n-tmp.h:3855 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:4856 src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:4931 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4998
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:5214 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5611
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5644
+#, fuzzy
+msgid "Gray 1"
+msgstr "Schacht 1"
+
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4985 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5606 src/xml/xmli18n-tmp.h:5639
+#, fuzzy
+msgid "MIS Quadtone"
+msgstr "Quadtone"
+
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4114
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Aus sieben Farben gemischt"
 
-#: src/xml/xmli18n-tmp.h:3260 src/xml/xmli18n-tmp.h:3281
+#: src/xml/xmli18n-tmp.h:4016 src/xml/xmli18n-tmp.h:4121
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3282
+#: src/xml/xmli18n-tmp.h:4021 src/xml/xmli18n-tmp.h:4126
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "vierfarbige Rohausgabe"
 
-#: src/xml/xmli18n-tmp.h:3262 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4132
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Aus sechs Farben gemischt "
 
-#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:4035 src/xml/xmli18n-tmp.h:4140
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Aus sieben Farben gemischt"
 
-#: src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:4141
+#, fuzzy
+msgid "MatteBlack"
+msgstr "Mattes Papier"
+
+#: src/xml/xmli18n-tmp.h:4224
 #, fuzzy
 msgid "Default Black"
 msgstr "Zurücksetzen"
 
-#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
-#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3365
-#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3504
-#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3533
-#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3564
-#: src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4446 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4573 src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:5344
+#: src/xml/xmli18n-tmp.h:5413 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5715
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Sechs Farben Foto"
 
-#: src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:4315
 msgid "Six Color Enhanced Composite"
 msgstr "Aus sechs Farben gemischt "
 
-#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3348
-#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3516
-#: src/xml/xmli18n-tmp.h:3530 src/xml/xmli18n-tmp.h:3576
-#: src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:4368 src/xml/xmli18n-tmp.h:4437
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:5404
+#: src/xml/xmli18n-tmp.h:5473 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5775
 msgid "Seven Color Raw"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3355
-#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3523
-#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5745
 msgid "Two Level Grayscale"
 msgstr "zweistufig Grau"
 
-#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3357
-#: src/xml/xmli18n-tmp.h:3511 src/xml/xmli18n-tmp.h:3525
-#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:4412 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5448
+#: src/xml/xmli18n-tmp.h:5681 src/xml/xmli18n-tmp.h:5750
 msgid "Two Color Raw"
 msgstr "zweifarbige Rohausgabe"
 
-#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3372
-#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3540
+#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5531
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Sechs Farben Foto"
 
-#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3378
-#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:4652 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5570
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Sechsfarbige Rohausgabe"
 
-#: src/xml/xmli18n-tmp.h:3462 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:5288
+msgid "MIS Six Tone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:4994
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5291
+#, fuzzy
+msgid "Gray 5"
+msgstr "Schacht 1"
+
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:4928 src/xml/xmli18n-tmp.h:4995
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5292
+#, fuzzy
+msgid "Gray 4"
+msgstr "Schacht 4"
+
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5145
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Sechs Farben Foto"
 
-#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3615
-#: src/xml/xmli18n-tmp.h:3621
+#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5852
+#: src/xml/xmli18n-tmp.h:5858
 #, fuzzy
 msgid "Interleave"
 msgstr "Drucker Name:"
 
-#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3616
-#: src/xml/xmli18n-tmp.h:3622
+#: src/xml/xmli18n-tmp.h:5848 src/xml/xmli18n-tmp.h:5853
+#: src/xml/xmli18n-tmp.h:5859
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3612 src/xml/xmli18n-tmp.h:3617
-#: src/xml/xmli18n-tmp.h:3623
+#: src/xml/xmli18n-tmp.h:5849 src/xml/xmli18n-tmp.h:5854
+#: src/xml/xmli18n-tmp.h:5860
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3613 src/xml/xmli18n-tmp.h:3618
-#: src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5855
+#: src/xml/xmli18n-tmp.h:5861
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:5862
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Drucker Name:"
 
-#: src/xml/xmli18n-tmp.h:3626
+#: src/xml/xmli18n-tmp.h:5863
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Helligkeit:"
 
-#: src/xml/xmli18n-tmp.h:3628
+#: src/xml/xmli18n-tmp.h:5865
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:5909
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:5910
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:3674
+#: src/xml/xmli18n-tmp.h:5911
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:3679
+#: src/xml/xmli18n-tmp.h:5916
 msgid "3x5"
 msgstr "3×5"
 
-#: src/xml/xmli18n-tmp.h:3680
+#: src/xml/xmli18n-tmp.h:5917
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:5918
 msgid "4x6"
 msgstr "4×6"
 
-#: src/xml/xmli18n-tmp.h:3682
+#: src/xml/xmli18n-tmp.h:5919
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:5920
+#, fuzzy
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:5921
 msgid "5x7"
 msgstr "5×7"
 
-#: src/xml/xmli18n-tmp.h:3684
+#: src/xml/xmli18n-tmp.h:5922
 msgid "5x8"
 msgstr "5×8"
 
-#: src/xml/xmli18n-tmp.h:3685
+#: src/xml/xmli18n-tmp.h:5923
 msgid "6x8"
 msgstr "6×8"
 
-#: src/xml/xmli18n-tmp.h:3686
+#: src/xml/xmli18n-tmp.h:5924
 msgid "8x10"
 msgstr "8×10"
 
-#: src/xml/xmli18n-tmp.h:3688
+#: src/xml/xmli18n-tmp.h:5926
 msgid "12x18"
 msgstr "12×18"
 
-#: src/xml/xmli18n-tmp.h:3689
+#: src/xml/xmli18n-tmp.h:5927
 msgid "Super B 13x19"
 msgstr "Super B 13×19"
 
-#: src/xml/xmli18n-tmp.h:3690
+#: src/xml/xmli18n-tmp.h:5928
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3691
+#: src/xml/xmli18n-tmp.h:5929
 msgid "8x12"
 msgstr "8×12"
 
-#: src/xml/xmli18n-tmp.h:3692
+#: src/xml/xmli18n-tmp.h:5930
 msgid "11x14"
 msgstr "11×14"
 
-#: src/xml/xmli18n-tmp.h:3693
+#: src/xml/xmli18n-tmp.h:5931
 msgid "16x20"
 msgstr "16×20"
 
-#: src/xml/xmli18n-tmp.h:3694
+#: src/xml/xmli18n-tmp.h:5932
 msgid "16x24"
 msgstr "16×24"
 
-#: src/xml/xmli18n-tmp.h:3695
+#: src/xml/xmli18n-tmp.h:5933
 msgid "20x24"
 msgstr "20×24"
 
-#: src/xml/xmli18n-tmp.h:3696
+#: src/xml/xmli18n-tmp.h:5934
 msgid "20x30"
 msgstr "20×30"
 
-#: src/xml/xmli18n-tmp.h:3697
+#: src/xml/xmli18n-tmp.h:5935
 #, fuzzy
 msgid "22x30"
 msgstr "20×30"
 
-#: src/xml/xmli18n-tmp.h:3698
+#: src/xml/xmli18n-tmp.h:5936
 msgid "24x30"
 msgstr "24×30"
 
-#: src/xml/xmli18n-tmp.h:3699
+#: src/xml/xmli18n-tmp.h:5937
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3700
+#: src/xml/xmli18n-tmp.h:5938
 msgid "30x40"
 msgstr "30×40"
 
-#: src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:5939
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:3702
+#: src/xml/xmli18n-tmp.h:5940
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:3703
+#: src/xml/xmli18n-tmp.h:5941
 #, fuzzy
 msgid "Super A0"
 msgstr "Sieben Farb Foto"
 
-#: src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:5942
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:3705
+#: src/xml/xmli18n-tmp.h:5943
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:3706
+#: src/xml/xmli18n-tmp.h:5944
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:3707
+#: src/xml/xmli18n-tmp.h:5945
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:3709
+#: src/xml/xmli18n-tmp.h:5947
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:3710
+#: src/xml/xmli18n-tmp.h:5948
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:5949
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:5950
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:3713
+#: src/xml/xmli18n-tmp.h:5951
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:3714
+#: src/xml/xmli18n-tmp.h:5952
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:3715
+#: src/xml/xmli18n-tmp.h:5953
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:3716
+#: src/xml/xmli18n-tmp.h:5954
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:5955
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:5956
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:5957
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:5958
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:5959
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:3722
+#: src/xml/xmli18n-tmp.h:5960
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:3723
+#: src/xml/xmli18n-tmp.h:5961
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:3724
+#: src/xml/xmli18n-tmp.h:5962
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:3725
+#: src/xml/xmli18n-tmp.h:5963
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:3726
+#: src/xml/xmli18n-tmp.h:5964
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:5965
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:5966
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:5967
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:3730
+#: src/xml/xmli18n-tmp.h:5968
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:3731
+#: src/xml/xmli18n-tmp.h:5969
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:3732
+#: src/xml/xmli18n-tmp.h:5970
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:3733
+#: src/xml/xmli18n-tmp.h:5971
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:3734
+#: src/xml/xmli18n-tmp.h:5972
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:3735
+#: src/xml/xmli18n-tmp.h:5973
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:3736
+#: src/xml/xmli18n-tmp.h:5974
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:3737
+#: src/xml/xmli18n-tmp.h:5975
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5976
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3739
+#: src/xml/xmli18n-tmp.h:5977
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:5978
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:3741
+#: src/xml/xmli18n-tmp.h:5979
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:5980
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:3743
+#: src/xml/xmli18n-tmp.h:5981
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:5982
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:5983
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:3746
+#: src/xml/xmli18n-tmp.h:5984
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:3747
+#: src/xml/xmli18n-tmp.h:5985
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:3748
+#: src/xml/xmli18n-tmp.h:5986
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:5987
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:3750
+#: src/xml/xmli18n-tmp.h:5988
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:3751
+#: src/xml/xmli18n-tmp.h:5989
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Querformat"
 
-#: src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:5990
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:5991
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Querformat"
 
-#: src/xml/xmli18n-tmp.h:3754
+#: src/xml/xmli18n-tmp.h:5992
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:3755
+#: src/xml/xmli18n-tmp.h:5993
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Querformat"
 
-#: src/xml/xmli18n-tmp.h:3756
+#: src/xml/xmli18n-tmp.h:5994
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:5995
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Querformat"
 
-#: src/xml/xmli18n-tmp.h:3758
+#: src/xml/xmli18n-tmp.h:5996
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:3759
+#: src/xml/xmli18n-tmp.h:5997
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Querformat"
 
-#: src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:5998
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:3761
+#: src/xml/xmli18n-tmp.h:5999
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Querformat"
 
-#: src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:6000
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:3763
+#: src/xml/xmli18n-tmp.h:6001
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Querformat"
 
-#: src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:6002
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:3765
+#: src/xml/xmli18n-tmp.h:6003
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Querformat"
 
-#: src/xml/xmli18n-tmp.h:3766
+#: src/xml/xmli18n-tmp.h:6004
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:6005
 #, fuzzy
 msgid "DL landscape"
 msgstr "Querformat"
 
-#: src/xml/xmli18n-tmp.h:3768
+#: src/xml/xmli18n-tmp.h:6006
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:3769
+#: src/xml/xmli18n-tmp.h:6007
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Querformat"
 
-#: src/xml/xmli18n-tmp.h:3770
+#: src/xml/xmli18n-tmp.h:6008
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:6009
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Querformat"
 
-#: src/xml/xmli18n-tmp.h:3772
+#: src/xml/xmli18n-tmp.h:6010
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:6011
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Querformat"
 
-#: src/xml/xmli18n-tmp.h:3774
+#: src/xml/xmli18n-tmp.h:6012
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:3775
+#: src/xml/xmli18n-tmp.h:6013
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Querformat"
 
-#: src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:6014
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:6015
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Querformat"
 
-#: src/xml/xmli18n-tmp.h:3778
+#: src/xml/xmli18n-tmp.h:6016
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:3779
+#: src/xml/xmli18n-tmp.h:6017
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3780
+#: src/xml/xmli18n-tmp.h:6018
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:6019
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3782
+#: src/xml/xmli18n-tmp.h:6020
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:6021
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3784
+#: src/xml/xmli18n-tmp.h:6022
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:6023
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:6024
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:3787
+#: src/xml/xmli18n-tmp.h:6025
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:6026
 msgid "American foolscap"
 msgstr "Amerikan. Narrenmütze"
 
-#: src/xml/xmli18n-tmp.h:3789
+#: src/xml/xmli18n-tmp.h:6027
 msgid "European foolscap"
 msgstr "Europäische Narrenmütze"
 
-#: src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:6028
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:6029
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3792
+#: src/xml/xmli18n-tmp.h:6030
 msgid "Demy Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:6031
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3794
+#: src/xml/xmli18n-tmp.h:6032
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3795
+#: src/xml/xmli18n-tmp.h:6033
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:6034
 msgid "Demy Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:6035
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:6036
 msgid "Small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:6037
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:6038
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:6039
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3802
+#: src/xml/xmli18n-tmp.h:6040
 msgid "Hagaki Card"
 msgstr "Hagaki Card"
 
-#: src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:6041
 msgid "Oufuku Card"
 msgstr "Oufuku Card"
 
-#: src/xml/xmli18n-tmp.h:3804
+#: src/xml/xmli18n-tmp.h:6042
 msgid "Japanese long envelope #3"
 msgstr "Japanese langer Umschlag #3"
 
-#: src/xml/xmli18n-tmp.h:3805
+#: src/xml/xmli18n-tmp.h:6043
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japanese langer Umschlag #3"
 
-#: src/xml/xmli18n-tmp.h:3806
+#: src/xml/xmli18n-tmp.h:6044
 msgid "Japanese long envelope #4"
 msgstr "Japanese langer Umschlag #4"
 
-#: src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:6045
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japanese langer Umschlag #4"
 
-#: src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:6046
 #, fuzzy
 msgid "Japanese Kaku envelope #4"
 msgstr "Japanese langer Umschlag #4"
 
-#: src/xml/xmli18n-tmp.h:3809
+#: src/xml/xmli18n-tmp.h:6047
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japanese langer Umschlag #4"
 
-#: src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:6048
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:6049
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:6050
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/xml/xmli18n-tmp.h:3813
+#: src/xml/xmli18n-tmp.h:6051
 msgid "Monarch Envelope"
 msgstr "Briefumschlag (Monarch)"
 
-#: src/xml/xmli18n-tmp.h:3814
+#: src/xml/xmli18n-tmp.h:6052
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Briefumschlag (Monarch)"
 
-#: src/xml/xmli18n-tmp.h:3815
+#: src/xml/xmli18n-tmp.h:6053
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3816
+#: src/xml/xmli18n-tmp.h:6054
 #, fuzzy
 msgid "4x7"
 msgstr "5×7"
 
-#: src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:6055
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3818
+#: src/xml/xmli18n-tmp.h:6056
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3819
+#: src/xml/xmli18n-tmp.h:6057
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Postkarte"
 
-#: src/xml/xmli18n-tmp.h:3820
+#: src/xml/xmli18n-tmp.h:6058
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:6059
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:6060
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3824
+#: src/xml/xmli18n-tmp.h:6062
 msgid "89 mm Roll Paper"
 msgstr "89 mm Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:6063
 msgid "4 Inch Roll Paper"
 msgstr "4 Inch Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:3826
+#: src/xml/xmli18n-tmp.h:6064
 msgid "5 Inch Roll Paper"
 msgstr "5 Inch Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:3827
+#: src/xml/xmli18n-tmp.h:6065
 msgid "210 mm Roll Paper"
 msgstr "210 mm Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:6066
 msgid "13 Inch Roll Paper"
 msgstr "13 Zoll Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:3829
+#: src/xml/xmli18n-tmp.h:6067
 #, fuzzy
 msgid "17 Inch Roll Paper"
 msgstr "13 Zoll Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:6068
 msgid "22 Inch Roll Paper"
 msgstr "22 Zoll Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:3831
+#: src/xml/xmli18n-tmp.h:6069
 msgid "24 Inch Roll Paper"
 msgstr "24 Zoll Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:6070
 msgid "36 Inch Roll Paper"
 msgstr "36 Zoll Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:6071
 msgid "44 Inch Roll Paper"
 msgstr "44 Zoll Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:3834
+#: src/xml/xmli18n-tmp.h:6072
 #, fuzzy
 msgid "60 Inch Roll Paper"
 msgstr "36 Zoll Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:6073
 #, fuzzy
 msgid "64 Inch Roll Paper"
 msgstr "4 Inch Endlospapier"
 
-#: src/xml/xmli18n-tmp.h:3836
+#: src/xml/xmli18n-tmp.h:6074
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3837
+#: src/xml/xmli18n-tmp.h:6075
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:6076
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:6077
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:6078
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:6079
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:6080
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:6081
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3844
+#: src/xml/xmli18n-tmp.h:6082
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:6083
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3846
+#: src/xml/xmli18n-tmp.h:6084
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3847
+#: src/xml/xmli18n-tmp.h:6085
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3848
+#: src/xml/xmli18n-tmp.h:6086
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:6087
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3850
+#: src/xml/xmli18n-tmp.h:6088
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:6089
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:6090
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3853
+#: src/xml/xmli18n-tmp.h:6091
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3854
+#: src/xml/xmli18n-tmp.h:6092
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3855
+#: src/xml/xmli18n-tmp.h:6093
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3856
+#: src/xml/xmli18n-tmp.h:6094
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3857
+#: src/xml/xmli18n-tmp.h:6095
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3858
+#: src/xml/xmli18n-tmp.h:6096
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:6097
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:6098
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:6099
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:6100
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3863
+#: src/xml/xmli18n-tmp.h:6101
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:6102
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:6103
 msgid "Canon S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:6104
 msgid "Canon S200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3867
+#: src/xml/xmli18n-tmp.h:6105
 msgid "Canon S300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3868
+#: src/xml/xmli18n-tmp.h:6106
 msgid "Canon S400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3869
+#: src/xml/xmli18n-tmp.h:6107
 msgid "Canon S450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3870
+#: src/xml/xmli18n-tmp.h:6108
 msgid "Canon S500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:6109
 msgid "Canon S600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3872
+#: src/xml/xmli18n-tmp.h:6110
 msgid "Canon S630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3873
+#: src/xml/xmli18n-tmp.h:6111
 msgid "Canon S800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3874
+#: src/xml/xmli18n-tmp.h:6112
 msgid "Canon S4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:6113
 msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:6114
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3877
+#: src/xml/xmli18n-tmp.h:6115
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3878
+#: src/xml/xmli18n-tmp.h:6116
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:6117
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3880
+#: src/xml/xmli18n-tmp.h:6118
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3881
+#: src/xml/xmli18n-tmp.h:6119
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:6120
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:6121
 msgid "Canon PIXMA iP4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3884
+#: src/xml/xmli18n-tmp.h:6122
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3885
+#: src/xml/xmli18n-tmp.h:6123
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3886
+#: src/xml/xmli18n-tmp.h:6124
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3887
+#: src/xml/xmli18n-tmp.h:6125
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3888
+#: src/xml/xmli18n-tmp.h:6126
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:6127
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:6128
+msgid "Canon PIXMA iX4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6129
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:6130
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:6131
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:6132
 msgid "Canon PIXMA MP160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:6133
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3895
+#: src/xml/xmli18n-tmp.h:6134
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:6135
 msgid "Canon PIXMA MP220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3897
+#: src/xml/xmli18n-tmp.h:6136
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:6137
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:6138
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3900
+#: src/xml/xmli18n-tmp.h:6139
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:6140
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3902
+#: src/xml/xmli18n-tmp.h:6141
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3903
+#: src/xml/xmli18n-tmp.h:6142
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:6143
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:6144
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:6145
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:6146
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:6147
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:6148
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3910
+#: src/xml/xmli18n-tmp.h:6149
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:6150
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3912
+#: src/xml/xmli18n-tmp.h:6151
 msgid "Canon i80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3913
+#: src/xml/xmli18n-tmp.h:6152
 msgid "Canon i560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3914
+#: src/xml/xmli18n-tmp.h:6153
 msgid "Canon i850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:6154
 msgid "Canon i860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3916
+#: src/xml/xmli18n-tmp.h:6155
 msgid "Canon i865"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:6156
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:6157
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:3919
+#: src/xml/xmli18n-tmp.h:6158
 msgid "Epson B-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3920
+#: src/xml/xmli18n-tmp.h:6159
 msgid "Epson B-308"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3921
+#: src/xml/xmli18n-tmp.h:6160
 msgid "Epson B-500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3922
+#: src/xml/xmli18n-tmp.h:6161
 msgid "Epson B-508DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3923
+#: src/xml/xmli18n-tmp.h:6162
 msgid "Epson Stylus C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3924
+#: src/xml/xmli18n-tmp.h:6163
 msgid "Epson Stylus C20SX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:6164
 msgid "Epson Stylus C20UX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:6165
 msgid "Epson Stylus C40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:6166
 msgid "Epson Stylus C40SX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:6167
 msgid "Epson Stylus C40UX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:6168
 msgid "Epson Stylus C41"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:6169
 msgid "Epson Stylus C41SX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:6170
 msgid "Epson Stylus C41UX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3932
+#: src/xml/xmli18n-tmp.h:6171
 msgid "Epson Stylus C42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:6172
 msgid "Epson Stylus C42SX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3934
+#: src/xml/xmli18n-tmp.h:6173
 msgid "Epson Stylus C42UX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3935
+#: src/xml/xmli18n-tmp.h:6174
 msgid "Epson Stylus C43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:6175
 msgid "Epson Stylus C43SX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3937
+#: src/xml/xmli18n-tmp.h:6176
 msgid "Epson Stylus C43UX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:6177
 msgid "Epson Stylus C44"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3939
+#: src/xml/xmli18n-tmp.h:6178
 msgid "Epson Stylus C44SX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:6179
 msgid "Epson Stylus C44UX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:6180
 msgid "Epson Stylus C45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3942
+#: src/xml/xmli18n-tmp.h:6181
 msgid "Epson Stylus C46"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3943
+#: src/xml/xmli18n-tmp.h:6182
 msgid "Epson Stylus C48"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:6183
 msgid "Epson Stylus C50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:6184
 msgid "Epson Stylus C60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3946
+#: src/xml/xmli18n-tmp.h:6185
 msgid "Epson Stylus C61"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3947
+#: src/xml/xmli18n-tmp.h:6186
 msgid "Epson Stylus C62"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3948
+#: src/xml/xmli18n-tmp.h:6187
 msgid "Epson Stylus C63"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3949
+#: src/xml/xmli18n-tmp.h:6188
 msgid "Epson Stylus C64"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:6189
 msgid "Epson Stylus C65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3951
+#: src/xml/xmli18n-tmp.h:6190
 msgid "Epson Stylus C66"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:6191
 msgid "Epson Stylus C68"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3953
+#: src/xml/xmli18n-tmp.h:6192
 msgid "Epson Stylus C70"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:6193
 msgid "Epson Stylus C79"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:6194
 msgid "Epson Stylus C80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3956
+#: src/xml/xmli18n-tmp.h:6195
 msgid "Epson Stylus C82"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3957
+#: src/xml/xmli18n-tmp.h:6196
 msgid "Epson Stylus C83"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3958
+#: src/xml/xmli18n-tmp.h:6197
 msgid "Epson Stylus C84"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3959
+#: src/xml/xmli18n-tmp.h:6198
 msgid "Epson Stylus C85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3960
+#: src/xml/xmli18n-tmp.h:6199
 msgid "Epson Stylus C86"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:6200
 msgid "Epson Stylus C87"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:6201
 msgid "Epson Stylus C88"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:6202
 msgid "Epson Stylus C110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3964
+#: src/xml/xmli18n-tmp.h:6203
 msgid "Epson Stylus C120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:6204
 msgid "Epson Stylus Color"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3966
+#: src/xml/xmli18n-tmp.h:6205
 msgid "Epson Stylus Color I"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3967
+#: src/xml/xmli18n-tmp.h:6206
 msgid "Epson Stylus Color II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:6207
 msgid "Epson Stylus Color IIs"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:6208
 msgid "Epson Stylus Color PRO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3970
+#: src/xml/xmli18n-tmp.h:6209
 msgid "Epson Stylus Pro XL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:6210
 msgid "Epson Stylus Color 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3972
+#: src/xml/xmli18n-tmp.h:6211
 msgid "Epson Stylus Color 440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:6212
 msgid "Epson Stylus Color 460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:6213
 msgid "Epson Stylus Color 480"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3975
+#: src/xml/xmli18n-tmp.h:6214
 msgid "Epson Stylus Color 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:6215
 msgid "Epson Stylus Color 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:6216
 msgid "Epson Stylus Color 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:6217
 msgid "Epson Stylus Color 640"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3979
+#: src/xml/xmli18n-tmp.h:6218
 msgid "Epson Stylus Color 660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:6219
 msgid "Epson Stylus Color 670"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3981
+#: src/xml/xmli18n-tmp.h:6220
 msgid "Epson Stylus Color 680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3982
+#: src/xml/xmli18n-tmp.h:6221
 msgid "Epson Stylus Color 740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3983
+#: src/xml/xmli18n-tmp.h:6222
 msgid "Epson Stylus Color 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3984
+#: src/xml/xmli18n-tmp.h:6223
 msgid "Epson Stylus Color 777"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:6224
 msgid "Epson Stylus Color 800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:6225
 msgid "Epson Stylus Color 850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3987
+#: src/xml/xmli18n-tmp.h:6226
 msgid "Epson Stylus Color 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:6227
 msgid "Epson Stylus Color 880"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3989
+#: src/xml/xmli18n-tmp.h:6228
 msgid "Epson Stylus Color 8 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:6229
 msgid "Epson Stylus Color 900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:6230
 msgid "Epson Stylus Color 980"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3992
+#: src/xml/xmli18n-tmp.h:6231
 msgid "Epson Stylus Color 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3993
+#: src/xml/xmli18n-tmp.h:6232
 msgid "Epson Stylus Color 1500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:6233
 msgid "Epson Stylus Color 1520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3995
+#: src/xml/xmli18n-tmp.h:6234
 msgid "Epson Stylus Color 3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:6235
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:6236
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:3998
+#: src/xml/xmli18n-tmp.h:6237
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:3999
+#: src/xml/xmli18n-tmp.h:6238
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:6239
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:6240
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4002
+#: src/xml/xmli18n-tmp.h:6241
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:6242
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:6243
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4005
+#: src/xml/xmli18n-tmp.h:6244
 #, fuzzy
-msgid "Epson Stylus Offixe TX300F"
+msgid "Epson Stylus Office TX300F"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4006
+#: src/xml/xmli18n-tmp.h:6245
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:6246
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4008
+#: src/xml/xmli18n-tmp.h:6247
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4009
+#: src/xml/xmli18n-tmp.h:6248
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:6249
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:6250
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:6251
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4013
+#: src/xml/xmli18n-tmp.h:6252
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4014
+#: src/xml/xmli18n-tmp.h:6253
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:6254
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4016
+#: src/xml/xmli18n-tmp.h:6255
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:6256
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:6257
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4019
+#: src/xml/xmli18n-tmp.h:6258
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4020
+#: src/xml/xmli18n-tmp.h:6259
 msgid "Epson Stylus Photo 830U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4021
+#: src/xml/xmli18n-tmp.h:6260
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4022
+#: src/xml/xmli18n-tmp.h:6261
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4023
+#: src/xml/xmli18n-tmp.h:6262
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4024
+#: src/xml/xmli18n-tmp.h:6263
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:6264
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:6265
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4027
+#: src/xml/xmli18n-tmp.h:6266
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:6267
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:6268
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:6269
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4031
+#: src/xml/xmli18n-tmp.h:6270
 msgid "Epson Stylus Photo 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:6271
 msgid "Epson Stylus Photo 1270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4033
+#: src/xml/xmli18n-tmp.h:6272
 msgid "Epson Stylus Photo 1280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4034
+#: src/xml/xmli18n-tmp.h:6273
 msgid "Epson Stylus Photo 1290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4035
+#: src/xml/xmli18n-tmp.h:6274
 msgid "Epson Stylus Photo 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:6275
 msgid "Epson Stylus Photo 1410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4037
+#: src/xml/xmli18n-tmp.h:6276
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4038
+#: src/xml/xmli18n-tmp.h:6277
 msgid "Epson Stylus Photo 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4039
+#: src/xml/xmli18n-tmp.h:6278
 msgid "Epson Stylus Photo 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:6279
 msgid "Epson Stylus Photo R200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4041
+#: src/xml/xmli18n-tmp.h:6280
 msgid "Epson Stylus Photo R210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:6281
 msgid "Epson Stylus Photo R220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:6282
 msgid "Epson Stylus Photo R230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4044
+#: src/xml/xmli18n-tmp.h:6283
 msgid "Epson Stylus Photo R240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:6284
 msgid "Epson Stylus Photo R245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:6285
 msgid "Epson Stylus Photo R260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:6286
 msgid "Epson Stylus Photo R265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:6287
 msgid "Epson Stylus Photo R270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4049
+#: src/xml/xmli18n-tmp.h:6288
 msgid "Epson Stylus Photo R280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:6289
 msgid "Epson Stylus Photo R285"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4051
+#: src/xml/xmli18n-tmp.h:6290
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:6291
 msgid "Epson Stylus Photo R300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4053
+#: src/xml/xmli18n-tmp.h:6292
 msgid "Epson Stylus Photo R310"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4054
+#: src/xml/xmli18n-tmp.h:6293
 msgid "Epson Stylus Photo R320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:6294
 msgid "Epson Stylus Photo R340"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4056
+#: src/xml/xmli18n-tmp.h:6295
 msgid "Epson Stylus Photo R350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:6296
 msgid "Epson Stylus Photo R360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4058
+#: src/xml/xmli18n-tmp.h:6297
 msgid "Epson Stylus Photo R380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4059
+#: src/xml/xmli18n-tmp.h:6298
 msgid "Epson Stylus Photo R390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:6299
 msgid "Epson Stylus Photo R800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:6300
 msgid "Epson Stylus Photo R1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4062
+#: src/xml/xmli18n-tmp.h:6301
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:6302
 msgid "Epson Stylus Photo R2400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4064
+#: src/xml/xmli18n-tmp.h:6303
+#, fuzzy
+msgid "Epson Stylus Photo R2880"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:6304
 msgid "Epson Stylus Photo RX400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4065
+#: src/xml/xmli18n-tmp.h:6305
 msgid "Epson Stylus Photo RX420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:6306
 msgid "Epson Stylus Photo RX425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4067
+#: src/xml/xmli18n-tmp.h:6307
 msgid "Epson Stylus Photo RX430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:6308
 msgid "Epson Stylus Photo RX500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4069
+#: src/xml/xmli18n-tmp.h:6309
 msgid "Epson Stylus Photo RX510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:6310
 msgid "Epson Stylus Photo RX560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:6311
 msgid "Epson Stylus Photo RX580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4072
+#: src/xml/xmli18n-tmp.h:6312
 msgid "Epson Stylus Photo RX585"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:6313
 msgid "Epson Stylus Photo RX590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4074
+#: src/xml/xmli18n-tmp.h:6314
 msgid "Epson Stylus Photo RX595"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4075
+#: src/xml/xmli18n-tmp.h:6315
 msgid "Epson Stylus Photo RX600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4076
+#: src/xml/xmli18n-tmp.h:6316
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:6317
 msgid "Epson Stylus Photo RX620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4078
+#: src/xml/xmli18n-tmp.h:6318
 msgid "Epson Stylus Photo RX630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:6319
 msgid "Epson Stylus Photo RX640"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:6320
 msgid "Epson Stylus Photo RX680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:6321
 msgid "Epson Stylus Photo RX685"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4082
+#: src/xml/xmli18n-tmp.h:6322
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:6323
 msgid "Epson Stylus Photo RX700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4084
+#: src/xml/xmli18n-tmp.h:6324
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4085
+#: src/xml/xmli18n-tmp.h:6325
 #, fuzzy
-msgid "Epson Stylus Photo TX800W"
+msgid "Epson Stylus Photo TX800FW"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4086
+#: src/xml/xmli18n-tmp.h:6326
 msgid "Epson Stylus Pro 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4087
+#: src/xml/xmli18n-tmp.h:6327
 msgid "Epson Stylus Pro 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4088
+#: src/xml/xmli18n-tmp.h:6328
 msgid "Epson Stylus Pro 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4089
+#: src/xml/xmli18n-tmp.h:6329
 msgid "Epson Stylus Pro 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:6330
 msgid "Epson Stylus Pro 7600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4091
+#: src/xml/xmli18n-tmp.h:6331
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:6332
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4093
+#: src/xml/xmli18n-tmp.h:6333
 msgid "Epson Stylus Pro 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4094
+#: src/xml/xmli18n-tmp.h:6334
 msgid "Epson Stylus Pro 9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:6335
 msgid "Epson Stylus Pro 9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:6336
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4097
+#: src/xml/xmli18n-tmp.h:6337
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:6338
 msgid "Epson Stylus Pro 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4099
+#: src/xml/xmli18n-tmp.h:6339
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:6340
 msgid "Epson Stylus Scan 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:6341
 msgid "Epson Stylus Scan 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:6342
 msgid "Epson Stylus CX1500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:6343
 msgid "Epson Stylus CX3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:6344
 msgid "Epson Stylus CX3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:6345
 msgid "Epson Stylus CX3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:6346
 msgid "Epson Stylus CX3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:6347
 msgid "Epson Stylus CX3650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:6348
 msgid "Epson Stylus CX3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:6349
 msgid "Epson Stylus CX3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4110
+#: src/xml/xmli18n-tmp.h:6350
 msgid "Epson Stylus CX3805"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:6351
 msgid "Epson Stylus CX3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:6352
 msgid "Epson Stylus CX4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4113
+#: src/xml/xmli18n-tmp.h:6353
 msgid "Epson Stylus CX4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Epson Stylus CX4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:6355
 msgid "Epson Stylus CX4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4116
+#: src/xml/xmli18n-tmp.h:6356
 msgid "Epson Stylus CX4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:6357
 msgid "Epson Stylus CX4700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4118
+#: src/xml/xmli18n-tmp.h:6358
 msgid "Epson Stylus CX4800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4119
+#: src/xml/xmli18n-tmp.h:6359
 msgid "Epson Stylus CX4900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:6360
 msgid "Epson Stylus CX5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4121
+#: src/xml/xmli18n-tmp.h:6361
 msgid "Epson Stylus CX5000F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:6362
 msgid "Epson Stylus CX5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:6363
 msgid "Epson Stylus CX5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4124
+#: src/xml/xmli18n-tmp.h:6364
 msgid "Epson Stylus CX5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:6365
 msgid "Epson Stylus CX5400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4126
+#: src/xml/xmli18n-tmp.h:6366
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4127
+#: src/xml/xmli18n-tmp.h:6367
 msgid "Epson Stylus CX5600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4128
+#: src/xml/xmli18n-tmp.h:6368
 msgid "Epson Stylus CX5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4129
+#: src/xml/xmli18n-tmp.h:6369
 msgid "Epson Stylus CX5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:6370
 msgid "Epson Stylus CX6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:6371
 msgid "Epson Stylus CX6300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:6372
 msgid "Epson Stylus CX6400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:6373
 msgid "Epson Stylus CX6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:6374
 msgid "Epson Stylus CX6600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:6375
 msgid "Epson Stylus CX7000F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:6376
 msgid "Epson Stylus CX7400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:6377
 msgid "Epson Stylus CX7700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:6378
 msgid "Epson Stylus CX7800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:6379
 msgid "Epson Stylus CX8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:6380
 msgid "Epson Stylus CX8400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:6381
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:6382
 msgid "Epson Stylus CX9400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:6383
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4144
+#: src/xml/xmli18n-tmp.h:6384
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:6385
 msgid "Epson Stylus D68"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:6386
 msgid "Epson Stylus D88"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:6387
 msgid "Epson Stylus D92"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:6388
 msgid "Epson Stylus D120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:6389
 msgid "Epson Stylus DX3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:6390
 msgid "Epson Stylus DX3850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:6391
+#, fuzzy
+msgid "Epson Stylus DX4000"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:6392
 msgid "Epson Stylus DX4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:6393
 msgid "Epson Stylus DX4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:6394
 msgid "Epson Stylus DX4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4154
+#: src/xml/xmli18n-tmp.h:6395
 msgid "Epson Stylus DX4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:6396
 msgid "Epson Stylus DX4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:6397
 msgid "Epson Stylus DX4800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:6398
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:6399
 msgid "Epson Stylus DX7000F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:6400
 msgid "Epson Stylus DX7400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:6401
 msgid "Epson Stylus DX7450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:6402
 msgid "Epson Stylus DX8400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:6403
 msgid "Epson Stylus DX8450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:6404
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:6405
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:6406
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:6407
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:6408
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:6409
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:6410
 #, fuzzy
-msgid "Epson Stylus PX700FW"
+msgid "Epson Stylus PX700W"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:6411
 #, fuzzy
 msgid "Epson Stylus PX800FW"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:6412
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4172
+#: src/xml/xmli18n-tmp.h:6413
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:6414
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4174
+#: src/xml/xmli18n-tmp.h:6415
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:6416
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:6417
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4177
+#: src/xml/xmli18n-tmp.h:6418
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4178
+#: src/xml/xmli18n-tmp.h:6419
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4179
+#: src/xml/xmli18n-tmp.h:6420
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4180
+#: src/xml/xmli18n-tmp.h:6421
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4181
+#: src/xml/xmli18n-tmp.h:6422
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:6423
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:6424
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:6425
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:6426
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:6427
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4187
+#: src/xml/xmli18n-tmp.h:6428
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4188
+#: src/xml/xmli18n-tmp.h:6429
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:6430
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:6431
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:6432
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4192
+#: src/xml/xmli18n-tmp.h:6433
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:6434
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:6435
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:6436
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4196
+#: src/xml/xmli18n-tmp.h:6437
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:6438
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:6439
 msgid "Epson PictureMate 215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4199
+#: src/xml/xmli18n-tmp.h:6440
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:6441
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:6442
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:6443
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4204
+#: src/xml/xmli18n-tmp.h:6445
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:6446
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:6447
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4207
+#: src/xml/xmli18n-tmp.h:6448
 msgid "Epson WorkForce 30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:6449
 msgid "Epson WorkForce 40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:6450
 msgid "Epson WorkForce 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:6451
 msgid "Epson WorkForce 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:6452
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4212
+#: src/xml/xmli18n-tmp.h:6453
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:6454
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:6455
 msgid "Epson E 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4215
+#: src/xml/xmli18n-tmp.h:6456
 msgid "Epson E 150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4216
+#: src/xml/xmli18n-tmp.h:6457
 msgid "Epson E 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:6458
 msgid "Epson E 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:6459
 msgid "Epson E 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4219
+#: src/xml/xmli18n-tmp.h:6460
 msgid "Epson E 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:6461
 msgid "Epson E 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:6462
 msgid "Epson E 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:6463
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:6464
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4224
+#: src/xml/xmli18n-tmp.h:6465
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:6466
 msgid "Epson EP 901A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:6467
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:6468
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4228
+#: src/xml/xmli18n-tmp.h:6469
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4229
+#: src/xml/xmli18n-tmp.h:6470
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:6471
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:6472
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:6473
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:6474
 msgid "Epson ME Office 70"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:6475
 msgid "Epson ME Office 80W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:6476
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:6477
 msgid "Epson ME Office 700FW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:6478
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4238
+#: src/xml/xmli18n-tmp.h:6479
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:6480
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:6481
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:6482
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4242
+#: src/xml/xmli18n-tmp.h:6483
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4243
+#: src/xml/xmli18n-tmp.h:6484
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:6485
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:6486
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4246
+#: src/xml/xmli18n-tmp.h:6487
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:6488
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:6490
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4251
+#: src/xml/xmli18n-tmp.h:6492
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4253
+#: src/xml/xmli18n-tmp.h:6494
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4254
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:6496
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:6497
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:6498
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:6499
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4259
+#: src/xml/xmli18n-tmp.h:6500
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4260
+#: src/xml/xmli18n-tmp.h:6501
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:6502
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4262
+#: src/xml/xmli18n-tmp.h:6503
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4263
+#: src/xml/xmli18n-tmp.h:6504
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4264
+#: src/xml/xmli18n-tmp.h:6505
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4265
+#: src/xml/xmli18n-tmp.h:6506
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:6507
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:6508
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:6509
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:6510
 msgid "Epson PM 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:6511
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:6512
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:6513
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:6514
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4274
+#: src/xml/xmli18n-tmp.h:6515
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4275
+#: src/xml/xmli18n-tmp.h:6516
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4276
+#: src/xml/xmli18n-tmp.h:6517
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:6518
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:6519
 msgid "Epson PM D750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:6520
 msgid "Epson PM D770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:6521
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:6522
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:6523
 msgid "Epson PM D1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:6524
 msgid "Epson PM G700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:6525
 msgid "Epson PM G720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4285
+#: src/xml/xmli18n-tmp.h:6526
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4286
+#: src/xml/xmli18n-tmp.h:6527
 msgid "Epson PM G800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:6528
 msgid "Epson PM G820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:6529
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:6530
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Epson 4×6 Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:6531
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:6532
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4292
+#: src/xml/xmli18n-tmp.h:6533
 msgid "Epson Offirio PX B300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:6534
 msgid "Epson Offirio PX B500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:6535
 msgid "Epson PX 101"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4295
+#: src/xml/xmli18n-tmp.h:6536
 msgid "Epson PX 201"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4296
+#: src/xml/xmli18n-tmp.h:6537
 msgid "Epson PX 401A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4297
+#: src/xml/xmli18n-tmp.h:6538
 msgid "Epson PX 601F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:6539
 msgid "Epson PX G900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4299
+#: src/xml/xmli18n-tmp.h:6540
 msgid "Epson PX G920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:6541
 msgid "Epson PX G5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:6542
 msgid "Epson PX G5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:6543
 msgid "Epson PX V500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:6544
 msgid "Epson PX V600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4305
+#: src/xml/xmli18n-tmp.h:6546
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:6547
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4307
+#: src/xml/xmli18n-tmp.h:6548
+#, fuzzy
+msgid "Epson PX G5600"
+msgstr "Epson 4×6 Photo Paper"
+
+#: src/xml/xmli18n-tmp.h:6549
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4308
+#: src/xml/xmli18n-tmp.h:6550
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4309
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4310
+#: src/xml/xmli18n-tmp.h:6552
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:6553
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:6554
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4313
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:6556
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4315
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:6559
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:6560
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:6561
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:6562
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:6563
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:6564
 msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:6565
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4324
+#: src/xml/xmli18n-tmp.h:6566
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:6567
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4326
+#: src/xml/xmli18n-tmp.h:6568
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4327
+#: src/xml/xmli18n-tmp.h:6569
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:6570
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:6571
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Brother HL-1430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:6576
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Brother HL-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4337
+#: src/xml/xmli18n-tmp.h:6579
 msgid "Brother HL-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:6580
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:6581
 msgid "Brother HL-1670N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:6582
 msgid "Brother HL-1850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:6583
 msgid "Brother HL-1870N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:6584
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:6585
 msgid "Brother HL-2460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:6586
 msgid "Brother HL-2460N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:6587
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4346
+#: src/xml/xmli18n-tmp.h:6588
 msgid "Brother HL-5030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:6589
 msgid "Brother HL-5040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:6590
 msgid "Brother HL-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:6591
 msgid "Brother HL-5070N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4350
+#: src/xml/xmli18n-tmp.h:6592
 msgid "Brother HL-5140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4351
+#: src/xml/xmli18n-tmp.h:6593
 msgid "Brother HL-5150D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:6594
 msgid "Brother HL-5170DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:6595
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4354
+#: src/xml/xmli18n-tmp.h:6596
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:6597
 msgid "Brother HL-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:6598
 msgid "Brother HL-7050N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4357
+#: src/xml/xmli18n-tmp.h:6599
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4358
+#: src/xml/xmli18n-tmp.h:6600
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:6601
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:6602
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:6603
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:6604
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:6605
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:6606
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:6607
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:6608
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:6609
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:6610
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:6611
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:6612
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:6613
 msgid "DEC 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:6614
 msgid "DEC LN17"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4373
+#: src/xml/xmli18n-tmp.h:6615
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4374
+#: src/xml/xmli18n-tmp.h:6616
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:6617
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4376
+#: src/xml/xmli18n-tmp.h:6618
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:6619
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:6620
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:6621
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:6622
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:6623
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:6624
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:6625
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4384
+#: src/xml/xmli18n-tmp.h:6626
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4385
+#: src/xml/xmli18n-tmp.h:6627
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4386
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4387
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:6630
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4389
+#: src/xml/xmli18n-tmp.h:6631
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4392
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Epson EPL-N2050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Epson EPL-N2050+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:6636
 msgid "Epson EPL-N2050PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:6637
 msgid "Epson EPL-N2050PS+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:6638
 msgid "Epson EPL-N2120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4397
+#: src/xml/xmli18n-tmp.h:6639
 msgid "Epson EPL-N2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:6640
 msgid "Epson EPL-N2500PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:6641
 msgid "Epson EPL-N2750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4400
+#: src/xml/xmli18n-tmp.h:6642
 msgid "Epson EPL-N2750PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:6643
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4403
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:6646
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:6647
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/xml/xmli18n-tmp.h:4406
+#: src/xml/xmli18n-tmp.h:6648
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/xml/xmli18n-tmp.h:4407
+#: src/xml/xmli18n-tmp.h:6649
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/xml/xmli18n-tmp.h:4408
+#: src/xml/xmli18n-tmp.h:6650
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:6651
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:6652
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:6653
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:6654
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:6656
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:6657
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4416
+#: src/xml/xmli18n-tmp.h:6658
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:6659
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:6660
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:6661
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4420
-msgid "Gestetner 3532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4421
-msgid "Gestetner 4235g"
+#: src/xml/xmli18n-tmp.h:6662
+msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:6663
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4423
-msgid "Gestetner 4532"
+#: src/xml/xmli18n-tmp.h:6664
+msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4424
-msgid "Gestetner 4245g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:6665
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:6666
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:6668
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:6669
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:6670
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4431
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:6672
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:6673
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:6674
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:6675
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4436
+#: src/xml/xmli18n-tmp.h:6676
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4437
-msgid "Gestetner DSm635"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4438
-msgid "Gestetner DSm635G"
+#: src/xml/xmli18n-tmp.h:6677
+msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4439
-msgid "Gestetner DSm645"
+#: src/xml/xmli18n-tmp.h:6678
+msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4440
-msgid "Gestetner DS645G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:6679
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:6680
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4443
+#: src/xml/xmli18n-tmp.h:6681
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:6682
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:6683
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4446
-msgid "Gestetner DSm735"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4447
-msgid "Gestetner DSm735G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4448
-msgid "Gestetner DSm745"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4449
-msgid "Gestetner DSm745G"
+#: src/xml/xmli18n-tmp.h:6684
+msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4450
-msgid "Gestetner MP1100"
+#: src/xml/xmli18n-tmp.h:6685
+msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4451
-msgid "Gestetner DSm7110"
+#: src/xml/xmli18n-tmp.h:6686
+msgid "Gestetner MP1100/DSm7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4452
-msgid "Gestetner MP1350"
+#: src/xml/xmli18n-tmp.h:6687
+msgid "Gestetner MP1350/DSm7135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4453
-msgid "Gestetner DSm7135"
+#: src/xml/xmli18n-tmp.h:6688
+msgid "Gestetner MP1600/DSm716"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4454
-msgid "Gestetner MP1600"
+#: src/xml/xmli18n-tmp.h:6689
+msgid "Gestetner MP2000/DSm721d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4455
-msgid "Gestetner DSm716"
+#: src/xml/xmli18n-tmp.h:6690
+msgid "Gestetner MP2500/DSm625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4456
-msgid "Gestetner MP2000"
+#: src/xml/xmli18n-tmp.h:6691
+msgid "Gestetner MP3500/DSm735e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4457
-msgid "Gestetner DSm721d"
+#: src/xml/xmli18n-tmp.h:6692
+msgid "Gestetner MP4500/DSm745e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4458
-msgid "Gestetner MP2500"
+#: src/xml/xmli18n-tmp.h:6693
+msgid "Gestetner MP5500/DSm755"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4459
-msgid "Gestetner DSm625"
+#: src/xml/xmli18n-tmp.h:6694
+msgid "Gestetner MP6500/DSm765"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4460
-msgid "Gestetner MP3500"
+#: src/xml/xmli18n-tmp.h:6695
+msgid "Gestetner MP7500/DSm775"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4461
-msgid "Gestetner DSm735e"
+#: src/xml/xmli18n-tmp.h:6696
+msgid "Gestetner MP9000/DSm790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4462
-msgid "Gestetner MP4500"
+#: src/xml/xmli18n-tmp.h:6697
+msgid "Gestetner MP 161/DSm416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4463
-msgid "Gestetner DSm745e"
+#: src/xml/xmli18n-tmp.h:6698
+msgid "Gestetner MP 2510/DSm725e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4464
-msgid "Gestetner MP5500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4465
-msgid "Gestetner DSm755"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4466
-msgid "Gestetner MP6500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4467
-msgid "Gestetner DSm765"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4468
-msgid "Gestetner MP7500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4469
-msgid "Gestetner DSm775"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4470
-msgid "Gestetner MP9000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4471
-msgid "Gestetner DSm790"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4472
-msgid "Gestetner MP 161"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4473
-msgid "Gestetner DSm416"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4474
-msgid "Gestetner MP 2510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4475
-msgid "Gestetner DSm725e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:6699
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:6700
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4478
-msgid "Gestetner MP 3010"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4479
-msgid "Gestetner DSm730e"
+#: src/xml/xmli18n-tmp.h:6701
+msgid "Gestetner MP 3010/DSm730e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4480
+#: src/xml/xmli18n-tmp.h:6702
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:6703
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:6704
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:6705
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Gestetner MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:6707
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:6708
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:6709
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:6710
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4489
+#: src/xml/xmli18n-tmp.h:6711
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:6712
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:6713
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4492
+#: src/xml/xmli18n-tmp.h:6714
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:6715
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:6716
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4495
+#: src/xml/xmli18n-tmp.h:6717
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4496
+#: src/xml/xmli18n-tmp.h:6718
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4497
+#: src/xml/xmli18n-tmp.h:6719
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:6720
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:6721
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:6722
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:6723
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:6724
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:6725
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:6726
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:6727
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4506
+#: src/xml/xmli18n-tmp.h:6728
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:6729
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4508
+#: src/xml/xmli18n-tmp.h:6730
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4509
+#: src/xml/xmli18n-tmp.h:6731
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4510
+#: src/xml/xmli18n-tmp.h:6732
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:6733
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:6734
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:6735
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:6736
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:6737
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:6738
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:6739
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4518
+#: src/xml/xmli18n-tmp.h:6740
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:6741
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:6742
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:6743
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:6744
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4523
+#: src/xml/xmli18n-tmp.h:6745
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:6746
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:6747
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:6748
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:6749
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4528
+#: src/xml/xmli18n-tmp.h:6750
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4529
+#: src/xml/xmli18n-tmp.h:6751
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4530
+#: src/xml/xmli18n-tmp.h:6752
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:6753
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4532
+#: src/xml/xmli18n-tmp.h:6754
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:6755
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:6756
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:6757
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:6758
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:6759
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:6760
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4539
+#: src/xml/xmli18n-tmp.h:6761
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4540
+#: src/xml/xmli18n-tmp.h:6762
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4541
+#: src/xml/xmli18n-tmp.h:6763
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4542
+#: src/xml/xmli18n-tmp.h:6764
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4543
+#: src/xml/xmli18n-tmp.h:6765
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:6766
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:6767
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4546
+#: src/xml/xmli18n-tmp.h:6768
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:6769
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:6770
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:6771
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:6772
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:6773
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4552
+#: src/xml/xmli18n-tmp.h:6774
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:6775
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:6776
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:6777
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:6778
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:6779
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:6780
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:6781
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:6782
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:6783
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:6784
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:6785
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:6786
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:6787
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:6788
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4567
+#: src/xml/xmli18n-tmp.h:6789
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4568
+#: src/xml/xmli18n-tmp.h:6790
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:6791
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4570
+#: src/xml/xmli18n-tmp.h:6792
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4571
+#: src/xml/xmli18n-tmp.h:6793
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:6794
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:6795
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:6796
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:6797
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:6798
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:6799
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:6800
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:6801
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:6802
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:6803
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4582
+#: src/xml/xmli18n-tmp.h:6804
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4583
+#: src/xml/xmli18n-tmp.h:6805
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4584
+#: src/xml/xmli18n-tmp.h:6806
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4585
+#: src/xml/xmli18n-tmp.h:6807
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:6808
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:6809
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:6810
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:6811
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:6812
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:6813
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:6814
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4593
+#: src/xml/xmli18n-tmp.h:6815
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4594
+#: src/xml/xmli18n-tmp.h:6816
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:6817
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:6818
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4597
+#: src/xml/xmli18n-tmp.h:6819
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:6820
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:6821
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:6822
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:6823
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4602
+#: src/xml/xmli18n-tmp.h:6824
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:6825
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:6826
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:6827
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:6828
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4607
+#: src/xml/xmli18n-tmp.h:6829
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:6830
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4609
+#: src/xml/xmli18n-tmp.h:6831
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4610
+#: src/xml/xmli18n-tmp.h:6832
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:6833
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:6834
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4613
+#: src/xml/xmli18n-tmp.h:6835
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:6836
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:6837
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:6838
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:6839
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:6840
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:6841
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:6842
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:6843
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:6844
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:6845
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4624
+#: src/xml/xmli18n-tmp.h:6846
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4625
+#: src/xml/xmli18n-tmp.h:6847
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:6848
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4627
+#: src/xml/xmli18n-tmp.h:6849
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4628
+#: src/xml/xmli18n-tmp.h:6850
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:6851
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:6852
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:6853
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:6854
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:6855
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:6856
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:6857
 msgid "HP LaserJet 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4636
+#: src/xml/xmli18n-tmp.h:6858
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4637
+#: src/xml/xmli18n-tmp.h:6859
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4638
+#: src/xml/xmli18n-tmp.h:6860
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:6861
 msgid "HP LaserJet 1320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4640
+#: src/xml/xmli18n-tmp.h:6862
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:6863
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:6864
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:6865
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4644
+#: src/xml/xmli18n-tmp.h:6866
 msgid "HP LaserJet 2410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:6867
 msgid "HP LaserJet 2420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:6868
 msgid "HP LaserJet 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4647
+#: src/xml/xmli18n-tmp.h:6869
 msgid "HP LaserJet 3015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4648
+#: src/xml/xmli18n-tmp.h:6870
 msgid "HP LaserJet 3020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:6871
 msgid "HP LaserJet 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4650
+#: src/xml/xmli18n-tmp.h:6872
 msgid "HP LaserJet 3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:6873
 msgid "HP LaserJet 3052"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:6874
 msgid "HP LaserJet 3055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:6875
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:6876
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:6877
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:6878
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:6879
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:6880
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:6881
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4660
+#: src/xml/xmli18n-tmp.h:6882
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:6883
 msgid "HP LaserJet 3380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:6884
 msgid "HP LaserJet 3390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4663
+#: src/xml/xmli18n-tmp.h:6885
 msgid "HP LaserJet 3392"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:6886
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:6887
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:6888
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4667
+#: src/xml/xmli18n-tmp.h:6889
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:6890
 msgid "HP LaserJet 4240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:6891
 msgid "HP LaserJet 4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:6892
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4671
+#: src/xml/xmli18n-tmp.h:6893
 msgid "HP LaserJet 4345 mfp"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:6894
 msgid "HP LaserJet 4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:6895
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:6896
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:6897
 msgid "HP LaserJet 5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:6898
 msgid "HP LaserJet 5200L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:6899
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:6900
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:6901
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4680
+#: src/xml/xmli18n-tmp.h:6902
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:6903
 msgid "HP LaserJet 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4682
+#: src/xml/xmli18n-tmp.h:6904
 msgid "HP LaserJet 9040 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4683
+#: src/xml/xmli18n-tmp.h:6905
 msgid "HP LaserJet 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4684
+#: src/xml/xmli18n-tmp.h:6906
 msgid "HP LaserJet 9050 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:6907
 msgid "HP LaserJet M3027 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:6908
 msgid "HP LaserJet M3035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:6909
 msgid "HP LaserJet M4345 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:6910
 msgid "HP LaserJet M5025 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:6911
 msgid "HP LaserJet M5035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:6912
 msgid "HP LaserJet P2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:6913
 msgid "HP LaserJet P2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:6914
 msgid "HP LaserJet P3004"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:6915
 msgid "HP LaserJet P3005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:6916
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4695
+#: src/xml/xmli18n-tmp.h:6917
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:6918
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:6919
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:6920
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:6921
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4700
+#: src/xml/xmli18n-tmp.h:6922
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:6923
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:6924
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4703
+#: src/xml/xmli18n-tmp.h:6925
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:6926
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:6927
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4706
+#: src/xml/xmli18n-tmp.h:6928
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4707
+#: src/xml/xmli18n-tmp.h:6929
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:6930
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:6931
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4710
+#: src/xml/xmli18n-tmp.h:6932
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:6933
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:6934
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:6935
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:6936
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:6937
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:6938
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:6939
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4718
+#: src/xml/xmli18n-tmp.h:6940
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:6941
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:6942
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4721
+#: src/xml/xmli18n-tmp.h:6943
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:6944
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:6945
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:6946
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4725
+#: src/xml/xmli18n-tmp.h:6947
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:6948
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:6949
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4728
+#: src/xml/xmli18n-tmp.h:6950
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4729
+#: src/xml/xmli18n-tmp.h:6951
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:6952
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:6953
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4732
+#: src/xml/xmli18n-tmp.h:6954
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:6955
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:6956
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:6957
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:6958
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:6959
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:6960
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4739
+#: src/xml/xmli18n-tmp.h:6961
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4740
+#: src/xml/xmli18n-tmp.h:6962
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4741
+#: src/xml/xmli18n-tmp.h:6963
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4742
+#: src/xml/xmli18n-tmp.h:6964
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:6965
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:6966
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4745
+#: src/xml/xmli18n-tmp.h:6967
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:6968
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:6969
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:6970
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4749
+#: src/xml/xmli18n-tmp.h:6971
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:6972
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:6973
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4752
+#: src/xml/xmli18n-tmp.h:6974
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:6975
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:6976
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4755
+#: src/xml/xmli18n-tmp.h:6977
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:6978
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:6979
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:6980
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4759
+#: src/xml/xmli18n-tmp.h:6981
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4760
+#: src/xml/xmli18n-tmp.h:6982
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:6983
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4762
+#: src/xml/xmli18n-tmp.h:6984
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:6985
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:6986
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4765
+#: src/xml/xmli18n-tmp.h:6987
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:6988
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:6989
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Drucker Name:"
 
-#: src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:6991
 msgid "IBM 4019"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:6992
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:6993
 msgid "IBM 4312"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4772
+#: src/xml/xmli18n-tmp.h:6994
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:6995
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4774
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4775
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4776
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:6999
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:7000
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:7002
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:7003
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:7004
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:7005
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:7006
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:7007
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:7008
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:7009
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:7010
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:7011
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4790
+#: src/xml/xmli18n-tmp.h:7012
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:7013
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:7014
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:7015
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4794
+#: src/xml/xmli18n-tmp.h:7016
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:7017
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:7018
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4797
+#: src/xml/xmli18n-tmp.h:7019
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:7020
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:7021
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:7022
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:7023
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:7025
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:7026
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:7027
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:7028
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4807
+#: src/xml/xmli18n-tmp.h:7029
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4808
+#: src/xml/xmli18n-tmp.h:7030
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:7031
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:7032
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:7034
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:7035
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:7037
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:7039
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:7040
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4819
+#: src/xml/xmli18n-tmp.h:7041
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:7042
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:7043
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:7044
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:7045
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:7046
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:7047
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:7048
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:7049
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:7050
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:7051
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4830
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:7057
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4837
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4840
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4842
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4852
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4853
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4854
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4855
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4866
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4867
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4873
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4874
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4883
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4886
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4888
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4890
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4894
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4896
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4903
-msgid "Lanier MP 2500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4904
-msgid "Lanier LD125"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4905
-msgid "Lanier MP 1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4906
-msgid "Lanier LD1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4907
-msgid "Lanier MP 1350"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4908
-msgid "Lanier LD1135"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4909
-msgid "Lanier MP 1600"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4910
-msgid "Lanier LD316"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4911
-msgid "Lanier MP 161"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4912
-msgid "Lanier LD016"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4913
-msgid "Lanier MP 2000"
+#: src/xml/xmli18n-tmp.h:7125
+msgid "Lanier MP2500/LD125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4914
-msgid "Lanier LD320d"
+#: src/xml/xmli18n-tmp.h:7126
+msgid "Lanier MP 1100/LD1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4915
-msgid "Lanier MP 2510"
+#: src/xml/xmli18n-tmp.h:7127
+msgid "Lanier MP 1350/LD1135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4916
-msgid "Lanier LD325"
+#: src/xml/xmli18n-tmp.h:7128
+msgid "Lanier MP 1600/LD316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4917
-msgid "Lanier MP 2550B"
+#: src/xml/xmli18n-tmp.h:7129
+msgid "Lanier MP 161/LD016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4918
-msgid "Lanier LD425B"
+#: src/xml/xmli18n-tmp.h:7130
+msgid "Lanier MP 2000/LD320d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4919
-msgid "Lanier MP 2550"
+#: src/xml/xmli18n-tmp.h:7131
+msgid "Lanier MP 2510/LD325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4920
-msgid "Lanier LD425"
+#: src/xml/xmli18n-tmp.h:7132
+msgid "Lanier MP 2550B/LD425B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4921
-msgid "Lanier MP 3010"
+#: src/xml/xmli18n-tmp.h:7133
+msgid "Lanier MP 2550/LD425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4922
-msgid "Lanier LD330"
+#: src/xml/xmli18n-tmp.h:7134
+msgid "Lanier MP 3010/LD330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4923
-msgid "Lanier MP 3350B"
+#: src/xml/xmli18n-tmp.h:7135
+msgid "Lanier MP 3350B/LD433B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4924
-msgid "Lanier LD433B"
+#: src/xml/xmli18n-tmp.h:7136
+msgid "Lanier MP 3350/LD433"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4925
-msgid "Lanier MP 3350"
+#: src/xml/xmli18n-tmp.h:7137
+msgid "Lanier MP 3500/LD335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4926
-msgid "Lanier LD433"
+#: src/xml/xmli18n-tmp.h:7138
+msgid "Lanier MP 4000B/LD040B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4927
-msgid "Lanier MP 3500"
+#: src/xml/xmli18n-tmp.h:7139
+msgid "Lanier MP 4000/LD040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4928
-msgid "Lanier LD335"
+#: src/xml/xmli18n-tmp.h:7140
+msgid "Lanier MP 4500/LD345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4929
-msgid "Lanier MP 4000B"
+#: src/xml/xmli18n-tmp.h:7141
+msgid "Lanier MP 5000B/LD050B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4930
-msgid "Lanier LD040B"
+#: src/xml/xmli18n-tmp.h:7142
+msgid "Lanier MP 5000/LD050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4931
-msgid "Lanier MP 4000"
+#: src/xml/xmli18n-tmp.h:7143
+msgid "Lanier MP 5500/LD255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4932
-msgid "Lanier LD040"
+#: src/xml/xmli18n-tmp.h:7144
+msgid "Lanier MP 6500/LD265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4933
-msgid "Lanier MP 4500"
+#: src/xml/xmli18n-tmp.h:7145
+msgid "Lanier MP 7500/LD275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4934
-msgid "Lanier LD345"
+#: src/xml/xmli18n-tmp.h:7146
+msgid "Lanier MP 9000/LD190"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4935
-msgid "Lanier MP 5000B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4936
-msgid "Lanier LD050B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4937
-msgid "Lanier MP 5000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4938
-msgid "Lanier LD050"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4939
-msgid "Lanier MP 5500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4940
-msgid "Lanier LD255"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4941
-msgid "Lanier MP 6500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4942
-msgid "Lanier LD265"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4943
-msgid "Lanier MP 7500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4944
-msgid "Lanier LD275"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4945
-msgid "Lanier MP 9000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4946
-msgid "Lanier LD190"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:7148
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4950
+#: src/xml/xmli18n-tmp.h:7150
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:7151
 msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4952
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4953
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:7155
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4960
+#: src/xml/xmli18n-tmp.h:7160
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:7161
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:7162
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4963
+#: src/xml/xmli18n-tmp.h:7163
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:7164
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:7165
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4966
-msgid "NRG 10515"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4967
-msgid "NRG 10518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4968
-msgid "NRG 10512"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4969
-msgid "NRG 2205"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4970
-msgid "NRG 2238"
+#: src/xml/xmli18n-tmp.h:7166
+msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4971
-msgid "NRG 2212"
+#: src/xml/xmli18n-tmp.h:7167
+msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4972
-msgid "NRG 2705"
+#: src/xml/xmli18n-tmp.h:7168
+msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4973
-msgid "NRG 2738"
+#: src/xml/xmli18n-tmp.h:7169
+msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4974
-msgid "NRG 2712"
+#: src/xml/xmli18n-tmp.h:7170
+msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4975
-msgid "NRG 3205"
+#: src/xml/xmli18n-tmp.h:7171
+msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4976
-msgid "NRG 3238"
+#: src/xml/xmli18n-tmp.h:7172
+msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4977
-msgid "NRG 3212"
+#: src/xml/xmli18n-tmp.h:7173
+msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4978
-msgid "NRG 3525"
+#: src/xml/xmli18n-tmp.h:7174
+msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4979
-msgid "NRG 3508"
+#: src/xml/xmli18n-tmp.h:7175
+msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4980
-msgid "NRG 3502"
+#: src/xml/xmli18n-tmp.h:7176
+msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4981
-msgid "NRG 3545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4982
-msgid "NRG 3518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4983
-msgid "NRG 3532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4984
-msgid "NRG 4525"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4985
-msgid "NRG 4508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4986
-msgid "NRG 4502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4987
-msgid "NRG 4545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4988
-msgid "NRG 4518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4989
-msgid "NRG 4532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4990
-msgid "NRG 6002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4991
-msgid "NRG 6005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4992
-msgid "NRG 6008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4993
-msgid "NRG 7502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4994
-msgid "NRG 7505"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4995
-msgid "NRG 7508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4996
-msgid "NRG 9005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4997
-msgid "NRG 9008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4998
-msgid "NRG 9002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:7177
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:7178
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5001
+#: src/xml/xmli18n-tmp.h:7179
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:7180
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:7181
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:7182
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:7183
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5006
+#: src/xml/xmli18n-tmp.h:7184
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:7185
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:7186
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5009
+#: src/xml/xmli18n-tmp.h:7187
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:7188
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:7189
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:7190
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:7191
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:7192
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5015
+#: src/xml/xmli18n-tmp.h:7193
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5016
+#: src/xml/xmli18n-tmp.h:7194
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5017
+#: src/xml/xmli18n-tmp.h:7195
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:7196
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:7197
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:7198
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:7199
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:7200
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:7201
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:7202
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5025
+#: src/xml/xmli18n-tmp.h:7203
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:7204
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:7205
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5028
+#: src/xml/xmli18n-tmp.h:7206
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:7207
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:7208
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:7209
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:7210
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5033
+#: src/xml/xmli18n-tmp.h:7211
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:7212
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:7213
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:7214
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:7215
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:7216
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:7217
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5040
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5051
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5053
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Sieben Farb Foto"
 
-#: src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:7234
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:7235
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5060
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5062
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5063
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:7242
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:7243
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:7244
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:7245
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:7246
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:7247
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:7248
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:7249
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5072
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5074
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5075
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5076
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:7255
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:7258
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5081
+#: src/xml/xmli18n-tmp.h:7259
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:7263
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5086
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5088
+#: src/xml/xmli18n-tmp.h:7266
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:7267
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5090
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5091
+#: src/xml/xmli18n-tmp.h:7269
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:7270
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5093
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5099
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5103
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5104
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:7284
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5107
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5108
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5110
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5118
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5120
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5126
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5127
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5131
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5133
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5134
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5138
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5146
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5147
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5150
-msgid "Savin 2535"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5151
-msgid "Savin 2235"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5152
-msgid "Savin 2545"
+#: src/xml/xmli18n-tmp.h:7328
+msgid "Savin 2535/2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5153
-msgid "Savin 2245"
+#: src/xml/xmli18n-tmp.h:7329
+msgid "Savin 2545/2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5154
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Savin 2560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5155
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5158
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5160
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5163
-msgid "Savin 4035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5164
-msgid "Savin 4135g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5165
-msgid "Savin 4035e"
+#: src/xml/xmli18n-tmp.h:7339
+msgid "Savin 4035/4135g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5166
-msgid "Savin 4135eG"
+#: src/xml/xmli18n-tmp.h:7340
+msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5167
-msgid "Savin 4045"
+#: src/xml/xmli18n-tmp.h:7341
+msgid "Savin 4045/4145g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5168
-msgid "Savin 4145g"
+#: src/xml/xmli18n-tmp.h:7342
+msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5169
-msgid "Savin 4045e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5170
-msgid "Savin 4145eG"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5171
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Savin 4060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5173
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5174
+#: src/xml/xmli18n-tmp.h:7346
 msgid "Savin 4090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:7348
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5177
+#: src/xml/xmli18n-tmp.h:7349
 msgid "Savin 8020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:7353
 msgid "Savin 8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5183
-msgid "Savin 8035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5184
-msgid "Savin 8035g"
+#: src/xml/xmli18n-tmp.h:7355
+msgid "Savin 8035/8035g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5186
-msgid "Savin 8045"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5187
-msgid "Savin 8045g"
+#: src/xml/xmli18n-tmp.h:7357
+msgid "Savin 8045/8045g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5190
+#: src/xml/xmli18n-tmp.h:7360
 msgid "Savin 8065"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5192
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Savin 8090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5194
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:7370
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5201
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:7373
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:7374
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5205
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5206
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:7379
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5211
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Drucker einrichten"
 
-#: src/xml/xmli18n-tmp.h:5212
+#: src/xml/xmli18n-tmp.h:7382
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5213
+#: src/xml/xmli18n-tmp.h:7383
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5216
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5221
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5224
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5225
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5227
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5230
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:7404
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5236
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:7409
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:7410
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5244
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5247
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5249
+#: src/xml/xmli18n-tmp.h:7419
+msgid "Canon SELPHY-CP-520"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Canon SELPHY-CP-720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5252
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Canon SELPHY-CP-730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Canon SELPHY-CP-740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Canon SELPHY-CP-750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Canon SELPHY ES1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Canon SELPHY ES2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Canon SELPHY ES20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5258
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5259
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:7434
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:7438
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5268
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Dai Nippon Printing DS40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Dai Nippon Printing DS80"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5269
+#: src/xml/xmli18n-tmp.h:7442
 msgid "RAW DATA 8 bit"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Epson Stylus Offixe TX300F"
+#~ msgstr "Epson 4×6 Photo Paper"
+
 #~ msgid "ISOLatin1"
 #~ msgstr "ISOLatin1"
 
diff --git a/po/el.gmo b/po/el.gmo
index 8d0c891..2c1fb83 100644
--- a/po/el.gmo
+++ b/po/el.gmo
diff --git a/po/el.po b/po/el.po
index c49bd31..84a9287 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: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-21 22:25-0500\n"
+"POT-Creation-Date: 2009-07-26 19:14-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"
@@ -17,7 +17,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2109 src/main/print-pcl.c:1779
+#: src/main/print-escp2.c:2314 src/main/print-pcl.c:1779
 #, fuzzy
 msgid "Default"
 msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
@@ -101,15 +101,15 @@ msgstr "Ðõêíüôçôá"
 
 #: src/main/dither-main.c:91 src/main/print-canon.c:300
 #: src/main/print-canon.c:308 src/main/print-canon.c:316
-#: src/main/print-canon.c:324 src/main/print-escp2.c:439
-#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
-#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-canon.c:324 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: 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-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:1769
-#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
-#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1935
+#: src/main/print-olympus.c:1943 src/main/print-olympus.c:1951
+#: src/main/print-olympus.c:1959 src/main/print-pcl.c:1324
 #: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
 #: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
@@ -160,7 +160,7 @@ msgstr ""
 
 #
 #: src/main/print-canon.c:199 src/main/print-escp2.c:165
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1866
 #: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
@@ -178,8 +178,8 @@ msgstr "ÌÝãåèïò"
 #: src/main/print-escp2.c:254 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:1704 src/main/print-olympus.c:1710
-#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-olympus.c:1866 src/main/print-olympus.c:1872
+#: src/main/print-olympus.c:1878 src/main/print-olympus.c:1884
 #: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
 #: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
 #: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
@@ -189,34 +189,34 @@ msgid "Basic Printer Setup"
 msgstr "Ñõèìßóåéò ÅðéëïãÝá"
 
 #: src/main/print-canon.c:200 src/main/print-escp2.c:166
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1867
 #: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå"
 
 #: src/main/print-canon.c:205 src/main/print-escp2.c:171
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1259 src/cups/genppd.c:1339 src/cups/genppd.c:2001
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1872
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1372 src/cups/genppd.c:2035
 #, fuzzy
 msgid "Media Type"
 msgstr "Åßäïò MIME"
 
 #: src/main/print-canon.c:206 src/main/print-escp2.c:172
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1873
 #: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
 #: src/main/print-canon.c:211 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
-#: src/main/print-pcl.c:1265 src/cups/genppd.c:1368 src/cups/genppd.c:2020
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1878
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1401 src/cups/genppd.c:2054
 #, fuzzy
 msgid "Media Source"
 msgstr "Áíïéêôü Ëïãéóìéêü"
 
 #: src/main/print-canon.c:212 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1879
 #: src/main/print-pcl.c:1266
 msgid "Source (input slot) of the media"
 msgstr ""
@@ -253,8 +253,8 @@ msgstr ""
 #: src/main/print-canon.c:235 src/main/print-canon.c:241
 #: src/main/print-canon.c:253 src/main/print-escp2.c:207
 #: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1906
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
@@ -269,18 +269,18 @@ msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:247 src/main/print-escp2.c:219
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
-#: src/main/print-pcl.c:1277 src/cups/genppd.c:1446 src/cups/genppd.c:2056
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1884
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1479 src/cups/genppd.c:2090
 msgid "Resolution"
 msgstr "ÁíÜëõóç"
 
 #: src/main/print-canon.c:248 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1723
+#: src/main/print-olympus.c:1885
 msgid "Resolution and quality of the print"
 msgstr ""
 
 #: src/main/print-canon.c:253 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 #, fuzzy
 msgid "Ink Type"
@@ -288,7 +288,7 @@ msgstr "Ôýðïò MIME"
 
 #: src/main/print-canon.c:254 src/main/print-escp2.c:231
 #: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
+#: src/main/print-olympus.c:1891 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 #, fuzzy
 msgid "Type of ink in the printer"
@@ -307,17 +307,18 @@ msgstr ""
 #: 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-escp2.c:320 src/main/print-escp2.c:767
-#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
-#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
-#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
-#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:893 src/main/print-escp2.c:901
+#: src/main/print-escp2.c:909 src/main/print-escp2.c:925
+#: src/main/print-escp2.c:933 src/main/print-escp2.c:941
+#: src/main/print-escp2.c:949 src/main/print-escp2.c:957
+#: src/main/print-escp2.c:965 src/main/print-escp2.c:973
 #: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:265 src/main/print-escp2.c:326
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-canon.c:265 src/main/print-escp2.c:332
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1912
 #: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
@@ -325,16 +326,16 @@ msgstr "¼íïìá åêôõðùôÞ:"
 
 #: src/main/print-canon.c:265 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:326
-#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-color.c:208 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1912 src/main/print-pcl.c:1295
 #: src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Êýñéá Óåëßäá"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:327
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-canon.c:266 src/main/print-escp2.c:333
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1913
 #: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
@@ -362,56 +363,56 @@ msgstr ""
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:300 src/main/print-escp2.c:439
+#: src/main/print-canon.c:300 src/main/print-escp2.c:445
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:301 src/main/print-escp2.c:446
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-canon.c:308 src/main/print-escp2.c:447
+#: src/main/print-canon.c:308 src/main/print-escp2.c:453
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 #, fuzzy
 msgid "Magenta Density"
 msgstr "ìþâ"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:309 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-canon.c:316 src/main/print-escp2.c:455
+#: src/main/print-canon.c:316 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:317 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-canon.c:324 src/main/print-escp2.c:463
+#: src/main/print-canon.c:324 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 #, fuzzy
 msgid "Black Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-canon.c:325 src/main/print-escp2.c:464
+#: src/main/print-canon.c:325 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:333
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:541 src/main/print-escp2.c:542
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 #, fuzzy
@@ -419,29 +420,36 @@ msgid "Light Cyan Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:340
-#: src/main/print-canon.c:348 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
-#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
-#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
-#: src/main/print-pcl.c:1364
+#: src/main/print-canon.c:348 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:541
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:557
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:573
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:589
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:605
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:621
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:637
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:653
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:669
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:685
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:701
+#: src/main/print-escp2.c:709 src/main/print-escp2.c:717
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:733
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:749
+#: src/main/print-escp2.c:757 src/main/print-escp2.c:765
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:781
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:797
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:813
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:829
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:845
+#: src/main/print-escp2.c:853 src/main/print-escp2.c:861
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:340 src/main/print-canon.c:341
-#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
+#: src/main/print-escp2.c:573 src/main/print-escp2.c:574
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #, fuzzy
@@ -453,14 +461,14 @@ msgstr "ØéëÞ Âñï÷Þ"
 msgid "Light Yellow Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-canon.c:368 src/main/print-escp2.c:2283
-#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3609
-#: src/xml/xmli18n-tmp.h:3614 src/xml/xmli18n-tmp.h:3620
-#: src/xml/xmli18n-tmp.h:3627
+#: src/main/print-canon.c:368 src/main/print-escp2.c:2488
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5851 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5864
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:369 src/main/print-escp2.c:2285
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2490
 #: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
@@ -469,69 +477,70 @@ msgstr ""
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:646 src/main/print-escp2.c:2005
-#: src/xml/xmli18n-tmp.h:3676
+#: src/main/print-canon.c:646 src/main/print-escp2.c:2210
+#: src/xml/xmli18n-tmp.h:5913
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:648 src/main/print-escp2.c:2007
-#: src/xml/xmli18n-tmp.h:3677
+#: src/main/print-canon.c:648 src/main/print-escp2.c:2212
+#: src/xml/xmli18n-tmp.h:5914
 msgid "CD - 3 inch"
 msgstr ""
 
 # Translation of "custom" sucks!  ("kata paraggelia"???  nah!)
-#: src/main/print-canon.c:650 src/main/print-escp2.c:2009
-#: src/xml/xmli18n-tmp.h:3678
+#: src/main/print-canon.c:650 src/main/print-escp2.c:2214
+#: src/xml/xmli18n-tmp.h:5915
 #, fuzzy
 msgid "CD - Custom"
 msgstr "ÏñéóìÝíï áðü ôï ÷ñÞóôç"
 
-#: src/main/print-canon.c:673 src/main/print-escp2.c:2034
-#: src/cups/genppd.c:1323 src/cups/genppd.c:1572 src/cups/genppd.c:1988
-#: src/cups/genppd.c:2079
+#: src/main/print-canon.c:673 src/main/print-escp2.c:2239
+#: src/cups/genppd.c:1356 src/cups/genppd.c:1605 src/cups/genppd.c:2022
+#: src/cups/genppd.c:2113
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:675 src/main/print-escp2.c:2036
+#: src/main/print-canon.c:675 src/main/print-escp2.c:2241
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Åêôýðùóç óå Áñ÷åßï"
 
 #
-#: src/main/print-canon.c:790 src/main/print-escp2.c:2447
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-canon.c:790 src/main/print-escp2.c:2652
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2167
 #: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
 #: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "×ñþìá"
 
-#: src/main/print-canon.c:792 src/main/print-escp2.c:2449
+#: src/main/print-canon.c:792 src/main/print-escp2.c:2654
 #: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
 #: src/main/print-ps.c:331 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
 msgstr "Ìáõ_ñüáóðñï"
 
-#: src/main/print-canon.c:831 src/main/print-escp2.c:2089
+#: src/main/print-canon.c:831 src/main/print-escp2.c:2294
 #: src/main/print-pcl.c:1797 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Byte Åîüäïõ"
 
-#: src/main/print-canon.c:833 src/main/print-escp2.c:2131
-#: src/main/print-escp2.c:2229 src/main/print-escp2.c:2241
+#: src/main/print-canon.c:833 src/main/print-escp2.c:2336
+#: src/main/print-escp2.c:2434 src/main/print-escp2.c:2446
 #: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
 #: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
-#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1215
-#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1219
-#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
-#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3170
-#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3177
-#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3461
-#: src/xml/xmli18n-tmp.h:3464 src/xml/xmli18n-tmp.h:3632
-#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3648
-#: src/xml/xmli18n-tmp.h:3657 src/xml/xmli18n-tmp.h:3665
+#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1627 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3713 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3722 src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5902
 msgid "Standard"
 msgstr "Êáíïíéêü"
 
@@ -571,7 +580,7 @@ msgid "Pre-Dithered"
 msgstr "Åêôýðùóç"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1268 src/cups/genppd.c:1971
+#: src/cups/genppd.c:1301 src/cups/genppd.c:2005
 msgid "Grayscale"
 msgstr "Êëßìáêá ôïõ ãêñé"
 
@@ -588,11 +597,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1299 src/cups/genppd.c:1978
+#: src/main/print-color.c:129 src/cups/genppd.c:1332 src/cups/genppd.c:2012
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1306 src/cups/genppd.c:1979
+#: src/main/print-color.c:131 src/cups/genppd.c:1339 src/cups/genppd.c:2013
 msgid "KCMY"
 msgstr ""
 
@@ -660,7 +669,7 @@ msgid "Output image type"
 msgstr "Byte Åîüäïõ"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338
 msgid "Raw Channels"
 msgstr ""
 
@@ -728,56 +737,208 @@ msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
 #: src/escputil/escputil.c:997 src/escputil/escputil.c:1017
-#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:1812
-#: src/xml/xmli18n-tmp.h:1823 src/xml/xmli18n-tmp.h:1836
-#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1863
-#: src/xml/xmli18n-tmp.h:1876 src/xml/xmli18n-tmp.h:1889
-#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1918
-#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1949
-#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1975
-#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:1999
-#: src/xml/xmli18n-tmp.h:2013 src/xml/xmli18n-tmp.h:2027
-#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2051
-#: src/xml/xmli18n-tmp.h:2064 src/xml/xmli18n-tmp.h:2076
-#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2102
-#: src/xml/xmli18n-tmp.h:2116 src/xml/xmli18n-tmp.h:2130
-#: src/xml/xmli18n-tmp.h:2143 src/xml/xmli18n-tmp.h:2156
-#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2184
-#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2210
-#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2236
-#: src/xml/xmli18n-tmp.h:2249 src/xml/xmli18n-tmp.h:2262
-#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2290
-#: src/xml/xmli18n-tmp.h:2305 src/xml/xmli18n-tmp.h:2320
-#: src/xml/xmli18n-tmp.h:2332 src/xml/xmli18n-tmp.h:2343
-#: src/xml/xmli18n-tmp.h:2356 src/xml/xmli18n-tmp.h:2369
-#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2392
-#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2415
-#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2442
-#: src/xml/xmli18n-tmp.h:2454 src/xml/xmli18n-tmp.h:2466
-#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2496
-#: src/xml/xmli18n-tmp.h:2509 src/xml/xmli18n-tmp.h:2522
-#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
-#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2574
-#: src/xml/xmli18n-tmp.h:2586 src/xml/xmli18n-tmp.h:2598
-#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2623
-#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2653
-#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2683
-#: src/xml/xmli18n-tmp.h:2697 src/xml/xmli18n-tmp.h:2715
-#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2745
-#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
-#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2803
-#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2828
-#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2854
-#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2881
-#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2915
-#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2943
-#: src/xml/xmli18n-tmp.h:2959 src/xml/xmli18n-tmp.h:2976
-#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:3004
-#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3032
-#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3062
-#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3093
-#: src/xml/xmli18n-tmp.h:3107 src/xml/xmli18n-tmp.h:3125
-#: src/xml/xmli18n-tmp.h:3141
+#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2387
+#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2413
+#: src/xml/xmli18n-tmp.h:2426 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2499
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2551
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2575
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2708
+#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2786
+#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2814
+#: src/xml/xmli18n-tmp.h:2829 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2893
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2966
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3005 src/xml/xmli18n-tmp.h:3020
+#: src/xml/xmli18n-tmp.h:3033 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3061 src/xml/xmli18n-tmp.h:3073
+#: src/xml/xmli18n-tmp.h:3085 src/xml/xmli18n-tmp.h:3098
+#: src/xml/xmli18n-tmp.h:3110 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3377
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3616
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3648
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3766 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3775 src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:3794 src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:3805 src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3869 src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:3880 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3902 src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:3913 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:3948 src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:3970 src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:3983 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4023 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4064 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4075 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4088 src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:4103 src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:4118 src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:4143 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:4203 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4275 src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4309 src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4356 src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4421
+#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4449
+#: src/xml/xmli18n-tmp.h:4456 src/xml/xmli18n-tmp.h:4462
+#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4485 src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:4551 src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:4694 src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4717 src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:4818 src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:4829 src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4885 src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4935
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:5041 src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:5052 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:5121 src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5165
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5182 src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:5193 src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:5271 src/xml/xmli18n-tmp.h:5299
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5327 src/xml/xmli18n-tmp.h:5331
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5347
+#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5367 src/xml/xmli18n-tmp.h:5371
+#: src/xml/xmli18n-tmp.h:5383 src/xml/xmli18n-tmp.h:5388
+#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5440
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5461 src/xml/xmli18n-tmp.h:5468
+#: src/xml/xmli18n-tmp.h:5476 src/xml/xmli18n-tmp.h:5486
+#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5514
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5525
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5543
+#: src/xml/xmli18n-tmp.h:5550 src/xml/xmli18n-tmp.h:5556
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5574 src/xml/xmli18n-tmp.h:5582
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5592
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5625
+#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5649
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5662
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5690
+#: src/xml/xmli18n-tmp.h:5694 src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5731
+#: src/xml/xmli18n-tmp.h:5738 src/xml/xmli18n-tmp.h:5742
+#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5759
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5770
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5807
+#: src/xml/xmli18n-tmp.h:5811 src/xml/xmli18n-tmp.h:5817
+#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5828
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5843
 msgid "Cyan"
 msgstr "Êõáíü"
 
@@ -788,56 +949,208 @@ msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
 #: src/escputil/escputil.c:998 src/escputil/escputil.c:1018
-#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:1813
-#: src/xml/xmli18n-tmp.h:1824 src/xml/xmli18n-tmp.h:1837
-#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1864
-#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1890
-#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1919
-#: src/xml/xmli18n-tmp.h:1935 src/xml/xmli18n-tmp.h:1950
-#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1976
-#: src/xml/xmli18n-tmp.h:1988 src/xml/xmli18n-tmp.h:2000
-#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2028
-#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2052
-#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2077
-#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2103
-#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2131
-#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2157
-#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2185
-#: src/xml/xmli18n-tmp.h:2198 src/xml/xmli18n-tmp.h:2211
-#: src/xml/xmli18n-tmp.h:2224 src/xml/xmli18n-tmp.h:2237
-#: src/xml/xmli18n-tmp.h:2250 src/xml/xmli18n-tmp.h:2263
-#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2291
-#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2321
-#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2344
-#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2370
-#: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2393
-#: src/xml/xmli18n-tmp.h:2405 src/xml/xmli18n-tmp.h:2416
-#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2443
-#: src/xml/xmli18n-tmp.h:2455 src/xml/xmli18n-tmp.h:2467
-#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2497
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2523
-#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2575
-#: src/xml/xmli18n-tmp.h:2587 src/xml/xmli18n-tmp.h:2599
-#: src/xml/xmli18n-tmp.h:2611 src/xml/xmli18n-tmp.h:2624
-#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
-#: src/xml/xmli18n-tmp.h:2670 src/xml/xmli18n-tmp.h:2684
-#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2714
-#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2747
-#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2780
-#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
-#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2829
-#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2855
-#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2882
-#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2914
-#: src/xml/xmli18n-tmp.h:2931 src/xml/xmli18n-tmp.h:2944
-#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2975
-#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:3005
-#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3033
-#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3060
-#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3094
-#: src/xml/xmli18n-tmp.h:3108 src/xml/xmli18n-tmp.h:3124
-#: src/xml/xmli18n-tmp.h:3140
+#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2361
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2388
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2414
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2459 src/xml/xmli18n-tmp.h:2474
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2512 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2552
+#: src/xml/xmli18n-tmp.h:2564 src/xml/xmli18n-tmp.h:2576
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2787
+#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2815
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2868
+#: src/xml/xmli18n-tmp.h:2881 src/xml/xmli18n-tmp.h:2894
+#: src/xml/xmli18n-tmp.h:2905 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:2967
+#: src/xml/xmli18n-tmp.h:2979 src/xml/xmli18n-tmp.h:2991
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3062 src/xml/xmli18n-tmp.h:3074
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3099
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3135 src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:3163 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3353
+#: src/xml/xmli18n-tmp.h:3365 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
+#: src/xml/xmli18n-tmp.h:3420 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3542 src/xml/xmli18n-tmp.h:3556
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3600 src/xml/xmli18n-tmp.h:3617
+#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3647
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3751 src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:3784 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3795 src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:3806 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3837 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3903 src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3939 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3960 src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:3972 src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:3984 src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:3999 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:4039 src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:4104 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:4170 src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4194 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:4230 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:4276 src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4311 src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4338 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:4401 src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:4427 src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:4442 src/xml/xmli18n-tmp.h:4451
+#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4464
+#: src/xml/xmli18n-tmp.h:4470 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4486 src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:4511 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:4809 src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4909 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:5007 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5018 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5111 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5123 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5148 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:5240 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5250 src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:5261 src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5301
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5313
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5349
+#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5401
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5441
+#: src/xml/xmli18n-tmp.h:5453 src/xml/xmli18n-tmp.h:5458
+#: src/xml/xmli18n-tmp.h:5463 src/xml/xmli18n-tmp.h:5470
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5496 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5527
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5552 src/xml/xmli18n-tmp.h:5558
+#: src/xml/xmli18n-tmp.h:5564 src/xml/xmli18n-tmp.h:5568
+#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5593
+#: src/xml/xmli18n-tmp.h:5598 src/xml/xmli18n-tmp.h:5616
+#: src/xml/xmli18n-tmp.h:5620 src/xml/xmli18n-tmp.h:5626
+#: src/xml/xmli18n-tmp.h:5631 src/xml/xmli18n-tmp.h:5651
+#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
+#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5674
+#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5720
+#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5733
+#: src/xml/xmli18n-tmp.h:5739 src/xml/xmli18n-tmp.h:5743
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5818
+#: src/xml/xmli18n-tmp.h:5823 src/xml/xmli18n-tmp.h:5829
+#: src/xml/xmli18n-tmp.h:5833 src/xml/xmli18n-tmp.h:5839
+#: src/xml/xmli18n-tmp.h:5844
 #, fuzzy
 msgid "Magenta"
 msgstr "ìþâ"
@@ -849,56 +1162,208 @@ msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
 #: src/escputil/escputil.c:999 src/escputil/escputil.c:1019
-#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:1814
-#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
-#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1865
-#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1891
-#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1920
-#: src/xml/xmli18n-tmp.h:1936 src/xml/xmli18n-tmp.h:1951
-#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1977
-#: src/xml/xmli18n-tmp.h:1989 src/xml/xmli18n-tmp.h:2001
-#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2029
-#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2053
-#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2078
-#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2104
-#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
-#: src/xml/xmli18n-tmp.h:2145 src/xml/xmli18n-tmp.h:2158
-#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2186
-#: src/xml/xmli18n-tmp.h:2199 src/xml/xmli18n-tmp.h:2212
-#: src/xml/xmli18n-tmp.h:2225 src/xml/xmli18n-tmp.h:2238
-#: src/xml/xmli18n-tmp.h:2251 src/xml/xmli18n-tmp.h:2264
-#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2292
-#: src/xml/xmli18n-tmp.h:2307 src/xml/xmli18n-tmp.h:2322
-#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
-#: src/xml/xmli18n-tmp.h:2358 src/xml/xmli18n-tmp.h:2371
-#: src/xml/xmli18n-tmp.h:2382 src/xml/xmli18n-tmp.h:2394
-#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2417
-#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2444
-#: src/xml/xmli18n-tmp.h:2456 src/xml/xmli18n-tmp.h:2468
-#: src/xml/xmli18n-tmp.h:2483 src/xml/xmli18n-tmp.h:2498
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2524
-#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2551
-#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2576
-#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
-#: src/xml/xmli18n-tmp.h:2612 src/xml/xmli18n-tmp.h:2625
-#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2651
-#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2685
-#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2713
-#: src/xml/xmli18n-tmp.h:2734 src/xml/xmli18n-tmp.h:2749
-#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2779
-#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2805
-#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2830
-#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2856
-#: src/xml/xmli18n-tmp.h:2871 src/xml/xmli18n-tmp.h:2883
-#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2910
-#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2945
-#: src/xml/xmli18n-tmp.h:2960 src/xml/xmli18n-tmp.h:2974
-#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3006
-#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3034
-#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3061
-#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3095
-#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3120
-#: src/xml/xmli18n-tmp.h:3136
+#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2389
+#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2444
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2475
+#: src/xml/xmli18n-tmp.h:2488 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2513 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2565 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2602
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2762
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2788
+#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2816
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2846
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2906 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3022
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3048
+#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3075
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3124
+#: src/xml/xmli18n-tmp.h:3136 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3175
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3315 src/xml/xmli18n-tmp.h:3329
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3433
+#: src/xml/xmli18n-tmp.h:3455 src/xml/xmli18n-tmp.h:3468
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3497
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3601 src/xml/xmli18n-tmp.h:3618
+#: src/xml/xmli18n-tmp.h:3632 src/xml/xmli18n-tmp.h:3643
+#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3747 src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3834 src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:3844 src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:3867 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:3900 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3910 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3935 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:3967 src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:3979 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4005 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4062 src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4110 src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:4124 src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4167 src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:4272 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:4321 src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:4334 src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4367 src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4471
+#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4505 src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4549 src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:4562 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4580 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4602 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:4678 src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:4691 src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4770 src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4893 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4904 src/xml/xmli18n-tmp.h:4911
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:4971 src/xml/xmli18n-tmp.h:4978
+#: src/xml/xmli18n-tmp.h:5004 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5050 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5071 src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:5097 src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:5142 src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:5169 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5184
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5257 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5318
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5358
+#: src/xml/xmli18n-tmp.h:5364 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5385
+#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5438
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5454
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5465
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5511
+#: src/xml/xmli18n-tmp.h:5516 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5547 src/xml/xmli18n-tmp.h:5554
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5584 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5617 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5632
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5687
+#: src/xml/xmli18n-tmp.h:5692 src/xml/xmli18n-tmp.h:5698
+#: src/xml/xmli18n-tmp.h:5705 src/xml/xmli18n-tmp.h:5713
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5729
+#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
+#: src/xml/xmli18n-tmp.h:5744 src/xml/xmli18n-tmp.h:5756
+#: src/xml/xmli18n-tmp.h:5761 src/xml/xmli18n-tmp.h:5767
+#: src/xml/xmli18n-tmp.h:5774 src/xml/xmli18n-tmp.h:5782
+#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5792
+#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5803
+#: src/xml/xmli18n-tmp.h:5809 src/xml/xmli18n-tmp.h:5813
+#: src/xml/xmli18n-tmp.h:5819 src/xml/xmli18n-tmp.h:5824
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5845
 msgid "Yellow"
 msgstr "Êßôñéíï"
 
@@ -909,9 +1374,17 @@ msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
 #: src/escputil/escputil.c:1006 src/escputil/escputil.c:1025
-#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2700
-#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2795
-#: src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:4041 src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:4056 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4091 src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:4155 src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5155
 msgid "Red"
 msgstr ""
 
@@ -931,8 +1404,13 @@ msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
 #: src/escputil/escputil.c:1007 src/escputil/escputil.c:1026
-#: src/xml/xmli18n-tmp.h:2657 src/xml/xmli18n-tmp.h:2701
-#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4051 src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:4084 src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:5156
 msgid "Blue"
 msgstr ""
 
@@ -944,53 +1422,183 @@ msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
 #: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1016 src/escputil/escputil.c:1285
-#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
-#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
-#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1875
-#: src/xml/xmli18n-tmp.h:1888 src/xml/xmli18n-tmp.h:1901
-#: src/xml/xmli18n-tmp.h:1917 src/xml/xmli18n-tmp.h:1933
-#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1961
-#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1986
-#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2012
-#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2038
-#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2063
-#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2090
-#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2115
-#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2142
-#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2169
-#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
-#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
-#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2248
-#: src/xml/xmli18n-tmp.h:2261 src/xml/xmli18n-tmp.h:2274
-#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2304
-#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2331
-#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
-#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
-#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2403
-#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2420
-#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2441
-#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2465
-#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2495
-#: src/xml/xmli18n-tmp.h:2508 src/xml/xmli18n-tmp.h:2521
-#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
-#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2573
-#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2597
-#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2622
-#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2672
-#: src/xml/xmli18n-tmp.h:2682 src/xml/xmli18n-tmp.h:2731
-#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2764
-#: src/xml/xmli18n-tmp.h:2781 src/xml/xmli18n-tmp.h:2794
-#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2815
-#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2839
-#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2868
-#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2894
-#: src/xml/xmli18n-tmp.h:2911 src/xml/xmli18n-tmp.h:2929
-#: src/xml/xmli18n-tmp.h:2942 src/xml/xmli18n-tmp.h:2977
-#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:3003
-#: src/xml/xmli18n-tmp.h:3017 src/xml/xmli18n-tmp.h:3031
-#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3079
-#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3110
-#: src/xml/xmli18n-tmp.h:3121 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2372
+#: src/xml/xmli18n-tmp.h:2386 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2457
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2510
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2536
+#: src/xml/xmli18n-tmp.h:2550 src/xml/xmli18n-tmp.h:2562
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2599 src/xml/xmli18n-tmp.h:2614
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2639
+#: src/xml/xmli18n-tmp.h:2653 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2965
+#: src/xml/xmli18n-tmp.h:2977 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3019
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3060 src/xml/xmli18n-tmp.h:3072
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3133 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3196
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3526
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3680 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3755 src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:3804 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3819 src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:3831 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3846 src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3873 src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:3924 src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:3943 src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:4022 src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4059 src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:4142 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4164 src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:4179 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:4255 src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4289 src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:4308 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4413 src/xml/xmli18n-tmp.h:4420
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4455
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4507 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:4565 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:4604 src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:4702 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:4733 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:4786 src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4920 src/xml/xmli18n-tmp.h:4926
+#: src/xml/xmli18n-tmp.h:4934 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:4973 src/xml/xmli18n-tmp.h:4981
+#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:4993
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:5047 src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5151
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5186
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5223 src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5270
+#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5284
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5320
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5337
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5375
+#: src/xml/xmli18n-tmp.h:5378 src/xml/xmli18n-tmp.h:5380
+#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5435
+#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5447
+#: src/xml/xmli18n-tmp.h:5449 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5474
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5492
+#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5571
+#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5590
+#: src/xml/xmli18n-tmp.h:5596 src/xml/xmli18n-tmp.h:5602
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5614
+#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5629
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5655
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5680 src/xml/xmli18n-tmp.h:5682
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5700
+#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5716
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5749
+#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5769 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5794
+#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5806
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5836
+#: src/xml/xmli18n-tmp.h:5842
 msgid "Black"
 msgstr "Ìáýñï"
 
@@ -999,7 +1607,7 @@ msgstr "Ìáýñï"
 msgid "Adjust the black gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1769
+#: src/main/print-color.c:322 src/main/print-olympus.c:1935
 msgid "Cyan Balance"
 msgstr ""
 
@@ -1014,7 +1622,7 @@ msgstr "Êëßìáêá ôïõ ãêñé"
 msgid "Adjust the cyan gray balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1777
+#: src/main/print-color.c:330 src/main/print-olympus.c:1943
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "ìþâ"
@@ -1024,7 +1632,7 @@ msgstr "ìþâ"
 msgid "Adjust the magenta gray balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1785
+#: src/main/print-color.c:338 src/main/print-olympus.c:1951
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
@@ -1054,11 +1662,11 @@ msgstr "Ôýðïò MIME"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
-#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
-#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
-#: src/main/print-escp2.c:759
+#: src/main/print-escp2.c:344 src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356 src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368 src/main/print-escp2.c:374
+#: src/main/print-escp2.c:869 src/main/print-escp2.c:877
+#: src/main/print-escp2.c:885
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Byte Åîüäïõ"
@@ -1067,27 +1675,27 @@ msgstr "Byte Åîüäïõ"
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:743
+#: src/main/print-color.c:365 src/main/print-escp2.c:869
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:744
+#: src/main/print-color.c:366 src/main/print-escp2.c:870
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:751
+#: src/main/print-color.c:373 src/main/print-escp2.c:877
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:752
+#: src/main/print-color.c:374 src/main/print-escp2.c:878
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:759
+#: src/main/print-color.c:381 src/main/print-escp2.c:885
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:760
+#: src/main/print-color.c:382 src/main/print-escp2.c:886
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -1357,11 +1965,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1906
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1907
 msgid "Print without borders"
 msgstr ""
 
@@ -1374,7 +1982,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:266 src/main/print-escp2.c:267
-#: src/cups/genppd.c:1567 src/cups/genppd.c:2078
+#: src/cups/genppd.c:1600 src/cups/genppd.c:2112
 #, fuzzy
 msgid "Output Order"
 msgstr "Byte Åîüäïõ"
@@ -1420,383 +2028,500 @@ msgstr ""
 #
 #: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 #, fuzzy
+msgid "Raw Channel Names"
+msgstr "Áêýñùóç"
+
+#
+#: src/main/print-escp2.c:326 src/main/print-escp2.c:327
+#, fuzzy
 msgid "Channel Names"
 msgstr "Áêýñùóç"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:339
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:344
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Êõáíü"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:345
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350
 #, fuzzy
 msgid "Magenta Map"
 msgstr "ìþâ"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:351
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Êßôñéíï"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:357
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362
 #, fuzzy
 msgid "Blue Map"
 msgstr "Ìáõ_ñüáóðñï"
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:363
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368
 #, fuzzy
 msgid "Orange Map"
 msgstr "Êõáíü"
 
-#: src/main/print-escp2.c:363
+#: src/main/print-escp2.c:369
 #, fuzzy
 msgid "Adjust the orange map"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:374
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:369
+#: src/main/print-escp2.c:375
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:471
+#: src/main/print-escp2.c:477
 #, fuzzy
 msgid "Red Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:478
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:485
 #, fuzzy
 msgid "Blue Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:486
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:493
 #, fuzzy
 msgid "Orange Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-escp2.c:488
+#: src/main/print-escp2.c:494
 #, fuzzy
 msgid "Adjust the orange density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:501
 msgid "Gloss Level"
 msgstr ""
 
-#: src/main/print-escp2.c:496
+#: src/main/print-escp2.c:502
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:509
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:504
+#: src/main/print-escp2.c:510
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:517
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:512
+#: src/main/print-escp2.c:518
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:525
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:520
+#: src/main/print-escp2.c:526
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:534
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:550
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
+#: src/main/print-escp2.c:557 src/main/print-escp2.c:558
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:566
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:582
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "Êßôñéíï"
 
-#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
+#: src/main/print-escp2.c:589 src/main/print-escp2.c:590
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:598
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "Êßôñéíï"
 
-#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
+#: src/main/print-escp2.c:605 src/main/print-escp2.c:606
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:630
 #, fuzzy
 msgid "Gray Value"
 msgstr "Êëßìáêá ôïõ ãêñé"
 
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
-#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:614
+#: src/main/print-escp2.c:637 src/main/print-escp2.c:638
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
+#: src/main/print-escp2.c:621 src/main/print-escp2.c:622
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:646
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "Êëßìáêá ôïõ ãêñé"
 
-#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
+#: src/main/print-escp2.c:653 src/main/print-escp2.c:654
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:726
 #, fuzzy
 msgid "Light Gray Value"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
-#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:662
+#: src/main/print-escp2.c:733 src/main/print-escp2.c:734
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
-#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
+#: src/main/print-escp2.c:669 src/main/print-escp2.c:670
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:742
 #, fuzzy
 msgid "Light Gray Density Scale"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:678
 #, fuzzy
 msgid "Dark Gray Value"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
+#: src/main/print-escp2.c:685 src/main/print-escp2.c:686
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:694
 #, fuzzy
 msgid "Dark Gray Density Scale"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:701
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "Êëßìáêá ôïõ ãêñé"
 
-#: src/main/print-escp2.c:696
+#: src/main/print-escp2.c:702
 #, fuzzy
 msgid "Medium Gray Value"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:709
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:704
+#: src/main/print-escp2.c:710
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:717
 #, fuzzy
 msgid "Mid Gray Density Scale"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:712
+#: src/main/print-escp2.c:718
 #, fuzzy
 msgid "Medium Gray Density Scale"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:767
+#: src/main/print-escp2.c:749
+#, fuzzy
+msgid "Hextone Gray 5 Value"
+msgstr "Êëßìáêá ôïõ ãêñé"
+
+#: src/main/print-escp2.c:750
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:757
+#, fuzzy
+msgid "Hextone Gray 5 Transition"
+msgstr "ØéëÞ Âñï÷Þ"
+
+#: src/main/print-escp2.c:758
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr "ØéëÞ Âñï÷Þ"
+
+#: src/main/print-escp2.c:765
+#, fuzzy
+msgid "Hextone Gray 5 Density Scale"
+msgstr "Êëßìáêá ôïõ ãêñé"
+
+#: src/main/print-escp2.c:766
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr "ØéëÞ Âñï÷Þ"
+
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:774
+#, fuzzy
+msgid "Hextone Gray 4 Value"
+msgstr "Êëßìáêá ôïõ ãêñé"
+
+#: src/main/print-escp2.c:781 src/main/print-escp2.c:782
+#, fuzzy
+msgid "Hextone Gray 4 Transition"
+msgstr "ØéëÞ Âñï÷Þ"
+
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:790
+#, fuzzy
+msgid "Hextone Gray 4 Density Scale"
+msgstr "Êëßìáêá ôïõ ãêñé"
+
+#: src/main/print-escp2.c:797 src/main/print-escp2.c:798
+#, fuzzy
+msgid "Hextone Gray 3 Value"
+msgstr "Êëßìáêá ôïõ ãêñé"
+
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:806
+#, fuzzy
+msgid "Hextone Gray 3 Transition"
+msgstr "ØéëÞ Âñï÷Þ"
+
+#: src/main/print-escp2.c:813 src/main/print-escp2.c:814
+#, fuzzy
+msgid "Hextone Gray 3 Density Scale"
+msgstr "Êëßìáêá ôïõ ãêñé"
+
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:822
+#, fuzzy
+msgid "Hextone Gray 2 Value"
+msgstr "Êëßìáêá ôïõ ãêñé"
+
+#: src/main/print-escp2.c:829 src/main/print-escp2.c:830
+#, fuzzy
+msgid "Hextone Gray 2 Transition"
+msgstr "ØéëÞ Âñï÷Þ"
+
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:838
+#, fuzzy
+msgid "Hextone Gray 2 Density Scale"
+msgstr "Êëßìáêá ôïõ ãêñé"
+
+#: src/main/print-escp2.c:845
+#, fuzzy
+msgid "Hextone Gray 1 Value"
+msgstr "Êëßìáêá ôïõ ãêñé"
+
+#: src/main/print-escp2.c:846
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:853
+#, fuzzy
+msgid "Hextone Gray 1 Transition"
+msgstr "ØéëÞ Âñï÷Þ"
+
+#: src/main/print-escp2.c:854
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr "ØéëÞ Âñï÷Þ"
+
+#: src/main/print-escp2.c:861
+#, fuzzy
+msgid "Hextone Gray 1 Density Scale"
+msgstr "Êëßìáêá ôïõ ãêñé"
+
+#: src/main/print-escp2.c:862
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr "ØéëÞ Âñï÷Þ"
+
+#: src/main/print-escp2.c:893
 msgid "Drying Time Per Page"
 msgstr ""
 
-#: src/main/print-escp2.c:768
+#: src/main/print-escp2.c:894
 msgid "Set drying time per page"
 msgstr ""
 
-#: src/main/print-escp2.c:775
+#: src/main/print-escp2.c:901
 msgid "Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:776
+#: src/main/print-escp2.c:902
 msgid "Set drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:783
+#: src/main/print-escp2.c:909
 msgid "Minimum Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:784
+#: src/main/print-escp2.c:910
 msgid "Set minimum drying time per scan"
 msgstr ""
 
+#: src/main/print-escp2.c:925
+msgid "Quality Enhancement"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Enhance print quality by additional passes"
+msgstr ""
+
 #
-#: src/main/print-escp2.c:799
+#: src/main/print-escp2.c:933
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "ÌÝãåèïò"
 
-#: src/main/print-escp2.c:800
+#: src/main/print-escp2.c:934
 #, fuzzy
 msgid "Set printer paper thickness"
 msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
 
-#: src/main/print-escp2.c:807
+#: src/main/print-escp2.c:941
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-escp2.c:808
+#: src/main/print-escp2.c:942
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:815
+#: src/main/print-escp2.c:949
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:816
+#: src/main/print-escp2.c:950
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:823
+#: src/main/print-escp2.c:957
 #, fuzzy
 msgid "Print Method"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/main/print-escp2.c:824
+#: src/main/print-escp2.c:958
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:831
+#: src/main/print-escp2.c:965
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Êýñéá Óåëßäá"
 
-#: src/main/print-escp2.c:832
+#: src/main/print-escp2.c:966
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:839
+#: src/main/print-escp2.c:973
 msgid "Feed Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:840
-#, c-format
+#: src/main/print-escp2.c:975
+#, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:1992
+#: src/main/print-escp2.c:2197
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Byte Åîüäïõ"
 
-#: src/main/print-escp2.c:1994
+#: src/main/print-escp2.c:2199
 msgid "Automatic Setting Control"
 msgstr ""
 
 #
-#: src/main/print-escp2.c:2208 src/cups/genppd.c:1484 src/cups/genppd.c:2059
+#: src/main/print-escp2.c:2413 src/cups/genppd.c:1517 src/cups/genppd.c:2093
 #, fuzzy
 msgid "Automatic"
 msgstr "ÌÝãåèïò"
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2415
 #, fuzzy
 msgid "Bidirectional"
 msgstr "360 DPI FOL2"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2417
 #, fuzzy
 msgid "Unidirectional"
 msgstr "360 DPI FOL2"
 
-#: src/main/print-escp2.c:2243
+#: src/main/print-escp2.c:2448
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2450
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2452
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2454
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2456
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2287
+#: src/main/print-escp2.c:2492
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:2858
+#: src/main/print-escp2.c:3100
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:4107 src/main/print-olympus.c:2472
+#: src/main/print-escp2.c:4355 src/main/print-olympus.c:2641
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1851,367 +2576,384 @@ msgid "test print"
 msgstr "Ôßôëïé ðñïò åêôýðùóç"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3205
-#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3217
-#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3233
-#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3255
-#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3276
-#: src/xml/xmli18n-tmp.h:3288 src/xml/xmli18n-tmp.h:3295
-#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3315
-#: src/xml/xmli18n-tmp.h:3327 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3368
-#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3380
-#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
-#: src/xml/xmli18n-tmp.h:3412 src/xml/xmli18n-tmp.h:3424
-#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3444
-#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3472
-#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3496
-#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3521
-#: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3544
-#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3556
-#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3581
-#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3598
-#: src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3754 src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:3809 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3863 src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:4058 src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:4163 src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:4227 src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:4335 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4467 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4594 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:4879 src/xml/xmli18n-tmp.h:4946
+#: src/xml/xmli18n-tmp.h:5000 src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:5243 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5365 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5512 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5667 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5784 src/xml/xmli18n-tmp.h:5805
+#: src/xml/xmli18n-tmp.h:5826
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3206
-#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3218
-#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3234
-#: src/xml/xmli18n-tmp.h:3244 src/xml/xmli18n-tmp.h:3251
-#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3268
-#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3289
-#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3306
-#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
-#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3354
-#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3377
-#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3389
-#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3413
-#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3435
-#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3455
-#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3485
-#: src/xml/xmli18n-tmp.h:3497 src/xml/xmli18n-tmp.h:3508
-#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3537
-#: src/xml/xmli18n-tmp.h:3545 src/xml/xmli18n-tmp.h:3549
-#: src/xml/xmli18n-tmp.h:3557 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3593
-#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3605
+#: src/xml/xmli18n-tmp.h:3759 src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3868 src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:4002 src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:4107 src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4472
+#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4817 src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5181 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5315 src/xml/xmli18n-tmp.h:5370
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5672
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5831
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3241
-#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3265
-#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3286
-#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
-#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3351
-#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3374
-#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3398
-#: src/xml/xmli18n-tmp.h:3410 src/xml/xmli18n-tmp.h:3422
-#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3452
-#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3470
-#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3494
-#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3519
-#: src/xml/xmli18n-tmp.h:3534 src/xml/xmli18n-tmp.h:3542
-#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3741 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4086 src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4933
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5421
+#: src/xml/xmli18n-tmp.h:5499 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5723
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3242
-#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3266
-#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3287
-#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3326
-#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3352
-#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3375
-#: src/xml/xmli18n-tmp.h:3387 src/xml/xmli18n-tmp.h:3399
-#: src/xml/xmli18n-tmp.h:3411 src/xml/xmli18n-tmp.h:3423
-#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3453
-#: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3483
-#: src/xml/xmli18n-tmp.h:3495 src/xml/xmli18n-tmp.h:3506
-#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3535
-#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3566
-#: src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3748 src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:3989 src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:4094 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4267 src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4940
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5661
+#: src/xml/xmli18n-tmp.h:5730
 msgid "Five Color Photo Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
-#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
-#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
-#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
-#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
-#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
-#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
-#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
-#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:849
-#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:963
-#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1077
-#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1170
-#: src/xml/xmli18n-tmp.h:1220 src/xml/xmli18n-tmp.h:1277
-#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1376
-#: src/xml/xmli18n-tmp.h:1439 src/xml/xmli18n-tmp.h:1502
-#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1619
-#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1739
-#: src/xml/xmli18n-tmp.h:1773
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1050
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1240
+#: src/xml/xmli18n-tmp.h:1335 src/xml/xmli18n-tmp.h:1449
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1580
+#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1862
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2200 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2297
 #, fuzzy
 msgid "Plain Paper"
 msgstr "Êýñéá Óåëßäá"
 
-#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
-#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
-#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
-#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
-#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
-#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
-#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
-#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
-#: src/xml/xmli18n-tmp.h:819 src/xml/xmli18n-tmp.h:858
-#: src/xml/xmli18n-tmp.h:915 src/xml/xmli18n-tmp.h:972
-#: src/xml/xmli18n-tmp.h:1029 src/xml/xmli18n-tmp.h:1086
-#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1176
-#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1286
-#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1385
-#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1508
-#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1628
-#: src/xml/xmli18n-tmp.h:1685 src/xml/xmli18n-tmp.h:1743
-#: src/xml/xmli18n-tmp.h:1779
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:101 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:365 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1160 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1740
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1871
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2136
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2267
+#: src/xml/xmli18n-tmp.h:2303
 msgid "Glossy Film"
 msgstr ""
 
-#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
-#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
-#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
-#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
-#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
-#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
-#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
-#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
-#: src/xml/xmli18n-tmp.h:821 src/xml/xmli18n-tmp.h:861
-#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:975
-#: src/xml/xmli18n-tmp.h:1032 src/xml/xmli18n-tmp.h:1089
-#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1178
-#: src/xml/xmli18n-tmp.h:1232 src/xml/xmli18n-tmp.h:1289
-#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1388
-#: src/xml/xmli18n-tmp.h:1451 src/xml/xmli18n-tmp.h:1511
-#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1631
-#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1745
-#: src/xml/xmli18n-tmp.h:1781
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:845 src/xml/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:965 src/xml/xmli18n-tmp.h:1022
+#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1359
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1550
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1745 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2305
 #, fuzzy
 msgid "Transparencies"
 msgstr "ÄéáöáíÝò"
 
-#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
-#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
-#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
-#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
-#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
-#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
-#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
-#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
-#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:823
-#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:921
-#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:1035
-#: src/xml/xmli18n-tmp.h:1092 src/xml/xmli18n-tmp.h:1142
-#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1235
-#: src/xml/xmli18n-tmp.h:1292 src/xml/xmli18n-tmp.h:1344
-#: src/xml/xmli18n-tmp.h:1391 src/xml/xmli18n-tmp.h:1454
-#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1577
-#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1691
-#: src/xml/xmli18n-tmp.h:1747 src/xml/xmli18n-tmp.h:1783
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:55 src/xml/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:151 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1024
+#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2215
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2307
 #, fuzzy
 msgid "Envelopes"
 msgstr "ÐñïãñáììáôéóôÝò"
 
-#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
-#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
-#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
-#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
-#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
-#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
-#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
-#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
-#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:827
-#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:927
-#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:1041
-#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1146
-#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1241
-#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1348
-#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1460
-#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1583
-#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1697
-#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1787
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:1028
+#: src/xml/xmli18n-tmp.h:1085 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1275 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1556
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1665
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1834
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2076
+#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2311
 #, fuzzy
 msgid "Matte Paper"
 msgstr "×áñôß Ìáíßëá"
 
-#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
-#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
-#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
-#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
-#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
-#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
-#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
-#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
-#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:831
-#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:933
-#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:1047
-#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1150
-#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1247
-#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1352
-#: src/xml/xmli18n-tmp.h:1403 src/xml/xmli18n-tmp.h:1466
-#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1589
-#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1703
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1791
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:167 src/xml/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:569
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1032
+#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1285 src/xml/xmli18n-tmp.h:1389
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1675
+#: src/xml/xmli18n-tmp.h:1770 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1889 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2012 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2227
+#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2315
 msgid "Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
-#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
-#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
-#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
-#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
-#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
-#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
-#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
-#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:833
-#: src/xml/xmli18n-tmp.h:879 src/xml/xmli18n-tmp.h:936
-#: src/xml/xmli18n-tmp.h:993 src/xml/xmli18n-tmp.h:1050
-#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1152
-#: src/xml/xmli18n-tmp.h:1190 src/xml/xmli18n-tmp.h:1250
-#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1354
-#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1469
-#: src/xml/xmli18n-tmp.h:1529 src/xml/xmli18n-tmp.h:1592
-#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1706
-#: src/xml/xmli18n-tmp.h:1757 src/xml/xmli18n-tmp.h:1793
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:425 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:512 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1034
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1499 src/xml/xmli18n-tmp.h:1562
+#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1775 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1955
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2088
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2317
 msgid "Photo Quality Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
-#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
-#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
-#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
-#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
-#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
-#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
-#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
-#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:835
-#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:939
-#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:1053
-#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1154
-#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1253
-#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1356
-#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1472
-#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1595
-#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1709
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1795
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1036
+#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1200
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1504 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1842
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2233
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2319
 #, fuzzy
 msgid "Photo Paper"
 msgstr "Êåßìåíá"
 
-#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
-#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
-#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
-#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
-#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
-#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
-#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
-#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
-#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:837
-#: src/xml/xmli18n-tmp.h:885 src/xml/xmli18n-tmp.h:942
-#: src/xml/xmli18n-tmp.h:999 src/xml/xmli18n-tmp.h:1056
-#: src/xml/xmli18n-tmp.h:1113 src/xml/xmli18n-tmp.h:1156
-#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1212
-#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1256
-#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1358
-#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1475
-#: src/xml/xmli18n-tmp.h:1535 src/xml/xmli18n-tmp.h:1598
-#: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1712
-#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1797
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:179 src/xml/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:518 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:869 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1038
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1407
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1566
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1622
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1844
+#: src/xml/xmli18n-tmp.h:1898 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2321
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
-#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
-#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
-#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
-#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
-#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
-#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
-#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
-#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:841
-#: src/xml/xmli18n-tmp.h:891 src/xml/xmli18n-tmp.h:948
-#: src/xml/xmli18n-tmp.h:1005 src/xml/xmli18n-tmp.h:1062
-#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1160
-#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1262
-#: src/xml/xmli18n-tmp.h:1319 src/xml/xmli18n-tmp.h:1362
-#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1481
-#: src/xml/xmli18n-tmp.h:1541 src/xml/xmli18n-tmp.h:1604
-#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1718
-#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1801
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1042
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1419
+#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1570
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2027 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2242
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2325
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
-#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
-#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
-#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
-#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
-#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
-#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
-#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
-#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:843
-#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:951
-#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1065
-#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1162
-#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1265
-#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1368
-#: src/xml/xmli18n-tmp.h:1427 src/xml/xmli18n-tmp.h:1490
-#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1607
-#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1727
-#: src/xml/xmli18n-tmp.h:1767 src/xml/xmli18n-tmp.h:1803
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:91 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:191 src/xml/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:439 src/xml/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:787 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1044
+#: src/xml/xmli18n-tmp.h:1125 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1315 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1854
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2327
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
-#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
-#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
-#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
-#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
-#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
-#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
-#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:897
-#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:1011
-#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1125
-#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1206
-#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1325
-#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1430
-#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1553
-#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1667
-#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1805
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1130
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1320
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1616
+#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1856 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2329
 msgid "Ilford Heavy Paper"
 msgstr ""
 
 #
-#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
-#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
-#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
-#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
-#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
-#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
-#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
-#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
-#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:847
-#: src/xml/xmli18n-tmp.h:903 src/xml/xmli18n-tmp.h:960
-#: src/xml/xmli18n-tmp.h:1017 src/xml/xmli18n-tmp.h:1074
-#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1168
-#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1214
-#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1274
-#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1374
-#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1499
-#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1616
-#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1736
-#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1809
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:129
+#: src/xml/xmli18n-tmp.h:203 src/xml/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:542 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1048
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1443
+#: src/xml/xmli18n-tmp.h:1539 src/xml/xmli18n-tmp.h:1578
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1720
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1985
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2333
 msgid "Other"
 msgstr "¶ëëá"
 
@@ -2229,57 +2971,61 @@ msgstr "Óåëßäá åã÷åéñéäßïõ"
 msgid "Manual without Pause"
 msgstr ""
 
-#: src/main/print-olympus.c:279
+#: src/main/print-olympus.c:281
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:280 src/cups/genppd.c:1685 src/cups/genppd.c:1713
-#: src/cups/genppd.c:1745 src/cups/genppd.c:1800 src/cups/genppd.c:1846
-#: src/cups/genppd.c:2147 src/cups/genppd.c:2160 src/cups/genppd.c:2183
-#: src/cups/genppd.c:2204 src/cups/genppd.c:2221
+#: src/main/print-olympus.c:282 src/cups/genppd.c:1718 src/cups/genppd.c:1746
+#: src/cups/genppd.c:1778 src/cups/genppd.c:1833 src/cups/genppd.c:1879
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2194 src/cups/genppd.c:2217
+#: src/cups/genppd.c:2238 src/cups/genppd.c:2255
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
-#: src/main/print-olympus.c:1132
+#: src/main/print-olympus.c:998 src/main/print-olympus.c:1061
+#: src/main/print-olympus.c:1165
 msgid "Glossy"
 msgstr ""
 
-#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
-#: src/main/print-olympus.c:1133
+#: src/main/print-olympus.c:999 src/main/print-olympus.c:1062
+#: src/main/print-olympus.c:1166
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
+#: src/main/print-olympus.c:1063 src/main/print-olympus.c:1167
 #, fuzzy
 msgid "Matte"
 msgstr "×áñôß Ìáíßëá"
 
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
+#. TRANSLATORS: 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.
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1901
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1770
+#: src/main/print-olympus.c:1936
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-olympus.c:1778
+#: src/main/print-olympus.c:1944
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1952
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-olympus.c:1793
+#: src/main/print-olympus.c:1959
 #, fuzzy
 msgid "Black Balance"
 msgstr "Ìáõ_ñüáóðñï"
 
-#: src/main/print-olympus.c:1794
+#: src/main/print-olympus.c:1960
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
@@ -2319,7 +3065,7 @@ msgid "Quick-dry Transparency"
 msgstr "ÄéáöÜíåéá ×ñïéÜò"
 
 # Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
-#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3687
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:5925
 msgid "Manual"
 msgstr "Åã÷åéñßäéï"
 
@@ -2413,24 +3159,24 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:278 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3638
-#: src/xml/xmli18n-tmp.h:3647 src/xml/xmli18n-tmp.h:3656
-#: src/xml/xmli18n-tmp.h:3664
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5875
+#: src/xml/xmli18n-tmp.h:5884 src/xml/xmli18n-tmp.h:5893
+#: src/xml/xmli18n-tmp.h:5901
 msgid "Draft"
 msgstr ""
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:3633 src/xml/xmli18n-tmp.h:3641
-#: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3658
-#: src/xml/xmli18n-tmp.h:3666
+#: src/xml/xmli18n-tmp.h:5870 src/xml/xmli18n-tmp.h:5878
+#: src/xml/xmli18n-tmp.h:5886 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5903
 #, fuzzy
 msgid "High"
 msgstr "¾øïò:"
 
 #: src/main/print-pcl.c:282 src/main/print-pcl.c:283
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3634
-#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3650
-#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3667
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5896 src/xml/xmli18n-tmp.h:5904
 #, fuzzy
 msgid "Photo"
 msgstr "Êñõðôïãñáößá"
@@ -2468,17 +3214,17 @@ msgid "None; please provide a PPD file"
 msgstr ""
 
 #
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3671
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:5908
 msgid "Letter"
 msgstr "ÄéáóôÜóåéò Letter"
 
 #
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3708
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:5946
 msgid "A4"
 msgstr "ÄéáóôÜóåéò Á4"
 
 # Translation of "custom" sucks!  ("kata paraggelia"???  nah!)
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3823
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6061
 msgid "Custom"
 msgstr "ÏñéóìÝíï áðü ôï ÷ñÞóôç"
 
@@ -2486,35 +3232,44 @@ msgstr "ÏñéóìÝíï áðü ôï ÷ñÞóôç"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3629
-#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3654
+#: src/main/print-weave.c:1511
+msgid "Fatal error!"
+msgstr ""
+
+#: src/main/print-weave.c:1547
+msgid ""
+"Please report the above information to gimp-print-devel@lists.sourceforge.net"
+msgstr ""
+
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:5866
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5891
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3630
-#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3655
-#: src/xml/xmli18n-tmp.h:3663
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5900
 msgid "Economy"
 msgstr ""
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3635
-#: src/xml/xmli18n-tmp.h:3642 src/xml/xmli18n-tmp.h:3651
-#: src/xml/xmli18n-tmp.h:3660 src/xml/xmli18n-tmp.h:3668
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:5872
+#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
 #, fuzzy
 msgid "Super Photo"
 msgstr "Slashdot"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3636
-#: src/xml/xmli18n-tmp.h:3643 src/xml/xmli18n-tmp.h:3652
-#: src/xml/xmli18n-tmp.h:3661 src/xml/xmli18n-tmp.h:3669
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:5873
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5889
+#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5906
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Slashdot"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1326 src/cups/genppd.c:1989
-#: src/xml/xmli18n-tmp.h:3637 src/xml/xmli18n-tmp.h:3644
-#: src/xml/xmli18n-tmp.h:3653 src/xml/xmli18n-tmp.h:3662
-#: src/xml/xmli18n-tmp.h:3670
+#: src/main/generic-options.c:41 src/cups/genppd.c:1359 src/cups/genppd.c:2023
+#: src/xml/xmli18n-tmp.h:5874 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5899
+#: src/xml/xmli18n-tmp.h:5907
 msgid "Best"
 msgstr ""
 
@@ -3315,84 +4070,84 @@ msgstr ""
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:960
+#: src/cups/genppd.c:993
 msgid "English"
 msgstr "Greek"
 
-#: src/cups/genppd.c:1159 src/cups/genppd.c:1175 src/cups/genppd.c:1934
-#: src/cups/genppd.c:1935
+#: src/cups/genppd.c:1192 src/cups/genppd.c:1208 src/cups/genppd.c:1968
+#: src/cups/genppd.c:1969
 #, fuzzy
 msgid "Media Size"
 msgstr "ÌÝãåèïò ×:"
 
 #
-#: src/cups/genppd.c:1248 src/cups/genppd.c:1970
+#: src/cups/genppd.c:1281 src/cups/genppd.c:2004
 #, fuzzy
 msgid "Color Model"
 msgstr "×ñþìá"
 
-#: src/cups/genppd.c:1275 src/cups/genppd.c:1972
+#: src/cups/genppd.c:1308 src/cups/genppd.c:2006
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "Êëßìáêá ôïõ ãêñé"
 
 #
-#: src/cups/genppd.c:1285 src/cups/genppd.c:1976
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2010
 #, fuzzy
 msgid "RGB Color"
 msgstr "×ñþìá"
 
-#: src/cups/genppd.c:1292 src/cups/genppd.c:1977
+#: src/cups/genppd.c:1325 src/cups/genppd.c:2011
 #, fuzzy
 msgid "CMY Color"
 msgstr "+ ×ñþìá"
 
-#: src/cups/genppd.c:1317 src/cups/genppd.c:1987
+#: src/cups/genppd.c:1350 src/cups/genppd.c:2021
 msgid "Color Precision"
 msgstr ""
 
-#: src/cups/genppd.c:1573 src/cups/genppd.c:2080
+#: src/cups/genppd.c:1606 src/cups/genppd.c:2114
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:1590 src/cups/genppd.c:2096
+#: src/cups/genppd.c:1623 src/cups/genppd.c:2130
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:1615 src/cups/genppd.c:2113
+#: src/cups/genppd.c:1648 src/cups/genppd.c:2147
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1620 src/cups/genppd.c:2114
+#: src/cups/genppd.c:1653 src/cups/genppd.c:2148
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1621 src/cups/genppd.c:2115
+#: src/cups/genppd.c:1654 src/cups/genppd.c:2149
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1622 src/cups/genppd.c:2116
+#: src/cups/genppd.c:1655 src/cups/genppd.c:2150
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1716 src/cups/genppd.c:2162
+#: src/cups/genppd.c:1749 src/cups/genppd.c:2196
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1718 src/cups/genppd.c:2164
+#: src/cups/genppd.c:1751 src/cups/genppd.c:2198
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1757 src/cups/genppd.c:1820 src/cups/genppd.c:1864
-#: src/cups/genppd.c:2185 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+#: src/cups/genppd.c:1790 src/cups/genppd.c:1853 src/cups/genppd.c:1897
+#: src/cups/genppd.c:2219 src/cups/genppd.c:2249 src/cups/genppd.c:2266
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1762 src/cups/genppd.c:2189
+#: src/cups/genppd.c:1795 src/cups/genppd.c:2223
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/cups/genppd.c:1805 src/cups/genppd.c:2209
+#: src/cups/genppd.c:1838 src/cups/genppd.c:2243
 #, c-format
 msgid "%.1f mm"
 msgstr ""
@@ -3612,51 +4367,61 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:383
-#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
-#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
-#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
-#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
-#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
-#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
-#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
-#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
-#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
-#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
-#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
-#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
-#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
-#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
-#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
-#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
-#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
-#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
-#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
-#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
-#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
-#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
-#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
-#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
-#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
-#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
-#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
-#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
-#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
-#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1503
-#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1509
-#: src/xml/xmli18n-tmp.h:1512 src/xml/xmli18n-tmp.h:1515
-#: src/xml/xmli18n-tmp.h:1518 src/xml/xmli18n-tmp.h:1521
-#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1527
-#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
-#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
-#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
-#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
-#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
-#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:2655
-#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2717
-#: src/xml/xmli18n-tmp.h:3045 src/xml/xmli18n-tmp.h:3252
-#: src/xml/xmli18n-tmp.h:3273 src/xml/xmli18n-tmp.h:3363
-#: src/xml/xmli18n-tmp.h:3531
+#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2001
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2010 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2025
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:4085 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4612 src/xml/xmli18n-tmp.h:5481
 #, fuzzy
 msgid "Photo Black"
 msgstr "Êåßìåíá"
@@ -3668,131 +4433,303 @@ msgid "Unknown"
 msgstr ""
 
 #: src/escputil/escputil.c:1000 src/escputil/escputil.c:1289
-#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1921
-#: src/xml/xmli18n-tmp.h:1937 src/xml/xmli18n-tmp.h:2002
-#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2079
-#: src/xml/xmli18n-tmp.h:2105 src/xml/xmli18n-tmp.h:2119
-#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2173
-#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
-#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
-#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2293
-#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2346
-#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2418
-#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2445
-#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2469
-#: src/xml/xmli18n-tmp.h:2484 src/xml/xmli18n-tmp.h:2512
-#: src/xml/xmli18n-tmp.h:2525 src/xml/xmli18n-tmp.h:2564
-#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2626
-#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2746
-#: src/xml/xmli18n-tmp.h:2762 src/xml/xmli18n-tmp.h:2843
-#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2895
-#: src/xml/xmli18n-tmp.h:2912 src/xml/xmli18n-tmp.h:2946
-#: src/xml/xmli18n-tmp.h:3001 src/xml/xmli18n-tmp.h:3015
-#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3122
-#: src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2461 src/xml/xmli18n-tmp.h:2526
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2683 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2711 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3101 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3661
+#: src/xml/xmli18n-tmp.h:3678 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3750 src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:3782 src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:3932 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3964 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4388 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:4639 src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:4875 src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4936
+#: src/xml/xmli18n-tmp.h:4942 src/xml/xmli18n-tmp.h:4968
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5339 src/xml/xmli18n-tmp.h:5348
+#: src/xml/xmli18n-tmp.h:5355 src/xml/xmli18n-tmp.h:5361
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5417
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5430
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5477 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5502
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5536 src/xml/xmli18n-tmp.h:5544
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5557
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5657 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5719
+#: src/xml/xmli18n-tmp.h:5726 src/xml/xmli18n-tmp.h:5732
+#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5779
 #, fuzzy
 msgid "Light Cyan"
 msgstr "ØéëÞ Âñï÷Þ"
 
 #: src/escputil/escputil.c:1001 src/escputil/escputil.c:1290
-#: src/xml/xmli18n-tmp.h:1906 src/xml/xmli18n-tmp.h:1922
-#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:2003
-#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2080
-#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2120
-#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2174
-#: src/xml/xmli18n-tmp.h:2188 src/xml/xmli18n-tmp.h:2201
-#: src/xml/xmli18n-tmp.h:2214 src/xml/xmli18n-tmp.h:2227
-#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2294
-#: src/xml/xmli18n-tmp.h:2309 src/xml/xmli18n-tmp.h:2347
-#: src/xml/xmli18n-tmp.h:2360 src/xml/xmli18n-tmp.h:2419
-#: src/xml/xmli18n-tmp.h:2432 src/xml/xmli18n-tmp.h:2446
-#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2470
-#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2513
-#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2565
-#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2627
-#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2748
-#: src/xml/xmli18n-tmp.h:2761 src/xml/xmli18n-tmp.h:2844
-#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2896
-#: src/xml/xmli18n-tmp.h:2913 src/xml/xmli18n-tmp.h:2947
-#: src/xml/xmli18n-tmp.h:3000 src/xml/xmli18n-tmp.h:3014
-#: src/xml/xmli18n-tmp.h:3028 src/xml/xmli18n-tmp.h:3123
-#: src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2446
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2527
+#: src/xml/xmli18n-tmp.h:2541 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2644
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2698
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2751
+#: src/xml/xmli18n-tmp.h:2803 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2956 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2994
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3381
+#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3662
+#: src/xml/xmli18n-tmp.h:3746 src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:3778 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3934 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3966 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:4265 src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:4390 src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:4428 src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4452
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4465
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4512 src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4586 src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:4641 src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4903
+#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4970
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:5044 src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5168
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5241 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5334
+#: src/xml/xmli18n-tmp.h:5341 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5363
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5419
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5471
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5504
+#: src/xml/xmli18n-tmp.h:5510 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5652
+#: src/xml/xmli18n-tmp.h:5659 src/xml/xmli18n-tmp.h:5665
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5721
+#: src/xml/xmli18n-tmp.h:5728 src/xml/xmli18n-tmp.h:5734
+#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5781
 #, fuzzy
 msgid "Light Magenta"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2433
-#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:3002
-#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3030
+#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3679 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4409 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:4566 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4605 src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4664 src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5376 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5450
+#: src/xml/xmli18n-tmp.h:5475 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5533 src/xml/xmli18n-tmp.h:5542
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5678 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5717
+#: src/xml/xmli18n-tmp.h:5747 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5777
 #, fuzzy
 msgid "Light Black"
 msgstr "Ìáýñï"
 
-#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:384
-#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
-#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
-#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
-#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
-#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
-#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
-#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
-#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
-#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
-#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
-#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
-#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
-#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
-#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
-#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
-#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
-#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
-#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
-#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
-#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
-#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
-#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
-#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
-#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
-#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
-#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
-#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
-#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
-#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
-#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1504
-#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1510
-#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1516
-#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1522
-#: src/xml/xmli18n-tmp.h:1525 src/xml/xmli18n-tmp.h:1528
-#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1534
-#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1540
-#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1546
-#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1552
-#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1558
-#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:2654
-#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2716
-#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3264
-#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3371
-#: src/xml/xmli18n-tmp.h:3539
+#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:508 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:532 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:538 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:562 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:568 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
+#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
+#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
+#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
+#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
+#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
+#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
+#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
+#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
+#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
+#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
+#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2011 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2026
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2032
+#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2038
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:4044 src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:5530
 #, fuzzy
 msgid "Matte Black"
 msgstr "×áñôß Ìáíßëá"
 
-#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:2658
-#: src/xml/xmli18n-tmp.h:2702 src/xml/xmli18n-tmp.h:2720
-#: src/xml/xmli18n-tmp.h:3048
+#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3995 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4006 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4020 src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:4106 src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:2760
-#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3013
-#: src/xml/xmli18n-tmp.h:3027
+#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3676
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4616 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5534 src/xml/xmli18n-tmp.h:5573
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Ìáýñï"
 
 #
 #: src/escputil/escputil.c:1010 src/escputil/escputil.c:1029
-#: src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:4099 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4189
 #, fuzzy
 msgid "Orange"
 msgstr "ÌÝãåèïò"
@@ -4349,8258 +5286,8386 @@ msgstr "Åêôõðþíåôáé .."
 #: src/xml/xmli18n-tmp.h:68 src/xml/xmli18n-tmp.h:70 src/xml/xmli18n-tmp.h:72
 #: src/xml/xmli18n-tmp.h:74 src/xml/xmli18n-tmp.h:76 src/xml/xmli18n-tmp.h:78
 #: src/xml/xmli18n-tmp.h:80 src/xml/xmli18n-tmp.h:82 src/xml/xmli18n-tmp.h:84
-#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:92
-#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
-#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
-#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
-#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
-#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
-#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
-#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
-#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
-#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
-#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
-#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
-#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
-#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
-#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
-#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
-#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
-#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
-#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
-#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
-#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
-#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
-#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
-#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
-#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
-#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
-#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
-#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
-#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
-#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
-#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
-#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
-#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
-#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
-#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
-#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
-#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
-#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
-#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
-#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
-#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
-#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
-#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
-#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
-#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
-#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
-#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
-#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
-#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
-#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
-#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
-#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
-#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
-#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
-#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
-#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
-#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
-#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
-#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
-#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
-#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
-#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
-#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
-#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
-#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
-#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
-#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
-#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
-#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
-#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
-#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
-#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
-#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
-#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
-#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
-#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
-#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
-#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
-#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
-#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
-#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
-#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
-#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
-#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
-#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
-#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
-#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
-#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
-#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
-#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
-#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
-#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
-#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
-#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
-#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
-#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
-#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:92 src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:102 src/xml/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:106 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:114 src/xml/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:118 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:126 src/xml/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:130 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:136 src/xml/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:144 src/xml/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:168 src/xml/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:192 src/xml/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:216 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:232 src/xml/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:240 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:256 src/xml/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:264 src/xml/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:304 src/xml/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:312 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:320 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:328 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:336 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:344 src/xml/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:352 src/xml/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:384 src/xml/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:408 src/xml/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:412 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:432 src/xml/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:444 src/xml/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:448 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:468 src/xml/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:484 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:642 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:698 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:714 src/xml/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:722 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:738 src/xml/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:746 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:764 src/xml/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:780 src/xml/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:804 src/xml/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:814
 #: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:818
 #: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:822
 #: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:826
 #: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:830
-#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:834
-#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:838
-#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:842
-#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:846
-#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:850
-#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
-#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
-#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
-#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
-#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
-#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
-#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
-#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:898
-#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
-#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
-#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
-#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
-#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
-#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
-#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
-#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
-#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
-#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
-#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
-#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
-#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
-#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
-#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
-#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
-#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
-#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
-#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
-#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1018
-#: src/xml/xmli18n-tmp.h:1021 src/xml/xmli18n-tmp.h:1024
-#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1030
-#: src/xml/xmli18n-tmp.h:1033 src/xml/xmli18n-tmp.h:1036
-#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1042
-#: src/xml/xmli18n-tmp.h:1045 src/xml/xmli18n-tmp.h:1048
-#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1054
-#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1060
-#: src/xml/xmli18n-tmp.h:1063 src/xml/xmli18n-tmp.h:1066
-#: src/xml/xmli18n-tmp.h:1069 src/xml/xmli18n-tmp.h:1072
-#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1078
-#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1084
-#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1090
-#: src/xml/xmli18n-tmp.h:1093 src/xml/xmli18n-tmp.h:1096
-#: src/xml/xmli18n-tmp.h:1099 src/xml/xmli18n-tmp.h:1102
-#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1108
-#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1114
-#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1120
-#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1126
-#: src/xml/xmli18n-tmp.h:1129 src/xml/xmli18n-tmp.h:1132
-#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
-#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
-#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
-#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
-#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
-#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
-#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
-#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
-#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
-#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
-#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
-#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
-#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
-#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1189
-#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1193
-#: src/xml/xmli18n-tmp.h:1195 src/xml/xmli18n-tmp.h:1197
-#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1201
-#: src/xml/xmli18n-tmp.h:1203 src/xml/xmli18n-tmp.h:1205
-#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1209
-#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1221
-#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
-#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
-#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
-#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
-#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
-#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
-#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
-#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
-#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
-#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
-#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
-#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
-#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
-#: src/xml/xmli18n-tmp.h:1302 src/xml/xmli18n-tmp.h:1305
-#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1311
-#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1317
-#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1323
-#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1329
-#: src/xml/xmli18n-tmp.h:1332 src/xml/xmli18n-tmp.h:1335
-#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
-#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1343
-#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1347
-#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1351
-#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1355
-#: src/xml/xmli18n-tmp.h:1357 src/xml/xmli18n-tmp.h:1359
-#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1363
-#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1367
-#: src/xml/xmli18n-tmp.h:1369 src/xml/xmli18n-tmp.h:1371
-#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1375
-#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1566
-#: src/xml/xmli18n-tmp.h:1569 src/xml/xmli18n-tmp.h:1572
-#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1578
-#: src/xml/xmli18n-tmp.h:1581 src/xml/xmli18n-tmp.h:1584
-#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1590
-#: src/xml/xmli18n-tmp.h:1593 src/xml/xmli18n-tmp.h:1596
-#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1602
-#: src/xml/xmli18n-tmp.h:1605 src/xml/xmli18n-tmp.h:1608
-#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1614
-#: src/xml/xmli18n-tmp.h:1617 src/xml/xmli18n-tmp.h:1620
-#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1626
-#: src/xml/xmli18n-tmp.h:1629 src/xml/xmli18n-tmp.h:1632
-#: src/xml/xmli18n-tmp.h:1635 src/xml/xmli18n-tmp.h:1638
-#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1644
-#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
-#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
-#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
-#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
-#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
-#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
-#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
-#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
-#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
-#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
-#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
-#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
-#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
-#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
-#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:1778
-#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1782
-#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1786
-#: src/xml/xmli18n-tmp.h:1788 src/xml/xmli18n-tmp.h:1790
-#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1794
-#: src/xml/xmli18n-tmp.h:1796 src/xml/xmli18n-tmp.h:1798
-#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1802
-#: src/xml/xmli18n-tmp.h:1804 src/xml/xmli18n-tmp.h:1806
-#: src/xml/xmli18n-tmp.h:1808 src/xml/xmli18n-tmp.h:1810
-#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3204
-#: src/xml/xmli18n-tmp.h:3210 src/xml/xmli18n-tmp.h:3216
-#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3232
-#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3250
-#: src/xml/xmli18n-tmp.h:3294 src/xml/xmli18n-tmp.h:3302
-#: src/xml/xmli18n-tmp.h:3304 src/xml/xmli18n-tmp.h:3312
-#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3379
-#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
-#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3421
-#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3441
-#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3469
-#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3555
-#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3597
-#: src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:1017
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1025
+#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1035 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1047 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1056
+#: src/xml/xmli18n-tmp.h:1061 src/xml/xmli18n-tmp.h:1066
+#: src/xml/xmli18n-tmp.h:1071 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1086
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1096
+#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1116
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1126
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1136
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1161 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1181 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1206
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1216
+#: src/xml/xmli18n-tmp.h:1221 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1236
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1246
+#: src/xml/xmli18n-tmp.h:1251 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1261 src/xml/xmli18n-tmp.h:1266
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1281 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1291 src/xml/xmli18n-tmp.h:1296
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1311 src/xml/xmli18n-tmp.h:1316
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1326
+#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1336
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1378 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1414 src/xml/xmli18n-tmp.h:1420
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1432
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1450 src/xml/xmli18n-tmp.h:1455
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1465
+#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1480 src/xml/xmli18n-tmp.h:1485
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1540 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1551 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1583 src/xml/xmli18n-tmp.h:1585
+#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1603 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1607 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1646
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1666
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1676
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1716
+#: src/xml/xmli18n-tmp.h:1721 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1736
+#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1835
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1843
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1851
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:2049
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2057
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2065
+#: src/xml/xmli18n-tmp.h:2069 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2113
+#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2129
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2137
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2153
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2161
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2185
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2264
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2272
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2276
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2282 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2286 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2296
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2300
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2308
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2314 src/xml/xmli18n-tmp.h:2316
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2324
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:3787 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3895 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:4223 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5579
+#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5825
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Bright White Paper"
 msgstr "×áñôß Ìáíßëá"
 
-#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
-#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
-#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
-#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
-#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
-#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
-#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
-#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:817
-#: src/xml/xmli18n-tmp.h:855 src/xml/xmli18n-tmp.h:912
-#: src/xml/xmli18n-tmp.h:969 src/xml/xmli18n-tmp.h:1026
-#: src/xml/xmli18n-tmp.h:1083 src/xml/xmli18n-tmp.h:1136
-#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1226
-#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1338
-#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1445
-#: src/xml/xmli18n-tmp.h:1505 src/xml/xmli18n-tmp.h:1568
-#: src/xml/xmli18n-tmp.h:1625 src/xml/xmli18n-tmp.h:1682
-#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1777
-#: src/xml/xmli18n-tmp.h:3675
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:139 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:959 src/xml/xmli18n-tmp.h:1018
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1155
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1546
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1931
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:5912
 #, fuzzy
 msgid "Postcard"
 msgstr "Ôåëåõôáßá êáñôÝëá"
 
-#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
-#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
-#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
-#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
-#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
-#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
-#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
-#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:825
-#: src/xml/xmli18n-tmp.h:867 src/xml/xmli18n-tmp.h:924
-#: src/xml/xmli18n-tmp.h:981 src/xml/xmli18n-tmp.h:1038
-#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1144
-#: src/xml/xmli18n-tmp.h:1182 src/xml/xmli18n-tmp.h:1238
-#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1346
-#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1457
-#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1580
-#: src/xml/xmli18n-tmp.h:1637 src/xml/xmli18n-tmp.h:1694
-#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1785
+#: src/xml/xmli18n-tmp.h:13 src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:155 src/xml/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:415 src/xml/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:851 src/xml/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1026
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1175
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1554
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1832
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2309
 #, fuzzy
 msgid "Back Light Film"
 msgstr "Åëáöñý ÷áëÜæé"
 
-#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
-#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
-#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
-#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
-#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
-#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
-#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
-#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:829
-#: src/xml/xmli18n-tmp.h:873 src/xml/xmli18n-tmp.h:930
-#: src/xml/xmli18n-tmp.h:987 src/xml/xmli18n-tmp.h:1044
-#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1148
-#: src/xml/xmli18n-tmp.h:1186 src/xml/xmli18n-tmp.h:1244
-#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1350
-#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1463
-#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1586
-#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1700
-#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1789
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:419 src/xml/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:857 src/xml/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1030
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1383
+#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1558
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2313
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "×áñôß Ìáíßëá"
 
-#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
-#: src/xml/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:421
 msgid "Premium Presentation Paper Matte"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:27
-msgid "Premium Glossy Photo Paper 170 wt"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:29
-msgid "Premium Glossy Photo Paper 250 wt"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
-#: src/xml/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:431
 #, fuzzy
 msgid "Ultra Glossy Photo Paper"
 msgstr "Êåßìåíá"
 
-#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
-#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
-#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
-#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
-#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
-#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
-#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
-#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:839
-#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:945
-#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1059
-#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1158
-#: src/xml/xmli18n-tmp.h:1196 src/xml/xmli18n-tmp.h:1259
-#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1360
-#: src/xml/xmli18n-tmp.h:1415 src/xml/xmli18n-tmp.h:1478
-#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1601
-#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1715
-#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1210
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1413
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1568
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1695
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1964
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2176 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2287 src/xml/xmli18n-tmp.h:2323
 msgid "Premium Semigloss Photo Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:35
-msgid "Premium Semigloss Photo Paper 170 wt"
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:437
+msgid "Ultra Premium Photo Paper Luster"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:37
-msgid "Premium Semigloss Photo Paper 250 wt"
+msgid "CD or DVD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:93 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1230
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1437
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2331
+#, fuzzy
+msgid "ColorLife Paper"
+msgstr "Êýñéá Óåëßäá"
+
+#: src/xml/xmli18n-tmp.h:73
+msgid "Premium Glossy Photo Paper 170 wt"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:41
-msgid "Premium Luster Photo Paper 250 wt"
+#: src/xml/xmli18n-tmp.h:75
+msgid "Premium Glossy Photo Paper 250 wt"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
-#: src/xml/xmli18n-tmp.h:334
-msgid "Ultra Premium Photo Paper Luster"
+#: src/xml/xmli18n-tmp.h:81
+msgid "Premium Semigloss Photo Paper 170 wt"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
-#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
-#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
-#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
-#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
-#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
-#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
-#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:845
-#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:957
-#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1071
-#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1166
-#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1271
-#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1372
-#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1496
-#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1613
-#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1733
-#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1807
-#, fuzzy
-msgid "ColorLife Paper"
-msgstr "Êýñéá Óåëßäá"
+#: src/xml/xmli18n-tmp.h:83
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
-#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
-#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
-#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
-#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
-#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
-#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
-#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
-#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
-#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
-#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
-#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
-#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
-#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
-#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
-#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
-#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
-#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
-#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
-#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
-#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
-#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
-#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
-#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
-#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
-#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
-#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
-#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
-#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
-#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
-#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
-#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
-#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
-#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
-#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
-#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
-#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
-#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
-#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
-#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
-#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
-#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
-#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
-#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
-#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
-#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
-#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:851
-#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:857
-#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:863
-#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:869
-#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:875
-#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:881
-#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:887
-#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:893
-#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:899
-#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:905
-#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:911
-#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:917
-#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:923
-#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:929
-#: src/xml/xmli18n-tmp.h:932 src/xml/xmli18n-tmp.h:935
-#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:941
-#: src/xml/xmli18n-tmp.h:944 src/xml/xmli18n-tmp.h:947
-#: src/xml/xmli18n-tmp.h:950 src/xml/xmli18n-tmp.h:953
-#: src/xml/xmli18n-tmp.h:956 src/xml/xmli18n-tmp.h:959
-#: src/xml/xmli18n-tmp.h:962 src/xml/xmli18n-tmp.h:965
-#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:971
-#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:977
-#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:983
-#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:989
-#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:995
-#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1001
-#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1007
-#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1013
-#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1019
-#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1025
-#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1031
-#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1037
-#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1043
-#: src/xml/xmli18n-tmp.h:1046 src/xml/xmli18n-tmp.h:1049
-#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1055
-#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1061
-#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1067
-#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1073
-#: src/xml/xmli18n-tmp.h:1076 src/xml/xmli18n-tmp.h:1079
-#: src/xml/xmli18n-tmp.h:1082 src/xml/xmli18n-tmp.h:1085
-#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1091
-#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1097
-#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1103
-#: src/xml/xmli18n-tmp.h:1106 src/xml/xmli18n-tmp.h:1109
-#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1115
-#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1121
-#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1127
-#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1133
-#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1225
-#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1231
-#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1237
-#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1243
-#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1249
-#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1255
-#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1261
-#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1267
-#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1273
-#: src/xml/xmli18n-tmp.h:1276 src/xml/xmli18n-tmp.h:1279
-#: src/xml/xmli18n-tmp.h:1282 src/xml/xmli18n-tmp.h:1285
-#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1291
-#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1297
-#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1303
-#: src/xml/xmli18n-tmp.h:1306 src/xml/xmli18n-tmp.h:1309
-#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1315
-#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1321
-#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1327
-#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1333
-#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1567
-#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1573
-#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1579
-#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1585
-#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1591
-#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1597
-#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1603
-#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1609
-#: src/xml/xmli18n-tmp.h:1612 src/xml/xmli18n-tmp.h:1615
-#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1621
-#: src/xml/xmli18n-tmp.h:1624 src/xml/xmli18n-tmp.h:1627
-#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1633
-#: src/xml/xmli18n-tmp.h:1636 src/xml/xmli18n-tmp.h:1639
-#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1645
-#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1651
-#: src/xml/xmli18n-tmp.h:1654 src/xml/xmli18n-tmp.h:1657
-#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1663
-#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1669
-#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1675
-#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3223
-#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3231
-#: src/xml/xmli18n-tmp.h:3238 src/xml/xmli18n-tmp.h:3239
-#: src/xml/xmli18n-tmp.h:3300 src/xml/xmli18n-tmp.h:3301
-#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3311
-#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3396
-#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3408
-#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3420
-#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3432
-#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3440
-#: src/xml/xmli18n-tmp.h:3479 src/xml/xmli18n-tmp.h:3480
-#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3492
-#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3554
-#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:87
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:133 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:149 src/xml/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:173 src/xml/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:197 src/xml/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:205 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:221 src/xml/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:229 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:245 src/xml/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:253 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:261 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:269 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:277 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:285 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:293 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:301 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:309 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:317 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:325 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:333 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:341 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:349 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:357 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:619 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:643 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:667 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:691 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:707 src/xml/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:715 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:731 src/xml/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:739 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:755 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1062
+#: src/xml/xmli18n-tmp.h:1067 src/xml/xmli18n-tmp.h:1072
+#: src/xml/xmli18n-tmp.h:1077 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1092
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1102
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1112
+#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1122
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1132
+#: src/xml/xmli18n-tmp.h:1137 src/xml/xmli18n-tmp.h:1142
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1157 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1177 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1192
+#: src/xml/xmli18n-tmp.h:1197 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1212
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1222
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1242
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1252
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1272
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1287 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1297 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1327 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1385 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1445 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1461
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1516 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1647
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1657
+#: src/xml/xmli18n-tmp.h:1662 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1677
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1687
+#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1742 src/xml/xmli18n-tmp.h:1747
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1767
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1807
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2090 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2098 src/xml/xmli18n-tmp.h:2102
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2118
+#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2126
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2162 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2190
+#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:3884 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:4779 src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:4845 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4919
+#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4980
+#: src/xml/xmli18n-tmp.h:4986 src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5209 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5276
+#: src/xml/xmli18n-tmp.h:5277 src/xml/xmli18n-tmp.h:5283
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5607 src/xml/xmli18n-tmp.h:5633
+#: src/xml/xmli18n-tmp.h:5634 src/xml/xmli18n-tmp.h:5640
 msgid "Quadtone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
-#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
-#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
-#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
-#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:852
-#: src/xml/xmli18n-tmp.h:909 src/xml/xmli18n-tmp.h:966
-#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1080
-#: src/xml/xmli18n-tmp.h:1172 src/xml/xmli18n-tmp.h:1223
-#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1336
-#: src/xml/xmli18n-tmp.h:1379 src/xml/xmli18n-tmp.h:1442
-#: src/xml/xmli18n-tmp.h:1565 src/xml/xmli18n-tmp.h:1622
-#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1775
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:142 src/xml/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:150 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:174 src/xml/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:198 src/xml/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:214 src/xml/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:222 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:238 src/xml/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:246 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:262 src/xml/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:302 src/xml/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:310 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:318 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:326 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:334 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:342 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:350 src/xml/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:636 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:660 src/xml/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:708 src/xml/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:716 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:732 src/xml/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:756 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1103
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1123
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1158 src/xml/xmli18n-tmp.h:1163
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1183
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1193
+#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1213
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1223
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1238 src/xml/xmli18n-tmp.h:1243
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1253
+#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1283
+#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1313
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1333
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1362 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1374 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1462
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1472
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1487 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1502
+#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:1532
+#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1542
+#: src/xml/xmli18n-tmp.h:1633 src/xml/xmli18n-tmp.h:1638
+#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1648
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1658
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1713 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1728
+#: src/xml/xmli18n-tmp.h:1733 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1768
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2071
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2095
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2115 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2123 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2139 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2183
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2191
+#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2199
+msgid "MISQuadtone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1150 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2299
 #, fuzzy
 msgid "Plain Paper Fast Load"
 msgstr "Êýñéá Óåëßäá"
 
-#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
-#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
-#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1364
-#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1484
-#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1970 src/xml/xmli18n-tmp.h:2030
+#: src/xml/xmli18n-tmp.h:2245
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "×áñôß Ìáíßëá"
 
-#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
-#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
-#: src/xml/xmli18n-tmp.h:1202 src/xml/xmli18n-tmp.h:1366
-#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1487
-#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:881 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2248
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
-#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
-#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
-#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
-#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
-#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
-#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
-#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
-#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
-#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
-#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1377
-#: src/xml/xmli18n-tmp.h:1380 src/xml/xmli18n-tmp.h:1383
-#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1389
-#: src/xml/xmli18n-tmp.h:1392 src/xml/xmli18n-tmp.h:1395
-#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1401
-#: src/xml/xmli18n-tmp.h:1404 src/xml/xmli18n-tmp.h:1407
-#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1413
-#: src/xml/xmli18n-tmp.h:1416 src/xml/xmli18n-tmp.h:1419
-#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1425
-#: src/xml/xmli18n-tmp.h:1428 src/xml/xmli18n-tmp.h:1431
-#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1437
-#: src/xml/xmli18n-tmp.h:1440 src/xml/xmli18n-tmp.h:1443
-#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1449
-#: src/xml/xmli18n-tmp.h:1452 src/xml/xmli18n-tmp.h:1455
-#: src/xml/xmli18n-tmp.h:1458 src/xml/xmli18n-tmp.h:1461
-#: src/xml/xmli18n-tmp.h:1464 src/xml/xmli18n-tmp.h:1467
-#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1473
-#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1479
-#: src/xml/xmli18n-tmp.h:1482 src/xml/xmli18n-tmp.h:1485
-#: src/xml/xmli18n-tmp.h:1488 src/xml/xmli18n-tmp.h:1491
-#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1497
-#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1677
-#: src/xml/xmli18n-tmp.h:1680 src/xml/xmli18n-tmp.h:1683
-#: src/xml/xmli18n-tmp.h:1686 src/xml/xmli18n-tmp.h:1689
-#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1695
-#: src/xml/xmli18n-tmp.h:1698 src/xml/xmli18n-tmp.h:1701
-#: src/xml/xmli18n-tmp.h:1704 src/xml/xmli18n-tmp.h:1707
-#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1713
-#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1719
-#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1725
-#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1731
-#: src/xml/xmli18n-tmp.h:1734 src/xml/xmli18n-tmp.h:1737
-#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3503
-#: src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:1863
+#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1881
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1893
+#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1905
+#: src/xml/xmli18n-tmp.h:1908 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1923
+#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:1950 src/xml/xmli18n-tmp.h:1953
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1968 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1983
+#: src/xml/xmli18n-tmp.h:1986 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2204 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2255
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5645
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Slashdot"
 
-#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
-#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
-#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
-#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
-#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
-#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
-#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
-#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
-#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
-#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
-#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1378
-#: src/xml/xmli18n-tmp.h:1381 src/xml/xmli18n-tmp.h:1384
-#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1390
-#: src/xml/xmli18n-tmp.h:1393 src/xml/xmli18n-tmp.h:1396
-#: src/xml/xmli18n-tmp.h:1399 src/xml/xmli18n-tmp.h:1402
-#: src/xml/xmli18n-tmp.h:1405 src/xml/xmli18n-tmp.h:1408
-#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1414
-#: src/xml/xmli18n-tmp.h:1417 src/xml/xmli18n-tmp.h:1420
-#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1426
-#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1432
-#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1438
-#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1444
-#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1450
-#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1456
-#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1462
-#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1468
-#: src/xml/xmli18n-tmp.h:1471 src/xml/xmli18n-tmp.h:1474
-#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1480
-#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1486
-#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1492
-#: src/xml/xmli18n-tmp.h:1495 src/xml/xmli18n-tmp.h:1498
-#: src/xml/xmli18n-tmp.h:1501 src/xml/xmli18n-tmp.h:1678
-#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1684
-#: src/xml/xmli18n-tmp.h:1687 src/xml/xmli18n-tmp.h:1690
-#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1696
-#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1702
-#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1708
-#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1714
-#: src/xml/xmli18n-tmp.h:1717 src/xml/xmli18n-tmp.h:1720
-#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1726
-#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1732
-#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1738
-#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3517
-#: src/xml/xmli18n-tmp.h:3577
+#: src/xml/xmli18n-tmp.h:835 src/xml/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:841 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1879 src/xml/xmli18n-tmp.h:1882
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1894
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1909 src/xml/xmli18n-tmp.h:1912
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1924
+#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1954
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1969 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1984
+#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2208
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2229 src/xml/xmli18n-tmp.h:2232
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2238
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2244
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2253 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2259 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5714
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1826
-#: src/xml/xmli18n-tmp.h:1839 src/xml/xmli18n-tmp.h:1852
-#: src/xml/xmli18n-tmp.h:1907 src/xml/xmli18n-tmp.h:1923
-#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1952
-#: src/xml/xmli18n-tmp.h:1965 src/xml/xmli18n-tmp.h:2054
-#: src/xml/xmli18n-tmp.h:2081 src/xml/xmli18n-tmp.h:2146
-#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
-#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
-#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2348
-#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2407
-#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2899
-#: src/xml/xmli18n-tmp.h:2916 src/xml/xmli18n-tmp.h:3142
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1139
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1154 src/xml/xmli18n-tmp.h:1159
+#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1179
+#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1199
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1214 src/xml/xmli18n-tmp.h:1219
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1229
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1244 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1259
+#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1274 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1289
+#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1309
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1329
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1423
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1429
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1447
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1634
+#: src/xml/xmli18n-tmp.h:1639 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1664
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1764
+#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1784
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1799 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1819
+msgid "MIS Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1463 src/xml/xmli18n-tmp.h:1468
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1478
+#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1508
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1533 src/xml/xmli18n-tmp.h:1538
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4858 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:5289
+msgid "Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2489 src/xml/xmli18n-tmp.h:2578
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2713 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2752
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2885 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:3051 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3665
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1828
-#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1853
-#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1879
-#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
-#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1940
-#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1966
-#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2055
-#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2133
-#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2175
-#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
-#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
-#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2336
-#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
-#: src/xml/xmli18n-tmp.h:2408 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2699
+#: src/xml/xmli18n-tmp.h:2714 src/xml/xmli18n-tmp.h:2727
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2886
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:3052
 msgid "180 DPI Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1830
-#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1854
-#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1880
-#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
-#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1941
-#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1967
-#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
-#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2134
-#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2176
-#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
-#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
-#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2337
-#: src/xml/xmli18n-tmp.h:2350 src/xml/xmli18n-tmp.h:2363
-#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
-#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2434
-#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2459
-#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2529
-#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2601
-#: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2703
-#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2735
-#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2768
-#: src/xml/xmli18n-tmp.h:2872 src/xml/xmli18n-tmp.h:2884
-#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2917
-#: src/xml/xmli18n-tmp.h:2961 src/xml/xmli18n-tmp.h:3007
-#: src/xml/xmli18n-tmp.h:3021 src/xml/xmli18n-tmp.h:3035
-#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3126
-#: src/xml/xmli18n-tmp.h:3143
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2404
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2658
+#: src/xml/xmli18n-tmp.h:2672 src/xml/xmli18n-tmp.h:2700
+#: src/xml/xmli18n-tmp.h:2715 src/xml/xmli18n-tmp.h:2728
+#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2754
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2919 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3053
+#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3125
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3292
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3530
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3649
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3684
 #, fuzzy
 msgid "360 x 180 DPI Draft"
 msgstr "150x150 DPI"
 
-#: src/xml/xmli18n-tmp.h:1818 src/xml/xmli18n-tmp.h:1831
-#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1855
-#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1881
-#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
-#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1942
-#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1968
-#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2135
-#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2392 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2418 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2479 src/xml/xmli18n-tmp.h:2492
+#: src/xml/xmli18n-tmp.h:2581 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2862 src/xml/xmli18n-tmp.h:2934
 msgid "360 DPI High Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1819 src/xml/xmli18n-tmp.h:1832
-#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1856
-#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1882
-#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
-#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1943
-#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1969
-#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1992
-#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2020
-#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
-#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
-#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2096
-#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2123
-#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2149
-#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2177
-#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2205
-#: src/xml/xmli18n-tmp.h:2218 src/xml/xmli18n-tmp.h:2231
-#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2254
-#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
-#: src/xml/xmli18n-tmp.h:2297 src/xml/xmli18n-tmp.h:2312
-#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2339
-#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
-#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2385
-#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2411
-#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2435
-#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2460
-#: src/xml/xmli18n-tmp.h:2473 src/xml/xmli18n-tmp.h:2488
-#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2516
-#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2541
-#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2591
-#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
-#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2645
-#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2675
-#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2704
-#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2736
-#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2769
-#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2808
-#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2833
-#: src/xml/xmli18n-tmp.h:2847 src/xml/xmli18n-tmp.h:2861
-#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2885
-#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2918
-#: src/xml/xmli18n-tmp.h:2935 src/xml/xmli18n-tmp.h:2950
-#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2987
-#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3022
-#: src/xml/xmli18n-tmp.h:3036 src/xml/xmli18n-tmp.h:3050
-#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3081
-#: src/xml/xmli18n-tmp.h:3098 src/xml/xmli18n-tmp.h:3113
-#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2369 src/xml/xmli18n-tmp.h:2380
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2406
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2493
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2544
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
+#: src/xml/xmli18n-tmp.h:2582 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2729
+#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2806
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2836
+#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
+#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3012
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3040
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3184 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3424 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3485 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3573
+#: src/xml/xmli18n-tmp.h:3587 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3650 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3685
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
 
-#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1833
-#: src/xml/xmli18n-tmp.h:1846 src/xml/xmli18n-tmp.h:1857
-#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1883
-#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1912
-#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1944
-#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1970
-#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1993
-#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2021
-#: src/xml/xmli18n-tmp.h:2033 src/xml/xmli18n-tmp.h:2045
-#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
-#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2097
-#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2124
-#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2150
-#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2178
-#: src/xml/xmli18n-tmp.h:2193 src/xml/xmli18n-tmp.h:2206
-#: src/xml/xmli18n-tmp.h:2219 src/xml/xmli18n-tmp.h:2232
-#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2255
-#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
-#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2313
-#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2340
-#: src/xml/xmli18n-tmp.h:2352 src/xml/xmli18n-tmp.h:2365
-#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2386
-#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2412
-#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2436
-#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2461
-#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2489
-#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2517
-#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2542
-#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2567
-#: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2592
-#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2616
-#: src/xml/xmli18n-tmp.h:2631 src/xml/xmli18n-tmp.h:2646
-#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2676
-#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2705
-#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2737
-#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2770
-#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2809
-#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2834
-#: src/xml/xmli18n-tmp.h:2848 src/xml/xmli18n-tmp.h:2862
-#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2886
-#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2919
-#: src/xml/xmli18n-tmp.h:2936 src/xml/xmli18n-tmp.h:2951
-#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2988
-#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3023
-#: src/xml/xmli18n-tmp.h:3037 src/xml/xmli18n-tmp.h:3051
-#: src/xml/xmli18n-tmp.h:3066 src/xml/xmli18n-tmp.h:3083
-#: src/xml/xmli18n-tmp.h:3099 src/xml/xmli18n-tmp.h:3114
-#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:2344 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2452 src/xml/xmli18n-tmp.h:2468
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2494
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2557 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:2594
+#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2648
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2674
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2807
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2837
+#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
+#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3013
+#: src/xml/xmli18n-tmp.h:3026 src/xml/xmli18n-tmp.h:3041
+#: src/xml/xmli18n-tmp.h:3055 src/xml/xmli18n-tmp.h:3066
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3140
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3170
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3229
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3333
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3358
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3385
+#: src/xml/xmli18n-tmp.h:3397 src/xml/xmli18n-tmp.h:3409
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3442
+#: src/xml/xmli18n-tmp.h:3459 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3574
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3637
+#: src/xml/xmli18n-tmp.h:3651 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3686
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1834
-#: src/xml/xmli18n-tmp.h:1847 src/xml/xmli18n-tmp.h:1858
-#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1884
-#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1913
-#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1945
-#: src/xml/xmli18n-tmp.h:1958 src/xml/xmli18n-tmp.h:1971
-#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:1994
-#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2022
-#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2046
-#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2071
-#: src/xml/xmli18n-tmp.h:2086 src/xml/xmli18n-tmp.h:2098
-#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2125
-#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2151
-#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2179
-#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2207
-#: src/xml/xmli18n-tmp.h:2220 src/xml/xmli18n-tmp.h:2233
-#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2256
-#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
-#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2314
-#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2341
-#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
-#: src/xml/xmli18n-tmp.h:2376 src/xml/xmli18n-tmp.h:2387
-#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2413
-#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2437
-#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2462
-#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2490
-#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2518
-#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2543
-#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
-#: src/xml/xmli18n-tmp.h:2580 src/xml/xmli18n-tmp.h:2593
-#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2617
-#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
-#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2677
-#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2706
-#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2738
-#: src/xml/xmli18n-tmp.h:2753 src/xml/xmli18n-tmp.h:2771
-#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2810
-#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2835
-#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
-#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2887
-#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2921
-#: src/xml/xmli18n-tmp.h:2937 src/xml/xmli18n-tmp.h:2952
-#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2990
-#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3024
-#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3052
-#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3085
-#: src/xml/xmli18n-tmp.h:3100 src/xml/xmli18n-tmp.h:3115
-#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:2345 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2469
+#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2546
+#: src/xml/xmli18n-tmp.h:2558 src/xml/xmli18n-tmp.h:2570
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2595
+#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2622
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2675
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2731
+#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2808
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2838
+#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2890
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2922 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3014
+#: src/xml/xmli18n-tmp.h:3027 src/xml/xmli18n-tmp.h:3042
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3067
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3186 src/xml/xmli18n-tmp.h:3201
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3334
+#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3359
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3444
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3475
+#: src/xml/xmli18n-tmp.h:3489 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3533 src/xml/xmli18n-tmp.h:3547
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3652 src/xml/xmli18n-tmp.h:3669
+#: src/xml/xmli18n-tmp.h:3687
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
-#: src/xml/xmli18n-tmp.h:1978 src/xml/xmli18n-tmp.h:2004
-#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2030
-#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2067
-#: src/xml/xmli18n-tmp.h:2094 src/xml/xmli18n-tmp.h:2107
-#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2161
-#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2252
-#: src/xml/xmli18n-tmp.h:2280 src/xml/xmli18n-tmp.h:2295
-#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2323
-#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
-#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2486
-#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2552
-#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2613
-#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
-#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2686
-#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2806
-#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2831
-#: src/xml/xmli18n-tmp.h:2845 src/xml/xmli18n-tmp.h:2859
-#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2948
-#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3080
-#: src/xml/xmli18n-tmp.h:3097 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2554
+#: src/xml/xmli18n-tmp.h:2566 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2804 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2834 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3076
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3382
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3586 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3634
 #, fuzzy
 msgid "360 x 120 DPI Economy"
 msgstr "ìïíü÷ñùìï"
 
-#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1842
-#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2005
-#: src/xml/xmli18n-tmp.h:2019 src/xml/xmli18n-tmp.h:2031
-#: src/xml/xmli18n-tmp.h:2043 src/xml/xmli18n-tmp.h:2068
-#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
-#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2162
-#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2253
-#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2296
-#: src/xml/xmli18n-tmp.h:2311 src/xml/xmli18n-tmp.h:2324
-#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2384
-#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2487
-#: src/xml/xmli18n-tmp.h:2500 src/xml/xmli18n-tmp.h:2553
-#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2614
-#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2644
-#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2687
-#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2807
-#: src/xml/xmli18n-tmp.h:2820 src/xml/xmli18n-tmp.h:2832
-#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
-#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2949
-#: src/xml/xmli18n-tmp.h:3112
+#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2555
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2632
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3077
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3211
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3383
+#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3635
 #, fuzzy
 msgid "360 x 240 DPI Draft"
 msgstr "600x600 DPI"
 
-#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1872
-#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1898
-#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1930
-#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1959
-#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:1995
-#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2023
-#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2047
-#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2087
-#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2112
-#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2139
-#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2166
-#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2328
-#: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2388
-#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2557
-#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2922
-#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2991
-#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3086
+#: src/xml/xmli18n-tmp.h:2383 src/xml/xmli18n-tmp.h:2396
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2422
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2470 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2507 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2704 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:3057 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3118 src/xml/xmli18n-tmp.h:3445
+#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3514
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3609
 msgid "720 DPI High Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1873
-#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1899
-#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1931
-#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1984
-#: src/xml/xmli18n-tmp.h:1996 src/xml/xmli18n-tmp.h:2010
-#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2036
-#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2061
-#: src/xml/xmli18n-tmp.h:2073 src/xml/xmli18n-tmp.h:2088
-#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2127
-#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2153
-#: src/xml/xmli18n-tmp.h:2167 src/xml/xmli18n-tmp.h:2181
-#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2208
-#: src/xml/xmli18n-tmp.h:2221 src/xml/xmli18n-tmp.h:2234
-#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2257
-#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2285
-#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2315
-#: src/xml/xmli18n-tmp.h:2329 src/xml/xmli18n-tmp.h:2354
-#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2389
-#: src/xml/xmli18n-tmp.h:2399 src/xml/xmli18n-tmp.h:2425
-#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2451
-#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
-#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2504
-#: src/xml/xmli18n-tmp.h:2519 src/xml/xmli18n-tmp.h:2534
-#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2558
-#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2605
-#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2633
-#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2663
-#: src/xml/xmli18n-tmp.h:2678 src/xml/xmli18n-tmp.h:2691
-#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2725
-#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2754
-#: src/xml/xmli18n-tmp.h:2772 src/xml/xmli18n-tmp.h:2787
-#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2811
-#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2836
-#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
-#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2888
-#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2923
-#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2953
-#: src/xml/xmli18n-tmp.h:2968 src/xml/xmli18n-tmp.h:2978
-#: src/xml/xmli18n-tmp.h:2992 src/xml/xmli18n-tmp.h:3011
-#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3039
-#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
-#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3101
-#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3130
-#: src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:2384 src/xml/xmli18n-tmp.h:2397
+#: src/xml/xmli18n-tmp.h:2410 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2548 src/xml/xmli18n-tmp.h:2560
+#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2691 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2794 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2839
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2923 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3105
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3129
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3231 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3311
+#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3335
+#: src/xml/xmli18n-tmp.h:3348 src/xml/xmli18n-tmp.h:3360
+#: src/xml/xmli18n-tmp.h:3372 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3427 src/xml/xmli18n-tmp.h:3446
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3576 src/xml/xmli18n-tmp.h:3593
+#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3688
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1874
-#: src/xml/xmli18n-tmp.h:1887 src/xml/xmli18n-tmp.h:1900
-#: src/xml/xmli18n-tmp.h:1916 src/xml/xmli18n-tmp.h:1932
-#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1985
-#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2011
-#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2037
-#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2062
-#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2089
-#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2128
-#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2154
-#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2182
-#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2258
-#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
-#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2316
-#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2390
-#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2559
-#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2634
-#: src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2385 src/xml/xmli18n-tmp.h:2398
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2535
+#: src/xml/xmli18n-tmp.h:2549 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2782
+#: src/xml/xmli18n-tmp.h:2795 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3388
 msgid "1440 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1960
-#: src/xml/xmli18n-tmp.h:2100 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2902
 msgid "720 DPI Highest Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2259
-#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
-#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2317
-#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2477
-#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2505
-#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2606
-#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2635
-#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2740
-#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2866
-#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2796 src/xml/xmli18n-tmp.h:2811
+#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3216 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3412
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2260
-#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
-#: src/xml/xmli18n-tmp.h:2303 src/xml/xmli18n-tmp.h:2318
-#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2771 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2812
+#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:3160 src/xml/xmli18n-tmp.h:3390
 msgid "2880 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2439
-#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2493
-#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2546
-#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2582
-#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2620
-#: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2664
-#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
-#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2726
-#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2755
-#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2789
-#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2812
-#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2878
-#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
-#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2939
-#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2969
-#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2994
-#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
-#: src/xml/xmli18n-tmp.h:3088 src/xml/xmli18n-tmp.h:3102
-#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3131
-#: src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2963
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3070
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3106
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3297 src/xml/xmli18n-tmp.h:3313
+#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
+#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3401
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3492
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3577 src/xml/xmli18n-tmp.h:3594
+#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3671 src/xml/xmli18n-tmp.h:3689
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2426
-#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2452
-#: src/xml/xmli18n-tmp.h:2464 src/xml/xmli18n-tmp.h:2479
-#: src/xml/xmli18n-tmp.h:2494 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2547
-#: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2583
-#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2621
-#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2665
-#: src/xml/xmli18n-tmp.h:2680 src/xml/xmli18n-tmp.h:2694
-#: src/xml/xmli18n-tmp.h:2709 src/xml/xmli18n-tmp.h:2727
-#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2756
-#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2790
-#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2813
-#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2837
-#: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2879
-#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
-#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2940
-#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2970
-#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2995
-#: src/xml/xmli18n-tmp.h:3012 src/xml/xmli18n-tmp.h:3026
-#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3055
-#: src/xml/xmli18n-tmp.h:3072 src/xml/xmli18n-tmp.h:3089
-#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3118
-#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3071
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3107
+#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3251
+#: src/xml/xmli18n-tmp.h:3266 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3298 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3324 src/xml/xmli18n-tmp.h:3337
+#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3374 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3463
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3535 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3563 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3612
+#: src/xml/xmli18n-tmp.h:3626 src/xml/xmli18n-tmp.h:3641
+#: src/xml/xmli18n-tmp.h:3655 src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:3690
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:4374
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Êßôñéíï"
 
-#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2584
-#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2711
-#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2743
-#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2776
-#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2908
-#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2972
-#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3057
-#: src/xml/xmli18n-tmp.h:3074 src/xml/xmli18n-tmp.h:3091
-#: src/xml/xmli18n-tmp.h:3105 src/xml/xmli18n-tmp.h:3134
-#: src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3108
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3267
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3495
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3614
+#: src/xml/xmli18n-tmp.h:3628 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3692
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2666 src/xml/xmli18n-tmp.h:2681
-#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2728
-#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2775
-#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2814
-#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2838
-#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2926
-#: src/xml/xmli18n-tmp.h:2941 src/xml/xmli18n-tmp.h:2971
-#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
-#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
-#: src/xml/xmli18n-tmp.h:3090 src/xml/xmli18n-tmp.h:3104
-#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3133
-#: src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3190 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3234 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3325 src/xml/xmli18n-tmp.h:3338
+#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3362
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3505
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3613
+#: src/xml/xmli18n-tmp.h:3627 src/xml/xmli18n-tmp.h:3642
+#: src/xml/xmli18n-tmp.h:3656 src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:3691
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2712
-#: src/xml/xmli18n-tmp.h:2730 src/xml/xmli18n-tmp.h:2759
-#: src/xml/xmli18n-tmp.h:2777 src/xml/xmli18n-tmp.h:2909
-#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2973
-#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3058
-#: src/xml/xmli18n-tmp.h:3075 src/xml/xmli18n-tmp.h:3092
-#: src/xml/xmli18n-tmp.h:3106 src/xml/xmli18n-tmp.h:3135
-#: src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3301 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3496
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3615
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2798 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3502
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2965
-#: src/xml/xmli18n-tmp.h:2989 src/xml/xmli18n-tmp.h:3067
-#: src/xml/xmli18n-tmp.h:3084
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:3607
 #, fuzzy
 msgid "720 x 360 DPI Enhanced"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:3479
 #, fuzzy
 msgid "Black 1"
 msgstr "Ìáýñï"
 
-#: src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3480
 #, fuzzy
 msgid "Black 2"
 msgstr "Ìáýñï"
 
-#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3065
-#: src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3605
 #, fuzzy
 msgid "360 DPI Enhanced"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3516
 #, fuzzy
 msgid "1440 x 720 DPI High Quality"
 msgstr "1440 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:3153
-msgid "Lower Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3677
+#, fuzzy
+msgid "Vivid Light Magenta"
+msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/xml/xmli18n-tmp.h:3154
-msgid "Upper Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3682
+#, fuzzy
+msgid "Vivid Magenta"
+msgstr "ìþâ"
+
+#: src/xml/xmli18n-tmp.h:3694
+#, fuzzy
+msgid "Main Tray"
+msgstr "ÄïêéìÞ"
+
+#: src/xml/xmli18n-tmp.h:3695
+#, fuzzy
+msgid "Photo Tray"
+msgstr "Êñõðôïãñáößá"
 
-#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3160
-#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3176
-#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3186
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3725 src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:3732
 #, fuzzy
 msgid "Print to CD"
 msgstr "Åêôýðùóç óå Áñ÷åßï"
 
-#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3181
-#: src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:3730
 #, fuzzy
 msgid "Rear Tray"
 msgstr "ÄïêéìÞ"
 
-#: src/xml/xmli18n-tmp.h:3157 src/xml/xmli18n-tmp.h:3182
-#: src/xml/xmli18n-tmp.h:3185
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:3731
 msgid "Front Tray"
 msgstr ""
 
 # Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
-#: src/xml/xmli18n-tmp.h:3159 src/xml/xmli18n-tmp.h:3164
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3705
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Åã÷åéñßäéï"
 
-#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3709
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3710
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3171
-#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3180
-#: src/xml/xmli18n-tmp.h:3193
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3716 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3739
 #, fuzzy
 msgid "Roll Feed"
 msgstr "Ñüëïò"
 
 # Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
-#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3714 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3723
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Åã÷åéñßäéï"
 
 # Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
-#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3715 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3724
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Åã÷åéñßäéï"
 
-#: src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3733
 #, fuzzy
 msgid "Photo Board"
 msgstr "Êåßìåíá"
 
-#: src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3734
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3735
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3190
+#: src/xml/xmli18n-tmp.h:3736
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "ÁðåðéëïãÞ"
 
-#: src/xml/xmli18n-tmp.h:3191
+#: src/xml/xmli18n-tmp.h:3737
 msgid "Manual Selection"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3199 src/xml/xmli18n-tmp.h:3207
-#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3219
-#: src/xml/xmli18n-tmp.h:3227 src/xml/xmli18n-tmp.h:3235
-#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3257
-#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3278
-#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3297
-#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3317
-#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3342
-#: src/xml/xmli18n-tmp.h:3356 src/xml/xmli18n-tmp.h:3382
-#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
-#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3426
-#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3446
-#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3474
-#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3498
-#: src/xml/xmli18n-tmp.h:3510 src/xml/xmli18n-tmp.h:3524
-#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3558
-#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:3584
-#: src/xml/xmli18n-tmp.h:3594 src/xml/xmli18n-tmp.h:3600
-#: src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3763 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3872 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:4067 src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4172 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4236 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:4754 src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5102 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5679 src/xml/xmli18n-tmp.h:5748
+#: src/xml/xmli18n-tmp.h:5793 src/xml/xmli18n-tmp.h:5814
+#: src/xml/xmli18n-tmp.h:5835
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3208
-#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3220
-#: src/xml/xmli18n-tmp.h:3228 src/xml/xmli18n-tmp.h:3236
-#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3259
-#: src/xml/xmli18n-tmp.h:3270 src/xml/xmli18n-tmp.h:3280
-#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3298
-#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3318
-#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3344
-#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3383
-#: src/xml/xmli18n-tmp.h:3391 src/xml/xmli18n-tmp.h:3403
-#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3427
-#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3447
-#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3475
-#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3499
-#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3526
-#: src/xml/xmli18n-tmp.h:3551 src/xml/xmli18n-tmp.h:3559
-#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3586
-#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3601
-#: src/xml/xmli18n-tmp.h:3607
+#: src/xml/xmli18n-tmp.h:3765 src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4484 src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:4756 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5321
+#: src/xml/xmli18n-tmp.h:5382 src/xml/xmli18n-tmp.h:5451
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5795 src/xml/xmli18n-tmp.h:5816
+#: src/xml/xmli18n-tmp.h:5837
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
-#: src/xml/xmli18n-tmp.h:3215 src/xml/xmli18n-tmp.h:3221
-#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3237
-#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3271
-#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3299
-#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3319
-#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3345
-#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3384
-#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
-#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3428
-#: src/xml/xmli18n-tmp.h:3438 src/xml/xmli18n-tmp.h:3448
-#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3463
-#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3476
-#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3500
-#: src/xml/xmli18n-tmp.h:3513 src/xml/xmli18n-tmp.h:3527
-#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3560
-#: src/xml/xmli18n-tmp.h:3573 src/xml/xmli18n-tmp.h:3587
-#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3602
-#: src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:3824 src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5325
+#: src/xml/xmli18n-tmp.h:5386 src/xml/xmli18n-tmp.h:5455
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5757
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5841
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3248
-#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
-#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3360
-#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
-#: src/xml/xmli18n-tmp.h:3417 src/xml/xmli18n-tmp.h:3429
-#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3459
-#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3501 src/xml/xmli18n-tmp.h:3514
-#: src/xml/xmli18n-tmp.h:3528 src/xml/xmli18n-tmp.h:3574
-#: src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4424 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:5066 src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:5196 src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5391
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5762
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3249
-#: src/xml/xmli18n-tmp.h:3272 src/xml/xmli18n-tmp.h:3293
-#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3333
-#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3361
-#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
-#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3430
-#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3460
-#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3478
-#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3502
-#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3529
-#: src/xml/xmli18n-tmp.h:3575 src/xml/xmli18n-tmp.h:3589
+#: src/xml/xmli18n-tmp.h:3780 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:4078 src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:4430 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4972
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5150 src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5336
+#: src/xml/xmli18n-tmp.h:5397 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5768
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3919 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:4781 src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:4795 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4921
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:4996
+#: src/xml/xmli18n-tmp.h:5023 src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:5226 src/xml/xmli18n-tmp.h:5279
+#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5603 src/xml/xmli18n-tmp.h:5609
+#: src/xml/xmli18n-tmp.h:5636 src/xml/xmli18n-tmp.h:5642
+#, fuzzy
+msgid "Gray 3"
+msgstr "ÄïêéìÞ"
+
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4782 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4796 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4916 src/xml/xmli18n-tmp.h:4922
+#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4983
+#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5286 src/xml/xmli18n-tmp.h:5294
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5643
+#, fuzzy
+msgid "Gray 2"
+msgstr "ÄïêéìÞ"
+
+#: src/xml/xmli18n-tmp.h:3855 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:4856 src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:4931 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4998
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:5214 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5611
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5644
+#, fuzzy
+msgid "Gray 1"
+msgstr "ÄïêéìÞ"
+
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4985 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5606 src/xml/xmli18n-tmp.h:5639
+msgid "MIS Quadtone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4114
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3260 src/xml/xmli18n-tmp.h:3281
+#: src/xml/xmli18n-tmp.h:4016 src/xml/xmli18n-tmp.h:4121
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3282
+#: src/xml/xmli18n-tmp.h:4021 src/xml/xmli18n-tmp.h:4126
 msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3262 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4132
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:4035 src/xml/xmli18n-tmp.h:4140
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:4141
+#, fuzzy
+msgid "MatteBlack"
+msgstr "×áñôß Ìáíßëá"
+
+#: src/xml/xmli18n-tmp.h:4224
 #, fuzzy
 msgid "Default Black"
 msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
 
-#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
-#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3365
-#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3504
-#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3533
-#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3564
-#: src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4446 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4573 src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:5344
+#: src/xml/xmli18n-tmp.h:5413 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5715
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:4315
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3348
-#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3516
-#: src/xml/xmli18n-tmp.h:3530 src/xml/xmli18n-tmp.h:3576
-#: src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:4368 src/xml/xmli18n-tmp.h:4437
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:5404
+#: src/xml/xmli18n-tmp.h:5473 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5775
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3355
-#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3523
-#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5745
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Êëßìáêá ôïõ ãêñé"
 
-#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3357
-#: src/xml/xmli18n-tmp.h:3511 src/xml/xmli18n-tmp.h:3525
-#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:4412 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5448
+#: src/xml/xmli18n-tmp.h:5681 src/xml/xmli18n-tmp.h:5750
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3372
-#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3540
+#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5531
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3378
-#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:4652 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5570
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3462 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:5288
+msgid "MIS Six Tone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:4994
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5291
+#, fuzzy
+msgid "Gray 5"
+msgstr "ÄïêéìÞ"
+
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:4928 src/xml/xmli18n-tmp.h:4995
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5292
+#, fuzzy
+msgid "Gray 4"
+msgstr "ÄïêéìÞ"
+
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5145
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3615
-#: src/xml/xmli18n-tmp.h:3621
+#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5852
+#: src/xml/xmli18n-tmp.h:5858
 #, fuzzy
 msgid "Interleave"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3616
-#: src/xml/xmli18n-tmp.h:3622
+#: src/xml/xmli18n-tmp.h:5848 src/xml/xmli18n-tmp.h:5853
+#: src/xml/xmli18n-tmp.h:5859
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3612 src/xml/xmli18n-tmp.h:3617
-#: src/xml/xmli18n-tmp.h:3623
+#: src/xml/xmli18n-tmp.h:5849 src/xml/xmli18n-tmp.h:5854
+#: src/xml/xmli18n-tmp.h:5860
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3613 src/xml/xmli18n-tmp.h:3618
-#: src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5855
+#: src/xml/xmli18n-tmp.h:5861
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:5862
 #, fuzzy
 msgid "Interleave 2"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/xml/xmli18n-tmp.h:3626
+#: src/xml/xmli18n-tmp.h:5863
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Åñãáóßá"
 
-#: src/xml/xmli18n-tmp.h:3628
+#: src/xml/xmli18n-tmp.h:5865
 msgid "On"
 msgstr ""
 
 #
-#: src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:5909
 msgid "Legal"
 msgstr "ÄéáóôÜóåéò Legal"
 
-#: src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:5910
 #, fuzzy
 msgid "Tabloid"
 msgstr "Ðßíáêáò"
 
-#: src/xml/xmli18n-tmp.h:3674
+#: src/xml/xmli18n-tmp.h:5911
 #, fuzzy
 msgid "Executive"
 msgstr "ÅêôÝëåóç"
 
-#: src/xml/xmli18n-tmp.h:3679
+#: src/xml/xmli18n-tmp.h:5916
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:3680
+#: src/xml/xmli18n-tmp.h:5917
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:5918
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:3682
+#: src/xml/xmli18n-tmp.h:5919
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Êåßìåíá"
 
-#: src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:5920
+#, fuzzy
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr "Êåßìåíá"
+
+#: src/xml/xmli18n-tmp.h:5921
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:3684
+#: src/xml/xmli18n-tmp.h:5922
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:3685
+#: src/xml/xmli18n-tmp.h:5923
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:3686
+#: src/xml/xmli18n-tmp.h:5924
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:3688
+#: src/xml/xmli18n-tmp.h:5926
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:3689
+#: src/xml/xmli18n-tmp.h:5927
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/xml/xmli18n-tmp.h:3690
+#: src/xml/xmli18n-tmp.h:5928
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3691
+#: src/xml/xmli18n-tmp.h:5929
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:3692
+#: src/xml/xmli18n-tmp.h:5930
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:3693
+#: src/xml/xmli18n-tmp.h:5931
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:3694
+#: src/xml/xmli18n-tmp.h:5932
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:3695
+#: src/xml/xmli18n-tmp.h:5933
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:3696
+#: src/xml/xmli18n-tmp.h:5934
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:3697
+#: src/xml/xmli18n-tmp.h:5935
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:3698
+#: src/xml/xmli18n-tmp.h:5936
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:3699
+#: src/xml/xmli18n-tmp.h:5937
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3700
+#: src/xml/xmli18n-tmp.h:5938
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:5939
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:3702
+#: src/xml/xmli18n-tmp.h:5940
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:3703
+#: src/xml/xmli18n-tmp.h:5941
 #, fuzzy
 msgid "Super A0"
 msgstr "Slashdot"
 
-#: src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:5942
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:3705
+#: src/xml/xmli18n-tmp.h:5943
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:3706
+#: src/xml/xmli18n-tmp.h:5944
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:3707
+#: src/xml/xmli18n-tmp.h:5945
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:3709
+#: src/xml/xmli18n-tmp.h:5947
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:3710
+#: src/xml/xmli18n-tmp.h:5948
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:5949
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:5950
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:3713
+#: src/xml/xmli18n-tmp.h:5951
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:3714
+#: src/xml/xmli18n-tmp.h:5952
 msgid "A10"
 msgstr "A10"
 
 #
-#: src/xml/xmli18n-tmp.h:3715
+#: src/xml/xmli18n-tmp.h:5953
 #, fuzzy
 msgid "RA0"
 msgstr "RAD"
 
 #
-#: src/xml/xmli18n-tmp.h:3716
+#: src/xml/xmli18n-tmp.h:5954
 #, fuzzy
 msgid "RA1"
 msgstr "RAD"
 
 #
-#: src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:5955
 #, fuzzy
 msgid "RA2"
 msgstr "RAD"
 
 #
-#: src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:5956
 #, fuzzy
 msgid "RA3"
 msgstr "RAD"
 
 #
-#: src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:5957
 #, fuzzy
 msgid "RA4"
 msgstr "ÄéáóôÜóåéò Á4"
 
-#: src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:5958
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:5959
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:3722
+#: src/xml/xmli18n-tmp.h:5960
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:3723
+#: src/xml/xmli18n-tmp.h:5961
 msgid "SRA3"
 msgstr "SRA3"
 
 #
-#: src/xml/xmli18n-tmp.h:3724
+#: src/xml/xmli18n-tmp.h:5962
 #, fuzzy
 msgid "SRA4"
 msgstr "ÄéáóôÜóåéò Á4"
 
-#: src/xml/xmli18n-tmp.h:3725
+#: src/xml/xmli18n-tmp.h:5963
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:3726
+#: src/xml/xmli18n-tmp.h:5964
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:5965
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:5966
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:5967
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:3730
+#: src/xml/xmli18n-tmp.h:5968
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:3731
+#: src/xml/xmli18n-tmp.h:5969
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:3732
+#: src/xml/xmli18n-tmp.h:5970
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:3733
+#: src/xml/xmli18n-tmp.h:5971
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:3734
+#: src/xml/xmli18n-tmp.h:5972
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:3735
+#: src/xml/xmli18n-tmp.h:5973
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:3736
+#: src/xml/xmli18n-tmp.h:5974
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:3737
+#: src/xml/xmli18n-tmp.h:5975
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5976
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3739
+#: src/xml/xmli18n-tmp.h:5977
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:5978
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:3741
+#: src/xml/xmli18n-tmp.h:5979
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:5980
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:3743
+#: src/xml/xmli18n-tmp.h:5981
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:5982
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:5983
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:3746
+#: src/xml/xmli18n-tmp.h:5984
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:3747
+#: src/xml/xmli18n-tmp.h:5985
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:3748
+#: src/xml/xmli18n-tmp.h:5986
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:5987
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:3750
+#: src/xml/xmli18n-tmp.h:5988
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:3751
+#: src/xml/xmli18n-tmp.h:5989
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:5990
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:5991
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:3754
+#: src/xml/xmli18n-tmp.h:5992
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:3755
+#: src/xml/xmli18n-tmp.h:5993
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:3756
+#: src/xml/xmli18n-tmp.h:5994
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:5995
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:3758
+#: src/xml/xmli18n-tmp.h:5996
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:3759
+#: src/xml/xmli18n-tmp.h:5997
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:5998
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:3761
+#: src/xml/xmli18n-tmp.h:5999
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:6000
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:3763
+#: src/xml/xmli18n-tmp.h:6001
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:6002
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:3765
+#: src/xml/xmli18n-tmp.h:6003
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:3766
+#: src/xml/xmli18n-tmp.h:6004
 #, fuzzy
 msgid "DL"
 msgstr "Ôåêìçñßùóç"
 
-#: src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:6005
 #, fuzzy
 msgid "DL landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:3768
+#: src/xml/xmli18n-tmp.h:6006
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:3769
+#: src/xml/xmli18n-tmp.h:6007
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:3770
+#: src/xml/xmli18n-tmp.h:6008
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:6009
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:3772
+#: src/xml/xmli18n-tmp.h:6010
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:6011
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:3774
+#: src/xml/xmli18n-tmp.h:6012
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:3775
+#: src/xml/xmli18n-tmp.h:6013
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:6014
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:6015
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/xml/xmli18n-tmp.h:3778
+#: src/xml/xmli18n-tmp.h:6016
 #, fuzzy
 msgid "ArchA"
 msgstr "Ôüîï"
 
-#: src/xml/xmli18n-tmp.h:3779
+#: src/xml/xmli18n-tmp.h:6017
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3780
+#: src/xml/xmli18n-tmp.h:6018
 #, fuzzy
 msgid "ArchB"
 msgstr "Ôüîï"
 
-#: src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:6019
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3782
+#: src/xml/xmli18n-tmp.h:6020
 #, fuzzy
 msgid "ArchC"
 msgstr "Ôüîï"
 
-#: src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:6021
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3784
+#: src/xml/xmli18n-tmp.h:6022
 #, fuzzy
 msgid "ArchD"
 msgstr "Ôüîï"
 
-#: src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:6023
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:6024
 #, fuzzy
 msgid "ArchE"
 msgstr "Ôüîï"
 
-#: src/xml/xmli18n-tmp.h:3787
+#: src/xml/xmli18n-tmp.h:6025
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:6026
 #, fuzzy
 msgid "American foolscap"
 msgstr "ÁìåñéêáíéêÞ Óáìüá"
 
-#: src/xml/xmli18n-tmp.h:3789
+#: src/xml/xmli18n-tmp.h:6027
 #, fuzzy
 msgid "European foolscap"
 msgstr "ÁìåñéêáíéêÞ Óáìüá"
 
-#: src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:6028
 #, fuzzy
 msgid "Crown Quarto"
 msgstr "ðñïóïìïßùóç"
 
-#: src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:6029
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3792
+#: src/xml/xmli18n-tmp.h:6030
 #, fuzzy
 msgid "Demy Quarto"
 msgstr "ðñïóïìïßùóç"
 
-#: src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:6031
 #, fuzzy
 msgid "Royal Quarto"
 msgstr "ðñïóïìïßùóç"
 
-#: src/xml/xmli18n-tmp.h:3794
+#: src/xml/xmli18n-tmp.h:6032
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3795
+#: src/xml/xmli18n-tmp.h:6033
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:6034
 #, fuzzy
 msgid "Demy Octavo"
 msgstr "ðñïóïìïßùóç"
 
-#: src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:6035
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:6036
 #, fuzzy
 msgid "Small paperback"
 msgstr "ÅðÝíäõóç"
 
-#: src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:6037
 #, fuzzy
 msgid "Penguin small paperback"
 msgstr "ÅðÝíäõóç"
 
-#: src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:6038
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:6039
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3802
+#: src/xml/xmli18n-tmp.h:6040
 #, fuzzy
 msgid "Hagaki Card"
 msgstr "ÁíáæÞôçóç êáñôÝëáò"
 
-#: src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:6041
 msgid "Oufuku Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3804
+#: src/xml/xmli18n-tmp.h:6042
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3805
+#: src/xml/xmli18n-tmp.h:6043
 msgid "Japanese long envelope #3 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3806
+#: src/xml/xmli18n-tmp.h:6044
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:6045
 msgid "Japanese long envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:6046
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3809
+#: src/xml/xmli18n-tmp.h:6047
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:6048
 msgid "Commercial 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:6049
 msgid "Commercial 10 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:6050
 #, fuzzy
 msgid "A2 Invitation"
 msgstr "Êéíïýìåíá ó÷Ýäéá"
 
-#: src/xml/xmli18n-tmp.h:3813
+#: src/xml/xmli18n-tmp.h:6051
 #, fuzzy
 msgid "Monarch Envelope"
 msgstr "Åêôýðùóç ÖáêÝëïõ"
 
-#: src/xml/xmli18n-tmp.h:3814
+#: src/xml/xmli18n-tmp.h:6052
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Åêôýðùóç ÖáêÝëïõ"
 
-#: src/xml/xmli18n-tmp.h:3815
+#: src/xml/xmli18n-tmp.h:6053
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3816
+#: src/xml/xmli18n-tmp.h:6054
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:6055
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3818
+#: src/xml/xmli18n-tmp.h:6056
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3819
+#: src/xml/xmli18n-tmp.h:6057
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Ôåëåõôáßá êáñôÝëá"
 
-#: src/xml/xmli18n-tmp.h:3820
+#: src/xml/xmli18n-tmp.h:6058
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:6059
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:6060
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3824
+#: src/xml/xmli18n-tmp.h:6062
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:6063
 msgid "4 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3826
+#: src/xml/xmli18n-tmp.h:6064
 msgid "5 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3827
+#: src/xml/xmli18n-tmp.h:6065
 msgid "210 mm Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:6066
 msgid "13 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3829
+#: src/xml/xmli18n-tmp.h:6067
 msgid "17 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:6068
 msgid "22 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3831
+#: src/xml/xmli18n-tmp.h:6069
 msgid "24 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:6070
 msgid "36 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:6071
 msgid "44 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3834
+#: src/xml/xmli18n-tmp.h:6072
 msgid "60 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:6073
 msgid "64 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3836
+#: src/xml/xmli18n-tmp.h:6074
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3837
+#: src/xml/xmli18n-tmp.h:6075
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:6076
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:6077
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:6078
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:6079
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:6080
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:6081
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3844
+#: src/xml/xmli18n-tmp.h:6082
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:6083
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3846
+#: src/xml/xmli18n-tmp.h:6084
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3847
+#: src/xml/xmli18n-tmp.h:6085
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3848
+#: src/xml/xmli18n-tmp.h:6086
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:6087
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3850
+#: src/xml/xmli18n-tmp.h:6088
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:6089
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:6090
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3853
+#: src/xml/xmli18n-tmp.h:6091
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3854
+#: src/xml/xmli18n-tmp.h:6092
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3855
+#: src/xml/xmli18n-tmp.h:6093
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3856
+#: src/xml/xmli18n-tmp.h:6094
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3857
+#: src/xml/xmli18n-tmp.h:6095
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3858
+#: src/xml/xmli18n-tmp.h:6096
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:6097
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:6098
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:6099
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:6100
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3863
+#: src/xml/xmli18n-tmp.h:6101
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:6102
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:6103
 msgid "Canon S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:6104
 msgid "Canon S200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3867
+#: src/xml/xmli18n-tmp.h:6105
 msgid "Canon S300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3868
+#: src/xml/xmli18n-tmp.h:6106
 msgid "Canon S400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3869
+#: src/xml/xmli18n-tmp.h:6107
 msgid "Canon S450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3870
+#: src/xml/xmli18n-tmp.h:6108
 msgid "Canon S500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:6109
 msgid "Canon S600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3872
+#: src/xml/xmli18n-tmp.h:6110
 msgid "Canon S630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3873
+#: src/xml/xmli18n-tmp.h:6111
 msgid "Canon S800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3874
+#: src/xml/xmli18n-tmp.h:6112
 msgid "Canon S4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:6113
 msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:6114
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3877
+#: src/xml/xmli18n-tmp.h:6115
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3878
+#: src/xml/xmli18n-tmp.h:6116
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:6117
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3880
+#: src/xml/xmli18n-tmp.h:6118
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3881
+#: src/xml/xmli18n-tmp.h:6119
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:6120
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:6121
 msgid "Canon PIXMA iP4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3884
+#: src/xml/xmli18n-tmp.h:6122
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3885
+#: src/xml/xmli18n-tmp.h:6123
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3886
+#: src/xml/xmli18n-tmp.h:6124
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3887
+#: src/xml/xmli18n-tmp.h:6125
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3888
+#: src/xml/xmli18n-tmp.h:6126
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:6127
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:6128
+msgid "Canon PIXMA iX4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6129
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:6130
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:6131
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:6132
 msgid "Canon PIXMA MP160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:6133
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3895
+#: src/xml/xmli18n-tmp.h:6134
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:6135
 msgid "Canon PIXMA MP220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3897
+#: src/xml/xmli18n-tmp.h:6136
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:6137
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:6138
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3900
+#: src/xml/xmli18n-tmp.h:6139
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:6140
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3902
+#: src/xml/xmli18n-tmp.h:6141
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3903
+#: src/xml/xmli18n-tmp.h:6142
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:6143
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:6144
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:6145
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:6146
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:6147
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:6148
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3910
+#: src/xml/xmli18n-tmp.h:6149
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:6150
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3912
+#: src/xml/xmli18n-tmp.h:6151
 msgid "Canon i80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3913
+#: src/xml/xmli18n-tmp.h:6152
 msgid "Canon i560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3914
+#: src/xml/xmli18n-tmp.h:6153
 msgid "Canon i850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:6154
 msgid "Canon i860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3916
+#: src/xml/xmli18n-tmp.h:6155
 msgid "Canon i865"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:6156
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:6157
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3919
+#: src/xml/xmli18n-tmp.h:6158
 #, fuzzy
 msgid "Epson B-300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3920
+#: src/xml/xmli18n-tmp.h:6159
 #, fuzzy
 msgid "Epson B-308"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3921
+#: src/xml/xmli18n-tmp.h:6160
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3922
+#: src/xml/xmli18n-tmp.h:6161
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3923
+#: src/xml/xmli18n-tmp.h:6162
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:3924
+#: src/xml/xmli18n-tmp.h:6163
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:6164
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:6165
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:6166
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:6167
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:6168
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:6169
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:6170
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3932
+#: src/xml/xmli18n-tmp.h:6171
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:6172
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3934
+#: src/xml/xmli18n-tmp.h:6173
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3935
+#: src/xml/xmli18n-tmp.h:6174
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:6175
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3937
+#: src/xml/xmli18n-tmp.h:6176
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:6177
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3939
+#: src/xml/xmli18n-tmp.h:6178
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:6179
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:6180
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3942
+#: src/xml/xmli18n-tmp.h:6181
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3943
+#: src/xml/xmli18n-tmp.h:6182
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:6183
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:6184
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3946
+#: src/xml/xmli18n-tmp.h:6185
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3947
+#: src/xml/xmli18n-tmp.h:6186
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3948
+#: src/xml/xmli18n-tmp.h:6187
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3949
+#: src/xml/xmli18n-tmp.h:6188
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:6189
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3951
+#: src/xml/xmli18n-tmp.h:6190
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:6191
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3953
+#: src/xml/xmli18n-tmp.h:6192
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:6193
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:6194
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3956
+#: src/xml/xmli18n-tmp.h:6195
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3957
+#: src/xml/xmli18n-tmp.h:6196
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3958
+#: src/xml/xmli18n-tmp.h:6197
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3959
+#: src/xml/xmli18n-tmp.h:6198
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3960
+#: src/xml/xmli18n-tmp.h:6199
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:6200
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:6201
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:6202
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3964
+#: src/xml/xmli18n-tmp.h:6203
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:6204
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3966
+#: src/xml/xmli18n-tmp.h:6205
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3967
+#: src/xml/xmli18n-tmp.h:6206
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:6207
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:6208
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3970
+#: src/xml/xmli18n-tmp.h:6209
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:6210
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:3972
+#: src/xml/xmli18n-tmp.h:6211
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:6212
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:6213
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:3975
+#: src/xml/xmli18n-tmp.h:6214
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:6215
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:6216
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:6217
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:3979
+#: src/xml/xmli18n-tmp.h:6218
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:6219
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:3981
+#: src/xml/xmli18n-tmp.h:6220
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:3982
+#: src/xml/xmli18n-tmp.h:6221
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:3983
+#: src/xml/xmli18n-tmp.h:6222
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:3984
+#: src/xml/xmli18n-tmp.h:6223
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:6224
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:6225
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:3987
+#: src/xml/xmli18n-tmp.h:6226
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:6227
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:3989
+#: src/xml/xmli18n-tmp.h:6228
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:6229
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:6230
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:3992
+#: src/xml/xmli18n-tmp.h:6231
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:3993
+#: src/xml/xmli18n-tmp.h:6232
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:6233
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:3995
+#: src/xml/xmli18n-tmp.h:6234
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:6235
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:6236
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3998
+#: src/xml/xmli18n-tmp.h:6237
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3999
+#: src/xml/xmli18n-tmp.h:6238
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:6239
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:6240
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:4002
+#: src/xml/xmli18n-tmp.h:6241
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:6242
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:6243
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4005
+#: src/xml/xmli18n-tmp.h:6244
 #, fuzzy
-msgid "Epson Stylus Offixe TX300F"
+msgid "Epson Stylus Office TX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4006
+#: src/xml/xmli18n-tmp.h:6245
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:6246
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Slashdot"
 
-#: src/xml/xmli18n-tmp.h:4008
+#: src/xml/xmli18n-tmp.h:6247
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4009
+#: src/xml/xmli18n-tmp.h:6248
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:6249
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:6250
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:6251
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4013
+#: src/xml/xmli18n-tmp.h:6252
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4014
+#: src/xml/xmli18n-tmp.h:6253
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:6254
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:4016
+#: src/xml/xmli18n-tmp.h:6255
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:6256
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:6257
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4019
+#: src/xml/xmli18n-tmp.h:6258
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4020
+#: src/xml/xmli18n-tmp.h:6259
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4021
+#: src/xml/xmli18n-tmp.h:6260
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:4022
+#: src/xml/xmli18n-tmp.h:6261
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:4023
+#: src/xml/xmli18n-tmp.h:6262
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:4024
+#: src/xml/xmli18n-tmp.h:6263
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:6264
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:6265
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4027
+#: src/xml/xmli18n-tmp.h:6266
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:6267
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:6268
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:6269
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:4031
+#: src/xml/xmli18n-tmp.h:6270
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:6271
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4033
+#: src/xml/xmli18n-tmp.h:6272
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4034
+#: src/xml/xmli18n-tmp.h:6273
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4035
+#: src/xml/xmli18n-tmp.h:6274
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:6275
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4037
+#: src/xml/xmli18n-tmp.h:6276
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:4038
+#: src/xml/xmli18n-tmp.h:6277
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4039
+#: src/xml/xmli18n-tmp.h:6278
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:6279
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4041
+#: src/xml/xmli18n-tmp.h:6280
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:6281
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:6282
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4044
+#: src/xml/xmli18n-tmp.h:6283
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:6284
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:6285
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:6286
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:6287
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4049
+#: src/xml/xmli18n-tmp.h:6288
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:6289
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4051
+#: src/xml/xmli18n-tmp.h:6290
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:6291
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4053
+#: src/xml/xmli18n-tmp.h:6292
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4054
+#: src/xml/xmli18n-tmp.h:6293
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:6294
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4056
+#: src/xml/xmli18n-tmp.h:6295
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:6296
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4058
+#: src/xml/xmli18n-tmp.h:6297
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4059
+#: src/xml/xmli18n-tmp.h:6298
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:6299
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:6300
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4062
+#: src/xml/xmli18n-tmp.h:6301
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:6302
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4064
+#: src/xml/xmli18n-tmp.h:6303
+#, fuzzy
+msgid "Epson Stylus Photo R2880"
+msgstr "Stylus Photo 1280"
+
+#: src/xml/xmli18n-tmp.h:6304
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4065
+#: src/xml/xmli18n-tmp.h:6305
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:6306
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4067
+#: src/xml/xmli18n-tmp.h:6307
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:6308
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4069
+#: src/xml/xmli18n-tmp.h:6309
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:6310
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:6311
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4072
+#: src/xml/xmli18n-tmp.h:6312
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:6313
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4074
+#: src/xml/xmli18n-tmp.h:6314
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4075
+#: src/xml/xmli18n-tmp.h:6315
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4076
+#: src/xml/xmli18n-tmp.h:6316
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:6317
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4078
+#: src/xml/xmli18n-tmp.h:6318
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:6319
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:6320
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:6321
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4082
+#: src/xml/xmli18n-tmp.h:6322
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:6323
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4084
+#: src/xml/xmli18n-tmp.h:6324
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4085
+#: src/xml/xmli18n-tmp.h:6325
 #, fuzzy
-msgid "Epson Stylus Photo TX800W"
+msgid "Epson Stylus Photo TX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4086
+#: src/xml/xmli18n-tmp.h:6326
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:4087
+#: src/xml/xmli18n-tmp.h:6327
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:4088
+#: src/xml/xmli18n-tmp.h:6328
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4089
+#: src/xml/xmli18n-tmp.h:6329
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:6330
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4091
+#: src/xml/xmli18n-tmp.h:6331
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:6332
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4093
+#: src/xml/xmli18n-tmp.h:6333
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4094
+#: src/xml/xmli18n-tmp.h:6334
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:6335
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:6336
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4097
+#: src/xml/xmli18n-tmp.h:6337
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:6338
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4099
+#: src/xml/xmli18n-tmp.h:6339
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:6340
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:6341
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:6342
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:6343
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:6344
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:6345
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:6346
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:6347
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:6348
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:6349
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4110
+#: src/xml/xmli18n-tmp.h:6350
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:6351
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:6352
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4113
+#: src/xml/xmli18n-tmp.h:6353
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:6354
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:6355
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4116
+#: src/xml/xmli18n-tmp.h:6356
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:6357
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4118
+#: src/xml/xmli18n-tmp.h:6358
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4119
+#: src/xml/xmli18n-tmp.h:6359
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:6360
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4121
+#: src/xml/xmli18n-tmp.h:6361
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:6362
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:6363
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4124
+#: src/xml/xmli18n-tmp.h:6364
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:6365
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4126
+#: src/xml/xmli18n-tmp.h:6366
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4127
+#: src/xml/xmli18n-tmp.h:6367
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4128
+#: src/xml/xmli18n-tmp.h:6368
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4129
+#: src/xml/xmli18n-tmp.h:6369
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:6370
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:6371
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:6372
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:6373
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:6374
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:6375
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:6376
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:6377
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:6378
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:6379
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:6380
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:6381
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:6382
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:6383
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4144
+#: src/xml/xmli18n-tmp.h:6384
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:6385
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:6386
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:6387
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:6388
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:6389
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:6390
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:6391
+#, fuzzy
+msgid "Epson Stylus DX4000"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:6392
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:6393
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:6394
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4154
+#: src/xml/xmli18n-tmp.h:6395
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:6396
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:6397
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:6398
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:6399
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:6400
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:6401
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:6402
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:6403
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:6404
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:6405
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:6406
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:6407
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:6408
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:6409
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:6410
 #, fuzzy
-msgid "Epson Stylus PX700FW"
+msgid "Epson Stylus PX700W"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:6411
 #, fuzzy
 msgid "Epson Stylus PX800FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:6412
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4172
+#: src/xml/xmli18n-tmp.h:6413
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:6414
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4174
+#: src/xml/xmli18n-tmp.h:6415
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:6416
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:6417
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4177
+#: src/xml/xmli18n-tmp.h:6418
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4178
+#: src/xml/xmli18n-tmp.h:6419
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4179
+#: src/xml/xmli18n-tmp.h:6420
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4180
+#: src/xml/xmli18n-tmp.h:6421
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4181
+#: src/xml/xmli18n-tmp.h:6422
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:6423
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:6424
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:6425
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:6426
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:6427
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4187
+#: src/xml/xmli18n-tmp.h:6428
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4188
+#: src/xml/xmli18n-tmp.h:6429
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:6430
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:6431
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:6432
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4192
+#: src/xml/xmli18n-tmp.h:6433
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:6434
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:6435
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:6436
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4196
+#: src/xml/xmli18n-tmp.h:6437
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:6438
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:6439
 msgid "Epson PictureMate 215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4199
+#: src/xml/xmli18n-tmp.h:6440
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:6441
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:6442
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:6443
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4204
+#: src/xml/xmli18n-tmp.h:6445
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:6446
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:6447
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4207
+#: src/xml/xmli18n-tmp.h:6448
 msgid "Epson WorkForce 30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:6449
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:6450
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:6451
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:6452
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4212
+#: src/xml/xmli18n-tmp.h:6453
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:6454
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:6455
 msgid "Epson E 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4215
+#: src/xml/xmli18n-tmp.h:6456
 msgid "Epson E 150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4216
+#: src/xml/xmli18n-tmp.h:6457
 msgid "Epson E 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:6458
 msgid "Epson E 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:6459
 msgid "Epson E 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4219
+#: src/xml/xmli18n-tmp.h:6460
 msgid "Epson E 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:6461
 msgid "Epson E 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:6462
 msgid "Epson E 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:6463
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:6464
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4224
+#: src/xml/xmli18n-tmp.h:6465
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:6466
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:6467
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:6468
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4228
+#: src/xml/xmli18n-tmp.h:6469
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4229
+#: src/xml/xmli18n-tmp.h:6470
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:6471
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:6472
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:6473
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:6474
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:6475
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:6476
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:6477
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:6478
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4238
+#: src/xml/xmli18n-tmp.h:6479
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:6480
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:6481
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:6482
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4242
+#: src/xml/xmli18n-tmp.h:6483
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4243
+#: src/xml/xmli18n-tmp.h:6484
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:6485
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:6486
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4246
+#: src/xml/xmli18n-tmp.h:6487
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:6488
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:6490
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4251
+#: src/xml/xmli18n-tmp.h:6492
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4253
+#: src/xml/xmli18n-tmp.h:6494
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4254
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:6496
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:6497
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:6498
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:6499
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4259
+#: src/xml/xmli18n-tmp.h:6500
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4260
+#: src/xml/xmli18n-tmp.h:6501
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:6502
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4262
+#: src/xml/xmli18n-tmp.h:6503
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4263
+#: src/xml/xmli18n-tmp.h:6504
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4264
+#: src/xml/xmli18n-tmp.h:6505
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4265
+#: src/xml/xmli18n-tmp.h:6506
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:6507
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:6508
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:6509
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:6510
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:6511
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:6512
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:6513
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:6514
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4274
+#: src/xml/xmli18n-tmp.h:6515
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4275
+#: src/xml/xmli18n-tmp.h:6516
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4276
+#: src/xml/xmli18n-tmp.h:6517
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:6518
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:6519
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:6520
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:6521
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:6522
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:6523
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:6524
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:6525
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4285
+#: src/xml/xmli18n-tmp.h:6526
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4286
+#: src/xml/xmli18n-tmp.h:6527
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:6528
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:6529
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:6530
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:6531
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:6532
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4292
+#: src/xml/xmli18n-tmp.h:6533
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:6534
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:6535
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4295
+#: src/xml/xmli18n-tmp.h:6536
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4296
+#: src/xml/xmli18n-tmp.h:6537
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4297
+#: src/xml/xmli18n-tmp.h:6538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:6539
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4299
+#: src/xml/xmli18n-tmp.h:6540
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:6541
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:6542
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:6543
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:6544
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4305
+#: src/xml/xmli18n-tmp.h:6546
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:6547
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4307
+#: src/xml/xmli18n-tmp.h:6548
+#, fuzzy
+msgid "Epson PX G5600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6549
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4308
+#: src/xml/xmli18n-tmp.h:6550
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4309
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4310
+#: src/xml/xmli18n-tmp.h:6552
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:6553
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:6554
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4313
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:6556
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4315
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:6559
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:6560
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:6561
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:6562
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:6563
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:6564
 msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:6565
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4324
+#: src/xml/xmli18n-tmp.h:6566
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:6567
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4326
+#: src/xml/xmli18n-tmp.h:6568
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4327
+#: src/xml/xmli18n-tmp.h:6569
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:6570
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:6571
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Brother HL-1430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:6576
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Brother HL-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4337
+#: src/xml/xmli18n-tmp.h:6579
 msgid "Brother HL-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:6580
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:6581
 msgid "Brother HL-1670N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:6582
 msgid "Brother HL-1850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:6583
 msgid "Brother HL-1870N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:6584
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:6585
 msgid "Brother HL-2460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:6586
 msgid "Brother HL-2460N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:6587
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4346
+#: src/xml/xmli18n-tmp.h:6588
 msgid "Brother HL-5030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:6589
 msgid "Brother HL-5040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:6590
 msgid "Brother HL-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:6591
 msgid "Brother HL-5070N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4350
+#: src/xml/xmli18n-tmp.h:6592
 msgid "Brother HL-5140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4351
+#: src/xml/xmli18n-tmp.h:6593
 msgid "Brother HL-5150D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:6594
 msgid "Brother HL-5170DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:6595
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4354
+#: src/xml/xmli18n-tmp.h:6596
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:6597
 msgid "Brother HL-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:6598
 msgid "Brother HL-7050N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4357
+#: src/xml/xmli18n-tmp.h:6599
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4358
+#: src/xml/xmli18n-tmp.h:6600
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:6601
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:6602
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:6603
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:6604
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:6605
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:6606
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:6607
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:6608
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:6609
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:6610
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:6611
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:6612
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:6613
 msgid "DEC 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:6614
 msgid "DEC LN17"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4373
+#: src/xml/xmli18n-tmp.h:6615
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4374
+#: src/xml/xmli18n-tmp.h:6616
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:6617
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4376
+#: src/xml/xmli18n-tmp.h:6618
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:6619
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:6620
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:6621
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:6622
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:6623
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:6624
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:6625
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4384
+#: src/xml/xmli18n-tmp.h:6626
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4385
+#: src/xml/xmli18n-tmp.h:6627
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4386
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4387
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:6630
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4389
+#: src/xml/xmli18n-tmp.h:6631
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4392
+#: src/xml/xmli18n-tmp.h:6634
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:6635
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:6636
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:6637
 msgid "Epson EPL-N2050PS+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4397
+#: src/xml/xmli18n-tmp.h:6639
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:6640
 #, fuzzy
 msgid "Epson EPL-N2500PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4400
+#: src/xml/xmli18n-tmp.h:6642
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:6643
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4403
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:6646
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
 #
-#: src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:6647
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
 #
-#: src/xml/xmli18n-tmp.h:4406
+#: src/xml/xmli18n-tmp.h:6648
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
 #
-#: src/xml/xmli18n-tmp.h:4407
+#: src/xml/xmli18n-tmp.h:6649
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
 #
-#: src/xml/xmli18n-tmp.h:4408
+#: src/xml/xmli18n-tmp.h:6650
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
 #
-#: src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:6651
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
 #
-#: src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:6652
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
 #
-#: src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:6653
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
 #
-#: src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:6654
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
-#: src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
 #
-#: src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:6656
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
-#: src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:6657
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4416
+#: src/xml/xmli18n-tmp.h:6658
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:6659
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:6660
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:6661
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4420
-msgid "Gestetner 3532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4421
-msgid "Gestetner 4235g"
+#: src/xml/xmli18n-tmp.h:6662
+msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:6663
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4423
-msgid "Gestetner 4532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4424
-msgid "Gestetner 4245g"
+#: src/xml/xmli18n-tmp.h:6664
+msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:6665
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:6666
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:6668
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:6669
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:6670
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4431
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:6672
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:6673
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:6674
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:6675
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4436
+#: src/xml/xmli18n-tmp.h:6676
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4437
-msgid "Gestetner DSm635"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4438
-msgid "Gestetner DSm635G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4439
-msgid "Gestetner DSm645"
+#: src/xml/xmli18n-tmp.h:6677
+msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4440
-msgid "Gestetner DS645G"
+#: src/xml/xmli18n-tmp.h:6678
+msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:6679
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:6680
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4443
+#: src/xml/xmli18n-tmp.h:6681
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:6682
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:6683
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4446
-msgid "Gestetner DSm735"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4447
-msgid "Gestetner DSm735G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4448
-msgid "Gestetner DSm745"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4449
-msgid "Gestetner DSm745G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4450
-msgid "Gestetner MP1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4451
-msgid "Gestetner DSm7110"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4452
-msgid "Gestetner MP1350"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4453
-msgid "Gestetner DSm7135"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4454
-msgid "Gestetner MP1600"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4455
-msgid "Gestetner DSm716"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4456
-msgid "Gestetner MP2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4457
-msgid "Gestetner DSm721d"
+#: src/xml/xmli18n-tmp.h:6684
+msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4458
-msgid "Gestetner MP2500"
+#: src/xml/xmli18n-tmp.h:6685
+msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4459
-msgid "Gestetner DSm625"
+#: src/xml/xmli18n-tmp.h:6686
+msgid "Gestetner MP1100/DSm7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4460
-msgid "Gestetner MP3500"
+#: src/xml/xmli18n-tmp.h:6687
+msgid "Gestetner MP1350/DSm7135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4461
-msgid "Gestetner DSm735e"
+#: src/xml/xmli18n-tmp.h:6688
+msgid "Gestetner MP1600/DSm716"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4462
-msgid "Gestetner MP4500"
+#: src/xml/xmli18n-tmp.h:6689
+msgid "Gestetner MP2000/DSm721d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4463
-msgid "Gestetner DSm745e"
+#: src/xml/xmli18n-tmp.h:6690
+msgid "Gestetner MP2500/DSm625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4464
-msgid "Gestetner MP5500"
+#: src/xml/xmli18n-tmp.h:6691
+msgid "Gestetner MP3500/DSm735e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4465
-msgid "Gestetner DSm755"
+#: src/xml/xmli18n-tmp.h:6692
+msgid "Gestetner MP4500/DSm745e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4466
-msgid "Gestetner MP6500"
+#: src/xml/xmli18n-tmp.h:6693
+msgid "Gestetner MP5500/DSm755"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4467
-msgid "Gestetner DSm765"
+#: src/xml/xmli18n-tmp.h:6694
+msgid "Gestetner MP6500/DSm765"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4468
-msgid "Gestetner MP7500"
+#: src/xml/xmli18n-tmp.h:6695
+msgid "Gestetner MP7500/DSm775"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4469
-msgid "Gestetner DSm775"
+#: src/xml/xmli18n-tmp.h:6696
+msgid "Gestetner MP9000/DSm790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4470
-msgid "Gestetner MP9000"
+#: src/xml/xmli18n-tmp.h:6697
+msgid "Gestetner MP 161/DSm416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4471
-msgid "Gestetner DSm790"
+#: src/xml/xmli18n-tmp.h:6698
+msgid "Gestetner MP 2510/DSm725e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4472
-msgid "Gestetner MP 161"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4473
-msgid "Gestetner DSm416"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4474
-msgid "Gestetner MP 2510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4475
-msgid "Gestetner DSm725e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:6699
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:6700
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4478
-msgid "Gestetner MP 3010"
+#: src/xml/xmli18n-tmp.h:6701
+msgid "Gestetner MP 3010/DSm730e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4479
-msgid "Gestetner DSm730e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4480
+#: src/xml/xmli18n-tmp.h:6702
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:6703
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:6704
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:6705
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Gestetner MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:6707
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:6708
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:6709
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:6710
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4489
+#: src/xml/xmli18n-tmp.h:6711
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:6712
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:6713
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4492
+#: src/xml/xmli18n-tmp.h:6714
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:6715
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:6716
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4495
+#: src/xml/xmli18n-tmp.h:6717
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4496
+#: src/xml/xmli18n-tmp.h:6718
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4497
+#: src/xml/xmli18n-tmp.h:6719
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:6720
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:6721
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:6722
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:6723
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:6724
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:6725
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:6726
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:6727
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4506
+#: src/xml/xmli18n-tmp.h:6728
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:6729
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4508
+#: src/xml/xmli18n-tmp.h:6730
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4509
+#: src/xml/xmli18n-tmp.h:6731
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4510
+#: src/xml/xmli18n-tmp.h:6732
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:6733
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:6734
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:6735
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:6736
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:6737
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:6738
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:6739
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4518
+#: src/xml/xmli18n-tmp.h:6740
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:6741
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:6742
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:6743
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:6744
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4523
+#: src/xml/xmli18n-tmp.h:6745
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:6746
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:6747
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:6748
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:6749
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4528
+#: src/xml/xmli18n-tmp.h:6750
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4529
+#: src/xml/xmli18n-tmp.h:6751
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4530
+#: src/xml/xmli18n-tmp.h:6752
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:6753
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4532
+#: src/xml/xmli18n-tmp.h:6754
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:6755
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:6756
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:6757
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:6758
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:6759
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:6760
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4539
+#: src/xml/xmli18n-tmp.h:6761
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4540
+#: src/xml/xmli18n-tmp.h:6762
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4541
+#: src/xml/xmli18n-tmp.h:6763
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4542
+#: src/xml/xmli18n-tmp.h:6764
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4543
+#: src/xml/xmli18n-tmp.h:6765
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:6766
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:6767
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4546
+#: src/xml/xmli18n-tmp.h:6768
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:6769
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:6770
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:6771
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:6772
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:6773
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4552
+#: src/xml/xmli18n-tmp.h:6774
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:6775
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:6776
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:6777
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:6778
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:6779
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:6780
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:6781
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:6782
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:6783
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:6784
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:6785
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:6786
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:6787
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:6788
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4567
+#: src/xml/xmli18n-tmp.h:6789
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4568
+#: src/xml/xmli18n-tmp.h:6790
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:6791
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4570
+#: src/xml/xmli18n-tmp.h:6792
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4571
+#: src/xml/xmli18n-tmp.h:6793
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:6794
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:6795
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:6796
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:6797
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:6798
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:6799
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:6800
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:6801
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:6802
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:6803
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4582
+#: src/xml/xmli18n-tmp.h:6804
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4583
+#: src/xml/xmli18n-tmp.h:6805
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4584
+#: src/xml/xmli18n-tmp.h:6806
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4585
+#: src/xml/xmli18n-tmp.h:6807
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:6808
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:6809
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:6810
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:6811
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:6812
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:6813
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:6814
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4593
+#: src/xml/xmli18n-tmp.h:6815
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4594
+#: src/xml/xmli18n-tmp.h:6816
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:6817
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:6818
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4597
+#: src/xml/xmli18n-tmp.h:6819
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:6820
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:6821
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:6822
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:6823
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4602
+#: src/xml/xmli18n-tmp.h:6824
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:6825
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:6826
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:6827
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:6828
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4607
+#: src/xml/xmli18n-tmp.h:6829
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:6830
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4609
+#: src/xml/xmli18n-tmp.h:6831
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4610
+#: src/xml/xmli18n-tmp.h:6832
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:6833
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:6834
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4613
+#: src/xml/xmli18n-tmp.h:6835
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:6836
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:6837
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:6838
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:6839
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:6840
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:6841
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:6842
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:6843
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:6844
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:6845
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4624
+#: src/xml/xmli18n-tmp.h:6846
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4625
+#: src/xml/xmli18n-tmp.h:6847
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:6848
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4627
+#: src/xml/xmli18n-tmp.h:6849
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4628
+#: src/xml/xmli18n-tmp.h:6850
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:6851
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:6852
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:6853
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:6854
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:6855
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:6856
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:6857
 msgid "HP LaserJet 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4636
+#: src/xml/xmli18n-tmp.h:6858
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4637
+#: src/xml/xmli18n-tmp.h:6859
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4638
+#: src/xml/xmli18n-tmp.h:6860
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:6861
 msgid "HP LaserJet 1320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4640
+#: src/xml/xmli18n-tmp.h:6862
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:6863
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:6864
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:6865
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4644
+#: src/xml/xmli18n-tmp.h:6866
 msgid "HP LaserJet 2410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:6867
 msgid "HP LaserJet 2420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:6868
 msgid "HP LaserJet 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4647
+#: src/xml/xmli18n-tmp.h:6869
 msgid "HP LaserJet 3015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4648
+#: src/xml/xmli18n-tmp.h:6870
 msgid "HP LaserJet 3020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:6871
 msgid "HP LaserJet 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4650
+#: src/xml/xmli18n-tmp.h:6872
 msgid "HP LaserJet 3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:6873
 msgid "HP LaserJet 3052"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:6874
 msgid "HP LaserJet 3055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:6875
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:6876
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:6877
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:6878
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:6879
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:6880
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:6881
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4660
+#: src/xml/xmli18n-tmp.h:6882
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:6883
 msgid "HP LaserJet 3380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:6884
 msgid "HP LaserJet 3390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4663
+#: src/xml/xmli18n-tmp.h:6885
 msgid "HP LaserJet 3392"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:6886
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:6887
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:6888
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4667
+#: src/xml/xmli18n-tmp.h:6889
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:6890
 msgid "HP LaserJet 4240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:6891
 msgid "HP LaserJet 4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:6892
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4671
+#: src/xml/xmli18n-tmp.h:6893
 msgid "HP LaserJet 4345 mfp"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:6894
 msgid "HP LaserJet 4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:6895
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:6896
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:6897
 msgid "HP LaserJet 5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:6898
 msgid "HP LaserJet 5200L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:6899
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:6900
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:6901
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4680
+#: src/xml/xmli18n-tmp.h:6902
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:6903
 msgid "HP LaserJet 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4682
+#: src/xml/xmli18n-tmp.h:6904
 msgid "HP LaserJet 9040 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4683
+#: src/xml/xmli18n-tmp.h:6905
 msgid "HP LaserJet 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4684
+#: src/xml/xmli18n-tmp.h:6906
 msgid "HP LaserJet 9050 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:6907
 msgid "HP LaserJet M3027 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:6908
 msgid "HP LaserJet M3035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:6909
 msgid "HP LaserJet M4345 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:6910
 msgid "HP LaserJet M5025 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:6911
 msgid "HP LaserJet M5035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:6912
 msgid "HP LaserJet P2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:6913
 msgid "HP LaserJet P2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:6914
 msgid "HP LaserJet P3004"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:6915
 msgid "HP LaserJet P3005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:6916
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4695
+#: src/xml/xmli18n-tmp.h:6917
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:6918
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:6919
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:6920
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:6921
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4700
+#: src/xml/xmli18n-tmp.h:6922
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:6923
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:6924
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4703
+#: src/xml/xmli18n-tmp.h:6925
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:6926
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:6927
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4706
+#: src/xml/xmli18n-tmp.h:6928
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4707
+#: src/xml/xmli18n-tmp.h:6929
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:6930
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:6931
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4710
+#: src/xml/xmli18n-tmp.h:6932
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:6933
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:6934
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:6935
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:6936
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:6937
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:6938
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:6939
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4718
+#: src/xml/xmli18n-tmp.h:6940
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:6941
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:6942
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4721
+#: src/xml/xmli18n-tmp.h:6943
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:6944
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:6945
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:6946
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4725
+#: src/xml/xmli18n-tmp.h:6947
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:6948
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:6949
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4728
+#: src/xml/xmli18n-tmp.h:6950
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4729
+#: src/xml/xmli18n-tmp.h:6951
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:6952
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:6953
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4732
+#: src/xml/xmli18n-tmp.h:6954
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:6955
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:6956
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:6957
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:6958
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:6959
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:6960
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4739
+#: src/xml/xmli18n-tmp.h:6961
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4740
+#: src/xml/xmli18n-tmp.h:6962
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4741
+#: src/xml/xmli18n-tmp.h:6963
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4742
+#: src/xml/xmli18n-tmp.h:6964
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:6965
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:6966
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4745
+#: src/xml/xmli18n-tmp.h:6967
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:6968
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:6969
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:6970
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4749
+#: src/xml/xmli18n-tmp.h:6971
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:6972
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:6973
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4752
+#: src/xml/xmli18n-tmp.h:6974
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:6975
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:6976
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4755
+#: src/xml/xmli18n-tmp.h:6977
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:6978
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:6979
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:6980
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4759
+#: src/xml/xmli18n-tmp.h:6981
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4760
+#: src/xml/xmli18n-tmp.h:6982
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:6983
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4762
+#: src/xml/xmli18n-tmp.h:6984
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:6985
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:6986
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4765
+#: src/xml/xmli18n-tmp.h:6987
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:6988
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:6989
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:6991
 msgid "IBM 4019"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:6992
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:6993
 msgid "IBM 4312"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4772
+#: src/xml/xmli18n-tmp.h:6994
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:6995
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4774
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4775
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4776
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:6999
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:7000
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:7002
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:7003
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:7004
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:7005
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:7006
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:7007
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:7008
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:7009
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:7010
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:7011
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4790
+#: src/xml/xmli18n-tmp.h:7012
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:7013
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:7014
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:7015
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4794
+#: src/xml/xmli18n-tmp.h:7016
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:7017
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:7018
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4797
+#: src/xml/xmli18n-tmp.h:7019
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:7020
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:7021
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:7022
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:7023
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:7025
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:7026
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:7027
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:7028
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4807
+#: src/xml/xmli18n-tmp.h:7029
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4808
+#: src/xml/xmli18n-tmp.h:7030
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:7031
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:7032
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:7034
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:7035
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:7037
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:7039
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:7040
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4819
+#: src/xml/xmli18n-tmp.h:7041
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:7042
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:7043
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:7044
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:7045
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:7046
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:7047
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:7048
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:7049
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:7050
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:7051
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4830
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:7057
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4837
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4840
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4842
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4852
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4853
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4854
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4855
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4866
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4867
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4873
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4874
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4883
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4886
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4888
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4890
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4894
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4896
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4903
-msgid "Lanier MP 2500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4904
-msgid "Lanier LD125"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4905
-msgid "Lanier MP 1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4906
-msgid "Lanier LD1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4907
-msgid "Lanier MP 1350"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4908
-msgid "Lanier LD1135"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4909
-msgid "Lanier MP 1600"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4910
-msgid "Lanier LD316"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4911
-msgid "Lanier MP 161"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4912
-msgid "Lanier LD016"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4913
-msgid "Lanier MP 2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4914
-msgid "Lanier LD320d"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4915
-msgid "Lanier MP 2510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4916
-msgid "Lanier LD325"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4917
-msgid "Lanier MP 2550B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4918
-msgid "Lanier LD425B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4919
-msgid "Lanier MP 2550"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4920
-msgid "Lanier LD425"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4921
-msgid "Lanier MP 3010"
+#: src/xml/xmli18n-tmp.h:7125
+msgid "Lanier MP2500/LD125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4922
-msgid "Lanier LD330"
+#: src/xml/xmli18n-tmp.h:7126
+msgid "Lanier MP 1100/LD1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4923
-msgid "Lanier MP 3350B"
+#: src/xml/xmli18n-tmp.h:7127
+msgid "Lanier MP 1350/LD1135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4924
-msgid "Lanier LD433B"
+#: src/xml/xmli18n-tmp.h:7128
+msgid "Lanier MP 1600/LD316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4925
-msgid "Lanier MP 3350"
+#: src/xml/xmli18n-tmp.h:7129
+msgid "Lanier MP 161/LD016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4926
-msgid "Lanier LD433"
+#: src/xml/xmli18n-tmp.h:7130
+msgid "Lanier MP 2000/LD320d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4927
-msgid "Lanier MP 3500"
+#: src/xml/xmli18n-tmp.h:7131
+msgid "Lanier MP 2510/LD325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4928
-msgid "Lanier LD335"
+#: src/xml/xmli18n-tmp.h:7132
+msgid "Lanier MP 2550B/LD425B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4929
-msgid "Lanier MP 4000B"
+#: src/xml/xmli18n-tmp.h:7133
+msgid "Lanier MP 2550/LD425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4930
-msgid "Lanier LD040B"
+#: src/xml/xmli18n-tmp.h:7134
+msgid "Lanier MP 3010/LD330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4931
-msgid "Lanier MP 4000"
+#: src/xml/xmli18n-tmp.h:7135
+msgid "Lanier MP 3350B/LD433B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4932
-msgid "Lanier LD040"
+#: src/xml/xmli18n-tmp.h:7136
+msgid "Lanier MP 3350/LD433"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4933
-msgid "Lanier MP 4500"
+#: src/xml/xmli18n-tmp.h:7137
+msgid "Lanier MP 3500/LD335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4934
-msgid "Lanier LD345"
+#: src/xml/xmli18n-tmp.h:7138
+msgid "Lanier MP 4000B/LD040B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4935
-msgid "Lanier MP 5000B"
+#: src/xml/xmli18n-tmp.h:7139
+msgid "Lanier MP 4000/LD040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4936
-msgid "Lanier LD050B"
+#: src/xml/xmli18n-tmp.h:7140
+msgid "Lanier MP 4500/LD345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4937
-msgid "Lanier MP 5000"
+#: src/xml/xmli18n-tmp.h:7141
+msgid "Lanier MP 5000B/LD050B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4938
-msgid "Lanier LD050"
+#: src/xml/xmli18n-tmp.h:7142
+msgid "Lanier MP 5000/LD050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4939
-msgid "Lanier MP 5500"
+#: src/xml/xmli18n-tmp.h:7143
+msgid "Lanier MP 5500/LD255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4940
-msgid "Lanier LD255"
+#: src/xml/xmli18n-tmp.h:7144
+msgid "Lanier MP 6500/LD265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4941
-msgid "Lanier MP 6500"
+#: src/xml/xmli18n-tmp.h:7145
+msgid "Lanier MP 7500/LD275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4942
-msgid "Lanier LD265"
+#: src/xml/xmli18n-tmp.h:7146
+msgid "Lanier MP 9000/LD190"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4943
-msgid "Lanier MP 7500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4944
-msgid "Lanier LD275"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4945
-msgid "Lanier MP 9000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4946
-msgid "Lanier LD190"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:7148
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4950
+#: src/xml/xmli18n-tmp.h:7150
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:7151
 msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4952
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4953
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:7155
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4960
+#: src/xml/xmli18n-tmp.h:7160
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:7161
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:7162
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4963
+#: src/xml/xmli18n-tmp.h:7163
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:7164
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:7165
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4966
-msgid "NRG 10515"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4967
-msgid "NRG 10518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4968
-msgid "NRG 10512"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4969
-msgid "NRG 2205"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4970
-msgid "NRG 2238"
+#: src/xml/xmli18n-tmp.h:7166
+msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4971
-msgid "NRG 2212"
+#: src/xml/xmli18n-tmp.h:7167
+msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4972
-msgid "NRG 2705"
+#: src/xml/xmli18n-tmp.h:7168
+msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4973
-msgid "NRG 2738"
+#: src/xml/xmli18n-tmp.h:7169
+msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4974
-msgid "NRG 2712"
+#: src/xml/xmli18n-tmp.h:7170
+msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4975
-msgid "NRG 3205"
+#: src/xml/xmli18n-tmp.h:7171
+msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4976
-msgid "NRG 3238"
+#: src/xml/xmli18n-tmp.h:7172
+msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4977
-msgid "NRG 3212"
+#: src/xml/xmli18n-tmp.h:7173
+msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4978
-msgid "NRG 3525"
+#: src/xml/xmli18n-tmp.h:7174
+msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4979
-msgid "NRG 3508"
+#: src/xml/xmli18n-tmp.h:7175
+msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4980
-msgid "NRG 3502"
+#: src/xml/xmli18n-tmp.h:7176
+msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4981
-msgid "NRG 3545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4982
-msgid "NRG 3518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4983
-msgid "NRG 3532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4984
-msgid "NRG 4525"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4985
-msgid "NRG 4508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4986
-msgid "NRG 4502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4987
-msgid "NRG 4545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4988
-msgid "NRG 4518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4989
-msgid "NRG 4532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4990
-msgid "NRG 6002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4991
-msgid "NRG 6005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4992
-msgid "NRG 6008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4993
-msgid "NRG 7502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4994
-msgid "NRG 7505"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4995
-msgid "NRG 7508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4996
-msgid "NRG 9005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4997
-msgid "NRG 9008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4998
-msgid "NRG 9002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:7177
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:7178
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5001
+#: src/xml/xmli18n-tmp.h:7179
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:7180
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:7181
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:7182
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:7183
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5006
+#: src/xml/xmli18n-tmp.h:7184
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:7185
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:7186
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5009
+#: src/xml/xmli18n-tmp.h:7187
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:7188
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:7189
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:7190
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:7191
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:7192
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5015
+#: src/xml/xmli18n-tmp.h:7193
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5016
+#: src/xml/xmli18n-tmp.h:7194
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5017
+#: src/xml/xmli18n-tmp.h:7195
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:7196
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:7197
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:7198
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:7199
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:7200
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:7201
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:7202
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5025
+#: src/xml/xmli18n-tmp.h:7203
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:7204
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:7205
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5028
+#: src/xml/xmli18n-tmp.h:7206
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:7207
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:7208
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:7209
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:7210
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5033
+#: src/xml/xmli18n-tmp.h:7211
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:7212
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:7213
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:7214
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:7215
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:7216
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:7217
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5040
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5051
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5053
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Slashdot"
 
-#: src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:7234
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:7235
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5060
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5062
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5063
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:7242
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:7243
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:7244
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:7245
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:7246
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:7247
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:7248
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:7249
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5072
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5074
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5075
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5076
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:7255
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:7258
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5081
+#: src/xml/xmli18n-tmp.h:7259
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:7263
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5086
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5088
+#: src/xml/xmli18n-tmp.h:7266
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:7267
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5090
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5091
+#: src/xml/xmli18n-tmp.h:7269
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:7270
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5093
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5099
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5103
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5104
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:7284
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5107
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5108
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5110
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5118
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5120
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5126
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5127
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5131
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5133
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5134
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5138
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5146
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5147
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5150
-msgid "Savin 2535"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5151
-msgid "Savin 2235"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5152
-msgid "Savin 2545"
+#: src/xml/xmli18n-tmp.h:7328
+msgid "Savin 2535/2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5153
-msgid "Savin 2245"
+#: src/xml/xmli18n-tmp.h:7329
+msgid "Savin 2545/2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5154
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Savin 2560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5155
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5158
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5160
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5163
-msgid "Savin 4035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5164
-msgid "Savin 4135g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5165
-msgid "Savin 4035e"
+#: src/xml/xmli18n-tmp.h:7339
+msgid "Savin 4035/4135g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5166
-msgid "Savin 4135eG"
+#: src/xml/xmli18n-tmp.h:7340
+msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5167
-msgid "Savin 4045"
+#: src/xml/xmli18n-tmp.h:7341
+msgid "Savin 4045/4145g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5168
-msgid "Savin 4145g"
+#: src/xml/xmli18n-tmp.h:7342
+msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5169
-msgid "Savin 4045e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5170
-msgid "Savin 4145eG"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5171
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Savin 4060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5173
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5174
+#: src/xml/xmli18n-tmp.h:7346
 msgid "Savin 4090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:7348
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5177
+#: src/xml/xmli18n-tmp.h:7349
 msgid "Savin 8020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:7353
 msgid "Savin 8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5183
-msgid "Savin 8035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5184
-msgid "Savin 8035g"
+#: src/xml/xmli18n-tmp.h:7355
+msgid "Savin 8035/8035g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5186
-msgid "Savin 8045"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5187
-msgid "Savin 8045g"
+#: src/xml/xmli18n-tmp.h:7357
+msgid "Savin 8045/8045g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5190
+#: src/xml/xmli18n-tmp.h:7360
 msgid "Savin 8065"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5192
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Savin 8090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5194
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:7370
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5201
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:7373
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:7374
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5205
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5206
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:7379
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5211
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Ñýèìéóç ÅêôõðùôÞ"
 
-#: src/xml/xmli18n-tmp.h:5212
+#: src/xml/xmli18n-tmp.h:7382
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5213
+#: src/xml/xmli18n-tmp.h:7383
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5216
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5221
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5224
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5225
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5227
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5230
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:7404
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5236
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:7409
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:7410
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5244
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5247
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5249
+#: src/xml/xmli18n-tmp.h:7419
+msgid "Canon SELPHY-CP-520"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Canon SELPHY-CP-720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5252
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Canon SELPHY-CP-730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Canon SELPHY-CP-740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Canon SELPHY-CP-750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Canon SELPHY ES1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Canon SELPHY ES2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Canon SELPHY ES20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5258
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5259
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:7434
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:7438
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5268
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Dai Nippon Printing DS40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Dai Nippon Printing DS80"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5269
+#: src/xml/xmli18n-tmp.h:7442
 msgid "RAW DATA 8 bit"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Epson Stylus Offixe TX300F"
+#~ msgstr "Stylus C20sx"
+
+#, fuzzy
 #~ msgid "ISOLatin1"
 #~ msgstr "ËÜôéí"
 
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index 0cafcbc..871673c 100644
--- a/po/en_GB.gmo
+++ b/po/en_GB.gmo
diff --git a/po/en_GB.po b/po/en_GB.po
index 2ce9a94..6ca761f 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: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-21 22:25-0500\n"
+"POT-Creation-Date: 2009-07-26 19:14-0400\n"
 "PO-Revision-Date: 2008-08-01 18:42+0100\n"
 "Last-Translator: Roger Leigh <rleigh@debian.org>\n"
 "Language-Team: British English\n"
@@ -17,7 +17,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2109 src/main/print-pcl.c:1779
+#: src/main/print-escp2.c:2314 src/main/print-pcl.c:1779
 msgid "Default"
 msgstr "Default"
 
@@ -90,15 +90,15 @@ msgstr "Density"
 
 #: src/main/dither-main.c:91 src/main/print-canon.c:300
 #: src/main/print-canon.c:308 src/main/print-canon.c:316
-#: src/main/print-canon.c:324 src/main/print-escp2.c:439
-#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
-#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-canon.c:324 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: 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-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:1769
-#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
-#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1935
+#: src/main/print-olympus.c:1943 src/main/print-olympus.c:1951
+#: src/main/print-olympus.c:1959 src/main/print-pcl.c:1324
 #: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
 #: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
@@ -159,7 +159,7 @@ msgid "Dither algorithm"
 msgstr "Dither algorithm"
 
 #: src/main/print-canon.c:199 src/main/print-escp2.c:165
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1866
 #: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Page Size"
@@ -176,8 +176,8 @@ msgstr "Page Size"
 #: src/main/print-escp2.c:254 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:1704 src/main/print-olympus.c:1710
-#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-olympus.c:1866 src/main/print-olympus.c:1872
+#: src/main/print-olympus.c:1878 src/main/print-olympus.c:1884
 #: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
 #: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
 #: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
@@ -186,31 +186,31 @@ msgid "Basic Printer Setup"
 msgstr "Basic Printer Setup"
 
 #: src/main/print-canon.c:200 src/main/print-escp2.c:166
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1867
 #: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr "Size of the paper being printed to"
 
 #: src/main/print-canon.c:205 src/main/print-escp2.c:171
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1259 src/cups/genppd.c:1339 src/cups/genppd.c:2001
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1872
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1372 src/cups/genppd.c:2035
 msgid "Media Type"
 msgstr "Media Type"
 
 #: src/main/print-canon.c:206 src/main/print-escp2.c:172
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1873
 #: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Type of media (plain paper, photo paper, etc.)"
 
 #: src/main/print-canon.c:211 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
-#: src/main/print-pcl.c:1265 src/cups/genppd.c:1368 src/cups/genppd.c:2020
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1878
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1401 src/cups/genppd.c:2054
 msgid "Media Source"
 msgstr "Media Source"
 
 #: src/main/print-canon.c:212 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1879
 #: src/main/print-pcl.c:1266
 msgid "Source (input slot) of the media"
 msgstr "Source (input slot) of the media"
@@ -246,8 +246,8 @@ msgstr "CD Horizontal Fine Adjustment"
 #: src/main/print-canon.c:235 src/main/print-canon.c:241
 #: src/main/print-canon.c:253 src/main/print-escp2.c:207
 #: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1906
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr "Advanced Printer Setup"
@@ -262,25 +262,25 @@ msgid "CD Vertical Fine Adjustment"
 msgstr "CD Vertical Fine Adjustment"
 
 #: src/main/print-canon.c:247 src/main/print-escp2.c:219
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
-#: src/main/print-pcl.c:1277 src/cups/genppd.c:1446 src/cups/genppd.c:2056
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1884
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1479 src/cups/genppd.c:2090
 msgid "Resolution"
 msgstr "Resolution"
 
 #: src/main/print-canon.c:248 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1723
+#: src/main/print-olympus.c:1885
 msgid "Resolution and quality of the print"
 msgstr "Resolution and quality of the print"
 
 #: src/main/print-canon.c:253 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Ink Type"
 
 #: src/main/print-canon.c:254 src/main/print-escp2.c:231
 #: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
+#: src/main/print-olympus.c:1891 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Type of ink in the printer"
@@ -298,32 +298,33 @@ msgstr "Ink Channels"
 #: 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-escp2.c:320 src/main/print-escp2.c:767
-#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
-#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
-#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
-#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:893 src/main/print-escp2.c:901
+#: src/main/print-escp2.c:909 src/main/print-escp2.c:925
+#: src/main/print-escp2.c:933 src/main/print-escp2.c:941
+#: src/main/print-escp2.c:949 src/main/print-escp2.c:957
+#: src/main/print-escp2.c:965 src/main/print-escp2.c:973
 #: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr "Advanced Printer Functionality"
 
-#: src/main/print-canon.c:265 src/main/print-escp2.c:326
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-canon.c:265 src/main/print-escp2.c:332
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1912
 #: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Printing Mode"
 
 #: src/main/print-canon.c:265 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:326
-#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-color.c:208 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1912 src/main/print-pcl.c:1295
 #: src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr "Core Parameter"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:327
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-canon.c:266 src/main/print-escp2.c:333
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1913
 #: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Printing Output Mode"
@@ -351,77 +352,84 @@ msgstr "Print Quality"
 msgid "Basic Output Adjustment"
 msgstr "Basic Output Adjustment"
 
-#: src/main/print-canon.c:300 src/main/print-escp2.c:439
+#: src/main/print-canon.c:300 src/main/print-escp2.c:445
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 msgid "Cyan Density"
 msgstr "Cyan Density"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:301 src/main/print-escp2.c:446
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 msgid "Adjust the cyan density"
 msgstr "Adjust the cyan density"
 
-#: src/main/print-canon.c:308 src/main/print-escp2.c:447
+#: src/main/print-canon.c:308 src/main/print-escp2.c:453
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 msgid "Magenta Density"
 msgstr "Magenta Density"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:309 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 msgid "Adjust the magenta density"
 msgstr "Adjust the magenta density"
 
-#: src/main/print-canon.c:316 src/main/print-escp2.c:455
+#: src/main/print-canon.c:316 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 msgid "Yellow Density"
 msgstr "Yellow Density"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:317 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 msgid "Adjust the yellow density"
 msgstr "Adjust the yellow density"
 
-#: src/main/print-canon.c:324 src/main/print-escp2.c:463
+#: src/main/print-canon.c:324 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 msgid "Black Density"
 msgstr "Black Density"
 
-#: src/main/print-canon.c:325 src/main/print-escp2.c:464
+#: src/main/print-canon.c:325 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 msgid "Adjust the black density"
 msgstr "Adjust the black density"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:333
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:541 src/main/print-escp2.c:542
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 msgid "Light Cyan Transition"
 msgstr "Light Cyan Transition"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:340
-#: src/main/print-canon.c:348 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
-#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
-#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
-#: src/main/print-pcl.c:1364
+#: src/main/print-canon.c:348 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:541
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:557
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:573
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:589
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:605
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:621
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:637
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:653
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:669
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:685
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:701
+#: src/main/print-escp2.c:709 src/main/print-escp2.c:717
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:733
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:749
+#: src/main/print-escp2.c:757 src/main/print-escp2.c:765
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:781
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:797
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:813
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:829
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:845
+#: src/main/print-escp2.c:853 src/main/print-escp2.c:861
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr "Advanced Ink Adjustment"
 
 #: src/main/print-canon.c:340 src/main/print-canon.c:341
-#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
+#: src/main/print-escp2.c:573 src/main/print-escp2.c:574
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 msgid "Light Magenta Transition"
@@ -431,14 +439,14 @@ msgstr "Light Magenta Transition"
 msgid "Light Yellow Transition"
 msgstr "Light Yellow Transition"
 
-#: src/main/print-canon.c:368 src/main/print-escp2.c:2283
-#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3609
-#: src/xml/xmli18n-tmp.h:3614 src/xml/xmli18n-tmp.h:3620
-#: src/xml/xmli18n-tmp.h:3627
+#: src/main/print-canon.c:368 src/main/print-escp2.c:2488
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5851 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5864
 msgid "Off"
 msgstr "Off"
 
-#: src/main/print-canon.c:369 src/main/print-escp2.c:2285
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2490
 #: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr "Long Edge (Standard)"
@@ -447,63 +455,64 @@ msgstr "Long Edge (Standard)"
 msgid "Short Edge (Flip)"
 msgstr "Short Edge (Flip)"
 
-#: src/main/print-canon.c:646 src/main/print-escp2.c:2005
-#: src/xml/xmli18n-tmp.h:3676
+#: src/main/print-canon.c:646 src/main/print-escp2.c:2210
+#: src/xml/xmli18n-tmp.h:5913
 msgid "CD - 5 inch"
 msgstr "CD - 5 inch"
 
-#: src/main/print-canon.c:648 src/main/print-escp2.c:2007
-#: src/xml/xmli18n-tmp.h:3677
+#: src/main/print-canon.c:648 src/main/print-escp2.c:2212
+#: src/xml/xmli18n-tmp.h:5914
 msgid "CD - 3 inch"
 msgstr "CD - 3 inch"
 
-#: src/main/print-canon.c:650 src/main/print-escp2.c:2009
-#: src/xml/xmli18n-tmp.h:3678
+#: src/main/print-canon.c:650 src/main/print-escp2.c:2214
+#: src/xml/xmli18n-tmp.h:5915
 msgid "CD - Custom"
 msgstr "CD - Custom"
 
-#: src/main/print-canon.c:673 src/main/print-escp2.c:2034
-#: src/cups/genppd.c:1323 src/cups/genppd.c:1572 src/cups/genppd.c:1988
-#: src/cups/genppd.c:2079
+#: src/main/print-canon.c:673 src/main/print-escp2.c:2239
+#: src/cups/genppd.c:1356 src/cups/genppd.c:1605 src/cups/genppd.c:2022
+#: src/cups/genppd.c:2113
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-canon.c:675 src/main/print-escp2.c:2036
+#: src/main/print-canon.c:675 src/main/print-escp2.c:2241
 msgid "Print To Hub"
 msgstr "Print To Hub"
 
-#: src/main/print-canon.c:790 src/main/print-escp2.c:2447
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-canon.c:790 src/main/print-escp2.c:2652
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2167
 #: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
 #: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Colour"
 
-#: src/main/print-canon.c:792 src/main/print-escp2.c:2449
+#: src/main/print-canon.c:792 src/main/print-escp2.c:2654
 #: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
 #: src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "Black and White"
 
-#: src/main/print-canon.c:831 src/main/print-escp2.c:2089
+#: src/main/print-canon.c:831 src/main/print-escp2.c:2294
 #: src/main/print-pcl.c:1797 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr "Manual Control"
 
-#: src/main/print-canon.c:833 src/main/print-escp2.c:2131
-#: src/main/print-escp2.c:2229 src/main/print-escp2.c:2241
+#: src/main/print-canon.c:833 src/main/print-escp2.c:2336
+#: src/main/print-escp2.c:2434 src/main/print-escp2.c:2446
 #: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
 #: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
-#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1215
-#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1219
-#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
-#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3170
-#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3177
-#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3461
-#: src/xml/xmli18n-tmp.h:3464 src/xml/xmli18n-tmp.h:3632
-#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3648
-#: src/xml/xmli18n-tmp.h:3657 src/xml/xmli18n-tmp.h:3665
+#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1627 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3713 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3722 src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5902
 msgid "Standard"
 msgstr "Standard"
 
@@ -540,7 +549,7 @@ msgid "Pre-Dithered"
 msgstr "Pre-Dithered"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1268 src/cups/genppd.c:1971
+#: src/cups/genppd.c:1301 src/cups/genppd.c:2005
 msgid "Grayscale"
 msgstr "Grayscale"
 
@@ -556,11 +565,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1299 src/cups/genppd.c:1978
+#: src/main/print-color.c:129 src/cups/genppd.c:1332 src/cups/genppd.c:2012
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1306 src/cups/genppd.c:1979
+#: src/main/print-color.c:131 src/cups/genppd.c:1339 src/cups/genppd.c:2013
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -620,7 +629,7 @@ msgid "Output image type"
 msgstr "Output image type"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338
 msgid "Raw Channels"
 msgstr "Raw Channels"
 
@@ -682,56 +691,208 @@ msgstr "Gamma value assumed by application"
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
 #: src/escputil/escputil.c:997 src/escputil/escputil.c:1017
-#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:1812
-#: src/xml/xmli18n-tmp.h:1823 src/xml/xmli18n-tmp.h:1836
-#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1863
-#: src/xml/xmli18n-tmp.h:1876 src/xml/xmli18n-tmp.h:1889
-#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1918
-#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1949
-#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1975
-#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:1999
-#: src/xml/xmli18n-tmp.h:2013 src/xml/xmli18n-tmp.h:2027
-#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2051
-#: src/xml/xmli18n-tmp.h:2064 src/xml/xmli18n-tmp.h:2076
-#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2102
-#: src/xml/xmli18n-tmp.h:2116 src/xml/xmli18n-tmp.h:2130
-#: src/xml/xmli18n-tmp.h:2143 src/xml/xmli18n-tmp.h:2156
-#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2184
-#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2210
-#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2236
-#: src/xml/xmli18n-tmp.h:2249 src/xml/xmli18n-tmp.h:2262
-#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2290
-#: src/xml/xmli18n-tmp.h:2305 src/xml/xmli18n-tmp.h:2320
-#: src/xml/xmli18n-tmp.h:2332 src/xml/xmli18n-tmp.h:2343
-#: src/xml/xmli18n-tmp.h:2356 src/xml/xmli18n-tmp.h:2369
-#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2392
-#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2415
-#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2442
-#: src/xml/xmli18n-tmp.h:2454 src/xml/xmli18n-tmp.h:2466
-#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2496
-#: src/xml/xmli18n-tmp.h:2509 src/xml/xmli18n-tmp.h:2522
-#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
-#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2574
-#: src/xml/xmli18n-tmp.h:2586 src/xml/xmli18n-tmp.h:2598
-#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2623
-#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2653
-#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2683
-#: src/xml/xmli18n-tmp.h:2697 src/xml/xmli18n-tmp.h:2715
-#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2745
-#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
-#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2803
-#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2828
-#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2854
-#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2881
-#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2915
-#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2943
-#: src/xml/xmli18n-tmp.h:2959 src/xml/xmli18n-tmp.h:2976
-#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:3004
-#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3032
-#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3062
-#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3093
-#: src/xml/xmli18n-tmp.h:3107 src/xml/xmli18n-tmp.h:3125
-#: src/xml/xmli18n-tmp.h:3141
+#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2387
+#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2413
+#: src/xml/xmli18n-tmp.h:2426 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2499
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2551
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2575
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2708
+#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2786
+#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2814
+#: src/xml/xmli18n-tmp.h:2829 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2893
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2966
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3005 src/xml/xmli18n-tmp.h:3020
+#: src/xml/xmli18n-tmp.h:3033 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3061 src/xml/xmli18n-tmp.h:3073
+#: src/xml/xmli18n-tmp.h:3085 src/xml/xmli18n-tmp.h:3098
+#: src/xml/xmli18n-tmp.h:3110 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3377
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3616
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3648
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3766 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3775 src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:3794 src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:3805 src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3869 src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:3880 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3902 src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:3913 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:3948 src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:3970 src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:3983 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4023 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4064 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4075 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4088 src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:4103 src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:4118 src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:4143 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:4203 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4275 src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4309 src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4356 src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4421
+#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4449
+#: src/xml/xmli18n-tmp.h:4456 src/xml/xmli18n-tmp.h:4462
+#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4485 src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:4551 src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:4694 src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4717 src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:4818 src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:4829 src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4885 src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4935
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:5041 src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:5052 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:5121 src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5165
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5182 src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:5193 src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:5271 src/xml/xmli18n-tmp.h:5299
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5327 src/xml/xmli18n-tmp.h:5331
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5347
+#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5367 src/xml/xmli18n-tmp.h:5371
+#: src/xml/xmli18n-tmp.h:5383 src/xml/xmli18n-tmp.h:5388
+#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5440
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5461 src/xml/xmli18n-tmp.h:5468
+#: src/xml/xmli18n-tmp.h:5476 src/xml/xmli18n-tmp.h:5486
+#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5514
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5525
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5543
+#: src/xml/xmli18n-tmp.h:5550 src/xml/xmli18n-tmp.h:5556
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5574 src/xml/xmli18n-tmp.h:5582
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5592
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5625
+#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5649
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5662
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5690
+#: src/xml/xmli18n-tmp.h:5694 src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5731
+#: src/xml/xmli18n-tmp.h:5738 src/xml/xmli18n-tmp.h:5742
+#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5759
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5770
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5807
+#: src/xml/xmli18n-tmp.h:5811 src/xml/xmli18n-tmp.h:5817
+#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5828
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5843
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -741,56 +902,208 @@ msgstr "Adjust the cyan gamma"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
 #: src/escputil/escputil.c:998 src/escputil/escputil.c:1018
-#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:1813
-#: src/xml/xmli18n-tmp.h:1824 src/xml/xmli18n-tmp.h:1837
-#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1864
-#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1890
-#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1919
-#: src/xml/xmli18n-tmp.h:1935 src/xml/xmli18n-tmp.h:1950
-#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1976
-#: src/xml/xmli18n-tmp.h:1988 src/xml/xmli18n-tmp.h:2000
-#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2028
-#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2052
-#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2077
-#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2103
-#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2131
-#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2157
-#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2185
-#: src/xml/xmli18n-tmp.h:2198 src/xml/xmli18n-tmp.h:2211
-#: src/xml/xmli18n-tmp.h:2224 src/xml/xmli18n-tmp.h:2237
-#: src/xml/xmli18n-tmp.h:2250 src/xml/xmli18n-tmp.h:2263
-#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2291
-#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2321
-#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2344
-#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2370
-#: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2393
-#: src/xml/xmli18n-tmp.h:2405 src/xml/xmli18n-tmp.h:2416
-#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2443
-#: src/xml/xmli18n-tmp.h:2455 src/xml/xmli18n-tmp.h:2467
-#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2497
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2523
-#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2575
-#: src/xml/xmli18n-tmp.h:2587 src/xml/xmli18n-tmp.h:2599
-#: src/xml/xmli18n-tmp.h:2611 src/xml/xmli18n-tmp.h:2624
-#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
-#: src/xml/xmli18n-tmp.h:2670 src/xml/xmli18n-tmp.h:2684
-#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2714
-#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2747
-#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2780
-#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
-#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2829
-#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2855
-#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2882
-#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2914
-#: src/xml/xmli18n-tmp.h:2931 src/xml/xmli18n-tmp.h:2944
-#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2975
-#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:3005
-#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3033
-#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3060
-#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3094
-#: src/xml/xmli18n-tmp.h:3108 src/xml/xmli18n-tmp.h:3124
-#: src/xml/xmli18n-tmp.h:3140
+#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2361
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2388
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2414
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2459 src/xml/xmli18n-tmp.h:2474
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2512 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2552
+#: src/xml/xmli18n-tmp.h:2564 src/xml/xmli18n-tmp.h:2576
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2787
+#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2815
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2868
+#: src/xml/xmli18n-tmp.h:2881 src/xml/xmli18n-tmp.h:2894
+#: src/xml/xmli18n-tmp.h:2905 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:2967
+#: src/xml/xmli18n-tmp.h:2979 src/xml/xmli18n-tmp.h:2991
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3062 src/xml/xmli18n-tmp.h:3074
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3099
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3135 src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:3163 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3353
+#: src/xml/xmli18n-tmp.h:3365 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
+#: src/xml/xmli18n-tmp.h:3420 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3542 src/xml/xmli18n-tmp.h:3556
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3600 src/xml/xmli18n-tmp.h:3617
+#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3647
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3751 src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:3784 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3795 src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:3806 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3837 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3903 src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3939 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3960 src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:3972 src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:3984 src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:3999 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:4039 src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:4104 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:4170 src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4194 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:4230 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:4276 src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4311 src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4338 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:4401 src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:4427 src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:4442 src/xml/xmli18n-tmp.h:4451
+#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4464
+#: src/xml/xmli18n-tmp.h:4470 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4486 src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:4511 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:4809 src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4909 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:5007 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5018 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5111 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5123 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5148 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:5240 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5250 src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:5261 src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5301
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5313
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5349
+#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5401
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5441
+#: src/xml/xmli18n-tmp.h:5453 src/xml/xmli18n-tmp.h:5458
+#: src/xml/xmli18n-tmp.h:5463 src/xml/xmli18n-tmp.h:5470
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5496 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5527
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5552 src/xml/xmli18n-tmp.h:5558
+#: src/xml/xmli18n-tmp.h:5564 src/xml/xmli18n-tmp.h:5568
+#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5593
+#: src/xml/xmli18n-tmp.h:5598 src/xml/xmli18n-tmp.h:5616
+#: src/xml/xmli18n-tmp.h:5620 src/xml/xmli18n-tmp.h:5626
+#: src/xml/xmli18n-tmp.h:5631 src/xml/xmli18n-tmp.h:5651
+#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
+#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5674
+#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5720
+#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5733
+#: src/xml/xmli18n-tmp.h:5739 src/xml/xmli18n-tmp.h:5743
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5818
+#: src/xml/xmli18n-tmp.h:5823 src/xml/xmli18n-tmp.h:5829
+#: src/xml/xmli18n-tmp.h:5833 src/xml/xmli18n-tmp.h:5839
+#: src/xml/xmli18n-tmp.h:5844
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -800,56 +1113,208 @@ msgstr "Adjust the magenta gamma"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
 #: src/escputil/escputil.c:999 src/escputil/escputil.c:1019
-#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:1814
-#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
-#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1865
-#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1891
-#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1920
-#: src/xml/xmli18n-tmp.h:1936 src/xml/xmli18n-tmp.h:1951
-#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1977
-#: src/xml/xmli18n-tmp.h:1989 src/xml/xmli18n-tmp.h:2001
-#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2029
-#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2053
-#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2078
-#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2104
-#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
-#: src/xml/xmli18n-tmp.h:2145 src/xml/xmli18n-tmp.h:2158
-#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2186
-#: src/xml/xmli18n-tmp.h:2199 src/xml/xmli18n-tmp.h:2212
-#: src/xml/xmli18n-tmp.h:2225 src/xml/xmli18n-tmp.h:2238
-#: src/xml/xmli18n-tmp.h:2251 src/xml/xmli18n-tmp.h:2264
-#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2292
-#: src/xml/xmli18n-tmp.h:2307 src/xml/xmli18n-tmp.h:2322
-#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
-#: src/xml/xmli18n-tmp.h:2358 src/xml/xmli18n-tmp.h:2371
-#: src/xml/xmli18n-tmp.h:2382 src/xml/xmli18n-tmp.h:2394
-#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2417
-#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2444
-#: src/xml/xmli18n-tmp.h:2456 src/xml/xmli18n-tmp.h:2468
-#: src/xml/xmli18n-tmp.h:2483 src/xml/xmli18n-tmp.h:2498
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2524
-#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2551
-#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2576
-#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
-#: src/xml/xmli18n-tmp.h:2612 src/xml/xmli18n-tmp.h:2625
-#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2651
-#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2685
-#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2713
-#: src/xml/xmli18n-tmp.h:2734 src/xml/xmli18n-tmp.h:2749
-#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2779
-#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2805
-#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2830
-#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2856
-#: src/xml/xmli18n-tmp.h:2871 src/xml/xmli18n-tmp.h:2883
-#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2910
-#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2945
-#: src/xml/xmli18n-tmp.h:2960 src/xml/xmli18n-tmp.h:2974
-#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3006
-#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3034
-#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3061
-#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3095
-#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3120
-#: src/xml/xmli18n-tmp.h:3136
+#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2389
+#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2444
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2475
+#: src/xml/xmli18n-tmp.h:2488 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2513 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2565 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2602
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2762
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2788
+#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2816
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2846
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2906 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3022
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3048
+#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3075
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3124
+#: src/xml/xmli18n-tmp.h:3136 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3175
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3315 src/xml/xmli18n-tmp.h:3329
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3433
+#: src/xml/xmli18n-tmp.h:3455 src/xml/xmli18n-tmp.h:3468
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3497
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3601 src/xml/xmli18n-tmp.h:3618
+#: src/xml/xmli18n-tmp.h:3632 src/xml/xmli18n-tmp.h:3643
+#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3747 src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3834 src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:3844 src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:3867 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:3900 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3910 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3935 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:3967 src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:3979 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4005 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4062 src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4110 src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:4124 src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4167 src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:4272 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:4321 src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:4334 src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4367 src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4471
+#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4505 src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4549 src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:4562 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4580 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4602 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:4678 src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:4691 src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4770 src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4893 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4904 src/xml/xmli18n-tmp.h:4911
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:4971 src/xml/xmli18n-tmp.h:4978
+#: src/xml/xmli18n-tmp.h:5004 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5050 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5071 src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:5097 src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:5142 src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:5169 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5184
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5257 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5318
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5358
+#: src/xml/xmli18n-tmp.h:5364 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5385
+#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5438
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5454
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5465
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5511
+#: src/xml/xmli18n-tmp.h:5516 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5547 src/xml/xmli18n-tmp.h:5554
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5584 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5617 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5632
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5687
+#: src/xml/xmli18n-tmp.h:5692 src/xml/xmli18n-tmp.h:5698
+#: src/xml/xmli18n-tmp.h:5705 src/xml/xmli18n-tmp.h:5713
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5729
+#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
+#: src/xml/xmli18n-tmp.h:5744 src/xml/xmli18n-tmp.h:5756
+#: src/xml/xmli18n-tmp.h:5761 src/xml/xmli18n-tmp.h:5767
+#: src/xml/xmli18n-tmp.h:5774 src/xml/xmli18n-tmp.h:5782
+#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5792
+#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5803
+#: src/xml/xmli18n-tmp.h:5809 src/xml/xmli18n-tmp.h:5813
+#: src/xml/xmli18n-tmp.h:5819 src/xml/xmli18n-tmp.h:5824
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5845
 msgid "Yellow"
 msgstr "Yellow"
 
@@ -859,9 +1324,17 @@ msgstr "Adjust the yellow gamma"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
 #: src/escputil/escputil.c:1006 src/escputil/escputil.c:1025
-#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2700
-#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2795
-#: src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:4041 src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:4056 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4091 src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:4155 src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5155
 msgid "Red"
 msgstr "Red"
 
@@ -879,8 +1352,13 @@ msgstr "Adjust the green gamma"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
 #: src/escputil/escputil.c:1007 src/escputil/escputil.c:1026
-#: src/xml/xmli18n-tmp.h:2657 src/xml/xmli18n-tmp.h:2701
-#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4051 src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:4084 src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:5156
 msgid "Blue"
 msgstr "Blue"
 
@@ -891,53 +1369,183 @@ msgstr "Adjust the blue gamma"
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
 #: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1016 src/escputil/escputil.c:1285
-#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
-#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
-#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1875
-#: src/xml/xmli18n-tmp.h:1888 src/xml/xmli18n-tmp.h:1901
-#: src/xml/xmli18n-tmp.h:1917 src/xml/xmli18n-tmp.h:1933
-#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1961
-#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1986
-#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2012
-#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2038
-#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2063
-#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2090
-#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2115
-#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2142
-#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2169
-#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
-#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
-#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2248
-#: src/xml/xmli18n-tmp.h:2261 src/xml/xmli18n-tmp.h:2274
-#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2304
-#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2331
-#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
-#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
-#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2403
-#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2420
-#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2441
-#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2465
-#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2495
-#: src/xml/xmli18n-tmp.h:2508 src/xml/xmli18n-tmp.h:2521
-#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
-#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2573
-#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2597
-#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2622
-#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2672
-#: src/xml/xmli18n-tmp.h:2682 src/xml/xmli18n-tmp.h:2731
-#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2764
-#: src/xml/xmli18n-tmp.h:2781 src/xml/xmli18n-tmp.h:2794
-#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2815
-#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2839
-#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2868
-#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2894
-#: src/xml/xmli18n-tmp.h:2911 src/xml/xmli18n-tmp.h:2929
-#: src/xml/xmli18n-tmp.h:2942 src/xml/xmli18n-tmp.h:2977
-#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:3003
-#: src/xml/xmli18n-tmp.h:3017 src/xml/xmli18n-tmp.h:3031
-#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3079
-#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3110
-#: src/xml/xmli18n-tmp.h:3121 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2372
+#: src/xml/xmli18n-tmp.h:2386 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2457
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2510
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2536
+#: src/xml/xmli18n-tmp.h:2550 src/xml/xmli18n-tmp.h:2562
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2599 src/xml/xmli18n-tmp.h:2614
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2639
+#: src/xml/xmli18n-tmp.h:2653 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2965
+#: src/xml/xmli18n-tmp.h:2977 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3019
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3060 src/xml/xmli18n-tmp.h:3072
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3133 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3196
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3526
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3680 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3755 src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:3804 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3819 src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:3831 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3846 src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3873 src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:3924 src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:3943 src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:4022 src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4059 src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:4142 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4164 src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:4179 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:4255 src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4289 src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:4308 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4413 src/xml/xmli18n-tmp.h:4420
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4455
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4507 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:4565 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:4604 src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:4702 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:4733 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:4786 src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4920 src/xml/xmli18n-tmp.h:4926
+#: src/xml/xmli18n-tmp.h:4934 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:4973 src/xml/xmli18n-tmp.h:4981
+#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:4993
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:5047 src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5151
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5186
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5223 src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5270
+#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5284
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5320
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5337
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5375
+#: src/xml/xmli18n-tmp.h:5378 src/xml/xmli18n-tmp.h:5380
+#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5435
+#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5447
+#: src/xml/xmli18n-tmp.h:5449 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5474
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5492
+#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5571
+#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5590
+#: src/xml/xmli18n-tmp.h:5596 src/xml/xmli18n-tmp.h:5602
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5614
+#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5629
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5655
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5680 src/xml/xmli18n-tmp.h:5682
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5700
+#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5716
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5749
+#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5769 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5794
+#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5806
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5836
+#: src/xml/xmli18n-tmp.h:5842
 msgid "Black"
 msgstr "Black"
 
@@ -945,7 +1553,7 @@ msgstr "Black"
 msgid "Adjust the black gamma"
 msgstr "Adjust the black gamma"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1769
+#: src/main/print-color.c:322 src/main/print-olympus.c:1935
 msgid "Cyan Balance"
 msgstr "Cyan Balance"
 
@@ -958,7 +1566,7 @@ msgstr "GrayBalance"
 msgid "Adjust the cyan gray balance"
 msgstr "Adjust the cyan gray balance"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1777
+#: src/main/print-color.c:330 src/main/print-olympus.c:1943
 msgid "Magenta Balance"
 msgstr "Magenta Balance"
 
@@ -966,7 +1574,7 @@ msgstr "Magenta Balance"
 msgid "Adjust the magenta gray balance"
 msgstr "Adjust the magenta gray balance"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1785
+#: src/main/print-color.c:338 src/main/print-olympus.c:1951
 msgid "Yellow Balance"
 msgstr "Yellow Balance"
 
@@ -993,11 +1601,11 @@ msgstr "Ink Limit"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
-#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
-#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
-#: src/main/print-escp2.c:759
+#: src/main/print-escp2.c:344 src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356 src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368 src/main/print-escp2.c:374
+#: src/main/print-escp2.c:869 src/main/print-escp2.c:877
+#: src/main/print-escp2.c:885
 msgid "Advanced Output Control"
 msgstr "Advanced Output Control"
 
@@ -1005,27 +1613,27 @@ msgstr "Advanced Output Control"
 msgid "Limit the total ink printed to the page"
 msgstr "Limit the total ink printed to the page"
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:743
+#: src/main/print-color.c:365 src/main/print-escp2.c:869
 msgid "GCR Transition"
 msgstr "GCR Transition"
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:744
+#: src/main/print-color.c:366 src/main/print-escp2.c:870
 msgid "Adjust the gray component transition rate"
 msgstr "Adjust the gray component transition rate"
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:751
+#: src/main/print-color.c:373 src/main/print-escp2.c:877
 msgid "GCR Lower Bound"
 msgstr "GCR Lower Bound"
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:752
+#: src/main/print-color.c:374 src/main/print-escp2.c:878
 msgid "Lower bound of gray component reduction"
 msgstr "Lower bound of gray component reduction"
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:759
+#: src/main/print-color.c:381 src/main/print-escp2.c:885
 msgid "GCR Upper Bound"
 msgstr "GCR Upper Bound"
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:760
+#: src/main/print-color.c:382 src/main/print-escp2.c:886
 msgid "Upper bound of gray component reduction"
 msgstr "Upper bound of gray component reduction"
 
@@ -1278,11 +1886,11 @@ msgstr "Advanced Output Adjustment"
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr "Printing direction (unidirectional is higher quality, but slower)"
 
-#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1906
 msgid "Borderless"
 msgstr "Borderless"
 
-#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1907
 msgid "Print without borders"
 msgstr "Print without borders"
 
@@ -1295,7 +1903,7 @@ msgid "Interleave pattern to use"
 msgstr "Interleave pattern to use"
 
 #: src/main/print-escp2.c:266 src/main/print-escp2.c:267
-#: src/cups/genppd.c:1567 src/cups/genppd.c:2078
+#: src/cups/genppd.c:1600 src/cups/genppd.c:2112
 msgid "Output Order"
 msgstr "Output Order"
 
@@ -1336,334 +1944,451 @@ msgid "Has multiple choices of ink cartridges"
 msgstr "Has multiple choices of ink cartridges"
 
 #: src/main/print-escp2.c:320 src/main/print-escp2.c:321
+#, fuzzy
+msgid "Raw Channel Names"
+msgstr "Channel Names"
+
+#: src/main/print-escp2.c:326 src/main/print-escp2.c:327
 msgid "Channel Names"
 msgstr "Channel Names"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:339
 msgid "Raw Channel Count"
 msgstr "Raw Channel Count"
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:344
 msgid "Cyan Map"
 msgstr "Cyan Map"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:345
 msgid "Adjust the cyan map"
 msgstr "Adjust the cyan map"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350
 msgid "Magenta Map"
 msgstr "Magenta Map"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:351
 msgid "Adjust the magenta map"
 msgstr "Adjust the magenta map"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356
 msgid "Yellow Map"
 msgstr "Yellow Map"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:357
 msgid "Adjust the yellow map"
 msgstr "Adjust the yellow map"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362
 msgid "Blue Map"
 msgstr "Blue Map"
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:363
 msgid "Adjust the blue map"
 msgstr "Adjust the blue map"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368
 msgid "Orange Map"
 msgstr "Orange Map"
 
-#: src/main/print-escp2.c:363
+#: src/main/print-escp2.c:369
 msgid "Adjust the orange map"
 msgstr "Adjust the orange map"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:374
 msgid "Red Map"
 msgstr "Red Map"
 
-#: src/main/print-escp2.c:369
+#: src/main/print-escp2.c:375
 msgid "Adjust the red map"
 msgstr "Adjust the red map"
 
-#: src/main/print-escp2.c:471
+#: src/main/print-escp2.c:477
 msgid "Red Density"
 msgstr "Red Density"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:478
 msgid "Adjust the red density"
 msgstr "Adjust the red density"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:485
 msgid "Blue Density"
 msgstr "Blue Density"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:486
 msgid "Adjust the blue density"
 msgstr "Adjust the blue density"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:493
 msgid "Orange Density"
 msgstr "Orange Density"
 
-#: src/main/print-escp2.c:488
+#: src/main/print-escp2.c:494
 msgid "Adjust the orange density"
 msgstr "Adjust the orange density"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:501
 msgid "Gloss Level"
 msgstr "Gloss Level"
 
-#: src/main/print-escp2.c:496
+#: src/main/print-escp2.c:502
 msgid "Adjust the gloss level"
 msgstr "Adjust the gloss level"
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:509
 msgid "Drop Size Small"
 msgstr "Drop Size Small"
 
-#: src/main/print-escp2.c:504
+#: src/main/print-escp2.c:510
 msgid "Drop Size 1 (small)"
 msgstr "Drop Size 1 (small)"
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:517
 msgid "Drop Size Medium"
 msgstr "Drop Size Medium"
 
-#: src/main/print-escp2.c:512
+#: src/main/print-escp2.c:518
 msgid "Drop Size 2 (medium)"
 msgstr "Drop Size 2 (medium)"
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:525
 msgid "Drop Size Large"
 msgstr "Drop Size Large"
 
-#: src/main/print-escp2.c:520
+#: src/main/print-escp2.c:526
 msgid "Drop Size 3 (large)"
 msgstr "Drop Size 3 (large)"
 
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:534
 msgid "Light Cyan Value"
 msgstr "Light Cyan Value"
 
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:550
 msgid "Light Cyan Density Scale"
 msgstr "Light Cyan Density Scale"
 
-#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
+#: src/main/print-escp2.c:557 src/main/print-escp2.c:558
 msgid "Light Magenta Value"
 msgstr "Light Magenta Value"
 
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:566
 msgid "Light Magenta Density Scale"
 msgstr "Light Magenta Density Scale"
 
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:582
 msgid "Dark Yellow Value"
 msgstr "Dark Yellow Value"
 
-#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
+#: src/main/print-escp2.c:589 src/main/print-escp2.c:590
 msgid "Dark Yellow Transition"
 msgstr "Dark Yellow Transition"
 
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:598
 msgid "Dark Yellow Density Scale"
 msgstr "Dark Yellow Density Scale"
 
-#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
+#: src/main/print-escp2.c:605 src/main/print-escp2.c:606
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:630
 msgid "Gray Value"
 msgstr "Gray Value"
 
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
-#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:614
+#: src/main/print-escp2.c:637 src/main/print-escp2.c:638
 msgid "Gray Transition"
 msgstr "Gray Transition"
 
-#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
+#: src/main/print-escp2.c:621 src/main/print-escp2.c:622
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:646
 msgid "Gray Density Scale"
 msgstr "Gray Density Scale"
 
-#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
+#: src/main/print-escp2.c:653 src/main/print-escp2.c:654
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:726
 msgid "Light Gray Value"
 msgstr "Light Gray Value"
 
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
-#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:662
+#: src/main/print-escp2.c:733 src/main/print-escp2.c:734
 msgid "Light Gray Transition"
 msgstr "Light Gray Transition"
 
-#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
-#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
+#: src/main/print-escp2.c:669 src/main/print-escp2.c:670
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:742
 msgid "Light Gray Density Scale"
 msgstr "Light Gray Density Scale"
 
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:678
 msgid "Dark Gray Value"
 msgstr "Dark Gray Value"
 
-#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
+#: src/main/print-escp2.c:685 src/main/print-escp2.c:686
 msgid "Dark Gray Transition"
 msgstr "Dark Gray Transition"
 
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:694
 msgid "Dark Gray Density Scale"
 msgstr "Dark Gray Density Scale"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:701
 msgid "Mid Gray Value"
 msgstr "Mid Gray Value"
 
-#: src/main/print-escp2.c:696
+#: src/main/print-escp2.c:702
 msgid "Medium Gray Value"
 msgstr "Medium Gray Value"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:709
 msgid "Mid Gray Transition"
 msgstr "Mid Gray Transition"
 
-#: src/main/print-escp2.c:704
+#: src/main/print-escp2.c:710
 msgid "Medium Gray Transition"
 msgstr "Medium Gray Transition"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:717
 msgid "Mid Gray Density Scale"
 msgstr "Mid Gray Density Scale"
 
-#: src/main/print-escp2.c:712
+#: src/main/print-escp2.c:718
 msgid "Medium Gray Density Scale"
 msgstr "Medium Gray Density Scale"
 
-#: src/main/print-escp2.c:767
+#: src/main/print-escp2.c:749
+#, fuzzy
+msgid "Hextone Gray 5 Value"
+msgstr "Gray Value"
+
+#: src/main/print-escp2.c:750
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:757
+#, fuzzy
+msgid "Hextone Gray 5 Transition"
+msgstr "Gray Transition"
+
+#: src/main/print-escp2.c:758
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr "Light Gray Transition"
+
+#: src/main/print-escp2.c:765
+#, fuzzy
+msgid "Hextone Gray 5 Density Scale"
+msgstr "Gray Density Scale"
+
+#: src/main/print-escp2.c:766
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr "Light Gray Density Scale"
+
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:774
+#, fuzzy
+msgid "Hextone Gray 4 Value"
+msgstr "Gray Value"
+
+#: src/main/print-escp2.c:781 src/main/print-escp2.c:782
+#, fuzzy
+msgid "Hextone Gray 4 Transition"
+msgstr "Gray Transition"
+
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:790
+#, fuzzy
+msgid "Hextone Gray 4 Density Scale"
+msgstr "Gray Density Scale"
+
+#: src/main/print-escp2.c:797 src/main/print-escp2.c:798
+#, fuzzy
+msgid "Hextone Gray 3 Value"
+msgstr "Gray Value"
+
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:806
+#, fuzzy
+msgid "Hextone Gray 3 Transition"
+msgstr "Gray Transition"
+
+#: src/main/print-escp2.c:813 src/main/print-escp2.c:814
+#, fuzzy
+msgid "Hextone Gray 3 Density Scale"
+msgstr "Gray Density Scale"
+
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:822
+#, fuzzy
+msgid "Hextone Gray 2 Value"
+msgstr "Gray Value"
+
+#: src/main/print-escp2.c:829 src/main/print-escp2.c:830
+#, fuzzy
+msgid "Hextone Gray 2 Transition"
+msgstr "Gray Transition"
+
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:838
+#, fuzzy
+msgid "Hextone Gray 2 Density Scale"
+msgstr "Gray Density Scale"
+
+#: src/main/print-escp2.c:845
+#, fuzzy
+msgid "Hextone Gray 1 Value"
+msgstr "Gray Value"
+
+#: src/main/print-escp2.c:846
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:853
+#, fuzzy
+msgid "Hextone Gray 1 Transition"
+msgstr "Gray Transition"
+
+#: src/main/print-escp2.c:854
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr "Light Magenta Transition"
+
+#: src/main/print-escp2.c:861
+#, fuzzy
+msgid "Hextone Gray 1 Density Scale"
+msgstr "Gray Density Scale"
+
+#: src/main/print-escp2.c:862
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr "Light Magenta Density Scale"
+
+#: src/main/print-escp2.c:893
 msgid "Drying Time Per Page"
 msgstr "Drying Time Per Page"
 
-#: src/main/print-escp2.c:768
+#: src/main/print-escp2.c:894
 msgid "Set drying time per page"
 msgstr "Set drying time per page"
 
-#: src/main/print-escp2.c:775
+#: src/main/print-escp2.c:901
 msgid "Drying Time Per Scan"
 msgstr "Drying Time Per Scan"
 
-#: src/main/print-escp2.c:776
+#: src/main/print-escp2.c:902
 msgid "Set drying time per scan"
 msgstr "Set drying time per scan"
 
-#: src/main/print-escp2.c:783
+#: src/main/print-escp2.c:909
 msgid "Minimum Drying Time Per Scan"
 msgstr "Minimum Drying Time Per Scan"
 
-#: src/main/print-escp2.c:784
+#: src/main/print-escp2.c:910
 msgid "Set minimum drying time per scan"
 msgstr "Set minimum drying time per scan"
 
-#: src/main/print-escp2.c:799
+#: src/main/print-escp2.c:925
+#, fuzzy
+msgid "Quality Enhancement"
+msgstr "Add gloss enhancement"
+
+#: src/main/print-escp2.c:926
+msgid "Enhance print quality by additional passes"
+msgstr ""
+
+#: src/main/print-escp2.c:933
 msgid "Paper Thickness"
 msgstr "Paper Thickness"
 
-#: src/main/print-escp2.c:800
+#: src/main/print-escp2.c:934
 msgid "Set printer paper thickness"
 msgstr "Set printer paper thickness"
 
-#: src/main/print-escp2.c:807
+#: src/main/print-escp2.c:941
 msgid "Vacuum Intensity"
 msgstr "Vacuum Intensity"
 
-#: src/main/print-escp2.c:808
+#: src/main/print-escp2.c:942
 msgid "Set vacuum intensity (printer-specific)"
 msgstr "Set vacuum intensity (printer-specific)"
 
-#: src/main/print-escp2.c:815
+#: src/main/print-escp2.c:949
 msgid "Feed Sequence"
 msgstr "Feed Sequence"
 
-#: src/main/print-escp2.c:816
+#: src/main/print-escp2.c:950
 msgid "Set paper feed sequence (printer-specific)"
 msgstr "Set paper feed sequence (printer-specific)"
 
-#: src/main/print-escp2.c:823
+#: src/main/print-escp2.c:957
 msgid "Print Method"
 msgstr "Print Method"
 
-#: src/main/print-escp2.c:824
+#: src/main/print-escp2.c:958
 msgid "Set print method (printer-specific)"
 msgstr "Set print method (printer-specific)"
 
-#: src/main/print-escp2.c:831
+#: src/main/print-escp2.c:965
 msgid "Platen Gap"
 msgstr "Platen Gap"
 
-#: src/main/print-escp2.c:832
+#: src/main/print-escp2.c:966
 msgid "Set platen gap (printer-specific)"
 msgstr "Set platen gap (printer-specific)"
 
-#: src/main/print-escp2.c:839
+#: src/main/print-escp2.c:973
 msgid "Feed Adjustment"
 msgstr "Feed Adjustment"
 
-#: src/main/print-escp2.c:840
-#, c-format
+#: src/main/print-escp2.c:975
+#, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr "Set paper feed adjustment (0.01% units)"
 
-#: src/main/print-escp2.c:1992
+#: src/main/print-escp2.c:2197
 msgid "Full Manual Control"
 msgstr "Full Manual Control"
 
-#: src/main/print-escp2.c:1994
+#: src/main/print-escp2.c:2199
 msgid "Automatic Setting Control"
 msgstr "Automatic Setting Control"
 
-#: src/main/print-escp2.c:2208 src/cups/genppd.c:1484 src/cups/genppd.c:2059
+#: src/main/print-escp2.c:2413 src/cups/genppd.c:1517 src/cups/genppd.c:2093
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2415
 msgid "Bidirectional"
 msgstr "Bidirectional"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2417
 msgid "Unidirectional"
 msgstr "Unidirectional"
 
-#: src/main/print-escp2.c:2243
+#: src/main/print-escp2.c:2448
 msgid "Alternate Fill"
 msgstr "Alternate Fill"
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2450
 msgid "Ascending Fill"
 msgstr "Ascending Fill"
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2452
 msgid "Descending Fill"
 msgstr "Descending Fill"
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2454
 msgid "Ascending Double"
 msgstr "Ascending Double"
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2456
 msgid "Nearest Neighbor Avoidance"
 msgstr "Nearest Neighbour Avoidance"
 
-#: src/main/print-escp2.c:2287
+#: src/main/print-escp2.c:2492
 msgid "Short Edge(Flip)"
 msgstr "Short Edge(Flip)"
 
-#: src/main/print-escp2.c:2858
+#: src/main/print-escp2.c:3100
 #, 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:4107 src/main/print-olympus.c:2472
+#: src/main/print-escp2.c:4355 src/main/print-olympus.c:2641
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr "Print options not verified; cannot print.\n"
@@ -1717,361 +2442,378 @@ msgid "test print"
 msgstr "test print"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3205
-#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3217
-#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3233
-#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3255
-#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3276
-#: src/xml/xmli18n-tmp.h:3288 src/xml/xmli18n-tmp.h:3295
-#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3315
-#: src/xml/xmli18n-tmp.h:3327 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3368
-#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3380
-#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
-#: src/xml/xmli18n-tmp.h:3412 src/xml/xmli18n-tmp.h:3424
-#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3444
-#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3472
-#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3496
-#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3521
-#: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3544
-#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3556
-#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3581
-#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3598
-#: src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3754 src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:3809 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3863 src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:4058 src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:4163 src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:4227 src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:4335 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4467 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4594 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:4879 src/xml/xmli18n-tmp.h:4946
+#: src/xml/xmli18n-tmp.h:5000 src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:5243 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5365 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5512 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5667 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5784 src/xml/xmli18n-tmp.h:5805
+#: src/xml/xmli18n-tmp.h:5826
 msgid "Four Color Standard"
 msgstr "Four Colour Standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3206
-#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3218
-#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3234
-#: src/xml/xmli18n-tmp.h:3244 src/xml/xmli18n-tmp.h:3251
-#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3268
-#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3289
-#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3306
-#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
-#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3354
-#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3377
-#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3389
-#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3413
-#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3435
-#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3455
-#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3485
-#: src/xml/xmli18n-tmp.h:3497 src/xml/xmli18n-tmp.h:3508
-#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3537
-#: src/xml/xmli18n-tmp.h:3545 src/xml/xmli18n-tmp.h:3549
-#: src/xml/xmli18n-tmp.h:3557 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3593
-#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3605
+#: src/xml/xmli18n-tmp.h:3759 src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3868 src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:4002 src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:4107 src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4472
+#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4817 src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5181 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5315 src/xml/xmli18n-tmp.h:5370
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5672
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5831
 msgid "Three Color Composite"
 msgstr "Three Colour Composite"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3241
-#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3265
-#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3286
-#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
-#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3351
-#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3374
-#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3398
-#: src/xml/xmli18n-tmp.h:3410 src/xml/xmli18n-tmp.h:3422
-#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3452
-#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3470
-#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3494
-#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3519
-#: src/xml/xmli18n-tmp.h:3534 src/xml/xmli18n-tmp.h:3542
-#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3741 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4086 src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4933
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5421
+#: src/xml/xmli18n-tmp.h:5499 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5723
 msgid "Six Color Photo"
 msgstr "Six Colour Photo"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3242
-#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3266
-#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3287
-#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3326
-#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3352
-#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3375
-#: src/xml/xmli18n-tmp.h:3387 src/xml/xmli18n-tmp.h:3399
-#: src/xml/xmli18n-tmp.h:3411 src/xml/xmli18n-tmp.h:3423
-#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3453
-#: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3483
-#: src/xml/xmli18n-tmp.h:3495 src/xml/xmli18n-tmp.h:3506
-#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3535
-#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3566
-#: src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3748 src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:3989 src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:4094 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4267 src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4940
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5661
+#: src/xml/xmli18n-tmp.h:5730
 msgid "Five Color Photo Composite"
 msgstr "Five Colour Photo Composite"
 
 #: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
-#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
-#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
-#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
-#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
-#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
-#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
-#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
-#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:849
-#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:963
-#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1077
-#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1170
-#: src/xml/xmli18n-tmp.h:1220 src/xml/xmli18n-tmp.h:1277
-#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1376
-#: src/xml/xmli18n-tmp.h:1439 src/xml/xmli18n-tmp.h:1502
-#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1619
-#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1739
-#: src/xml/xmli18n-tmp.h:1773
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1050
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1240
+#: src/xml/xmli18n-tmp.h:1335 src/xml/xmli18n-tmp.h:1449
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1580
+#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1862
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2200 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2297
 msgid "Plain Paper"
 msgstr "Plain Paper"
 
-#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
-#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
-#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
-#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
-#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
-#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
-#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
-#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
-#: src/xml/xmli18n-tmp.h:819 src/xml/xmli18n-tmp.h:858
-#: src/xml/xmli18n-tmp.h:915 src/xml/xmli18n-tmp.h:972
-#: src/xml/xmli18n-tmp.h:1029 src/xml/xmli18n-tmp.h:1086
-#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1176
-#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1286
-#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1385
-#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1508
-#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1628
-#: src/xml/xmli18n-tmp.h:1685 src/xml/xmli18n-tmp.h:1743
-#: src/xml/xmli18n-tmp.h:1779
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:101 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:365 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1160 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1740
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1871
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2136
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2267
+#: src/xml/xmli18n-tmp.h:2303
 msgid "Glossy Film"
 msgstr "Glossy Film"
 
-#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
-#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
-#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
-#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
-#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
-#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
-#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
-#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
-#: src/xml/xmli18n-tmp.h:821 src/xml/xmli18n-tmp.h:861
-#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:975
-#: src/xml/xmli18n-tmp.h:1032 src/xml/xmli18n-tmp.h:1089
-#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1178
-#: src/xml/xmli18n-tmp.h:1232 src/xml/xmli18n-tmp.h:1289
-#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1388
-#: src/xml/xmli18n-tmp.h:1451 src/xml/xmli18n-tmp.h:1511
-#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1631
-#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1745
-#: src/xml/xmli18n-tmp.h:1781
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:845 src/xml/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:965 src/xml/xmli18n-tmp.h:1022
+#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1359
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1550
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1745 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2305
 msgid "Transparencies"
 msgstr "Transparencies"
 
-#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
-#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
-#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
-#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
-#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
-#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
-#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
-#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
-#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:823
-#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:921
-#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:1035
-#: src/xml/xmli18n-tmp.h:1092 src/xml/xmli18n-tmp.h:1142
-#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1235
-#: src/xml/xmli18n-tmp.h:1292 src/xml/xmli18n-tmp.h:1344
-#: src/xml/xmli18n-tmp.h:1391 src/xml/xmli18n-tmp.h:1454
-#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1577
-#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1691
-#: src/xml/xmli18n-tmp.h:1747 src/xml/xmli18n-tmp.h:1783
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:55 src/xml/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:151 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1024
+#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2215
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2307
 msgid "Envelopes"
 msgstr "Envelopes"
 
-#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
-#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
-#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
-#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
-#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
-#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
-#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
-#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
-#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:827
-#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:927
-#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:1041
-#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1146
-#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1241
-#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1348
-#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1460
-#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1583
-#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1697
-#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1787
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:1028
+#: src/xml/xmli18n-tmp.h:1085 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1275 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1556
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1665
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1834
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2076
+#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2311
 msgid "Matte Paper"
 msgstr "Matte Paper"
 
-#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
-#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
-#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
-#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
-#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
-#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
-#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
-#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
-#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:831
-#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:933
-#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:1047
-#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1150
-#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1247
-#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1352
-#: src/xml/xmli18n-tmp.h:1403 src/xml/xmli18n-tmp.h:1466
-#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1589
-#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1703
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1791
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:167 src/xml/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:569
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1032
+#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1285 src/xml/xmli18n-tmp.h:1389
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1675
+#: src/xml/xmli18n-tmp.h:1770 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1889 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2012 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2227
+#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2315
 msgid "Inkjet Paper"
 msgstr "Inkjet Paper"
 
-#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
-#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
-#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
-#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
-#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
-#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
-#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
-#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
-#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:833
-#: src/xml/xmli18n-tmp.h:879 src/xml/xmli18n-tmp.h:936
-#: src/xml/xmli18n-tmp.h:993 src/xml/xmli18n-tmp.h:1050
-#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1152
-#: src/xml/xmli18n-tmp.h:1190 src/xml/xmli18n-tmp.h:1250
-#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1354
-#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1469
-#: src/xml/xmli18n-tmp.h:1529 src/xml/xmli18n-tmp.h:1592
-#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1706
-#: src/xml/xmli18n-tmp.h:1757 src/xml/xmli18n-tmp.h:1793
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:425 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:512 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1034
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1499 src/xml/xmli18n-tmp.h:1562
+#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1775 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1955
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2088
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2317
 msgid "Photo Quality Inkjet Paper"
 msgstr "Photo Quality Inkjet Paper"
 
-#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
-#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
-#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
-#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
-#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
-#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
-#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
-#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
-#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:835
-#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:939
-#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:1053
-#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1154
-#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1253
-#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1356
-#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1472
-#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1595
-#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1709
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1795
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1036
+#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1200
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1504 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1842
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2233
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2319
 msgid "Photo Paper"
 msgstr "Photo Paper"
 
-#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
-#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
-#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
-#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
-#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
-#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
-#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
-#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
-#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:837
-#: src/xml/xmli18n-tmp.h:885 src/xml/xmli18n-tmp.h:942
-#: src/xml/xmli18n-tmp.h:999 src/xml/xmli18n-tmp.h:1056
-#: src/xml/xmli18n-tmp.h:1113 src/xml/xmli18n-tmp.h:1156
-#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1212
-#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1256
-#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1358
-#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1475
-#: src/xml/xmli18n-tmp.h:1535 src/xml/xmli18n-tmp.h:1598
-#: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1712
-#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1797
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:179 src/xml/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:518 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:869 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1038
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1407
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1566
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1622
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1844
+#: src/xml/xmli18n-tmp.h:1898 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2321
 msgid "Premium Glossy Photo Paper"
 msgstr "Premium Glossy Photo Paper"
 
-#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
-#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
-#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
-#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
-#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
-#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
-#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
-#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
-#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:841
-#: src/xml/xmli18n-tmp.h:891 src/xml/xmli18n-tmp.h:948
-#: src/xml/xmli18n-tmp.h:1005 src/xml/xmli18n-tmp.h:1062
-#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1160
-#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1262
-#: src/xml/xmli18n-tmp.h:1319 src/xml/xmli18n-tmp.h:1362
-#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1481
-#: src/xml/xmli18n-tmp.h:1541 src/xml/xmli18n-tmp.h:1604
-#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1718
-#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1801
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1042
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1419
+#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1570
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2027 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2242
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2325
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Lustre Photo Paper"
 
-#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
-#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
-#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
-#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
-#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
-#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
-#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
-#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
-#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:843
-#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:951
-#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1065
-#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1162
-#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1265
-#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1368
-#: src/xml/xmli18n-tmp.h:1427 src/xml/xmli18n-tmp.h:1490
-#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1607
-#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1727
-#: src/xml/xmli18n-tmp.h:1767 src/xml/xmli18n-tmp.h:1803
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:91 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:191 src/xml/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:439 src/xml/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:787 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1044
+#: src/xml/xmli18n-tmp.h:1125 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1315 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1854
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2327
 msgid "Photo Quality Glossy Paper"
 msgstr "Photo Quality Glossy Paper"
 
-#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
-#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
-#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
-#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
-#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
-#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
-#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
-#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:897
-#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:1011
-#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1125
-#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1206
-#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1325
-#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1430
-#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1553
-#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1667
-#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1805
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1130
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1320
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1616
+#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1856 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2329
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Paper"
 
-#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
-#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
-#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
-#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
-#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
-#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
-#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
-#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
-#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:847
-#: src/xml/xmli18n-tmp.h:903 src/xml/xmli18n-tmp.h:960
-#: src/xml/xmli18n-tmp.h:1017 src/xml/xmli18n-tmp.h:1074
-#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1168
-#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1214
-#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1274
-#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1374
-#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1499
-#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1616
-#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1736
-#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1809
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:129
+#: src/xml/xmli18n-tmp.h:203 src/xml/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:542 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1048
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1443
+#: src/xml/xmli18n-tmp.h:1539 src/xml/xmli18n-tmp.h:1578
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1720
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1985
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2333
 msgid "Other"
 msgstr "Other"
 
@@ -2087,52 +2829,56 @@ msgstr "Manual with Pause"
 msgid "Manual without Pause"
 msgstr "Manual without Pause"
 
-#: src/main/print-olympus.c:279
+#: src/main/print-olympus.c:281
 msgid "Coated"
 msgstr "Coated"
 
-#: src/main/print-olympus.c:280 src/cups/genppd.c:1685 src/cups/genppd.c:1713
-#: src/cups/genppd.c:1745 src/cups/genppd.c:1800 src/cups/genppd.c:1846
-#: src/cups/genppd.c:2147 src/cups/genppd.c:2160 src/cups/genppd.c:2183
-#: src/cups/genppd.c:2204 src/cups/genppd.c:2221
+#: src/main/print-olympus.c:282 src/cups/genppd.c:1718 src/cups/genppd.c:1746
+#: src/cups/genppd.c:1778 src/cups/genppd.c:1833 src/cups/genppd.c:1879
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2194 src/cups/genppd.c:2217
+#: src/cups/genppd.c:2238 src/cups/genppd.c:2255
 msgid "None"
 msgstr "None"
 
-#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
-#: src/main/print-olympus.c:1132
+#: src/main/print-olympus.c:998 src/main/print-olympus.c:1061
+#: src/main/print-olympus.c:1165
 msgid "Glossy"
 msgstr "Glossy"
 
-#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
-#: src/main/print-olympus.c:1133
+#: src/main/print-olympus.c:999 src/main/print-olympus.c:1062
+#: src/main/print-olympus.c:1166
 msgid "Texture"
 msgstr "Texture"
 
-#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
+#: src/main/print-olympus.c:1063 src/main/print-olympus.c:1167
 msgid "Matte"
 msgstr "Matte"
 
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
+#. TRANSLATORS: 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.
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1901
 msgid "Laminate Pattern"
 msgstr "Laminate Pattern"
 
-#: src/main/print-olympus.c:1770
+#: src/main/print-olympus.c:1936
 msgid "Adjust the cyan balance"
 msgstr "Adjust the cyan balance"
 
-#: src/main/print-olympus.c:1778
+#: src/main/print-olympus.c:1944
 msgid "Adjust the magenta balance"
 msgstr "Adjust the magenta balance"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1952
 msgid "Adjust the yellow balance"
 msgstr "Adjust the yellow balance"
 
-#: src/main/print-olympus.c:1793
+#: src/main/print-olympus.c:1959
 msgid "Black Balance"
 msgstr "Black Balance"
 
-#: src/main/print-olympus.c:1794
+#: src/main/print-olympus.c:1960
 msgid "Adjust the black balance"
 msgstr "Adjust the black balance"
 
@@ -2164,7 +2910,7 @@ msgstr "Quick-dry Photo"
 msgid "Quick-dry Transparency"
 msgstr "Quick-dry Transparency"
 
-#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3687
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:5925
 msgid "Manual"
 msgstr "Manual"
 
@@ -2249,23 +2995,23 @@ msgid "2400x600 DPI"
 msgstr "2400×600 DPI"
 
 #: src/main/print-pcl.c:278 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3638
-#: src/xml/xmli18n-tmp.h:3647 src/xml/xmli18n-tmp.h:3656
-#: src/xml/xmli18n-tmp.h:3664
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5875
+#: src/xml/xmli18n-tmp.h:5884 src/xml/xmli18n-tmp.h:5893
+#: src/xml/xmli18n-tmp.h:5901
 msgid "Draft"
 msgstr "Draft"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:3633 src/xml/xmli18n-tmp.h:3641
-#: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3658
-#: src/xml/xmli18n-tmp.h:3666
+#: src/xml/xmli18n-tmp.h:5870 src/xml/xmli18n-tmp.h:5878
+#: src/xml/xmli18n-tmp.h:5886 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5903
 msgid "High"
 msgstr "High"
 
 #: src/main/print-pcl.c:282 src/main/print-pcl.c:283
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3634
-#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3650
-#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3667
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5896 src/xml/xmli18n-tmp.h:5904
 msgid "Photo"
 msgstr "Photo"
 
@@ -2297,15 +3043,15 @@ msgstr "PPD File Model Name"
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3671
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:5908
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3708
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:5946
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3823
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6061
 msgid "Custom"
 msgstr "Custom"
 
@@ -2313,33 +3059,43 @@ msgstr "Custom"
 msgid "Image dimensions must match paper dimensions"
 msgstr "Image dimensions must match paper dimensions"
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3629
-#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3654
+#: src/main/print-weave.c:1511
+#, fuzzy
+msgid "Fatal error!"
+msgstr "Error: Fatal Error\n"
+
+#: src/main/print-weave.c:1547
+msgid ""
+"Please report the above information to gimp-print-devel@lists.sourceforge.net"
+msgstr ""
+
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:5866
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5891
 msgid "Fast Economy"
 msgstr "Fast Economy"
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3630
-#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3655
-#: src/xml/xmli18n-tmp.h:3663
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5900
 msgid "Economy"
 msgstr "Economy"
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3635
-#: src/xml/xmli18n-tmp.h:3642 src/xml/xmli18n-tmp.h:3651
-#: src/xml/xmli18n-tmp.h:3660 src/xml/xmli18n-tmp.h:3668
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:5872
+#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
 msgid "Super Photo"
 msgstr "Super Photo"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3636
-#: src/xml/xmli18n-tmp.h:3643 src/xml/xmli18n-tmp.h:3652
-#: src/xml/xmli18n-tmp.h:3661 src/xml/xmli18n-tmp.h:3669
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:5873
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5889
+#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5906
 msgid "Ultra Photo"
 msgstr "Ultra Photo"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1326 src/cups/genppd.c:1989
-#: src/xml/xmli18n-tmp.h:3637 src/xml/xmli18n-tmp.h:3644
-#: src/xml/xmli18n-tmp.h:3653 src/xml/xmli18n-tmp.h:3662
-#: src/xml/xmli18n-tmp.h:3670
+#: src/main/generic-options.c:41 src/cups/genppd.c:1359 src/cups/genppd.c:2023
+#: src/xml/xmli18n-tmp.h:5874 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5899
+#: src/xml/xmli18n-tmp.h:5907
 msgid "Best"
 msgstr "Best"
 
@@ -3061,77 +3817,77 @@ msgstr "Extra 5"
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:960
+#: src/cups/genppd.c:993
 msgid "English"
 msgstr "English-GB"
 
-#: src/cups/genppd.c:1159 src/cups/genppd.c:1175 src/cups/genppd.c:1934
-#: src/cups/genppd.c:1935
+#: src/cups/genppd.c:1192 src/cups/genppd.c:1208 src/cups/genppd.c:1968
+#: src/cups/genppd.c:1969
 msgid "Media Size"
 msgstr "Media Size"
 
-#: src/cups/genppd.c:1248 src/cups/genppd.c:1970
+#: src/cups/genppd.c:1281 src/cups/genppd.c:2004
 msgid "Color Model"
 msgstr "Colour Model"
 
-#: src/cups/genppd.c:1275 src/cups/genppd.c:1972
+#: src/cups/genppd.c:1308 src/cups/genppd.c:2006
 msgid "Inverted Grayscale"
 msgstr "Inverted Grayscale"
 
-#: src/cups/genppd.c:1285 src/cups/genppd.c:1976
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2010
 msgid "RGB Color"
 msgstr "RGB Colour"
 
-#: src/cups/genppd.c:1292 src/cups/genppd.c:1977
+#: src/cups/genppd.c:1325 src/cups/genppd.c:2011
 msgid "CMY Color"
 msgstr "CMY Colour"
 
-#: src/cups/genppd.c:1317 src/cups/genppd.c:1987
+#: src/cups/genppd.c:1350 src/cups/genppd.c:2021
 msgid "Color Precision"
 msgstr "Colour Precision"
 
-#: src/cups/genppd.c:1573 src/cups/genppd.c:2080
+#: src/cups/genppd.c:1606 src/cups/genppd.c:2114
 msgid "Reverse"
 msgstr "Reverse"
 
-#: src/cups/genppd.c:1590 src/cups/genppd.c:2096
+#: src/cups/genppd.c:1623 src/cups/genppd.c:2130
 msgid "2-Sided Printing"
 msgstr "2-Sided Printing"
 
-#: src/cups/genppd.c:1615 src/cups/genppd.c:2113
+#: src/cups/genppd.c:1648 src/cups/genppd.c:2147
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr "Shrink Page If Necessary to Fit Borders"
 
-#: src/cups/genppd.c:1620 src/cups/genppd.c:2114
+#: src/cups/genppd.c:1653 src/cups/genppd.c:2148
 msgid "Shrink (print the whole page)"
 msgstr "Shrink (print the whole page)"
 
-#: src/cups/genppd.c:1621 src/cups/genppd.c:2115
+#: src/cups/genppd.c:1654 src/cups/genppd.c:2149
 msgid "Crop (preserve dimensions)"
 msgstr "Crop (preserve dimensions)"
 
-#: src/cups/genppd.c:1622 src/cups/genppd.c:2116
+#: src/cups/genppd.c:1655 src/cups/genppd.c:2150
 msgid "Expand (use maximum page area)"
 msgstr "Expand (use maximum page area)"
 
-#: src/cups/genppd.c:1716 src/cups/genppd.c:2162
+#: src/cups/genppd.c:1749 src/cups/genppd.c:2196
 msgid "No"
 msgstr "No"
 
-#: src/cups/genppd.c:1718 src/cups/genppd.c:2164
+#: src/cups/genppd.c:1751 src/cups/genppd.c:2198
 msgid "Yes"
 msgstr "Yes"
 
-#: src/cups/genppd.c:1757 src/cups/genppd.c:1820 src/cups/genppd.c:1864
-#: src/cups/genppd.c:2185 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+#: src/cups/genppd.c:1790 src/cups/genppd.c:1853 src/cups/genppd.c:1897
+#: src/cups/genppd.c:2219 src/cups/genppd.c:2249 src/cups/genppd.c:2266
 msgid "Value"
 msgstr "Value"
 
-#: src/cups/genppd.c:1762 src/cups/genppd.c:2189
+#: src/cups/genppd.c:1795 src/cups/genppd.c:2223
 msgid "Fine Adjustment"
 msgstr "Fine Adjustment"
 
-#: src/cups/genppd.c:1805 src/cups/genppd.c:2209
+#: src/cups/genppd.c:1838 src/cups/genppd.c:2243
 #, c-format
 msgid "%.1f mm"
 msgstr ""
@@ -3452,51 +4208,61 @@ msgstr ""
 "Cannot detect printer type.\n"
 "Please use -m to specify your printer model.\n"
 
-#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:383
-#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
-#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
-#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
-#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
-#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
-#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
-#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
-#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
-#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
-#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
-#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
-#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
-#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
-#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
-#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
-#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
-#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
-#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
-#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
-#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
-#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
-#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
-#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
-#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
-#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
-#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
-#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
-#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
-#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
-#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1503
-#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1509
-#: src/xml/xmli18n-tmp.h:1512 src/xml/xmli18n-tmp.h:1515
-#: src/xml/xmli18n-tmp.h:1518 src/xml/xmli18n-tmp.h:1521
-#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1527
-#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
-#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
-#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
-#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
-#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
-#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:2655
-#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2717
-#: src/xml/xmli18n-tmp.h:3045 src/xml/xmli18n-tmp.h:3252
-#: src/xml/xmli18n-tmp.h:3273 src/xml/xmli18n-tmp.h:3363
-#: src/xml/xmli18n-tmp.h:3531
+#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2001
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2010 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2025
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:4085 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4612 src/xml/xmli18n-tmp.h:5481
 msgid "Photo Black"
 msgstr "Photo Black"
 
@@ -3507,125 +4273,297 @@ msgid "Unknown"
 msgstr "Unknown"
 
 #: src/escputil/escputil.c:1000 src/escputil/escputil.c:1289
-#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1921
-#: src/xml/xmli18n-tmp.h:1937 src/xml/xmli18n-tmp.h:2002
-#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2079
-#: src/xml/xmli18n-tmp.h:2105 src/xml/xmli18n-tmp.h:2119
-#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2173
-#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
-#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
-#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2293
-#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2346
-#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2418
-#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2445
-#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2469
-#: src/xml/xmli18n-tmp.h:2484 src/xml/xmli18n-tmp.h:2512
-#: src/xml/xmli18n-tmp.h:2525 src/xml/xmli18n-tmp.h:2564
-#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2626
-#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2746
-#: src/xml/xmli18n-tmp.h:2762 src/xml/xmli18n-tmp.h:2843
-#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2895
-#: src/xml/xmli18n-tmp.h:2912 src/xml/xmli18n-tmp.h:2946
-#: src/xml/xmli18n-tmp.h:3001 src/xml/xmli18n-tmp.h:3015
-#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3122
-#: src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2461 src/xml/xmli18n-tmp.h:2526
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2683 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2711 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3101 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3661
+#: src/xml/xmli18n-tmp.h:3678 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3750 src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:3782 src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:3932 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3964 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4388 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:4639 src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:4875 src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4936
+#: src/xml/xmli18n-tmp.h:4942 src/xml/xmli18n-tmp.h:4968
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5339 src/xml/xmli18n-tmp.h:5348
+#: src/xml/xmli18n-tmp.h:5355 src/xml/xmli18n-tmp.h:5361
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5417
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5430
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5477 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5502
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5536 src/xml/xmli18n-tmp.h:5544
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5557
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5657 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5719
+#: src/xml/xmli18n-tmp.h:5726 src/xml/xmli18n-tmp.h:5732
+#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5779
 msgid "Light Cyan"
 msgstr "Light Cyan"
 
 #: src/escputil/escputil.c:1001 src/escputil/escputil.c:1290
-#: src/xml/xmli18n-tmp.h:1906 src/xml/xmli18n-tmp.h:1922
-#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:2003
-#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2080
-#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2120
-#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2174
-#: src/xml/xmli18n-tmp.h:2188 src/xml/xmli18n-tmp.h:2201
-#: src/xml/xmli18n-tmp.h:2214 src/xml/xmli18n-tmp.h:2227
-#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2294
-#: src/xml/xmli18n-tmp.h:2309 src/xml/xmli18n-tmp.h:2347
-#: src/xml/xmli18n-tmp.h:2360 src/xml/xmli18n-tmp.h:2419
-#: src/xml/xmli18n-tmp.h:2432 src/xml/xmli18n-tmp.h:2446
-#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2470
-#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2513
-#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2565
-#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2627
-#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2748
-#: src/xml/xmli18n-tmp.h:2761 src/xml/xmli18n-tmp.h:2844
-#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2896
-#: src/xml/xmli18n-tmp.h:2913 src/xml/xmli18n-tmp.h:2947
-#: src/xml/xmli18n-tmp.h:3000 src/xml/xmli18n-tmp.h:3014
-#: src/xml/xmli18n-tmp.h:3028 src/xml/xmli18n-tmp.h:3123
-#: src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2446
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2527
+#: src/xml/xmli18n-tmp.h:2541 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2644
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2698
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2751
+#: src/xml/xmli18n-tmp.h:2803 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2956 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2994
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3381
+#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3662
+#: src/xml/xmli18n-tmp.h:3746 src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:3778 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3934 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3966 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:4265 src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:4390 src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:4428 src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4452
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4465
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4512 src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4586 src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:4641 src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4903
+#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4970
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:5044 src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5168
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5241 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5334
+#: src/xml/xmli18n-tmp.h:5341 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5363
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5419
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5471
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5504
+#: src/xml/xmli18n-tmp.h:5510 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5652
+#: src/xml/xmli18n-tmp.h:5659 src/xml/xmli18n-tmp.h:5665
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5721
+#: src/xml/xmli18n-tmp.h:5728 src/xml/xmli18n-tmp.h:5734
+#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5781
 msgid "Light Magenta"
 msgstr "Light Magenta"
 
-#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2433
-#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:3002
-#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3030
+#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3679 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4409 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:4566 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4605 src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4664 src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5376 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5450
+#: src/xml/xmli18n-tmp.h:5475 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5533 src/xml/xmli18n-tmp.h:5542
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5678 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5717
+#: src/xml/xmli18n-tmp.h:5747 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5777
 msgid "Light Black"
 msgstr "Light Black"
 
-#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:384
-#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
-#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
-#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
-#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
-#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
-#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
-#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
-#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
-#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
-#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
-#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
-#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
-#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
-#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
-#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
-#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
-#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
-#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
-#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
-#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
-#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
-#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
-#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
-#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
-#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
-#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
-#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
-#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
-#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
-#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1504
-#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1510
-#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1516
-#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1522
-#: src/xml/xmli18n-tmp.h:1525 src/xml/xmli18n-tmp.h:1528
-#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1534
-#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1540
-#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1546
-#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1552
-#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1558
-#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:2654
-#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2716
-#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3264
-#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3371
-#: src/xml/xmli18n-tmp.h:3539
+#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:508 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:532 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:538 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:562 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:568 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
+#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
+#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
+#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
+#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
+#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
+#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
+#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
+#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
+#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
+#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
+#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2011 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2026
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2032
+#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2038
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:4044 src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:5530
 msgid "Matte Black"
 msgstr "Matte Black"
 
-#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:2658
-#: src/xml/xmli18n-tmp.h:2702 src/xml/xmli18n-tmp.h:2720
-#: src/xml/xmli18n-tmp.h:3048
+#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3995 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4006 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4020 src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:4106 src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Gloss Optimizer"
 msgstr "Gloss Optimiser"
 
-#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:2760
-#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3013
-#: src/xml/xmli18n-tmp.h:3027
+#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3676
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4616 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5534 src/xml/xmli18n-tmp.h:5573
 msgid "Light Light Black"
 msgstr "Light Light Black"
 
 #: src/escputil/escputil.c:1010 src/escputil/escputil.c:1029
-#: src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:4099 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4189
 msgid "Orange"
 msgstr "Orange"
 
@@ -4274,7899 +5212,8323 @@ msgstr "Printing…"
 #: src/xml/xmli18n-tmp.h:68 src/xml/xmli18n-tmp.h:70 src/xml/xmli18n-tmp.h:72
 #: src/xml/xmli18n-tmp.h:74 src/xml/xmli18n-tmp.h:76 src/xml/xmli18n-tmp.h:78
 #: src/xml/xmli18n-tmp.h:80 src/xml/xmli18n-tmp.h:82 src/xml/xmli18n-tmp.h:84
-#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:92
-#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
-#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
-#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
-#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
-#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
-#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
-#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
-#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
-#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
-#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
-#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
-#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
-#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
-#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
-#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
-#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
-#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
-#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
-#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
-#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
-#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
-#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
-#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
-#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
-#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
-#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
-#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
-#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
-#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
-#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
-#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
-#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
-#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
-#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
-#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
-#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
-#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
-#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
-#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
-#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
-#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
-#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
-#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
-#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
-#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
-#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
-#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
-#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
-#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
-#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
-#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
-#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
-#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
-#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
-#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
-#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
-#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
-#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
-#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
-#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
-#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
-#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
-#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
-#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
-#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
-#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
-#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
-#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
-#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
-#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
-#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
-#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
-#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
-#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
-#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
-#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
-#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
-#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
-#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
-#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
-#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
-#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
-#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
-#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
-#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
-#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
-#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
-#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
-#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
-#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
-#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
-#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
-#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
-#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
-#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
-#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:92 src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:102 src/xml/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:106 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:114 src/xml/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:118 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:126 src/xml/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:130 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:136 src/xml/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:144 src/xml/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:168 src/xml/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:192 src/xml/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:216 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:232 src/xml/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:240 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:256 src/xml/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:264 src/xml/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:304 src/xml/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:312 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:320 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:328 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:336 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:344 src/xml/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:352 src/xml/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:384 src/xml/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:408 src/xml/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:412 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:432 src/xml/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:444 src/xml/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:448 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:468 src/xml/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:484 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:642 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:698 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:714 src/xml/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:722 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:738 src/xml/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:746 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:764 src/xml/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:780 src/xml/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:804 src/xml/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:814
 #: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:818
 #: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:822
 #: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:826
 #: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:830
-#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:834
-#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:838
-#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:842
-#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:846
-#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:850
-#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
-#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
-#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
-#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
-#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
-#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
-#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
-#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:898
-#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
-#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
-#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
-#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
-#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
-#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
-#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
-#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
-#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
-#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
-#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
-#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
-#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
-#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
-#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
-#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
-#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
-#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
-#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
-#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1018
-#: src/xml/xmli18n-tmp.h:1021 src/xml/xmli18n-tmp.h:1024
-#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1030
-#: src/xml/xmli18n-tmp.h:1033 src/xml/xmli18n-tmp.h:1036
-#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1042
-#: src/xml/xmli18n-tmp.h:1045 src/xml/xmli18n-tmp.h:1048
-#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1054
-#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1060
-#: src/xml/xmli18n-tmp.h:1063 src/xml/xmli18n-tmp.h:1066
-#: src/xml/xmli18n-tmp.h:1069 src/xml/xmli18n-tmp.h:1072
-#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1078
-#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1084
-#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1090
-#: src/xml/xmli18n-tmp.h:1093 src/xml/xmli18n-tmp.h:1096
-#: src/xml/xmli18n-tmp.h:1099 src/xml/xmli18n-tmp.h:1102
-#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1108
-#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1114
-#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1120
-#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1126
-#: src/xml/xmli18n-tmp.h:1129 src/xml/xmli18n-tmp.h:1132
-#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
-#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
-#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
-#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
-#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
-#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
-#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
-#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
-#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
-#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
-#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
-#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
-#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
-#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1189
-#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1193
-#: src/xml/xmli18n-tmp.h:1195 src/xml/xmli18n-tmp.h:1197
-#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1201
-#: src/xml/xmli18n-tmp.h:1203 src/xml/xmli18n-tmp.h:1205
-#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1209
-#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1221
-#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
-#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
-#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
-#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
-#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
-#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
-#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
-#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
-#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
-#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
-#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
-#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
-#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
-#: src/xml/xmli18n-tmp.h:1302 src/xml/xmli18n-tmp.h:1305
-#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1311
-#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1317
-#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1323
-#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1329
-#: src/xml/xmli18n-tmp.h:1332 src/xml/xmli18n-tmp.h:1335
-#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
-#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1343
-#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1347
-#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1351
-#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1355
-#: src/xml/xmli18n-tmp.h:1357 src/xml/xmli18n-tmp.h:1359
-#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1363
-#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1367
-#: src/xml/xmli18n-tmp.h:1369 src/xml/xmli18n-tmp.h:1371
-#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1375
-#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1566
-#: src/xml/xmli18n-tmp.h:1569 src/xml/xmli18n-tmp.h:1572
-#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1578
-#: src/xml/xmli18n-tmp.h:1581 src/xml/xmli18n-tmp.h:1584
-#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1590
-#: src/xml/xmli18n-tmp.h:1593 src/xml/xmli18n-tmp.h:1596
-#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1602
-#: src/xml/xmli18n-tmp.h:1605 src/xml/xmli18n-tmp.h:1608
-#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1614
-#: src/xml/xmli18n-tmp.h:1617 src/xml/xmli18n-tmp.h:1620
-#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1626
-#: src/xml/xmli18n-tmp.h:1629 src/xml/xmli18n-tmp.h:1632
-#: src/xml/xmli18n-tmp.h:1635 src/xml/xmli18n-tmp.h:1638
-#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1644
-#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
-#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
-#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
-#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
-#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
-#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
-#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
-#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
-#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
-#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
-#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
-#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
-#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
-#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
-#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:1778
-#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1782
-#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1786
-#: src/xml/xmli18n-tmp.h:1788 src/xml/xmli18n-tmp.h:1790
-#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1794
-#: src/xml/xmli18n-tmp.h:1796 src/xml/xmli18n-tmp.h:1798
-#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1802
-#: src/xml/xmli18n-tmp.h:1804 src/xml/xmli18n-tmp.h:1806
-#: src/xml/xmli18n-tmp.h:1808 src/xml/xmli18n-tmp.h:1810
-#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3204
-#: src/xml/xmli18n-tmp.h:3210 src/xml/xmli18n-tmp.h:3216
-#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3232
-#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3250
-#: src/xml/xmli18n-tmp.h:3294 src/xml/xmli18n-tmp.h:3302
-#: src/xml/xmli18n-tmp.h:3304 src/xml/xmli18n-tmp.h:3312
-#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3379
-#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
-#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3421
-#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3441
-#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3469
-#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3555
-#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3597
-#: src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:1017
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1025
+#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1035 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1047 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1056
+#: src/xml/xmli18n-tmp.h:1061 src/xml/xmli18n-tmp.h:1066
+#: src/xml/xmli18n-tmp.h:1071 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1086
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1096
+#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1116
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1126
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1136
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1161 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1181 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1206
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1216
+#: src/xml/xmli18n-tmp.h:1221 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1236
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1246
+#: src/xml/xmli18n-tmp.h:1251 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1261 src/xml/xmli18n-tmp.h:1266
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1281 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1291 src/xml/xmli18n-tmp.h:1296
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1311 src/xml/xmli18n-tmp.h:1316
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1326
+#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1336
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1378 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1414 src/xml/xmli18n-tmp.h:1420
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1432
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1450 src/xml/xmli18n-tmp.h:1455
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1465
+#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1480 src/xml/xmli18n-tmp.h:1485
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1540 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1551 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1583 src/xml/xmli18n-tmp.h:1585
+#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1603 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1607 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1646
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1666
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1676
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1716
+#: src/xml/xmli18n-tmp.h:1721 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1736
+#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1835
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1843
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1851
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:2049
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2057
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2065
+#: src/xml/xmli18n-tmp.h:2069 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2113
+#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2129
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2137
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2153
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2161
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2185
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2264
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2272
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2276
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2282 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2286 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2296
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2300
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2308
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2314 src/xml/xmli18n-tmp.h:2316
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2324
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:3787 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3895 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:4223 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5579
+#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5825
 msgid "EPSON Standard Inks"
 msgstr "EPSON Standard Inks"
 
-#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:405
 msgid "Bright White Paper"
 msgstr "Bright White Paper"
 
-#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
-#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
-#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
-#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
-#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
-#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
-#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
-#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:817
-#: src/xml/xmli18n-tmp.h:855 src/xml/xmli18n-tmp.h:912
-#: src/xml/xmli18n-tmp.h:969 src/xml/xmli18n-tmp.h:1026
-#: src/xml/xmli18n-tmp.h:1083 src/xml/xmli18n-tmp.h:1136
-#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1226
-#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1338
-#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1445
-#: src/xml/xmli18n-tmp.h:1505 src/xml/xmli18n-tmp.h:1568
-#: src/xml/xmli18n-tmp.h:1625 src/xml/xmli18n-tmp.h:1682
-#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1777
-#: src/xml/xmli18n-tmp.h:3675
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:139 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:959 src/xml/xmli18n-tmp.h:1018
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1155
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1546
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1931
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:5912
 msgid "Postcard"
 msgstr "Postcard"
 
-#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
-#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
-#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
-#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
-#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
-#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
-#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
-#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:825
-#: src/xml/xmli18n-tmp.h:867 src/xml/xmli18n-tmp.h:924
-#: src/xml/xmli18n-tmp.h:981 src/xml/xmli18n-tmp.h:1038
-#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1144
-#: src/xml/xmli18n-tmp.h:1182 src/xml/xmli18n-tmp.h:1238
-#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1346
-#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1457
-#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1580
-#: src/xml/xmli18n-tmp.h:1637 src/xml/xmli18n-tmp.h:1694
-#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1785
+#: src/xml/xmli18n-tmp.h:13 src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:155 src/xml/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:415 src/xml/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:851 src/xml/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1026
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1175
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1554
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1832
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2309
 msgid "Back Light Film"
 msgstr "Back Light Film"
 
-#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
-#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
-#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
-#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
-#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
-#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
-#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
-#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:829
-#: src/xml/xmli18n-tmp.h:873 src/xml/xmli18n-tmp.h:930
-#: src/xml/xmli18n-tmp.h:987 src/xml/xmli18n-tmp.h:1044
-#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1148
-#: src/xml/xmli18n-tmp.h:1186 src/xml/xmli18n-tmp.h:1244
-#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1350
-#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1463
-#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1586
-#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1700
-#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1789
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:419 src/xml/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:857 src/xml/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1030
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1383
+#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1558
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2313
 msgid "Matte Paper Heavyweight"
 msgstr "Matte Paper Heavyweight"
 
-#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
-#: src/xml/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:421
 msgid "Premium Presentation Paper Matte"
 msgstr "Premium Presentation Paper Matte"
 
-#: src/xml/xmli18n-tmp.h:27
-msgid "Premium Glossy Photo Paper 170 wt"
-msgstr "Premium Glossy Photo Paper 170 wt"
-
-#: src/xml/xmli18n-tmp.h:29
-msgid "Premium Glossy Photo Paper 250 wt"
-msgstr "Premium Glossy Photo Paper 250 wt"
-
-#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
-#: src/xml/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:431
 msgid "Ultra Glossy Photo Paper"
 msgstr "Ultra Glossy Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
-#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
-#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
-#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
-#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
-#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
-#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
-#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:839
-#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:945
-#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1059
-#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1158
-#: src/xml/xmli18n-tmp.h:1196 src/xml/xmli18n-tmp.h:1259
-#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1360
-#: src/xml/xmli18n-tmp.h:1415 src/xml/xmli18n-tmp.h:1478
-#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1601
-#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1715
-#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1210
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1413
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1568
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1695
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1964
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2176 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2287 src/xml/xmli18n-tmp.h:2323
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premium Semigloss Photo Paper"
 
-#: src/xml/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:437
+msgid "Ultra Premium Photo Paper Luster"
+msgstr "Ultra Premium Photo Paper Lustre"
+
+#: src/xml/xmli18n-tmp.h:37
+msgid "CD or DVD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:93 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1230
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1437
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2331
+msgid "ColorLife Paper"
+msgstr "ColorLife Paper"
+
+#: src/xml/xmli18n-tmp.h:73
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Premium Glossy Photo Paper 170 wt"
+
+#: src/xml/xmli18n-tmp.h:75
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "Premium Glossy Photo Paper 250 wt"
+
+#: src/xml/xmli18n-tmp.h:81
 msgid "Premium Semigloss Photo Paper 170 wt"
 msgstr "Premium Semigloss Photo Paper 170 wt"
 
-#: src/xml/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:83
 msgid "Premium Semigloss Photo Paper 250 wt"
 msgstr "Premium Semigloss Photo Paper 250 wt"
 
-#: src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:87
 msgid "Premium Luster Photo Paper 250 wt"
 msgstr "Premium Lustre Photo Paper 250 wt"
 
-#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
-#: src/xml/xmli18n-tmp.h:334
-msgid "Ultra Premium Photo Paper Luster"
-msgstr "Ultra Premium Photo Paper Lustre"
-
-#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
-#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
-#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
-#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
-#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
-#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
-#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
-#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:845
-#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:957
-#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1071
-#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1166
-#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1271
-#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1372
-#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1496
-#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1613
-#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1733
-#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1807
-msgid "ColorLife Paper"
-msgstr "ColorLife Paper"
-
-#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
-#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
-#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
-#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
-#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
-#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
-#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
-#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
-#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
-#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
-#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
-#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
-#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
-#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
-#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
-#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
-#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
-#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
-#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
-#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
-#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
-#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
-#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
-#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
-#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
-#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
-#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
-#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
-#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
-#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
-#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
-#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
-#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
-#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
-#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
-#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
-#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
-#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
-#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
-#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
-#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
-#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
-#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
-#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
-#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
-#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
-#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:851
-#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:857
-#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:863
-#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:869
-#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:875
-#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:881
-#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:887
-#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:893
-#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:899
-#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:905
-#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:911
-#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:917
-#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:923
-#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:929
-#: src/xml/xmli18n-tmp.h:932 src/xml/xmli18n-tmp.h:935
-#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:941
-#: src/xml/xmli18n-tmp.h:944 src/xml/xmli18n-tmp.h:947
-#: src/xml/xmli18n-tmp.h:950 src/xml/xmli18n-tmp.h:953
-#: src/xml/xmli18n-tmp.h:956 src/xml/xmli18n-tmp.h:959
-#: src/xml/xmli18n-tmp.h:962 src/xml/xmli18n-tmp.h:965
-#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:971
-#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:977
-#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:983
-#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:989
-#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:995
-#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1001
-#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1007
-#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1013
-#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1019
-#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1025
-#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1031
-#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1037
-#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1043
-#: src/xml/xmli18n-tmp.h:1046 src/xml/xmli18n-tmp.h:1049
-#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1055
-#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1061
-#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1067
-#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1073
-#: src/xml/xmli18n-tmp.h:1076 src/xml/xmli18n-tmp.h:1079
-#: src/xml/xmli18n-tmp.h:1082 src/xml/xmli18n-tmp.h:1085
-#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1091
-#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1097
-#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1103
-#: src/xml/xmli18n-tmp.h:1106 src/xml/xmli18n-tmp.h:1109
-#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1115
-#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1121
-#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1127
-#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1133
-#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1225
-#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1231
-#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1237
-#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1243
-#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1249
-#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1255
-#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1261
-#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1267
-#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1273
-#: src/xml/xmli18n-tmp.h:1276 src/xml/xmli18n-tmp.h:1279
-#: src/xml/xmli18n-tmp.h:1282 src/xml/xmli18n-tmp.h:1285
-#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1291
-#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1297
-#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1303
-#: src/xml/xmli18n-tmp.h:1306 src/xml/xmli18n-tmp.h:1309
-#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1315
-#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1321
-#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1327
-#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1333
-#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1567
-#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1573
-#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1579
-#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1585
-#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1591
-#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1597
-#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1603
-#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1609
-#: src/xml/xmli18n-tmp.h:1612 src/xml/xmli18n-tmp.h:1615
-#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1621
-#: src/xml/xmli18n-tmp.h:1624 src/xml/xmli18n-tmp.h:1627
-#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1633
-#: src/xml/xmli18n-tmp.h:1636 src/xml/xmli18n-tmp.h:1639
-#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1645
-#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1651
-#: src/xml/xmli18n-tmp.h:1654 src/xml/xmli18n-tmp.h:1657
-#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1663
-#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1669
-#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1675
-#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3223
-#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3231
-#: src/xml/xmli18n-tmp.h:3238 src/xml/xmli18n-tmp.h:3239
-#: src/xml/xmli18n-tmp.h:3300 src/xml/xmli18n-tmp.h:3301
-#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3311
-#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3396
-#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3408
-#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3420
-#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3432
-#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3440
-#: src/xml/xmli18n-tmp.h:3479 src/xml/xmli18n-tmp.h:3480
-#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3492
-#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3554
-#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:133 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:149 src/xml/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:173 src/xml/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:197 src/xml/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:205 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:221 src/xml/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:229 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:245 src/xml/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:253 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:261 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:269 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:277 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:285 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:293 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:301 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:309 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:317 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:325 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:333 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:341 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:349 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:357 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:619 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:643 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:667 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:691 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:707 src/xml/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:715 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:731 src/xml/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:739 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:755 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1062
+#: src/xml/xmli18n-tmp.h:1067 src/xml/xmli18n-tmp.h:1072
+#: src/xml/xmli18n-tmp.h:1077 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1092
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1102
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1112
+#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1122
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1132
+#: src/xml/xmli18n-tmp.h:1137 src/xml/xmli18n-tmp.h:1142
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1157 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1177 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1192
+#: src/xml/xmli18n-tmp.h:1197 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1212
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1222
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1242
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1252
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1272
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1287 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1297 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1327 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1385 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1445 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1461
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1516 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1647
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1657
+#: src/xml/xmli18n-tmp.h:1662 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1677
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1687
+#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1742 src/xml/xmli18n-tmp.h:1747
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1767
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1807
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2090 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2098 src/xml/xmli18n-tmp.h:2102
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2118
+#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2126
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2162 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2190
+#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:3884 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:4779 src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:4845 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4919
+#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4980
+#: src/xml/xmli18n-tmp.h:4986 src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5209 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5276
+#: src/xml/xmli18n-tmp.h:5277 src/xml/xmli18n-tmp.h:5283
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5607 src/xml/xmli18n-tmp.h:5633
+#: src/xml/xmli18n-tmp.h:5634 src/xml/xmli18n-tmp.h:5640
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
-#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
-#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
-#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
-#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:852
-#: src/xml/xmli18n-tmp.h:909 src/xml/xmli18n-tmp.h:966
-#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1080
-#: src/xml/xmli18n-tmp.h:1172 src/xml/xmli18n-tmp.h:1223
-#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1336
-#: src/xml/xmli18n-tmp.h:1379 src/xml/xmli18n-tmp.h:1442
-#: src/xml/xmli18n-tmp.h:1565 src/xml/xmli18n-tmp.h:1622
-#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1775
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:142 src/xml/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:150 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:174 src/xml/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:198 src/xml/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:214 src/xml/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:222 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:238 src/xml/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:246 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:262 src/xml/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:302 src/xml/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:310 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:318 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:326 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:334 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:342 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:350 src/xml/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:636 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:660 src/xml/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:708 src/xml/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:716 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:732 src/xml/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:756 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1103
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1123
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1158 src/xml/xmli18n-tmp.h:1163
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1183
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1193
+#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1213
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1223
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1238 src/xml/xmli18n-tmp.h:1243
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1253
+#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1283
+#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1313
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1333
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1362 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1374 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1462
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1472
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1487 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1502
+#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:1532
+#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1542
+#: src/xml/xmli18n-tmp.h:1633 src/xml/xmli18n-tmp.h:1638
+#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1648
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1658
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1713 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1728
+#: src/xml/xmli18n-tmp.h:1733 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1768
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2071
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2095
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2115 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2123 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2139 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2183
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2191
+#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2199
+#, fuzzy
+msgid "MISQuadtone"
+msgstr "Quadtone"
+
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1150 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2299
 msgid "Plain Paper Fast Load"
 msgstr "Plain Paper Fast Load"
 
-#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
-#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
-#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1364
-#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1484
-#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1970 src/xml/xmli18n-tmp.h:2030
+#: src/xml/xmli18n-tmp.h:2245
 msgid "Archival Matte Paper"
 msgstr "Archival Matte Paper"
 
-#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
-#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
-#: src/xml/xmli18n-tmp.h:1202 src/xml/xmli18n-tmp.h:1366
-#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1487
-#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:881 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2248
 msgid "Watercolor Paper - Radiant White"
 msgstr "Watercolour Paper - Radiant White"
 
-#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
-#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
-#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
-#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
-#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
-#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
-#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
-#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
-#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
-#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
-#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1377
-#: src/xml/xmli18n-tmp.h:1380 src/xml/xmli18n-tmp.h:1383
-#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1389
-#: src/xml/xmli18n-tmp.h:1392 src/xml/xmli18n-tmp.h:1395
-#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1401
-#: src/xml/xmli18n-tmp.h:1404 src/xml/xmli18n-tmp.h:1407
-#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1413
-#: src/xml/xmli18n-tmp.h:1416 src/xml/xmli18n-tmp.h:1419
-#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1425
-#: src/xml/xmli18n-tmp.h:1428 src/xml/xmli18n-tmp.h:1431
-#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1437
-#: src/xml/xmli18n-tmp.h:1440 src/xml/xmli18n-tmp.h:1443
-#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1449
-#: src/xml/xmli18n-tmp.h:1452 src/xml/xmli18n-tmp.h:1455
-#: src/xml/xmli18n-tmp.h:1458 src/xml/xmli18n-tmp.h:1461
-#: src/xml/xmli18n-tmp.h:1464 src/xml/xmli18n-tmp.h:1467
-#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1473
-#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1479
-#: src/xml/xmli18n-tmp.h:1482 src/xml/xmli18n-tmp.h:1485
-#: src/xml/xmli18n-tmp.h:1488 src/xml/xmli18n-tmp.h:1491
-#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1497
-#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1677
-#: src/xml/xmli18n-tmp.h:1680 src/xml/xmli18n-tmp.h:1683
-#: src/xml/xmli18n-tmp.h:1686 src/xml/xmli18n-tmp.h:1689
-#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1695
-#: src/xml/xmli18n-tmp.h:1698 src/xml/xmli18n-tmp.h:1701
-#: src/xml/xmli18n-tmp.h:1704 src/xml/xmli18n-tmp.h:1707
-#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1713
-#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1719
-#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1725
-#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1731
-#: src/xml/xmli18n-tmp.h:1734 src/xml/xmli18n-tmp.h:1737
-#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3503
-#: src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:1863
+#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1881
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1893
+#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1905
+#: src/xml/xmli18n-tmp.h:1908 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1923
+#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:1950 src/xml/xmli18n-tmp.h:1953
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1968 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1983
+#: src/xml/xmli18n-tmp.h:1986 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2204 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2255
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5645
 msgid "UltraChrome Photo Black"
 msgstr "UltraChrome Photo Black"
 
-#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
-#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
-#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
-#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
-#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
-#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
-#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
-#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
-#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
-#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
-#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1378
-#: src/xml/xmli18n-tmp.h:1381 src/xml/xmli18n-tmp.h:1384
-#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1390
-#: src/xml/xmli18n-tmp.h:1393 src/xml/xmli18n-tmp.h:1396
-#: src/xml/xmli18n-tmp.h:1399 src/xml/xmli18n-tmp.h:1402
-#: src/xml/xmli18n-tmp.h:1405 src/xml/xmli18n-tmp.h:1408
-#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1414
-#: src/xml/xmli18n-tmp.h:1417 src/xml/xmli18n-tmp.h:1420
-#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1426
-#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1432
-#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1438
-#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1444
-#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1450
-#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1456
-#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1462
-#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1468
-#: src/xml/xmli18n-tmp.h:1471 src/xml/xmli18n-tmp.h:1474
-#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1480
-#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1486
-#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1492
-#: src/xml/xmli18n-tmp.h:1495 src/xml/xmli18n-tmp.h:1498
-#: src/xml/xmli18n-tmp.h:1501 src/xml/xmli18n-tmp.h:1678
-#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1684
-#: src/xml/xmli18n-tmp.h:1687 src/xml/xmli18n-tmp.h:1690
-#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1696
-#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1702
-#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1708
-#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1714
-#: src/xml/xmli18n-tmp.h:1717 src/xml/xmli18n-tmp.h:1720
-#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1726
-#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1732
-#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1738
-#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3517
-#: src/xml/xmli18n-tmp.h:3577
+#: src/xml/xmli18n-tmp.h:835 src/xml/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:841 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1879 src/xml/xmli18n-tmp.h:1882
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1894
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1909 src/xml/xmli18n-tmp.h:1912
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1924
+#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1954
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1969 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1984
+#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2208
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2229 src/xml/xmli18n-tmp.h:2232
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2238
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2244
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2253 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2259 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5714
 msgid "UltraChrome Matte Black"
 msgstr "UltraChrome Matte Black"
 
-#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1826
-#: src/xml/xmli18n-tmp.h:1839 src/xml/xmli18n-tmp.h:1852
-#: src/xml/xmli18n-tmp.h:1907 src/xml/xmli18n-tmp.h:1923
-#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1952
-#: src/xml/xmli18n-tmp.h:1965 src/xml/xmli18n-tmp.h:2054
-#: src/xml/xmli18n-tmp.h:2081 src/xml/xmli18n-tmp.h:2146
-#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
-#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
-#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2348
-#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2407
-#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2899
-#: src/xml/xmli18n-tmp.h:2916 src/xml/xmli18n-tmp.h:3142
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1139
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1154 src/xml/xmli18n-tmp.h:1159
+#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1179
+#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1199
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1214 src/xml/xmli18n-tmp.h:1219
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1229
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1244 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1259
+#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1274 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1289
+#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1309
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1329
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1423
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1429
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1447
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1634
+#: src/xml/xmli18n-tmp.h:1639 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1664
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1764
+#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1784
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1799 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1819
+msgid "MIS Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1463 src/xml/xmli18n-tmp.h:1468
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1478
+#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1508
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1533 src/xml/xmli18n-tmp.h:1538
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4858 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:5289
+msgid "Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2489 src/xml/xmli18n-tmp.h:2578
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2713 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2752
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2885 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:3051 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3665
 msgid "360 x 90 DPI Fast Economy"
 msgstr "360 × 90 DPI Fast Economy"
 
-#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1828
-#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1853
-#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1879
-#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
-#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1940
-#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1966
-#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2055
-#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2133
-#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2175
-#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
-#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
-#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2336
-#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
-#: src/xml/xmli18n-tmp.h:2408 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2699
+#: src/xml/xmli18n-tmp.h:2714 src/xml/xmli18n-tmp.h:2727
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2886
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:3052
 msgid "180 DPI Economy"
 msgstr "180 DPI Economy"
 
-#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1830
-#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1854
-#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1880
-#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
-#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1941
-#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1967
-#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
-#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2134
-#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2176
-#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
-#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
-#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2337
-#: src/xml/xmli18n-tmp.h:2350 src/xml/xmli18n-tmp.h:2363
-#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
-#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2434
-#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2459
-#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2529
-#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2601
-#: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2703
-#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2735
-#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2768
-#: src/xml/xmli18n-tmp.h:2872 src/xml/xmli18n-tmp.h:2884
-#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2917
-#: src/xml/xmli18n-tmp.h:2961 src/xml/xmli18n-tmp.h:3007
-#: src/xml/xmli18n-tmp.h:3021 src/xml/xmli18n-tmp.h:3035
-#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3126
-#: src/xml/xmli18n-tmp.h:3143
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2404
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2658
+#: src/xml/xmli18n-tmp.h:2672 src/xml/xmli18n-tmp.h:2700
+#: src/xml/xmli18n-tmp.h:2715 src/xml/xmli18n-tmp.h:2728
+#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2754
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2919 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3053
+#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3125
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3292
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3530
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3649
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3684
 msgid "360 x 180 DPI Draft"
 msgstr "360 × 180 DPI Draft"
 
-#: src/xml/xmli18n-tmp.h:1818 src/xml/xmli18n-tmp.h:1831
-#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1855
-#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1881
-#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
-#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1942
-#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1968
-#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2135
-#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2392 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2418 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2479 src/xml/xmli18n-tmp.h:2492
+#: src/xml/xmli18n-tmp.h:2581 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2862 src/xml/xmli18n-tmp.h:2934
 msgid "360 DPI High Quality"
 msgstr "360 DPI High Quality"
 
-#: src/xml/xmli18n-tmp.h:1819 src/xml/xmli18n-tmp.h:1832
-#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1856
-#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1882
-#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
-#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1943
-#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1969
-#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1992
-#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2020
-#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
-#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
-#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2096
-#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2123
-#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2149
-#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2177
-#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2205
-#: src/xml/xmli18n-tmp.h:2218 src/xml/xmli18n-tmp.h:2231
-#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2254
-#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
-#: src/xml/xmli18n-tmp.h:2297 src/xml/xmli18n-tmp.h:2312
-#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2339
-#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
-#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2385
-#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2411
-#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2435
-#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2460
-#: src/xml/xmli18n-tmp.h:2473 src/xml/xmli18n-tmp.h:2488
-#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2516
-#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2541
-#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2591
-#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
-#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2645
-#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2675
-#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2704
-#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2736
-#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2769
-#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2808
-#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2833
-#: src/xml/xmli18n-tmp.h:2847 src/xml/xmli18n-tmp.h:2861
-#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2885
-#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2918
-#: src/xml/xmli18n-tmp.h:2935 src/xml/xmli18n-tmp.h:2950
-#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2987
-#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3022
-#: src/xml/xmli18n-tmp.h:3036 src/xml/xmli18n-tmp.h:3050
-#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3081
-#: src/xml/xmli18n-tmp.h:3098 src/xml/xmli18n-tmp.h:3113
-#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2369 src/xml/xmli18n-tmp.h:2380
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2406
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2493
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2544
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
+#: src/xml/xmli18n-tmp.h:2582 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2729
+#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2806
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2836
+#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
+#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3012
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3040
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3184 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3424 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3485 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3573
+#: src/xml/xmli18n-tmp.h:3587 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3650 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3685
 msgid "360 DPI"
 msgstr "360 DPI"
 
-#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1833
-#: src/xml/xmli18n-tmp.h:1846 src/xml/xmli18n-tmp.h:1857
-#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1883
-#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1912
-#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1944
-#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1970
-#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1993
-#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2021
-#: src/xml/xmli18n-tmp.h:2033 src/xml/xmli18n-tmp.h:2045
-#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
-#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2097
-#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2124
-#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2150
-#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2178
-#: src/xml/xmli18n-tmp.h:2193 src/xml/xmli18n-tmp.h:2206
-#: src/xml/xmli18n-tmp.h:2219 src/xml/xmli18n-tmp.h:2232
-#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2255
-#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
-#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2313
-#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2340
-#: src/xml/xmli18n-tmp.h:2352 src/xml/xmli18n-tmp.h:2365
-#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2386
-#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2412
-#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2436
-#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2461
-#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2489
-#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2517
-#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2542
-#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2567
-#: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2592
-#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2616
-#: src/xml/xmli18n-tmp.h:2631 src/xml/xmli18n-tmp.h:2646
-#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2676
-#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2705
-#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2737
-#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2770
-#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2809
-#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2834
-#: src/xml/xmli18n-tmp.h:2848 src/xml/xmli18n-tmp.h:2862
-#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2886
-#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2919
-#: src/xml/xmli18n-tmp.h:2936 src/xml/xmli18n-tmp.h:2951
-#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2988
-#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3023
-#: src/xml/xmli18n-tmp.h:3037 src/xml/xmli18n-tmp.h:3051
-#: src/xml/xmli18n-tmp.h:3066 src/xml/xmli18n-tmp.h:3083
-#: src/xml/xmli18n-tmp.h:3099 src/xml/xmli18n-tmp.h:3114
-#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:2344 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2452 src/xml/xmli18n-tmp.h:2468
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2494
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2557 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:2594
+#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2648
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2674
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2807
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2837
+#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
+#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3013
+#: src/xml/xmli18n-tmp.h:3026 src/xml/xmli18n-tmp.h:3041
+#: src/xml/xmli18n-tmp.h:3055 src/xml/xmli18n-tmp.h:3066
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3140
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3170
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3229
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3333
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3358
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3385
+#: src/xml/xmli18n-tmp.h:3397 src/xml/xmli18n-tmp.h:3409
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3442
+#: src/xml/xmli18n-tmp.h:3459 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3574
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3637
+#: src/xml/xmli18n-tmp.h:3651 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3686
 msgid "720 x 360 DPI"
 msgstr "720 × 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1834
-#: src/xml/xmli18n-tmp.h:1847 src/xml/xmli18n-tmp.h:1858
-#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1884
-#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1913
-#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1945
-#: src/xml/xmli18n-tmp.h:1958 src/xml/xmli18n-tmp.h:1971
-#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:1994
-#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2022
-#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2046
-#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2071
-#: src/xml/xmli18n-tmp.h:2086 src/xml/xmli18n-tmp.h:2098
-#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2125
-#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2151
-#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2179
-#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2207
-#: src/xml/xmli18n-tmp.h:2220 src/xml/xmli18n-tmp.h:2233
-#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2256
-#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
-#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2314
-#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2341
-#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
-#: src/xml/xmli18n-tmp.h:2376 src/xml/xmli18n-tmp.h:2387
-#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2413
-#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2437
-#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2462
-#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2490
-#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2518
-#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2543
-#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
-#: src/xml/xmli18n-tmp.h:2580 src/xml/xmli18n-tmp.h:2593
-#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2617
-#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
-#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2677
-#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2706
-#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2738
-#: src/xml/xmli18n-tmp.h:2753 src/xml/xmli18n-tmp.h:2771
-#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2810
-#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2835
-#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
-#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2887
-#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2921
-#: src/xml/xmli18n-tmp.h:2937 src/xml/xmli18n-tmp.h:2952
-#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2990
-#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3024
-#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3052
-#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3085
-#: src/xml/xmli18n-tmp.h:3100 src/xml/xmli18n-tmp.h:3115
-#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:2345 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2469
+#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2546
+#: src/xml/xmli18n-tmp.h:2558 src/xml/xmli18n-tmp.h:2570
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2595
+#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2622
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2675
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2731
+#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2808
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2838
+#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2890
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2922 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3014
+#: src/xml/xmli18n-tmp.h:3027 src/xml/xmli18n-tmp.h:3042
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3067
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3186 src/xml/xmli18n-tmp.h:3201
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3334
+#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3359
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3444
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3475
+#: src/xml/xmli18n-tmp.h:3489 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3533 src/xml/xmli18n-tmp.h:3547
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3652 src/xml/xmli18n-tmp.h:3669
+#: src/xml/xmli18n-tmp.h:3687
 msgid "720 DPI"
 msgstr "720 DPI"
 
-#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
-#: src/xml/xmli18n-tmp.h:1978 src/xml/xmli18n-tmp.h:2004
-#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2030
-#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2067
-#: src/xml/xmli18n-tmp.h:2094 src/xml/xmli18n-tmp.h:2107
-#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2161
-#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2252
-#: src/xml/xmli18n-tmp.h:2280 src/xml/xmli18n-tmp.h:2295
-#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2323
-#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
-#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2486
-#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2552
-#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2613
-#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
-#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2686
-#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2806
-#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2831
-#: src/xml/xmli18n-tmp.h:2845 src/xml/xmli18n-tmp.h:2859
-#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2948
-#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3080
-#: src/xml/xmli18n-tmp.h:3097 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2554
+#: src/xml/xmli18n-tmp.h:2566 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2804 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2834 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3076
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3382
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3586 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3634
 msgid "360 x 120 DPI Economy"
 msgstr "360 × 120 DPI Economy"
 
-#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1842
-#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2005
-#: src/xml/xmli18n-tmp.h:2019 src/xml/xmli18n-tmp.h:2031
-#: src/xml/xmli18n-tmp.h:2043 src/xml/xmli18n-tmp.h:2068
-#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
-#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2162
-#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2253
-#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2296
-#: src/xml/xmli18n-tmp.h:2311 src/xml/xmli18n-tmp.h:2324
-#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2384
-#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2487
-#: src/xml/xmli18n-tmp.h:2500 src/xml/xmli18n-tmp.h:2553
-#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2614
-#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2644
-#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2687
-#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2807
-#: src/xml/xmli18n-tmp.h:2820 src/xml/xmli18n-tmp.h:2832
-#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
-#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2949
-#: src/xml/xmli18n-tmp.h:3112
+#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2555
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2632
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3077
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3211
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3383
+#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3635
 msgid "360 x 240 DPI Draft"
 msgstr "360 × 240 DPI Draft"
 
-#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1872
-#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1898
-#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1930
-#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1959
-#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:1995
-#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2023
-#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2047
-#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2087
-#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2112
-#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2139
-#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2166
-#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2328
-#: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2388
-#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2557
-#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2922
-#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2991
-#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3086
+#: src/xml/xmli18n-tmp.h:2383 src/xml/xmli18n-tmp.h:2396
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2422
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2470 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2507 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2704 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:3057 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3118 src/xml/xmli18n-tmp.h:3445
+#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3514
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3609
 msgid "720 DPI High Quality"
 msgstr "720 DPI High Quality"
 
-#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1873
-#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1899
-#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1931
-#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1984
-#: src/xml/xmli18n-tmp.h:1996 src/xml/xmli18n-tmp.h:2010
-#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2036
-#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2061
-#: src/xml/xmli18n-tmp.h:2073 src/xml/xmli18n-tmp.h:2088
-#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2127
-#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2153
-#: src/xml/xmli18n-tmp.h:2167 src/xml/xmli18n-tmp.h:2181
-#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2208
-#: src/xml/xmli18n-tmp.h:2221 src/xml/xmli18n-tmp.h:2234
-#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2257
-#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2285
-#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2315
-#: src/xml/xmli18n-tmp.h:2329 src/xml/xmli18n-tmp.h:2354
-#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2389
-#: src/xml/xmli18n-tmp.h:2399 src/xml/xmli18n-tmp.h:2425
-#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2451
-#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
-#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2504
-#: src/xml/xmli18n-tmp.h:2519 src/xml/xmli18n-tmp.h:2534
-#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2558
-#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2605
-#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2633
-#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2663
-#: src/xml/xmli18n-tmp.h:2678 src/xml/xmli18n-tmp.h:2691
-#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2725
-#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2754
-#: src/xml/xmli18n-tmp.h:2772 src/xml/xmli18n-tmp.h:2787
-#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2811
-#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2836
-#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
-#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2888
-#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2923
-#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2953
-#: src/xml/xmli18n-tmp.h:2968 src/xml/xmli18n-tmp.h:2978
-#: src/xml/xmli18n-tmp.h:2992 src/xml/xmli18n-tmp.h:3011
-#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3039
-#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
-#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3101
-#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3130
-#: src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:2384 src/xml/xmli18n-tmp.h:2397
+#: src/xml/xmli18n-tmp.h:2410 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2548 src/xml/xmli18n-tmp.h:2560
+#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2691 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2794 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2839
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2923 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3105
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3129
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3231 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3311
+#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3335
+#: src/xml/xmli18n-tmp.h:3348 src/xml/xmli18n-tmp.h:3360
+#: src/xml/xmli18n-tmp.h:3372 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3427 src/xml/xmli18n-tmp.h:3446
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3576 src/xml/xmli18n-tmp.h:3593
+#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3688
 msgid "1440 x 720 DPI"
 msgstr "1440 × 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1874
-#: src/xml/xmli18n-tmp.h:1887 src/xml/xmli18n-tmp.h:1900
-#: src/xml/xmli18n-tmp.h:1916 src/xml/xmli18n-tmp.h:1932
-#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1985
-#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2011
-#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2037
-#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2062
-#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2089
-#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2128
-#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2154
-#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2182
-#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2258
-#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
-#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2316
-#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2390
-#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2559
-#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2634
-#: src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2385 src/xml/xmli18n-tmp.h:2398
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2535
+#: src/xml/xmli18n-tmp.h:2549 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2782
+#: src/xml/xmli18n-tmp.h:2795 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3388
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 × 720 DPI Highest Quality"
 
-#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1960
-#: src/xml/xmli18n-tmp.h:2100 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2902
 msgid "720 DPI Highest Quality"
 msgstr "720 DPI Highest Quality"
 
-#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2259
-#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
-#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2317
-#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2477
-#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2505
-#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2606
-#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2635
-#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2740
-#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2866
-#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2796 src/xml/xmli18n-tmp.h:2811
+#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3216 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3412
 msgid "2880 x 720 DPI"
 msgstr "2880 × 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2260
-#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
-#: src/xml/xmli18n-tmp.h:2303 src/xml/xmli18n-tmp.h:2318
-#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2771 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2812
+#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:3160 src/xml/xmli18n-tmp.h:3390
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 × 720 DPI Highest Quality"
 
-#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2439
-#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2493
-#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2546
-#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2582
-#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2620
-#: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2664
-#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
-#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2726
-#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2755
-#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2789
-#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2812
-#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2878
-#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
-#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2939
-#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2969
-#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2994
-#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
-#: src/xml/xmli18n-tmp.h:3088 src/xml/xmli18n-tmp.h:3102
-#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3131
-#: src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2963
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3070
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3106
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3297 src/xml/xmli18n-tmp.h:3313
+#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
+#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3401
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3492
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3577 src/xml/xmli18n-tmp.h:3594
+#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3671 src/xml/xmli18n-tmp.h:3689
 msgid "1440 x 1440 DPI"
 msgstr "1440 × 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2426
-#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2452
-#: src/xml/xmli18n-tmp.h:2464 src/xml/xmli18n-tmp.h:2479
-#: src/xml/xmli18n-tmp.h:2494 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2547
-#: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2583
-#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2621
-#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2665
-#: src/xml/xmli18n-tmp.h:2680 src/xml/xmli18n-tmp.h:2694
-#: src/xml/xmli18n-tmp.h:2709 src/xml/xmli18n-tmp.h:2727
-#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2756
-#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2790
-#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2813
-#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2837
-#: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2879
-#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
-#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2940
-#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2970
-#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2995
-#: src/xml/xmli18n-tmp.h:3012 src/xml/xmli18n-tmp.h:3026
-#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3055
-#: src/xml/xmli18n-tmp.h:3072 src/xml/xmli18n-tmp.h:3089
-#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3118
-#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3071
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3107
+#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3251
+#: src/xml/xmli18n-tmp.h:3266 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3298 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3324 src/xml/xmli18n-tmp.h:3337
+#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3374 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3463
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3535 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3563 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3612
+#: src/xml/xmli18n-tmp.h:3626 src/xml/xmli18n-tmp.h:3641
+#: src/xml/xmli18n-tmp.h:3655 src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:3690
 msgid "2880 x 1440 DPI"
 msgstr "2880 × 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:4374
 msgid "Dark Yellow"
 msgstr "Dark Yellow"
 
-#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2584
-#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2711
-#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2743
-#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2776
-#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2908
-#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2972
-#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3057
-#: src/xml/xmli18n-tmp.h:3074 src/xml/xmli18n-tmp.h:3091
-#: src/xml/xmli18n-tmp.h:3105 src/xml/xmli18n-tmp.h:3134
-#: src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3108
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3267
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3495
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3614
+#: src/xml/xmli18n-tmp.h:3628 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3692
 msgid "2880 x 2880 DPI"
 msgstr "2880 × 2880 DPI"
 
-#: src/xml/xmli18n-tmp.h:2666 src/xml/xmli18n-tmp.h:2681
-#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2728
-#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2775
-#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2814
-#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2838
-#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2926
-#: src/xml/xmli18n-tmp.h:2941 src/xml/xmli18n-tmp.h:2971
-#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
-#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
-#: src/xml/xmli18n-tmp.h:3090 src/xml/xmli18n-tmp.h:3104
-#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3133
-#: src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3190 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3234 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3325 src/xml/xmli18n-tmp.h:3338
+#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3362
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3505
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3613
+#: src/xml/xmli18n-tmp.h:3627 src/xml/xmli18n-tmp.h:3642
+#: src/xml/xmli18n-tmp.h:3656 src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:3691
 msgid "5760 x 1440 DPI"
 msgstr "5760 × 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2712
-#: src/xml/xmli18n-tmp.h:2730 src/xml/xmli18n-tmp.h:2759
-#: src/xml/xmli18n-tmp.h:2777 src/xml/xmli18n-tmp.h:2909
-#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2973
-#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3058
-#: src/xml/xmli18n-tmp.h:3075 src/xml/xmli18n-tmp.h:3092
-#: src/xml/xmli18n-tmp.h:3106 src/xml/xmli18n-tmp.h:3135
-#: src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3301 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3496
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3615
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
 msgid "5760 x 2880 DPI"
 msgstr "5760 × 2880 DPI"
 
-#: src/xml/xmli18n-tmp.h:2798 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3502
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 × 720 DPI Transposed"
 
-#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2965
-#: src/xml/xmli18n-tmp.h:2989 src/xml/xmli18n-tmp.h:3067
-#: src/xml/xmli18n-tmp.h:3084
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:3607
 msgid "720 x 360 DPI Enhanced"
 msgstr "720 × 360 DPI Enhanced"
 
-#: src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:3479
 msgid "Black 1"
 msgstr "Black 1"
 
-#: src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3480
 msgid "Black 2"
 msgstr "Black 2"
 
-#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3065
-#: src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3605
 msgid "360 DPI Enhanced"
 msgstr "360 DPI Enhanced"
 
-#: src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3516
 msgid "1440 x 720 DPI High Quality"
 msgstr "1440 × 720 DPI High Quality"
 
-#: src/xml/xmli18n-tmp.h:3153
+#: src/xml/xmli18n-tmp.h:3677
+#, fuzzy
+msgid "Vivid Light Magenta"
+msgstr "Light Magenta"
+
+#: src/xml/xmli18n-tmp.h:3682
 #, fuzzy
-msgid "Lower Front Tray"
-msgstr "Front Tray"
+msgid "Vivid Magenta"
+msgstr "Magenta"
 
-#: src/xml/xmli18n-tmp.h:3154
+#: src/xml/xmli18n-tmp.h:3694
 #, fuzzy
-msgid "Upper Front Tray"
-msgstr "Front Tray"
+msgid "Main Tray"
+msgstr "Rear Tray"
 
-#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3160
-#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3176
-#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3186
+#: src/xml/xmli18n-tmp.h:3695
+#, fuzzy
+msgid "Photo Tray"
+msgstr "Photograph"
+
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3725 src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:3732
 msgid "Print to CD"
 msgstr "Print to CD"
 
-#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3181
-#: src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:3730
 msgid "Rear Tray"
 msgstr "Rear Tray"
 
-#: src/xml/xmli18n-tmp.h:3157 src/xml/xmli18n-tmp.h:3182
-#: src/xml/xmli18n-tmp.h:3185
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:3731
 msgid "Front Tray"
 msgstr "Front Tray"
 
-#: src/xml/xmli18n-tmp.h:3159 src/xml/xmli18n-tmp.h:3164
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3705
 msgid "Manual Feed"
 msgstr "Manual Feed"
 
-#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3709
 msgid "Roll Feed (cut each page)"
 msgstr "Roll Feed (cut each page)"
 
-#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3710
 msgid "Roll Feed (do not cut)"
 msgstr "Roll Feed (do not cut)"
 
-#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3171
-#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3180
-#: src/xml/xmli18n-tmp.h:3193
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3716 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3739
 msgid "Roll Feed"
 msgstr "Roll Feed"
 
-#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3714 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3723
 msgid "Manual Sheet Guide"
 msgstr "Manual Sheet Guide"
 
-#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3715 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3724
 msgid "Manual Feed (Front)"
 msgstr "Manual Feed (Front)"
 
-#: src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3733
 msgid "Photo Board"
 msgstr "Photo Board"
 
-#: src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3734
 msgid "Cut Sheet Bin 1"
 msgstr "Cut Sheet Bin 1"
 
-#: src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3735
 msgid "Cut Sheet Bin 2"
 msgstr "Cut Sheet Bin 2"
 
-#: src/xml/xmli18n-tmp.h:3190
+#: src/xml/xmli18n-tmp.h:3736
 msgid "Cut Sheet Autoselect"
 msgstr "Cut Sheet Autoselect"
 
-#: src/xml/xmli18n-tmp.h:3191
+#: src/xml/xmli18n-tmp.h:3737
 msgid "Manual Selection"
 msgstr "Manual Selection"
 
-#: src/xml/xmli18n-tmp.h:3199 src/xml/xmli18n-tmp.h:3207
-#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3219
-#: src/xml/xmli18n-tmp.h:3227 src/xml/xmli18n-tmp.h:3235
-#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3257
-#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3278
-#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3297
-#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3317
-#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3342
-#: src/xml/xmli18n-tmp.h:3356 src/xml/xmli18n-tmp.h:3382
-#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
-#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3426
-#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3446
-#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3474
-#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3498
-#: src/xml/xmli18n-tmp.h:3510 src/xml/xmli18n-tmp.h:3524
-#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3558
-#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:3584
-#: src/xml/xmli18n-tmp.h:3594 src/xml/xmli18n-tmp.h:3600
-#: src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3763 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3872 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:4067 src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4172 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4236 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:4754 src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5102 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5679 src/xml/xmli18n-tmp.h:5748
+#: src/xml/xmli18n-tmp.h:5793 src/xml/xmli18n-tmp.h:5814
+#: src/xml/xmli18n-tmp.h:5835
 msgid "One Color Raw"
 msgstr "One Colour Raw"
 
-#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3208
-#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3220
-#: src/xml/xmli18n-tmp.h:3228 src/xml/xmli18n-tmp.h:3236
-#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3259
-#: src/xml/xmli18n-tmp.h:3270 src/xml/xmli18n-tmp.h:3280
-#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3298
-#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3318
-#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3344
-#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3383
-#: src/xml/xmli18n-tmp.h:3391 src/xml/xmli18n-tmp.h:3403
-#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3427
-#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3447
-#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3475
-#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3499
-#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3526
-#: src/xml/xmli18n-tmp.h:3551 src/xml/xmli18n-tmp.h:3559
-#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3586
-#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3601
-#: src/xml/xmli18n-tmp.h:3607
+#: src/xml/xmli18n-tmp.h:3765 src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4484 src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:4756 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5321
+#: src/xml/xmli18n-tmp.h:5382 src/xml/xmli18n-tmp.h:5451
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5795 src/xml/xmli18n-tmp.h:5816
+#: src/xml/xmli18n-tmp.h:5837
 msgid "Three Color Raw"
 msgstr "Three Colour Raw"
 
-#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
-#: src/xml/xmli18n-tmp.h:3215 src/xml/xmli18n-tmp.h:3221
-#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3237
-#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3271
-#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3299
-#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3319
-#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3345
-#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3384
-#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
-#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3428
-#: src/xml/xmli18n-tmp.h:3438 src/xml/xmli18n-tmp.h:3448
-#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3463
-#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3476
-#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3500
-#: src/xml/xmli18n-tmp.h:3513 src/xml/xmli18n-tmp.h:3527
-#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3560
-#: src/xml/xmli18n-tmp.h:3573 src/xml/xmli18n-tmp.h:3587
-#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3602
-#: src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:3824 src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5325
+#: src/xml/xmli18n-tmp.h:5386 src/xml/xmli18n-tmp.h:5455
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5757
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5841
 msgid "Four Color Raw"
 msgstr "Four Colour Raw"
 
-#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3248
-#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
-#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3360
-#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
-#: src/xml/xmli18n-tmp.h:3417 src/xml/xmli18n-tmp.h:3429
-#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3459
-#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3501 src/xml/xmli18n-tmp.h:3514
-#: src/xml/xmli18n-tmp.h:3528 src/xml/xmli18n-tmp.h:3574
-#: src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4424 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:5066 src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:5196 src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5391
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5762
 msgid "Five Color Raw"
 msgstr "Five Colour Raw"
 
-#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3249
-#: src/xml/xmli18n-tmp.h:3272 src/xml/xmli18n-tmp.h:3293
-#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3333
-#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3361
-#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
-#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3430
-#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3460
-#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3478
-#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3502
-#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3529
-#: src/xml/xmli18n-tmp.h:3575 src/xml/xmli18n-tmp.h:3589
+#: src/xml/xmli18n-tmp.h:3780 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:4078 src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:4430 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4972
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5150 src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5336
+#: src/xml/xmli18n-tmp.h:5397 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5768
 msgid "Six Color Raw"
 msgstr "Six Colour Raw"
 
-#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3919 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:4781 src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:4795 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4921
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:4996
+#: src/xml/xmli18n-tmp.h:5023 src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:5226 src/xml/xmli18n-tmp.h:5279
+#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5603 src/xml/xmli18n-tmp.h:5609
+#: src/xml/xmli18n-tmp.h:5636 src/xml/xmli18n-tmp.h:5642
+#, fuzzy
+msgid "Gray 3"
+msgstr "Tray 3"
+
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4782 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4796 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4916 src/xml/xmli18n-tmp.h:4922
+#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4983
+#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5286 src/xml/xmli18n-tmp.h:5294
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5643
+#, fuzzy
+msgid "Gray 2"
+msgstr "Tray 2"
+
+#: src/xml/xmli18n-tmp.h:3855 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:4856 src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:4931 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4998
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:5214 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5611
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5644
+#, fuzzy
+msgid "Gray 1"
+msgstr "Tray 1"
+
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4985 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5606 src/xml/xmli18n-tmp.h:5639
+#, fuzzy
+msgid "MIS Quadtone"
+msgstr "Quadtone"
+
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4114
 msgid "One Color Raw Enhanced Gloss"
 msgstr "One Colour Raw Enhanced Gloss"
 
-#: src/xml/xmli18n-tmp.h:3260 src/xml/xmli18n-tmp.h:3281
+#: src/xml/xmli18n-tmp.h:4016 src/xml/xmli18n-tmp.h:4121
 msgid "Three Color Raw Gloss"
 msgstr "Three Colour Raw Gloss"
 
-#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3282
+#: src/xml/xmli18n-tmp.h:4021 src/xml/xmli18n-tmp.h:4126
 msgid "Four Color Raw Gloss"
 msgstr "Four Colour Raw Gloss"
 
-#: src/xml/xmli18n-tmp.h:3262 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4132
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Six Colour Enhanced Gloss Raw"
 
-#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:4035 src/xml/xmli18n-tmp.h:4140
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Seven Colour Enhanced Gloss Raw"
 
-#: src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:4141
+#, fuzzy
+msgid "MatteBlack"
+msgstr "Matte Black"
+
+#: src/xml/xmli18n-tmp.h:4224
 msgid "Default Black"
 msgstr "Default Black"
 
-#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
-#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3365
-#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3504
-#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3533
-#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3564
-#: src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4446 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4573 src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:5344
+#: src/xml/xmli18n-tmp.h:5413 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Seven Color Photo"
 msgstr "Seven Colour Photo"
 
-#: src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:4315
 msgid "Six Color Enhanced Composite"
 msgstr "Six Colour Enhanced Composite"
 
-#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3348
-#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3516
-#: src/xml/xmli18n-tmp.h:3530 src/xml/xmli18n-tmp.h:3576
-#: src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:4368 src/xml/xmli18n-tmp.h:4437
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:5404
+#: src/xml/xmli18n-tmp.h:5473 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5775
 msgid "Seven Color Raw"
 msgstr "Seven Colour Raw"
 
-#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3355
-#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3523
-#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5745
 msgid "Two Level Grayscale"
 msgstr "Two Level Grayscale"
 
-#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3357
-#: src/xml/xmli18n-tmp.h:3511 src/xml/xmli18n-tmp.h:3525
-#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:4412 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5448
+#: src/xml/xmli18n-tmp.h:5681 src/xml/xmli18n-tmp.h:5750
 msgid "Two Color Raw"
 msgstr "Two Colour Raw"
 
-#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3372
-#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3540
+#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5531
 msgid "Eight Color Photo"
 msgstr "Eight Colour Photo"
 
-#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3378
-#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:4652 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5570
 msgid "Eight Color Raw"
 msgstr "Eight Colour Raw"
 
-#: src/xml/xmli18n-tmp.h:3462 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:5288
+msgid "MIS Six Tone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:4994
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5291
+#, fuzzy
+msgid "Gray 5"
+msgstr "Tray 1"
+
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:4928 src/xml/xmli18n-tmp.h:4995
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5292
+#, fuzzy
+msgid "Gray 4"
+msgstr "Tray 4"
+
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5145
 msgid "Four Color Photo"
 msgstr "Four Colour Photo"
 
-#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3615
-#: src/xml/xmli18n-tmp.h:3621
+#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5852
+#: src/xml/xmli18n-tmp.h:5858
 msgid "Interleave"
 msgstr "Interleave"
 
-#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3616
-#: src/xml/xmli18n-tmp.h:3622
+#: src/xml/xmli18n-tmp.h:5848 src/xml/xmli18n-tmp.h:5853
+#: src/xml/xmli18n-tmp.h:5859
 msgid "Full Overlap"
 msgstr "Full Overlap"
 
-#: src/xml/xmli18n-tmp.h:3612 src/xml/xmli18n-tmp.h:3617
-#: src/xml/xmli18n-tmp.h:3623
+#: src/xml/xmli18n-tmp.h:5849 src/xml/xmli18n-tmp.h:5854
+#: src/xml/xmli18n-tmp.h:5860
 msgid "Four Pass"
 msgstr "Four Pass"
 
-#: src/xml/xmli18n-tmp.h:3613 src/xml/xmli18n-tmp.h:3618
-#: src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5855
+#: src/xml/xmli18n-tmp.h:5861
 msgid "Full Overlap 2"
 msgstr "Full Overlap 2"
 
-#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:5862
 msgid "Interleave 2"
 msgstr "Interleave 2"
 
-#: src/xml/xmli18n-tmp.h:3626
+#: src/xml/xmli18n-tmp.h:5863
 msgid "Eight Pass"
 msgstr "Eight Pass"
 
-#: src/xml/xmli18n-tmp.h:3628
+#: src/xml/xmli18n-tmp.h:5865
 msgid "On"
 msgstr "On"
 
-#: src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:5909
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:5910
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:3674
+#: src/xml/xmli18n-tmp.h:5911
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:3679
+#: src/xml/xmli18n-tmp.h:5916
 msgid "3x5"
 msgstr "3×5"
 
-#: src/xml/xmli18n-tmp.h:3680
+#: src/xml/xmli18n-tmp.h:5917
 msgid "3 1/2 x5"
 msgstr "3½×5"
 
-#: src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:5918
 msgid "4x6"
 msgstr "4×6"
 
-#: src/xml/xmli18n-tmp.h:3682
+#: src/xml/xmli18n-tmp.h:5919
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4×6 Photo Paper (tear-off borders)"
 
-#: src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:5920
+#, fuzzy
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr "Epson 4×6 Photo Paper (tear-off borders)"
+
+#: src/xml/xmli18n-tmp.h:5921
 msgid "5x7"
 msgstr "5×7"
 
-#: src/xml/xmli18n-tmp.h:3684
+#: src/xml/xmli18n-tmp.h:5922
 msgid "5x8"
 msgstr "5×8"
 
-#: src/xml/xmli18n-tmp.h:3685
+#: src/xml/xmli18n-tmp.h:5923
 msgid "6x8"
 msgstr "6×8"
 
-#: src/xml/xmli18n-tmp.h:3686
+#: src/xml/xmli18n-tmp.h:5924
 msgid "8x10"
 msgstr "8×10"
 
-#: src/xml/xmli18n-tmp.h:3688
+#: src/xml/xmli18n-tmp.h:5926
 msgid "12x18"
 msgstr "12×18"
 
-#: src/xml/xmli18n-tmp.h:3689
+#: src/xml/xmli18n-tmp.h:5927
 msgid "Super B 13x19"
 msgstr "Super B 13×19"
 
-#: src/xml/xmli18n-tmp.h:3690
+#: src/xml/xmli18n-tmp.h:5928
 msgid "Engineering C 17x22"
 msgstr "Engineering C 17×22"
 
-#: src/xml/xmli18n-tmp.h:3691
+#: src/xml/xmli18n-tmp.h:5929
 msgid "8x12"
 msgstr "8×12"
 
-#: src/xml/xmli18n-tmp.h:3692
+#: src/xml/xmli18n-tmp.h:5930
 msgid "11x14"
 msgstr "11×14"
 
-#: src/xml/xmli18n-tmp.h:3693
+#: src/xml/xmli18n-tmp.h:5931
 msgid "16x20"
 msgstr "16×20"
 
-#: src/xml/xmli18n-tmp.h:3694
+#: src/xml/xmli18n-tmp.h:5932
 msgid "16x24"
 msgstr "16×24"
 
-#: src/xml/xmli18n-tmp.h:3695
+#: src/xml/xmli18n-tmp.h:5933
 msgid "20x24"
 msgstr "20×24"
 
-#: src/xml/xmli18n-tmp.h:3696
+#: src/xml/xmli18n-tmp.h:5934
 msgid "20x30"
 msgstr "20×30"
 
-#: src/xml/xmli18n-tmp.h:3697
+#: src/xml/xmli18n-tmp.h:5935
 msgid "22x30"
 msgstr "22×30"
 
-#: src/xml/xmli18n-tmp.h:3698
+#: src/xml/xmli18n-tmp.h:5936
 msgid "24x30"
 msgstr "24×30"
 
-#: src/xml/xmli18n-tmp.h:3699
+#: src/xml/xmli18n-tmp.h:5937
 msgid "Super A1 24x36"
 msgstr "Super A1 24×36"
 
-#: src/xml/xmli18n-tmp.h:3700
+#: src/xml/xmli18n-tmp.h:5938
 msgid "30x40"
 msgstr "30×40"
 
-#: src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:5939
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:3702
+#: src/xml/xmli18n-tmp.h:5940
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:3703
+#: src/xml/xmli18n-tmp.h:5941
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:5942
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:3705
+#: src/xml/xmli18n-tmp.h:5943
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:3706
+#: src/xml/xmli18n-tmp.h:5944
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:3707
+#: src/xml/xmli18n-tmp.h:5945
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:3709
+#: src/xml/xmli18n-tmp.h:5947
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:3710
+#: src/xml/xmli18n-tmp.h:5948
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:5949
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:5950
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:3713
+#: src/xml/xmli18n-tmp.h:5951
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:3714
+#: src/xml/xmli18n-tmp.h:5952
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:3715
+#: src/xml/xmli18n-tmp.h:5953
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:3716
+#: src/xml/xmli18n-tmp.h:5954
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:5955
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:5956
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:5957
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:5958
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:5959
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:3722
+#: src/xml/xmli18n-tmp.h:5960
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:3723
+#: src/xml/xmli18n-tmp.h:5961
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:3724
+#: src/xml/xmli18n-tmp.h:5962
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:3725
+#: src/xml/xmli18n-tmp.h:5963
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:3726
+#: src/xml/xmli18n-tmp.h:5964
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:5965
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:5966
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:5967
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:3730
+#: src/xml/xmli18n-tmp.h:5968
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:3731
+#: src/xml/xmli18n-tmp.h:5969
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:3732
+#: src/xml/xmli18n-tmp.h:5970
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:3733
+#: src/xml/xmli18n-tmp.h:5971
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:3734
+#: src/xml/xmli18n-tmp.h:5972
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:3735
+#: src/xml/xmli18n-tmp.h:5973
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:3736
+#: src/xml/xmli18n-tmp.h:5974
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:3737
+#: src/xml/xmli18n-tmp.h:5975
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5976
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3739
+#: src/xml/xmli18n-tmp.h:5977
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:5978
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:3741
+#: src/xml/xmli18n-tmp.h:5979
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:5980
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:3743
+#: src/xml/xmli18n-tmp.h:5981
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:5982
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:5983
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:3746
+#: src/xml/xmli18n-tmp.h:5984
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:3747
+#: src/xml/xmli18n-tmp.h:5985
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:3748
+#: src/xml/xmli18n-tmp.h:5986
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:5987
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:3750
+#: src/xml/xmli18n-tmp.h:5988
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:3751
+#: src/xml/xmli18n-tmp.h:5989
 msgid "C0 landscape"
 msgstr "C0 landscape"
 
-#: src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:5990
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:5991
 msgid "C1 landscape"
 msgstr "C1 landscape"
 
-#: src/xml/xmli18n-tmp.h:3754
+#: src/xml/xmli18n-tmp.h:5992
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:3755
+#: src/xml/xmli18n-tmp.h:5993
 msgid "C2 landscape"
 msgstr "C2 landscape"
 
-#: src/xml/xmli18n-tmp.h:3756
+#: src/xml/xmli18n-tmp.h:5994
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:5995
 msgid "C3 landscape"
 msgstr "C3 landscape"
 
-#: src/xml/xmli18n-tmp.h:3758
+#: src/xml/xmli18n-tmp.h:5996
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:3759
+#: src/xml/xmli18n-tmp.h:5997
 msgid "C4 landscape"
 msgstr "C4 landscape"
 
-#: src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:5998
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:3761
+#: src/xml/xmli18n-tmp.h:5999
 msgid "C5 landscape"
 msgstr "C5 landscape"
 
-#: src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:6000
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:3763
+#: src/xml/xmli18n-tmp.h:6001
 msgid "B6-C4 landscape"
 msgstr "B6-C4 landscape"
 
-#: src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:6002
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:3765
+#: src/xml/xmli18n-tmp.h:6003
 msgid "C6 landscape"
 msgstr "C6 landscape"
 
-#: src/xml/xmli18n-tmp.h:3766
+#: src/xml/xmli18n-tmp.h:6004
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:6005
 msgid "DL landscape"
 msgstr "DL landscape"
 
-#: src/xml/xmli18n-tmp.h:3768
+#: src/xml/xmli18n-tmp.h:6006
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:3769
+#: src/xml/xmli18n-tmp.h:6007
 msgid "C7-6 landscape"
 msgstr "C7-6 landscape"
 
-#: src/xml/xmli18n-tmp.h:3770
+#: src/xml/xmli18n-tmp.h:6008
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:6009
 msgid "C7 landscape"
 msgstr "C7 landscape"
 
-#: src/xml/xmli18n-tmp.h:3772
+#: src/xml/xmli18n-tmp.h:6010
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:6011
 msgid "C8 landscape"
 msgstr "C8 landscape"
 
-#: src/xml/xmli18n-tmp.h:3774
+#: src/xml/xmli18n-tmp.h:6012
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:3775
+#: src/xml/xmli18n-tmp.h:6013
 msgid "C9 landscape"
 msgstr "C9 landscape"
 
-#: src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:6014
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:6015
 msgid "C10 landscape"
 msgstr "C10 landscape"
 
-#: src/xml/xmli18n-tmp.h:3778
+#: src/xml/xmli18n-tmp.h:6016
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:3779
+#: src/xml/xmli18n-tmp.h:6017
 msgid "ArchA transposed"
 msgstr "ArchA transposed"
 
-#: src/xml/xmli18n-tmp.h:3780
+#: src/xml/xmli18n-tmp.h:6018
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:6019
 msgid "ArchB transposed"
 msgstr "ArchB transposed"
 
-#: src/xml/xmli18n-tmp.h:3782
+#: src/xml/xmli18n-tmp.h:6020
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:6021
 msgid "ArchC transposed"
 msgstr "ArchC transposed"
 
-#: src/xml/xmli18n-tmp.h:3784
+#: src/xml/xmli18n-tmp.h:6022
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:6023
 msgid "ArchD transposed"
 msgstr "ArchD transposed"
 
-#: src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:6024
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:3787
+#: src/xml/xmli18n-tmp.h:6025
 msgid "ArchE transposed"
 msgstr "ArchE transposed"
 
-#: src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:6026
 msgid "American foolscap"
 msgstr "American foolscap"
 
-#: src/xml/xmli18n-tmp.h:3789
+#: src/xml/xmli18n-tmp.h:6027
 msgid "European foolscap"
 msgstr "European foolscap"
 
-#: src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:6028
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:6029
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:3792
+#: src/xml/xmli18n-tmp.h:6030
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:6031
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/xml/xmli18n-tmp.h:3794
+#: src/xml/xmli18n-tmp.h:6032
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:3795
+#: src/xml/xmli18n-tmp.h:6033
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:6034
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:6035
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:6036
 msgid "Small paperback"
 msgstr "Small paperback"
 
-#: src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:6037
 msgid "Penguin small paperback"
 msgstr "Penguin small paperback"
 
-#: src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:6038
 msgid "Penguin large paperback"
 msgstr "Penguin large paperback"
 
-#: src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:6039
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/xml/xmli18n-tmp.h:3802
+#: src/xml/xmli18n-tmp.h:6040
 msgid "Hagaki Card"
 msgstr "Hagaki Card"
 
-#: src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:6041
 msgid "Oufuku Card"
 msgstr "Oufuku Card"
 
-#: src/xml/xmli18n-tmp.h:3804
+#: src/xml/xmli18n-tmp.h:6042
 msgid "Japanese long envelope #3"
 msgstr "Japanese long envelope #3"
 
-#: src/xml/xmli18n-tmp.h:3805
+#: src/xml/xmli18n-tmp.h:6043
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japanese long envelope #3 landscape"
 
-#: src/xml/xmli18n-tmp.h:3806
+#: src/xml/xmli18n-tmp.h:6044
 msgid "Japanese long envelope #4"
 msgstr "Japanese long envelope #4"
 
-#: src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:6045
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japanese long envelope #4 landscape"
 
-#: src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:6046
 msgid "Japanese Kaku envelope #4"
 msgstr "Japanese Kaku envelope #4"
 
-#: src/xml/xmli18n-tmp.h:3809
+#: src/xml/xmli18n-tmp.h:6047
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japanese Kaku envelope #4 landscape"
 
-#: src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:6048
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:6049
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10 landscape"
 
-#: src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:6050
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/xml/xmli18n-tmp.h:3813
+#: src/xml/xmli18n-tmp.h:6051
 msgid "Monarch Envelope"
 msgstr "Monarch Envelope"
 
-#: src/xml/xmli18n-tmp.h:3814
+#: src/xml/xmli18n-tmp.h:6052
 msgid "Monarch Envelope landscape"
 msgstr "Monarch Envelope landscape"
 
-#: src/xml/xmli18n-tmp.h:3815
+#: src/xml/xmli18n-tmp.h:6053
 msgid "4x5 3/8"
 msgstr "4×5 3/8"
 
-#: src/xml/xmli18n-tmp.h:3816
+#: src/xml/xmli18n-tmp.h:6054
 msgid "4x7"
 msgstr "4×7"
 
-#: src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:6055
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/xml/xmli18n-tmp.h:3818
+#: src/xml/xmli18n-tmp.h:6056
 msgid "Card"
 msgstr "Card"
 
-#: src/xml/xmli18n-tmp.h:3819
+#: src/xml/xmli18n-tmp.h:6057
 msgid "Wide Postcard"
 msgstr "Wide Postcard"
 
-#: src/xml/xmli18n-tmp.h:3820
+#: src/xml/xmli18n-tmp.h:6058
 msgid "Chilean Office"
 msgstr "Chilean Office"
 
-#: src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:6059
 msgid "Chilean Double Letter"
 msgstr "Chilean Double Letter"
 
-#: src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:6060
 msgid "Chilean Double Office"
 msgstr "Chilean Double Office"
 
-#: src/xml/xmli18n-tmp.h:3824
+#: src/xml/xmli18n-tmp.h:6062
 msgid "89 mm Roll Paper"
 msgstr "89 mm Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:6063
 msgid "4 Inch Roll Paper"
 msgstr "4 Inch Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:3826
+#: src/xml/xmli18n-tmp.h:6064
 msgid "5 Inch Roll Paper"
 msgstr "5 Inch Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:3827
+#: src/xml/xmli18n-tmp.h:6065
 msgid "210 mm Roll Paper"
 msgstr "210 mm Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:6066
 msgid "13 Inch Roll Paper"
 msgstr "13 Inch Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:3829
+#: src/xml/xmli18n-tmp.h:6067
 msgid "17 Inch Roll Paper"
 msgstr "17 Inch Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:6068
 msgid "22 Inch Roll Paper"
 msgstr "22 Inch Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:3831
+#: src/xml/xmli18n-tmp.h:6069
 msgid "24 Inch Roll Paper"
 msgstr "24 Inch Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:6070
 msgid "36 Inch Roll Paper"
 msgstr "36 Inch Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:6071
 msgid "44 Inch Roll Paper"
 msgstr "44 Inch Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:3834
+#: src/xml/xmli18n-tmp.h:6072
 msgid "60 Inch Roll Paper"
 msgstr "60 Inch Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:6073
 msgid "64 Inch Roll Paper"
 msgstr "64 Inch Roll Paper"
 
-#: src/xml/xmli18n-tmp.h:3836
+#: src/xml/xmli18n-tmp.h:6074
 msgid "PostScript Level 1"
 msgstr "PostScript Level 1"
 
-#: src/xml/xmli18n-tmp.h:3837
+#: src/xml/xmli18n-tmp.h:6075
 msgid "PostScript Level 2"
 msgstr "PostScript Level 2"
 
-#: src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:6076
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:6077
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:6078
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:6079
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:6080
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:6081
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/xml/xmli18n-tmp.h:3844
+#: src/xml/xmli18n-tmp.h:6082
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:6083
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/xml/xmli18n-tmp.h:3846
+#: src/xml/xmli18n-tmp.h:6084
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:3847
+#: src/xml/xmli18n-tmp.h:6085
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/xml/xmli18n-tmp.h:3848
+#: src/xml/xmli18n-tmp.h:6086
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:6087
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/xml/xmli18n-tmp.h:3850
+#: src/xml/xmli18n-tmp.h:6088
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:6089
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:6090
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/xml/xmli18n-tmp.h:3853
+#: src/xml/xmli18n-tmp.h:6091
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/xml/xmli18n-tmp.h:3854
+#: src/xml/xmli18n-tmp.h:6092
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/xml/xmli18n-tmp.h:3855
+#: src/xml/xmli18n-tmp.h:6093
 msgid "Canon BJC-5100"
 msgstr "Canon BJC-5100"
 
-#: src/xml/xmli18n-tmp.h:3856
+#: src/xml/xmli18n-tmp.h:6094
 msgid "Canon BJC-5500"
 msgstr "Canon BJC-5500"
 
-#: src/xml/xmli18n-tmp.h:3857
+#: src/xml/xmli18n-tmp.h:6095
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/xml/xmli18n-tmp.h:3858
+#: src/xml/xmli18n-tmp.h:6096
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:6097
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:6098
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:6099
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:6100
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/xml/xmli18n-tmp.h:3863
+#: src/xml/xmli18n-tmp.h:6101
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:6102
 msgid "Canon BJC-8500"
 msgstr "Canon BJC-8500"
 
-#: src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:6103
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:6104
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/xml/xmli18n-tmp.h:3867
+#: src/xml/xmli18n-tmp.h:6105
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/xml/xmli18n-tmp.h:3868
+#: src/xml/xmli18n-tmp.h:6106
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:3869
+#: src/xml/xmli18n-tmp.h:6107
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:3870
+#: src/xml/xmli18n-tmp.h:6108
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:6109
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:3872
+#: src/xml/xmli18n-tmp.h:6110
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/xml/xmli18n-tmp.h:3873
+#: src/xml/xmli18n-tmp.h:6111
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:3874
+#: src/xml/xmli18n-tmp.h:6112
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:6113
 msgid "Canon PIXMA iP2000"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:6114
 msgid "Canon PIXMA iP3000"
 msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:3877
+#: src/xml/xmli18n-tmp.h:6115
 msgid "Canon PIXMA iP3100"
 msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:3878
+#: src/xml/xmli18n-tmp.h:6116
 msgid "Canon PIXMA iP4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:6117
 msgid "Canon PIXMA iP4100"
 msgstr "Canon PIXMA iP4100"
 
-#: src/xml/xmli18n-tmp.h:3880
+#: src/xml/xmli18n-tmp.h:6118
 msgid "Canon PIXMA iP4200"
 msgstr "Canon PIXMA iP4200"
 
-#: src/xml/xmli18n-tmp.h:3881
+#: src/xml/xmli18n-tmp.h:6119
 msgid "Canon PIXMA iP4300"
 msgstr "Canon PIXMA iP4300"
 
-#: src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:6120
 msgid "Canon PIXMA iP4500"
 msgstr "Canon PIXMA iP4500"
 
-#: src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:6121
 #, fuzzy
 msgid "Canon PIXMA iP4600"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:3884
+#: src/xml/xmli18n-tmp.h:6122
 msgid "Canon PIXMA iP5000"
 msgstr "Canon PIXMA iP5000"
 
-#: src/xml/xmli18n-tmp.h:3885
+#: src/xml/xmli18n-tmp.h:6123
 msgid "Canon PIXMA iP5200"
 msgstr "Canon PIXMA iP5200"
 
-#: src/xml/xmli18n-tmp.h:3886
+#: src/xml/xmli18n-tmp.h:6124
 msgid "Canon PIXMA iP5300"
 msgstr "Canon PIXMA iP5300"
 
-#: src/xml/xmli18n-tmp.h:3887
+#: src/xml/xmli18n-tmp.h:6125
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:3888
+#: src/xml/xmli18n-tmp.h:6126
 msgid "Canon PIXMA iP6700"
 msgstr "Canon PIXMA iP6700"
 
-#: src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:6127
 msgid "Canon PIXMA iP8500"
 msgstr "Canon PIXMA iP8500"
 
-#: src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:6128
+#, fuzzy
+msgid "Canon PIXMA iX4000"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6129
 msgid "Canon PIXMA iX5000"
 msgstr "Canon PIXMA iX5000"
 
-#: src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:6130
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:6131
 msgid "Canon PIXMA MP150"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:6132
 #, fuzzy
 msgid "Canon PIXMA MP160"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:6133
 msgid "Canon PIXMA MP170"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:3895
+#: src/xml/xmli18n-tmp.h:6134
 msgid "Canon PIXMA MP180"
 msgstr "Canon PIXMA MP180"
 
-#: src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:6135
 #, fuzzy
 msgid "Canon PIXMA MP220"
 msgstr "Canon PIXMA MP520"
 
-#: src/xml/xmli18n-tmp.h:3897
+#: src/xml/xmli18n-tmp.h:6136
 msgid "Canon PIXMA MP500"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:6137
 msgid "Canon PIXMA MP520"
 msgstr "Canon PIXMA MP520"
 
-#: src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:6138
 msgid "Canon PIXMA MP610"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:3900
+#: src/xml/xmli18n-tmp.h:6139
 msgid "Canon PIXMA MP700"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:6140
 msgid "Canon PIXMA MP710"
 msgstr "Canon PIXMA MP710"
 
-#: src/xml/xmli18n-tmp.h:3902
+#: src/xml/xmli18n-tmp.h:6141
 msgid "Canon PIXMA MP730"
 msgstr "Canon PIXMA MP730"
 
-#: src/xml/xmli18n-tmp.h:3903
+#: src/xml/xmli18n-tmp.h:6142
 msgid "Canon PIXMA MP740"
 msgstr "Canon PIXMA MP740"
 
-#: src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:6143
 msgid "Canon PIXMA MP750"
 msgstr "Canon PIXMA MP750"
 
-#: src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:6144
 msgid "Canon PIXMA MP760"
 msgstr "Canon PIXMA MP760"
 
-#: src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:6145
 msgid "Canon PIXMA MP770"
 msgstr "Canon PIXMA MP770"
 
-#: src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:6146
 msgid "Canon PIXMA MP780"
 msgstr "Canon PIXMA MP780"
 
-#: src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:6147
 msgid "Canon PIXMA MP790"
 msgstr "Canon PIXMA MP790"
 
-#: src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:6148
 msgid "Canon PIXMA MP830"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:3910
+#: src/xml/xmli18n-tmp.h:6149
 msgid "Canon PIXUS iP3100"
 msgstr "Canon PIXUS iP3100"
 
-#: src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:6150
 msgid "Canon PIXUS iP4100"
 msgstr "Canon PIXUS iP4100"
 
-#: src/xml/xmli18n-tmp.h:3912
+#: src/xml/xmli18n-tmp.h:6151
 msgid "Canon i80"
 msgstr "Canon i80"
 
-#: src/xml/xmli18n-tmp.h:3913
+#: src/xml/xmli18n-tmp.h:6152
 msgid "Canon i560"
 msgstr "Canon i560"
 
-#: src/xml/xmli18n-tmp.h:3914
+#: src/xml/xmli18n-tmp.h:6153
 msgid "Canon i850"
 msgstr "Canon i850"
 
-#: src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:6154
 msgid "Canon i860"
 msgstr "Canon i860"
 
-#: src/xml/xmli18n-tmp.h:3916
+#: src/xml/xmli18n-tmp.h:6155
 msgid "Canon i865"
 msgstr "Canon i865"
 
-#: src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:6156
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:6157
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3919
+#: src/xml/xmli18n-tmp.h:6158
 msgid "Epson B-300"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:3920
+#: src/xml/xmli18n-tmp.h:6159
 msgid "Epson B-308"
 msgstr "Epson B-308"
 
-#: src/xml/xmli18n-tmp.h:3921
+#: src/xml/xmli18n-tmp.h:6160
 msgid "Epson B-500DN"
 msgstr "Epson B-500DN"
 
-#: src/xml/xmli18n-tmp.h:3922
+#: src/xml/xmli18n-tmp.h:6161
 msgid "Epson B-508DN"
 msgstr "Epson B-508DN"
 
-#: src/xml/xmli18n-tmp.h:3923
+#: src/xml/xmli18n-tmp.h:6162
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:3924
+#: src/xml/xmli18n-tmp.h:6163
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:6164
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:6165
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:6166
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:6167
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:6168
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:6169
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:6170
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/xml/xmli18n-tmp.h:3932
+#: src/xml/xmli18n-tmp.h:6171
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:6172
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:3934
+#: src/xml/xmli18n-tmp.h:6173
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/xml/xmli18n-tmp.h:3935
+#: src/xml/xmli18n-tmp.h:6174
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:6175
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:3937
+#: src/xml/xmli18n-tmp.h:6176
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:6177
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/xml/xmli18n-tmp.h:3939
+#: src/xml/xmli18n-tmp.h:6178
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:6179
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:6180
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:3942
+#: src/xml/xmli18n-tmp.h:6181
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:3943
+#: src/xml/xmli18n-tmp.h:6182
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:6183
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:6184
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3946
+#: src/xml/xmli18n-tmp.h:6185
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:3947
+#: src/xml/xmli18n-tmp.h:6186
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:3948
+#: src/xml/xmli18n-tmp.h:6187
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/xml/xmli18n-tmp.h:3949
+#: src/xml/xmli18n-tmp.h:6188
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:6189
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/xml/xmli18n-tmp.h:3951
+#: src/xml/xmli18n-tmp.h:6190
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:6191
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/xml/xmli18n-tmp.h:3953
+#: src/xml/xmli18n-tmp.h:6192
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:6193
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C79"
 
-#: src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:6194
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3956
+#: src/xml/xmli18n-tmp.h:6195
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:3957
+#: src/xml/xmli18n-tmp.h:6196
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/xml/xmli18n-tmp.h:3958
+#: src/xml/xmli18n-tmp.h:6197
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/xml/xmli18n-tmp.h:3959
+#: src/xml/xmli18n-tmp.h:6198
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/xml/xmli18n-tmp.h:3960
+#: src/xml/xmli18n-tmp.h:6199
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:6200
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C87"
 
-#: src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:6201
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:6202
 msgid "Epson Stylus C110"
 msgstr "Epson Stylus C110"
 
-#: src/xml/xmli18n-tmp.h:3964
+#: src/xml/xmli18n-tmp.h:6203
 msgid "Epson Stylus C120"
 msgstr "Epson Stylus C120"
 
-#: src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:6204
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3966
+#: src/xml/xmli18n-tmp.h:6205
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/xml/xmli18n-tmp.h:3967
+#: src/xml/xmli18n-tmp.h:6206
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:6207
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:6208
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/xml/xmli18n-tmp.h:3970
+#: src/xml/xmli18n-tmp.h:6209
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:6210
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:3972
+#: src/xml/xmli18n-tmp.h:6211
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:6212
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:6213
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:3975
+#: src/xml/xmli18n-tmp.h:6214
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:6215
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:6216
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:6217
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:3979
+#: src/xml/xmli18n-tmp.h:6218
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:6219
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:3981
+#: src/xml/xmli18n-tmp.h:6220
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:3982
+#: src/xml/xmli18n-tmp.h:6221
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:3983
+#: src/xml/xmli18n-tmp.h:6222
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:3984
+#: src/xml/xmli18n-tmp.h:6223
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:6224
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:6225
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:3987
+#: src/xml/xmli18n-tmp.h:6226
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:6227
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:3989
+#: src/xml/xmli18n-tmp.h:6228
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:6229
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:6230
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:3992
+#: src/xml/xmli18n-tmp.h:6231
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:3993
+#: src/xml/xmli18n-tmp.h:6232
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:6233
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:3995
+#: src/xml/xmli18n-tmp.h:6234
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:6235
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:6236
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:3998
+#: src/xml/xmli18n-tmp.h:6237
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:3999
+#: src/xml/xmli18n-tmp.h:6238
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:6239
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:6240
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:4002
+#: src/xml/xmli18n-tmp.h:6241
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:6242
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:6243
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4005
+#: src/xml/xmli18n-tmp.h:6244
 #, fuzzy
-msgid "Epson Stylus Offixe TX300F"
+msgid "Epson Stylus Office TX300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4006
+#: src/xml/xmli18n-tmp.h:6245
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:6246
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:4008
+#: src/xml/xmli18n-tmp.h:6247
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4009
+#: src/xml/xmli18n-tmp.h:6248
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:6249
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:6250
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:6251
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4013
+#: src/xml/xmli18n-tmp.h:6252
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4014
+#: src/xml/xmli18n-tmp.h:6253
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:6254
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:4016
+#: src/xml/xmli18n-tmp.h:6255
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:6256
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:6257
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/xml/xmli18n-tmp.h:4019
+#: src/xml/xmli18n-tmp.h:6258
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:4020
+#: src/xml/xmli18n-tmp.h:6259
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/xml/xmli18n-tmp.h:4021
+#: src/xml/xmli18n-tmp.h:6260
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:4022
+#: src/xml/xmli18n-tmp.h:6261
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:4023
+#: src/xml/xmli18n-tmp.h:6262
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:4024
+#: src/xml/xmli18n-tmp.h:6263
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:6264
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:6265
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:4027
+#: src/xml/xmli18n-tmp.h:6266
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:6267
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:6268
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:6269
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:4031
+#: src/xml/xmli18n-tmp.h:6270
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:6271
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4033
+#: src/xml/xmli18n-tmp.h:6272
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4034
+#: src/xml/xmli18n-tmp.h:6273
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4035
+#: src/xml/xmli18n-tmp.h:6274
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1400"
 
-#: src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:6275
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 1410"
 
-#: src/xml/xmli18n-tmp.h:4037
+#: src/xml/xmli18n-tmp.h:6276
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:4038
+#: src/xml/xmli18n-tmp.h:6277
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:4039
+#: src/xml/xmli18n-tmp.h:6278
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:6279
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:4041
+#: src/xml/xmli18n-tmp.h:6280
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:6281
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:6282
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R230"
 
-#: src/xml/xmli18n-tmp.h:4044
+#: src/xml/xmli18n-tmp.h:6283
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R240"
 
-#: src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:6284
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo R245"
 
-#: src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:6285
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R260"
 
-#: src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:6286
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo R265"
 
-#: src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:6287
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo R270"
 
-#: src/xml/xmli18n-tmp.h:4049
+#: src/xml/xmli18n-tmp.h:6288
 msgid "Epson Stylus Photo R280"
 msgstr "Epson Stylus Photo R280"
 
-#: src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:6289
 msgid "Epson Stylus Photo R285"
 msgstr "Epson Stylus Photo R285"
 
-#: src/xml/xmli18n-tmp.h:4051
+#: src/xml/xmli18n-tmp.h:6290
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:6291
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:4053
+#: src/xml/xmli18n-tmp.h:6292
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/xml/xmli18n-tmp.h:4054
+#: src/xml/xmli18n-tmp.h:6293
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:6294
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/xml/xmli18n-tmp.h:4056
+#: src/xml/xmli18n-tmp.h:6295
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R350"
 
-#: src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:6296
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R360"
 
-#: src/xml/xmli18n-tmp.h:4058
+#: src/xml/xmli18n-tmp.h:6297
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R380"
 
-#: src/xml/xmli18n-tmp.h:4059
+#: src/xml/xmli18n-tmp.h:6298
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R390"
 
-#: src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:6299
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:6300
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:4062
+#: src/xml/xmli18n-tmp.h:6301
 msgid "Epson Stylus Photo R1900"
 msgstr "Epson Stylus Photo R1900"
 
-#: src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:6302
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:4064
+#: src/xml/xmli18n-tmp.h:6303
+#, fuzzy
+msgid "Epson Stylus Photo R2880"
+msgstr "Epson Stylus Photo R280"
+
+#: src/xml/xmli18n-tmp.h:6304
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:4065
+#: src/xml/xmli18n-tmp.h:6305
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:6306
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4067
+#: src/xml/xmli18n-tmp.h:6307
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:6308
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4069
+#: src/xml/xmli18n-tmp.h:6309
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:6310
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX560"
 
-#: src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:6311
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX580"
 
-#: src/xml/xmli18n-tmp.h:4072
+#: src/xml/xmli18n-tmp.h:6312
 msgid "Epson Stylus Photo RX585"
 msgstr "Epson Stylus Photo RX585"
 
-#: src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:6313
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX590"
 
-#: src/xml/xmli18n-tmp.h:4074
+#: src/xml/xmli18n-tmp.h:6314
 msgid "Epson Stylus Photo RX595"
 msgstr "Epson Stylus Photo RX595"
 
-#: src/xml/xmli18n-tmp.h:4075
+#: src/xml/xmli18n-tmp.h:6315
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:4076
+#: src/xml/xmli18n-tmp.h:6316
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:6317
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/xml/xmli18n-tmp.h:4078
+#: src/xml/xmli18n-tmp.h:6318
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:6319
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX640"
 
-#: src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:6320
 msgid "Epson Stylus Photo RX680"
 msgstr "Epson Stylus Photo RX680"
 
-#: src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:6321
 msgid "Epson Stylus Photo RX685"
 msgstr "Epson Stylus Photo RX685"
 
-#: src/xml/xmli18n-tmp.h:4082
+#: src/xml/xmli18n-tmp.h:6322
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Epson Stylus Photo RX560"
 
-#: src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:6323
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:4084
+#: src/xml/xmli18n-tmp.h:6324
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:4085
+#: src/xml/xmli18n-tmp.h:6325
 #, fuzzy
-msgid "Epson Stylus Photo TX800W"
+msgid "Epson Stylus Photo TX800FW"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:4086
+#: src/xml/xmli18n-tmp.h:6326
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:4087
+#: src/xml/xmli18n-tmp.h:6327
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:4088
+#: src/xml/xmli18n-tmp.h:6328
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4089
+#: src/xml/xmli18n-tmp.h:6329
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:6330
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:4091
+#: src/xml/xmli18n-tmp.h:6331
 msgid "Epson Stylus Pro 7800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:6332
 msgid "Epson Stylus Pro 7880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:4093
+#: src/xml/xmli18n-tmp.h:6333
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4094
+#: src/xml/xmli18n-tmp.h:6334
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:6335
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:6336
 msgid "Epson Stylus Pro 9800"
 msgstr "Epson Stylus Pro 9800"
 
-#: src/xml/xmli18n-tmp.h:4097
+#: src/xml/xmli18n-tmp.h:6337
 msgid "Epson Stylus Pro 9880"
 msgstr "Epson Stylus Pro 9880"
 
-#: src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:6338
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4099
+#: src/xml/xmli18n-tmp.h:6339
 msgid "Epson Stylus Pro 11880"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:6340
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:6341
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:6342
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:6343
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:6344
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:6345
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:6346
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:6347
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:6348
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:6349
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:4110
+#: src/xml/xmli18n-tmp.h:6350
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:6351
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:6352
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4113
+#: src/xml/xmli18n-tmp.h:6353
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Epson Stylus CX4400"
 msgstr "Epson Stylus CX4400"
 
-#: src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:6355
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/xml/xmli18n-tmp.h:4116
+#: src/xml/xmli18n-tmp.h:6356
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:6357
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/xml/xmli18n-tmp.h:4118
+#: src/xml/xmli18n-tmp.h:6358
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/xml/xmli18n-tmp.h:4119
+#: src/xml/xmli18n-tmp.h:6359
 msgid "Epson Stylus CX4900"
 msgstr "Epson Stylus CX4900"
 
-#: src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:6360
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX5000"
 
-#: src/xml/xmli18n-tmp.h:4121
+#: src/xml/xmli18n-tmp.h:6361
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX5000F"
 
-#: src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:6362
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:6363
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/xml/xmli18n-tmp.h:4124
+#: src/xml/xmli18n-tmp.h:6364
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:6365
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/xml/xmli18n-tmp.h:4126
+#: src/xml/xmli18n-tmp.h:6366
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4127
+#: src/xml/xmli18n-tmp.h:6367
 msgid "Epson Stylus CX5600"
 msgstr "Epson Stylus CX5600"
 
-#: src/xml/xmli18n-tmp.h:4128
+#: src/xml/xmli18n-tmp.h:6368
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/xml/xmli18n-tmp.h:4129
+#: src/xml/xmli18n-tmp.h:6369
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:6370
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX6000"
 
-#: src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:6371
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:6372
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:6373
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:6374
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:6375
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX7000F"
 
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:6376
 msgid "Epson Stylus CX7400"
 msgstr "Epson Stylus CX7400"
 
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:6377
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:6378
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:6379
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:6380
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:6381
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:6382
 msgid "Epson Stylus CX9400"
 msgstr "Epson Stylus CX9400"
 
-#: src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:6383
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Epson Stylus CX9400"
 
-#: src/xml/xmli18n-tmp.h:4144
+#: src/xml/xmli18n-tmp.h:6384
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:6385
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:6386
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:6387
 msgid "Epson Stylus D92"
 msgstr "Epson Stylus D92"
 
-#: src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:6388
 msgid "Epson Stylus D120"
 msgstr "Epson Stylus D120"
 
-#: src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:6389
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:6390
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:6391
+#, fuzzy
+msgid "Epson Stylus DX4000"
+msgstr "Epson Stylus DX4050"
+
+#: src/xml/xmli18n-tmp.h:6392
 msgid "Epson Stylus DX4050"
 msgstr "Epson Stylus DX4050"
 
-#: src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:6393
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:6394
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:4154
+#: src/xml/xmli18n-tmp.h:6395
 msgid "Epson Stylus DX4400"
 msgstr "Epson Stylus DX4400"
 
-#: src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:6396
 msgid "Epson Stylus DX4450"
 msgstr "Epson Stylus DX4450"
 
-#: src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:6397
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:6398
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:6399
 msgid "Epson Stylus DX7000F"
 msgstr "Epson Stylus DX7000F"
 
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:6400
 msgid "Epson Stylus DX7400"
 msgstr "Epson Stylus DX7400"
 
-#: src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:6401
 msgid "Epson Stylus DX7450"
 msgstr "Epson Stylus DX7450"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:6402
 msgid "Epson Stylus DX8400"
 msgstr "Epson Stylus DX8400"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:6403
 msgid "Epson Stylus DX8450"
 msgstr "Epson Stylus DX8450"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:6404
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Epson Stylus CX9400"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:6405
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:6406
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:6407
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:6408
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:6409
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:6410
 #, fuzzy
-msgid "Epson Stylus PX700FW"
+msgid "Epson Stylus PX700W"
 msgstr "Epson Stylus CX7000F"
 
-#: src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:6411
 #, fuzzy
 msgid "Epson Stylus PX800FW"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:6412
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:4172
+#: src/xml/xmli18n-tmp.h:6413
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:6414
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4174
+#: src/xml/xmli18n-tmp.h:6415
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:6416
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:6417
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4177
+#: src/xml/xmli18n-tmp.h:6418
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Epson Stylus DX4050"
 
-#: src/xml/xmli18n-tmp.h:4178
+#: src/xml/xmli18n-tmp.h:6419
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:4179
+#: src/xml/xmli18n-tmp.h:6420
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4180
+#: src/xml/xmli18n-tmp.h:6421
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4181
+#: src/xml/xmli18n-tmp.h:6422
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:6423
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:6424
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:6425
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:6426
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:6427
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4187
+#: src/xml/xmli18n-tmp.h:6428
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4188
+#: src/xml/xmli18n-tmp.h:6429
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:6430
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:6431
 msgid "Epson PictureMate Dash"
 msgstr "Epson PictureMate Dash"
 
-#: src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:6432
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/xml/xmli18n-tmp.h:4192
+#: src/xml/xmli18n-tmp.h:6433
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate Flash"
 
-#: src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:6434
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate Pal"
 
-#: src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:6435
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate Snap"
 
-#: src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:6436
 msgid "Epson PictureMate 100"
 msgstr "Epson PictureMate 100"
 
-#: src/xml/xmli18n-tmp.h:4196
+#: src/xml/xmli18n-tmp.h:6437
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate 200"
 
-#: src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:6438
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate 210"
 
-#: src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:6439
 #, fuzzy
 msgid "Epson PictureMate 215"
 msgstr "Epson PictureMate 210"
 
-#: src/xml/xmli18n-tmp.h:4199
+#: src/xml/xmli18n-tmp.h:6440
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate 240"
 
-#: src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:6441
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate 250"
 
-#: src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:6442
 msgid "Epson PictureMate 260"
 msgstr "Epson PictureMate 260"
 
-#: src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:6443
 msgid "Epson PictureMate 270"
 msgstr "Epson PictureMate 270"
 
-#: src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate 280"
 
-#: src/xml/xmli18n-tmp.h:4204
+#: src/xml/xmli18n-tmp.h:6445
 msgid "Epson PictureMate 290"
 msgstr "Epson PictureMate 290"
 
-#: src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:6446
 msgid "Epson PictureMate 500"
 msgstr "Epson PictureMate 500"
 
-#: src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:6447
 msgid "Epson PictureMate 2005"
 msgstr "Epson PictureMate 2005"
 
-#: src/xml/xmli18n-tmp.h:4207
+#: src/xml/xmli18n-tmp.h:6448
 #, fuzzy
 msgid "Epson WorkForce 30"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:6449
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:6450
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Epson E 500"
 
-#: src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:6451
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:6452
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/xml/xmli18n-tmp.h:4212
+#: src/xml/xmli18n-tmp.h:6453
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:6454
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:6455
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4215
+#: src/xml/xmli18n-tmp.h:6456
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:4216
+#: src/xml/xmli18n-tmp.h:6457
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:6458
 msgid "Epson E 300"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:6459
 msgid "Epson E 500"
 msgstr "Epson E 500"
 
-#: src/xml/xmli18n-tmp.h:4219
+#: src/xml/xmli18n-tmp.h:6460
 msgid "Epson E 520"
 msgstr "Epson E 520"
 
-#: src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:6461
 msgid "Epson E 700"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:6462
 msgid "Epson E 720"
 msgstr "Epson E 720"
 
-#: src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:6463
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:6464
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/xml/xmli18n-tmp.h:4224
+#: src/xml/xmli18n-tmp.h:6465
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:6466
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:6467
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:6468
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:4228
+#: src/xml/xmli18n-tmp.h:6469
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4229
+#: src/xml/xmli18n-tmp.h:6470
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:6471
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:6472
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:6473
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:6474
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:6475
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:6476
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:6477
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:6478
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/xml/xmli18n-tmp.h:4238
+#: src/xml/xmli18n-tmp.h:6479
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:6480
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:6481
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:6482
 msgid "Epson PM 670C"
 msgstr "Epson PM 670C"
 
-#: src/xml/xmli18n-tmp.h:4242
+#: src/xml/xmli18n-tmp.h:6483
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:4243
+#: src/xml/xmli18n-tmp.h:6484
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:6485
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:6486
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/xml/xmli18n-tmp.h:4246
+#: src/xml/xmli18n-tmp.h:6487
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:6488
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:6490
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/xml/xmli18n-tmp.h:4251
+#: src/xml/xmli18n-tmp.h:6492
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:4253
+#: src/xml/xmli18n-tmp.h:6494
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/xml/xmli18n-tmp.h:4254
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:6496
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:6497
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:6498
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:6499
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/xml/xmli18n-tmp.h:4259
+#: src/xml/xmli18n-tmp.h:6500
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/xml/xmli18n-tmp.h:4260
+#: src/xml/xmli18n-tmp.h:6501
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:6502
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/xml/xmli18n-tmp.h:4262
+#: src/xml/xmli18n-tmp.h:6503
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/xml/xmli18n-tmp.h:4263
+#: src/xml/xmli18n-tmp.h:6504
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/xml/xmli18n-tmp.h:4264
+#: src/xml/xmli18n-tmp.h:6505
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/xml/xmli18n-tmp.h:4265
+#: src/xml/xmli18n-tmp.h:6506
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:6507
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:6508
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:6509
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:6510
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:6511
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:6512
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:6513
 msgid "Epson PM A820"
 msgstr "Epson PM A820"
 
-#: src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:6514
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:4274
+#: src/xml/xmli18n-tmp.h:6515
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/xml/xmli18n-tmp.h:4275
+#: src/xml/xmli18n-tmp.h:6516
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:4276
+#: src/xml/xmli18n-tmp.h:6517
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:6518
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:6519
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:6520
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:6521
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:6522
 msgid "Epson PM D870"
 msgstr "Epson PM D870"
 
-#: src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:6523
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:6524
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:6525
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/xml/xmli18n-tmp.h:4285
+#: src/xml/xmli18n-tmp.h:6526
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/xml/xmli18n-tmp.h:4286
+#: src/xml/xmli18n-tmp.h:6527
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:6528
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:6529
 msgid "Epson PM G850"
 msgstr "Epson PM G850"
 
-#: src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:6530
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Epson PM 670C"
 
-#: src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:6531
 msgid "Epson PM G4500"
 msgstr "Epson PM G4500"
 
-#: src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:6532
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4292
+#: src/xml/xmli18n-tmp.h:6533
 msgid "Epson Offirio PX B300"
 msgstr "Epson Offirio PX B300"
 
-#: src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:6534
 msgid "Epson Offirio PX B500"
 msgstr "Epson Offirio PX B500"
 
-#: src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:6535
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4295
+#: src/xml/xmli18n-tmp.h:6536
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:4296
+#: src/xml/xmli18n-tmp.h:6537
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4297
+#: src/xml/xmli18n-tmp.h:6538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:6539
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:4299
+#: src/xml/xmli18n-tmp.h:6540
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:6541
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:6542
 msgid "Epson PX G5300"
 msgstr "Epson PX G5300"
 
-#: src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:6543
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:6544
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/xml/xmli18n-tmp.h:4305
+#: src/xml/xmli18n-tmp.h:6546
 msgid "Epson PX V780"
 msgstr "Epson PX V780"
 
-#: src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:6547
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/xml/xmli18n-tmp.h:4307
+#: src/xml/xmli18n-tmp.h:6548
+#, fuzzy
+msgid "Epson PX G5600"
+msgstr "Epson PX G5000"
+
+#: src/xml/xmli18n-tmp.h:6549
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/xml/xmli18n-tmp.h:4308
+#: src/xml/xmli18n-tmp.h:6550
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/xml/xmli18n-tmp.h:4309
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/xml/xmli18n-tmp.h:4310
+#: src/xml/xmli18n-tmp.h:6552
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:6553
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:6554
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/xml/xmli18n-tmp.h:4313
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:6556
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/xml/xmli18n-tmp.h:4315
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:6559
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Colour StyleWriter 4100"
 
-#: src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:6560
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Colour StyleWriter 4500"
 
-#: src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:6561
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Colour StyleWriter 6500"
 
-#: src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:6562
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:6563
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:6564
 msgid "Brother DCP-8045D"
 msgstr "Brother DCP-8045D"
 
-#: src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:6565
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:4324
+#: src/xml/xmli18n-tmp.h:6566
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:6567
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/xml/xmli18n-tmp.h:4326
+#: src/xml/xmli18n-tmp.h:6568
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:4327
+#: src/xml/xmli18n-tmp.h:6569
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:6570
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:6571
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Brother HL-1430"
 msgstr "Brother HL-1430"
 
-#: src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:6576
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Brother HL-1450"
 msgstr "Brother HL-1450"
 
-#: src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Brother HL-1470N"
 msgstr "Brother HL-1470N"
 
-#: src/xml/xmli18n-tmp.h:4337
+#: src/xml/xmli18n-tmp.h:6579
 msgid "Brother HL-1650"
 msgstr "Brother HL-1650"
 
-#: src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:6580
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:6581
 msgid "Brother HL-1670N"
 msgstr "Brother HL-1670N"
 
-#: src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:6582
 msgid "Brother HL-1850"
 msgstr "Brother HL-1850"
 
-#: src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:6583
 msgid "Brother HL-1870N"
 msgstr "Brother HL-1870N"
 
-#: src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:6584
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:6585
 msgid "Brother HL-2460"
 msgstr "Brother HL-2460"
 
-#: src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:6586
 msgid "Brother HL-2460N"
 msgstr "Brother HL-2460N"
 
-#: src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:6587
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/xml/xmli18n-tmp.h:4346
+#: src/xml/xmli18n-tmp.h:6588
 msgid "Brother HL-5030"
 msgstr "Brother HL-5030"
 
-#: src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:6589
 msgid "Brother HL-5040"
 msgstr "Brother HL-5040"
 
-#: src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:6590
 msgid "Brother HL-5050"
 msgstr "Brother HL-5050"
 
-#: src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:6591
 msgid "Brother HL-5070N"
 msgstr "Brother HL-5070N"
 
-#: src/xml/xmli18n-tmp.h:4350
+#: src/xml/xmli18n-tmp.h:6592
 msgid "Brother HL-5140"
 msgstr "Brother HL-5140"
 
-#: src/xml/xmli18n-tmp.h:4351
+#: src/xml/xmli18n-tmp.h:6593
 msgid "Brother HL-5150D"
 msgstr "Brother HL-5150D"
 
-#: src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:6594
 msgid "Brother HL-5170DN"
 msgstr "Brother HL-5170DN"
 
-#: src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:6595
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:4354
+#: src/xml/xmli18n-tmp.h:6596
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:6597
 msgid "Brother HL-7050"
 msgstr "Brother HL-7050"
 
-#: src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:6598
 msgid "Brother HL-7050N"
 msgstr "Brother HL-7050N"
 
-#: src/xml/xmli18n-tmp.h:4357
+#: src/xml/xmli18n-tmp.h:6599
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/xml/xmli18n-tmp.h:4358
+#: src/xml/xmli18n-tmp.h:6600
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:6601
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:6602
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:6603
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:6604
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:6605
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:6606
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:6607
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:6608
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:6609
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:6610
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:6611
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:6612
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:6613
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:6614
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/xml/xmli18n-tmp.h:4373
+#: src/xml/xmli18n-tmp.h:6615
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/xml/xmli18n-tmp.h:4374
+#: src/xml/xmli18n-tmp.h:6616
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:6617
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/xml/xmli18n-tmp.h:4376
+#: src/xml/xmli18n-tmp.h:6618
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:6619
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:6620
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:6621
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:6622
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:6623
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:6624
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:6625
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/xml/xmli18n-tmp.h:4384
+#: src/xml/xmli18n-tmp.h:6626
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:4385
+#: src/xml/xmli18n-tmp.h:6627
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:4386
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:4387
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:6630
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/xml/xmli18n-tmp.h:4389
+#: src/xml/xmli18n-tmp.h:6631
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/xml/xmli18n-tmp.h:4392
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Epson EPL-N2050"
 msgstr "Epson EPL-N2050"
 
-#: src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Epson EPL-N2050+"
 msgstr "Epson EPL-N2050+"
 
-#: src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:6636
 msgid "Epson EPL-N2050PS"
 msgstr "Epson EPL-N2050PS"
 
-#: src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:6637
 msgid "Epson EPL-N2050PS+"
 msgstr "Epson EPL-N2050PS+"
 
-#: src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:6638
 msgid "Epson EPL-N2120"
 msgstr "Epson EPL-N2120"
 
-#: src/xml/xmli18n-tmp.h:4397
+#: src/xml/xmli18n-tmp.h:6639
 msgid "Epson EPL-N2500"
 msgstr "Epson EPL-N2500"
 
-#: src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:6640
 msgid "Epson EPL-N2500PS"
 msgstr "Epson EPL-N2500PS"
 
-#: src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:6641
 msgid "Epson EPL-N2750"
 msgstr "Epson EPL-N2750"
 
-#: src/xml/xmli18n-tmp.h:4400
+#: src/xml/xmli18n-tmp.h:6642
 msgid "Epson EPL-N2750PS"
 msgstr "Epson EPL-N2750PS"
 
-#: src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:6643
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/xml/xmli18n-tmp.h:4403
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:6646
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:6647
 msgid "Generic PCL 4 Printer"
 msgstr "Generic PCL 4 Printer"
 
-#: src/xml/xmli18n-tmp.h:4406
+#: src/xml/xmli18n-tmp.h:6648
 msgid "Generic PCL 4 LF Printer"
 msgstr "Generic PCL 4 LF Printer"
 
-#: src/xml/xmli18n-tmp.h:4407
+#: src/xml/xmli18n-tmp.h:6649
 msgid "Generic PCL 5 Printer"
 msgstr "Generic PCL 5 Printer"
 
-#: src/xml/xmli18n-tmp.h:4408
+#: src/xml/xmli18n-tmp.h:6650
 msgid "Generic PCL 5 LF Printer"
 msgstr "Generic PCL 5 LF Printer"
 
-#: src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:6651
 msgid "Generic PCL 5c Printer"
 msgstr "Generic PCL 5c Printer"
 
-#: src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Generic PCL 5c LF Printer"
 msgstr "Generic PCL 5c LF Printer"
 
-#: src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:6653
 msgid "Generic PCL 5e Printer"
 msgstr "Generic PCL 5e Printer"
 
-#: src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:6654
 msgid "Generic PCL 5e LF Printer"
 msgstr "Generic PCL 5e LF Printer"
 
-#: src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Generic PCL 6/PCL XL Printer"
 
-#: src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Generic PCL 6/PCL XL LF Printer"
 
-#: src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:6657
 msgid "Gestetner 10512"
 msgstr "Gestetner 10512"
 
-#: src/xml/xmli18n-tmp.h:4416
+#: src/xml/xmli18n-tmp.h:6658
 msgid "Gestetner 2212"
 msgstr "Gestetner 2212"
 
-#: src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:6659
 msgid "Gestetner 2712"
 msgstr "Gestetner 2712"
 
-#: src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:6660
 msgid "Gestetner 3212"
 msgstr "Gestetner 3212"
 
-#: src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:6661
 msgid "Gestetner 3502"
 msgstr "Gestetner 3502"
 
-#: src/xml/xmli18n-tmp.h:4420
-msgid "Gestetner 3532"
-msgstr "Gestetner 3532"
-
-#: src/xml/xmli18n-tmp.h:4421
-msgid "Gestetner 4235g"
+#: src/xml/xmli18n-tmp.h:6662
+#, fuzzy
+msgid "Gestetner 3532/4235g"
 msgstr "Gestetner 4235g"
 
-#: src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:6663
 msgid "Gestetner 4502"
 msgstr "Gestetner 4502"
 
-#: src/xml/xmli18n-tmp.h:4423
-msgid "Gestetner 4532"
-msgstr "Gestetner 4532"
-
-#: src/xml/xmli18n-tmp.h:4424
-msgid "Gestetner 4245g"
+#: src/xml/xmli18n-tmp.h:6664
+#, fuzzy
+msgid "Gestetner 4532/4245g"
 msgstr "Gestetner 4245g"
 
-#: src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:6665
 msgid "Gestetner 6002"
 msgstr "Gestetner 6002"
 
-#: src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:6666
 msgid "Gestetner 7502"
 msgstr "Gestetner 7502"
 
-#: src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Gestetner 9002"
 msgstr "Gestetner 9002"
 
-#: src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:6668
 msgid "Gestetner DSm415"
 msgstr "Gestetner DSm415"
 
-#: src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:6669
 msgid "Gestetner DSm615"
 msgstr "Gestetner DSm615"
 
-#: src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:6670
 msgid "Gestetner DSm616"
 msgstr "Gestetner DSm616"
 
-#: src/xml/xmli18n-tmp.h:4431
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Gestetner DSm618"
 msgstr "Gestetner DSm618"
 
-#: src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:6672
 msgid "Gestetner DSm618d"
 msgstr "Gestetner DSm618d"
 
-#: src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:6673
 msgid "Gestetner DSm620"
 msgstr "Gestetner DSm620"
 
-#: src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:6674
 msgid "Gestetner DSm620d"
 msgstr "Gestetner DSm620d"
 
-#: src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:6675
 msgid "Gestetner DSm622"
 msgstr "Gestetner DSm622"
 
-#: src/xml/xmli18n-tmp.h:4436
+#: src/xml/xmli18n-tmp.h:6676
 msgid "Gestetner DSm627"
 msgstr "Gestetner DSm627"
 
-#: src/xml/xmli18n-tmp.h:4437
-msgid "Gestetner DSm635"
-msgstr "Gestetner DSm635"
-
-#: src/xml/xmli18n-tmp.h:4438
-msgid "Gestetner DSm635G"
+#: src/xml/xmli18n-tmp.h:6677
+#, fuzzy
+msgid "Gestetner DSm635/635G"
 msgstr "Gestetner DSm635G"
 
-#: src/xml/xmli18n-tmp.h:4439
-msgid "Gestetner DSm645"
+#: src/xml/xmli18n-tmp.h:6678
+#, fuzzy
+msgid "Gestetner DSm645/645G"
 msgstr "Gestetner DSm645"
 
-#: src/xml/xmli18n-tmp.h:4440
-msgid "Gestetner DS645G"
-msgstr "Gestetner DS645G"
-
-#: src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:6679
 msgid "Gestetner DSm651"
 msgstr "Gestetner DSm651"
 
-#: src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:6680
 msgid "Gestetner DSm660"
 msgstr "Gestetner DSm660"
 
-#: src/xml/xmli18n-tmp.h:4443
+#: src/xml/xmli18n-tmp.h:6681
 msgid "Gestetner DSm675"
 msgstr "Gestetner DSm675"
 
-#: src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:6682
 msgid "Gestetner DSm725"
 msgstr "Gestetner DSm725"
 
-#: src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:6683
 msgid "Gestetner DSm730"
 msgstr "Gestetner DSm730"
 
-#: src/xml/xmli18n-tmp.h:4446
-msgid "Gestetner DSm735"
-msgstr "Gestetner DSm735"
-
-#: src/xml/xmli18n-tmp.h:4447
-msgid "Gestetner DSm735G"
+#: src/xml/xmli18n-tmp.h:6684
+#, fuzzy
+msgid "Gestetner DSm735/735G"
 msgstr "Gestetner DSm735G"
 
-#: src/xml/xmli18n-tmp.h:4448
-msgid "Gestetner DSm745"
-msgstr "Gestetner DSm745"
-
-#: src/xml/xmli18n-tmp.h:4449
-msgid "Gestetner DSm745G"
+#: src/xml/xmli18n-tmp.h:6685
+#, fuzzy
+msgid "Gestetner DSm745/745G"
 msgstr "Gestetner DSm745G"
 
-#: src/xml/xmli18n-tmp.h:4450
-msgid "Gestetner MP1100"
-msgstr "Gestetner MP1100"
-
-#: src/xml/xmli18n-tmp.h:4451
-msgid "Gestetner DSm7110"
+#: src/xml/xmli18n-tmp.h:6686
+#, fuzzy
+msgid "Gestetner MP1100/DSm7110"
 msgstr "Gestetner DSm7110"
 
-#: src/xml/xmli18n-tmp.h:4452
-msgid "Gestetner MP1350"
-msgstr "Gestetner MP1350"
-
-#: src/xml/xmli18n-tmp.h:4453
-msgid "Gestetner DSm7135"
+#: src/xml/xmli18n-tmp.h:6687
+#, fuzzy
+msgid "Gestetner MP1350/DSm7135"
 msgstr "Gestetner DSm7135"
 
-#: src/xml/xmli18n-tmp.h:4454
-msgid "Gestetner MP1600"
+#: src/xml/xmli18n-tmp.h:6688
+#, fuzzy
+msgid "Gestetner MP1600/DSm716"
 msgstr "Gestetner MP1600"
 
-#: src/xml/xmli18n-tmp.h:4455
-msgid "Gestetner DSm716"
-msgstr "Gestetner DSm716"
-
-#: src/xml/xmli18n-tmp.h:4456
-msgid "Gestetner MP2000"
-msgstr "Gestetner MP2000"
-
-#: src/xml/xmli18n-tmp.h:4457
-msgid "Gestetner DSm721d"
+#: src/xml/xmli18n-tmp.h:6689
+#, fuzzy
+msgid "Gestetner MP2000/DSm721d"
 msgstr "Gestetner DSm721d"
 
-#: src/xml/xmli18n-tmp.h:4458
-msgid "Gestetner MP2500"
+#: src/xml/xmli18n-tmp.h:6690
+#, fuzzy
+msgid "Gestetner MP2500/DSm625"
 msgstr "Gestetner MP2500"
 
-#: src/xml/xmli18n-tmp.h:4459
-msgid "Gestetner DSm625"
-msgstr "Gestetner DSm625"
-
-#: src/xml/xmli18n-tmp.h:4460
-msgid "Gestetner MP3500"
-msgstr "Gestetner MP3500"
-
-#: src/xml/xmli18n-tmp.h:4461
-msgid "Gestetner DSm735e"
+#: src/xml/xmli18n-tmp.h:6691
+#, fuzzy
+msgid "Gestetner MP3500/DSm735e"
 msgstr "Gestetner DSm735e"
 
-#: src/xml/xmli18n-tmp.h:4462
-msgid "Gestetner MP4500"
-msgstr "Gestetner MP4500"
-
-#: src/xml/xmli18n-tmp.h:4463
-msgid "Gestetner DSm745e"
+#: src/xml/xmli18n-tmp.h:6692
+#, fuzzy
+msgid "Gestetner MP4500/DSm745e"
 msgstr "Gestetner DSm745e"
 
-#: src/xml/xmli18n-tmp.h:4464
-msgid "Gestetner MP5500"
+#: src/xml/xmli18n-tmp.h:6693
+#, fuzzy
+msgid "Gestetner MP5500/DSm755"
 msgstr "Gestetner MP5500"
 
-#: src/xml/xmli18n-tmp.h:4465
-msgid "Gestetner DSm755"
-msgstr "Gestetner DSm755"
-
-#: src/xml/xmli18n-tmp.h:4466
-msgid "Gestetner MP6500"
+#: src/xml/xmli18n-tmp.h:6694
+#, fuzzy
+msgid "Gestetner MP6500/DSm765"
 msgstr "Gestetner MP6500"
 
-#: src/xml/xmli18n-tmp.h:4467
-msgid "Gestetner DSm765"
-msgstr "Gestetner DSm765"
-
-#: src/xml/xmli18n-tmp.h:4468
-msgid "Gestetner MP7500"
+#: src/xml/xmli18n-tmp.h:6695
+#, fuzzy
+msgid "Gestetner MP7500/DSm775"
 msgstr "Gestetner MP7500"
 
-#: src/xml/xmli18n-tmp.h:4469
-msgid "Gestetner DSm775"
-msgstr "Gestetner DSm775"
-
-#: src/xml/xmli18n-tmp.h:4470
-msgid "Gestetner MP9000"
+#: src/xml/xmli18n-tmp.h:6696
+#, fuzzy
+msgid "Gestetner MP9000/DSm790"
 msgstr "Gestetner MP9000"
 
-#: src/xml/xmli18n-tmp.h:4471
-msgid "Gestetner DSm790"
-msgstr "Gestetner DSm790"
-
-#: src/xml/xmli18n-tmp.h:4472
-msgid "Gestetner MP 161"
+#: src/xml/xmli18n-tmp.h:6697
+#, fuzzy
+msgid "Gestetner MP 161/DSm416"
 msgstr "Gestetner MP 161"
 
-#: src/xml/xmli18n-tmp.h:4473
-msgid "Gestetner DSm416"
-msgstr "Gestetner DSm416"
-
-#: src/xml/xmli18n-tmp.h:4474
-msgid "Gestetner MP 2510"
+#: src/xml/xmli18n-tmp.h:6698
+#, fuzzy
+msgid "Gestetner MP 2510/DSm725e"
 msgstr "Gestetner MP 2510"
 
-#: src/xml/xmli18n-tmp.h:4475
-msgid "Gestetner DSm725e"
-msgstr "Gestetner DSm725e"
-
-#: src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:6699
 msgid "Gestetner MP 2550"
 msgstr "Gestetner MP 2550"
 
-#: src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:6700
 msgid "Gestetner MP 2550B"
 msgstr "Gestetner MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:4478
-msgid "Gestetner MP 3010"
+#: src/xml/xmli18n-tmp.h:6701
+#, fuzzy
+msgid "Gestetner MP 3010/DSm730e"
 msgstr "Gestetner MP 3010"
 
-#: src/xml/xmli18n-tmp.h:4479
-msgid "Gestetner DSm730e"
-msgstr "Gestetner DSm730e"
-
-#: src/xml/xmli18n-tmp.h:4480
+#: src/xml/xmli18n-tmp.h:6702
 msgid "Gestetner MP 3350"
 msgstr "Gestetner MP 3350"
 
-#: src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:6703
 msgid "Gestetner MP 3350B"
 msgstr "Gestetner MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:6704
 msgid "Gestetner MP 4000"
 msgstr "Gestetner MP 4000"
 
-#: src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:6705
 msgid "Gestetner MP 4000B"
 msgstr "Gestetner MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Gestetner MP 5000"
 msgstr "Gestetner MP 5000"
 
-#: src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:6707
 msgid "Gestetner MP 5000B"
 msgstr "Gestetner MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:6708
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:6709
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:6710
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/xml/xmli18n-tmp.h:4489
+#: src/xml/xmli18n-tmp.h:6711
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:6712
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:6713
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/xml/xmli18n-tmp.h:4492
+#: src/xml/xmli18n-tmp.h:6714
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:6715
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:6716
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/xml/xmli18n-tmp.h:4495
+#: src/xml/xmli18n-tmp.h:6717
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/xml/xmli18n-tmp.h:4496
+#: src/xml/xmli18n-tmp.h:6718
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/xml/xmli18n-tmp.h:4497
+#: src/xml/xmli18n-tmp.h:6719
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:6720
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:6721
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:6722
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:6723
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:6724
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:6725
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:6726
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:6727
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:4506
+#: src/xml/xmli18n-tmp.h:6728
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:6729
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:4508
+#: src/xml/xmli18n-tmp.h:6730
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/xml/xmli18n-tmp.h:4509
+#: src/xml/xmli18n-tmp.h:6731
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:4510
+#: src/xml/xmli18n-tmp.h:6732
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:6733
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:6734
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:6735
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:6736
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:6737
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:6738
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:6739
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:4518
+#: src/xml/xmli18n-tmp.h:6740
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:6741
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:6742
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:6743
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:6744
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:4523
+#: src/xml/xmli18n-tmp.h:6745
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:6746
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:6747
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:6748
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:6749
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/xml/xmli18n-tmp.h:4528
+#: src/xml/xmli18n-tmp.h:6750
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/xml/xmli18n-tmp.h:4529
+#: src/xml/xmli18n-tmp.h:6751
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/xml/xmli18n-tmp.h:4530
+#: src/xml/xmli18n-tmp.h:6752
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:6753
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/xml/xmli18n-tmp.h:4532
+#: src/xml/xmli18n-tmp.h:6754
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:6755
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:6756
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:6757
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:6758
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:6759
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:6760
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/xml/xmli18n-tmp.h:4539
+#: src/xml/xmli18n-tmp.h:6761
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/xml/xmli18n-tmp.h:4540
+#: src/xml/xmli18n-tmp.h:6762
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/xml/xmli18n-tmp.h:4541
+#: src/xml/xmli18n-tmp.h:6763
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/xml/xmli18n-tmp.h:4542
+#: src/xml/xmli18n-tmp.h:6764
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/xml/xmli18n-tmp.h:4543
+#: src/xml/xmli18n-tmp.h:6765
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:6766
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:6767
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/xml/xmli18n-tmp.h:4546
+#: src/xml/xmli18n-tmp.h:6768
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:6769
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:6770
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:6771
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:6772
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:6773
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/xml/xmli18n-tmp.h:4552
+#: src/xml/xmli18n-tmp.h:6774
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:6775
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:6776
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:6777
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:6778
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:6779
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:6780
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:6781
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:6782
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:6783
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:6784
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:6785
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:6786
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:6787
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:6788
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/xml/xmli18n-tmp.h:4567
+#: src/xml/xmli18n-tmp.h:6789
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/xml/xmli18n-tmp.h:4568
+#: src/xml/xmli18n-tmp.h:6790
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:6791
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/xml/xmli18n-tmp.h:4570
+#: src/xml/xmli18n-tmp.h:6792
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/xml/xmli18n-tmp.h:4571
+#: src/xml/xmli18n-tmp.h:6793
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:6794
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:6795
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:6796
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:6797
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:6798
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:6799
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:6800
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:6801
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:6802
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:6803
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/xml/xmli18n-tmp.h:4582
+#: src/xml/xmli18n-tmp.h:6804
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/xml/xmli18n-tmp.h:4583
+#: src/xml/xmli18n-tmp.h:6805
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/xml/xmli18n-tmp.h:4584
+#: src/xml/xmli18n-tmp.h:6806
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/xml/xmli18n-tmp.h:4585
+#: src/xml/xmli18n-tmp.h:6807
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:6808
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:6809
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:6810
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:6811
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:6812
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:6813
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:6814
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:4593
+#: src/xml/xmli18n-tmp.h:6815
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/xml/xmli18n-tmp.h:4594
+#: src/xml/xmli18n-tmp.h:6816
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:6817
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:6818
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/xml/xmli18n-tmp.h:4597
+#: src/xml/xmli18n-tmp.h:6819
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:6820
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:6821
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:6822
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:6823
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/xml/xmli18n-tmp.h:4602
+#: src/xml/xmli18n-tmp.h:6824
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:6825
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:6826
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:6827
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:6828
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:4607
+#: src/xml/xmli18n-tmp.h:6829
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:6830
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/xml/xmli18n-tmp.h:4609
+#: src/xml/xmli18n-tmp.h:6831
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/xml/xmli18n-tmp.h:4610
+#: src/xml/xmli18n-tmp.h:6832
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:6833
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:6834
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4613
+#: src/xml/xmli18n-tmp.h:6835
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:6836
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:6837
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:6838
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:6839
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:6840
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:6841
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:6842
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:6843
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:6844
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:6845
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4624
+#: src/xml/xmli18n-tmp.h:6846
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/xml/xmli18n-tmp.h:4625
+#: src/xml/xmli18n-tmp.h:6847
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:6848
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/xml/xmli18n-tmp.h:4627
+#: src/xml/xmli18n-tmp.h:6849
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/xml/xmli18n-tmp.h:4628
+#: src/xml/xmli18n-tmp.h:6850
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:6851
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:6852
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:6853
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 1022"
 
-#: src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:6854
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:6855
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:6856
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:6857
 msgid "HP LaserJet 1160"
 msgstr "HP LaserJet 1160"
 
-#: src/xml/xmli18n-tmp.h:4636
+#: src/xml/xmli18n-tmp.h:6858
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:4637
+#: src/xml/xmli18n-tmp.h:6859
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/xml/xmli18n-tmp.h:4638
+#: src/xml/xmli18n-tmp.h:6860
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:6861
 msgid "HP LaserJet 1320"
 msgstr "HP LaserJet 1320"
 
-#: src/xml/xmli18n-tmp.h:4640
+#: src/xml/xmli18n-tmp.h:6862
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:6863
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:6864
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:6865
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:4644
+#: src/xml/xmli18n-tmp.h:6866
 msgid "HP LaserJet 2410"
 msgstr "HP LaserJet 2410"
 
-#: src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:6867
 msgid "HP LaserJet 2420"
 msgstr "HP LaserJet 2420"
 
-#: src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:6868
 msgid "HP LaserJet 2430"
 msgstr "HP LaserJet 2430"
 
-#: src/xml/xmli18n-tmp.h:4647
+#: src/xml/xmli18n-tmp.h:6869
 msgid "HP LaserJet 3015"
 msgstr "HP LaserJet 3015"
 
-#: src/xml/xmli18n-tmp.h:4648
+#: src/xml/xmli18n-tmp.h:6870
 msgid "HP LaserJet 3020"
 msgstr "HP LaserJet 3020"
 
-#: src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:6871
 msgid "HP LaserJet 3030"
 msgstr "HP LaserJet 3030"
 
-#: src/xml/xmli18n-tmp.h:4650
+#: src/xml/xmli18n-tmp.h:6872
 msgid "HP LaserJet 3050"
 msgstr "HP LaserJet 3050"
 
-#: src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:6873
 msgid "HP LaserJet 3052"
 msgstr "HP LaserJet 3052"
 
-#: src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:6874
 msgid "HP LaserJet 3055"
 msgstr "HP LaserJet 3055"
 
-#: src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:6875
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:6876
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:6877
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:6878
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:6879
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:6880
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:6881
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/xml/xmli18n-tmp.h:4660
+#: src/xml/xmli18n-tmp.h:6882
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:6883
 msgid "HP LaserJet 3380"
 msgstr "HP LaserJet 3380"
 
-#: src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:6884
 msgid "HP LaserJet 3390"
 msgstr "HP LaserJet 3390"
 
-#: src/xml/xmli18n-tmp.h:4663
+#: src/xml/xmli18n-tmp.h:6885
 msgid "HP LaserJet 3392"
 msgstr "HP LaserJet 3392"
 
-#: src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:6886
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:6887
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:6888
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/xml/xmli18n-tmp.h:4667
+#: src/xml/xmli18n-tmp.h:6889
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:6890
 msgid "HP LaserJet 4240"
 msgstr "HP LaserJet 4240"
 
-#: src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:6891
 msgid "HP LaserJet 4250"
 msgstr "HP LaserJet 4250"
 
-#: src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:6892
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/xml/xmli18n-tmp.h:4671
+#: src/xml/xmli18n-tmp.h:6893
 msgid "HP LaserJet 4345 mfp"
 msgstr "HP LaserJet 4345 mfp"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:6894
 msgid "HP LaserJet 4350"
 msgstr "HP LaserJet 4350"
 
-#: src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:6895
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:6896
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:6897
 msgid "HP LaserJet 5200"
 msgstr "HP LaserJet 5200"
 
-#: src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:6898
 msgid "HP LaserJet 5200L"
 msgstr "HP LaserJet 5200L"
 
-#: src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:6899
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:6900
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:6901
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/xml/xmli18n-tmp.h:4680
+#: src/xml/xmli18n-tmp.h:6902
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:6903
 msgid "HP LaserJet 9040"
 msgstr "HP LaserJet 9040"
 
-#: src/xml/xmli18n-tmp.h:4682
+#: src/xml/xmli18n-tmp.h:6904
 msgid "HP LaserJet 9040 MFP"
 msgstr "HP LaserJet 9040 MFP"
 
-#: src/xml/xmli18n-tmp.h:4683
+#: src/xml/xmli18n-tmp.h:6905
 msgid "HP LaserJet 9050"
 msgstr "HP LaserJet 9050"
 
-#: src/xml/xmli18n-tmp.h:4684
+#: src/xml/xmli18n-tmp.h:6906
 msgid "HP LaserJet 9050 MFP"
 msgstr "HP LaserJet 9050 MFP"
 
-#: src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:6907
 msgid "HP LaserJet M3027 MFP"
 msgstr "HP LaserJet M3027 MFP"
 
-#: src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:6908
 msgid "HP LaserJet M3035 MFP"
 msgstr "HP LaserJet M3035 MFP"
 
-#: src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:6909
 msgid "HP LaserJet M4345 MFP"
 msgstr "HP LaserJet M4345 MFP"
 
-#: src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:6910
 msgid "HP LaserJet M5025 MFP"
 msgstr "HP LaserJet M5025 MFP"
 
-#: src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:6911
 msgid "HP LaserJet M5035 MFP"
 msgstr "HP LaserJet M5035 MFP"
 
-#: src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:6912
 msgid "HP LaserJet P2010"
 msgstr "HP LaserJet P2010"
 
-#: src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:6913
 msgid "HP LaserJet P2015"
 msgstr "HP LaserJet P2015"
 
-#: src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:6914
 msgid "HP LaserJet P3004"
 msgstr "HP LaserJet P3004"
 
-#: src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:6915
 msgid "HP LaserJet P3005"
 msgstr "HP LaserJet P3005"
 
-#: src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:6916
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/xml/xmli18n-tmp.h:4695
+#: src/xml/xmli18n-tmp.h:6917
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:6918
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:6919
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:6920
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:6921
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/xml/xmli18n-tmp.h:4700
+#: src/xml/xmli18n-tmp.h:6922
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:6923
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:6924
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/xml/xmli18n-tmp.h:4703
+#: src/xml/xmli18n-tmp.h:6925
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:6926
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:6927
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/xml/xmli18n-tmp.h:4706
+#: src/xml/xmli18n-tmp.h:6928
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/xml/xmli18n-tmp.h:4707
+#: src/xml/xmli18n-tmp.h:6929
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:6930
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:6931
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/xml/xmli18n-tmp.h:4710
+#: src/xml/xmli18n-tmp.h:6932
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:6933
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:6934
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:6935
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:6936
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:6937
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:6938
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:6939
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/xml/xmli18n-tmp.h:4718
+#: src/xml/xmli18n-tmp.h:6940
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:6941
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:6942
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/xml/xmli18n-tmp.h:4721
+#: src/xml/xmli18n-tmp.h:6943
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:6944
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:6945
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:6946
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/xml/xmli18n-tmp.h:4725
+#: src/xml/xmli18n-tmp.h:6947
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:6948
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:6949
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/xml/xmli18n-tmp.h:4728
+#: src/xml/xmli18n-tmp.h:6950
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/xml/xmli18n-tmp.h:4729
+#: src/xml/xmli18n-tmp.h:6951
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:6952
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:6953
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/xml/xmli18n-tmp.h:4732
+#: src/xml/xmli18n-tmp.h:6954
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:6955
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:6956
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:6957
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:6958
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:6959
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:6960
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/xml/xmli18n-tmp.h:4739
+#: src/xml/xmli18n-tmp.h:6961
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/xml/xmli18n-tmp.h:4740
+#: src/xml/xmli18n-tmp.h:6962
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/xml/xmli18n-tmp.h:4741
+#: src/xml/xmli18n-tmp.h:6963
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/xml/xmli18n-tmp.h:4742
+#: src/xml/xmli18n-tmp.h:6964
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:6965
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:6966
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/xml/xmli18n-tmp.h:4745
+#: src/xml/xmli18n-tmp.h:6967
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:6968
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:6969
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:6970
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/xml/xmli18n-tmp.h:4749
+#: src/xml/xmli18n-tmp.h:6971
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:6972
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:6973
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/xml/xmli18n-tmp.h:4752
+#: src/xml/xmli18n-tmp.h:6974
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:6975
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:6976
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/xml/xmli18n-tmp.h:4755
+#: src/xml/xmli18n-tmp.h:6977
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:6978
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:6979
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:6980
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/xml/xmli18n-tmp.h:4759
+#: src/xml/xmli18n-tmp.h:6981
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/xml/xmli18n-tmp.h:4760
+#: src/xml/xmli18n-tmp.h:6982
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:6983
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/xml/xmli18n-tmp.h:4762
+#: src/xml/xmli18n-tmp.h:6984
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:6985
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:6986
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/xml/xmli18n-tmp.h:4765
+#: src/xml/xmli18n-tmp.h:6987
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:6988
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:6989
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:6990
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:6991
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:6992
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:6993
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/xml/xmli18n-tmp.h:4772
+#: src/xml/xmli18n-tmp.h:6994
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:6995
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/xml/xmli18n-tmp.h:4774
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Infotec 4353 MF"
 msgstr "Infotec 4353 MF"
 
-#: src/xml/xmli18n-tmp.h:4775
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Infotec 4452 MF"
 msgstr "Infotec 4452 MF"
 
-#: src/xml/xmli18n-tmp.h:4776
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:6999
 msgid "Infotec IS2022"
 msgstr "Infotec IS2022"
 
-#: src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:7000
 msgid "Infotec IS2027"
 msgstr "Infotec IS2027"
 
-#: src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Infotec IS2032"
 msgstr "Infotec IS2032"
 
-#: src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:7002
 msgid "Infotec IS2035"
 msgstr "Infotec IS2035"
 
-#: src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:7003
 msgid "Infotec IS2045"
 msgstr "Infotec IS2045"
 
-#: src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:7004
 msgid "Infotec IS2090"
 msgstr "Infotec IS2090"
 
-#: src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:7005
 msgid "Infotec IS2105"
 msgstr "Infotec IS2105"
 
-#: src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:7006
 msgid "Infotec IS 2015"
 msgstr "Infotec IS 2015"
 
-#: src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:7007
 msgid "Infotec IS 2018"
 msgstr "Infotec IS 2018"
 
-#: src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:7008
 msgid "Infotec IS 2018D"
 msgstr "Infotec IS 2018D"
 
-#: src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:7009
 msgid "Infotec IS 2060"
 msgstr "Infotec IS 2060"
 
-#: src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:7010
 msgid "Infotec IS 2075"
 msgstr "Infotec IS 2075"
 
-#: src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:7011
 msgid "Infotec IS 2122"
 msgstr "Infotec IS 2122"
 
-#: src/xml/xmli18n-tmp.h:4790
+#: src/xml/xmli18n-tmp.h:7012
 msgid "Infotec IS 2127"
 msgstr "Infotec IS 2127"
 
-#: src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:7013
 msgid "Infotec IS 2132"
 msgstr "Infotec IS 2132"
 
-#: src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:7014
 msgid "Infotec IS 2135"
 msgstr "Infotec IS 2135"
 
-#: src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:7015
 msgid "Infotec IS 2145"
 msgstr "Infotec IS 2145"
 
-#: src/xml/xmli18n-tmp.h:4794
+#: src/xml/xmli18n-tmp.h:7016
 msgid "Infotec IS 2151"
 msgstr "Infotec IS 2151"
 
-#: src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:7017
 msgid "Infotec IS 2160"
 msgstr "Infotec IS 2160"
 
-#: src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:7018
 msgid "Infotec IS 2175"
 msgstr "Infotec IS 2175"
 
-#: src/xml/xmli18n-tmp.h:4797
+#: src/xml/xmli18n-tmp.h:7019
 msgid "Infotec IS 2215"
 msgstr "Infotec IS 2215"
 
-#: src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:7020
 msgid "Infotec IS 2216"
 msgstr "Infotec IS 2216"
 
-#: src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:7021
 msgid "Infotec IS 2220"
 msgstr "Infotec IS 2220"
 
-#: src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:7022
 msgid "Infotec IS 2220D"
 msgstr "Infotec IS 2220D"
 
-#: src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:7023
 msgid "Infotec IS 2225"
 msgstr "Infotec IS 2225"
 
-#: src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Infotec IS 2230"
 msgstr "Infotec IS 2230"
 
-#: src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:7025
 msgid "Infotec IS 2235"
 msgstr "Infotec IS 2235"
 
-#: src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:7026
 msgid "Infotec IS 2245"
 msgstr "Infotec IS 2245"
 
-#: src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:7027
 msgid "Infotec IS 2255"
 msgstr "Infotec IS 2255"
 
-#: src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:7028
 msgid "Infotec IS 2265"
 msgstr "Infotec IS 2265"
 
-#: src/xml/xmli18n-tmp.h:4807
+#: src/xml/xmli18n-tmp.h:7029
 msgid "Infotec IS 2275"
 msgstr "Infotec IS 2275"
 
-#: src/xml/xmli18n-tmp.h:4808
+#: src/xml/xmli18n-tmp.h:7030
 msgid "Infotec IS 2316"
 msgstr "Infotec IS 2316"
 
-#: src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:7031
 msgid "Infotec IS 2320"
 msgstr "Infotec IS 2320"
 
-#: src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:7032
 msgid "Infotec IS 2325"
 msgstr "Infotec IS 2325"
 
-#: src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Infotec IS 2416"
 msgstr "Infotec IS 2416"
 
-#: src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:7034
 msgid "Infotec IS 2425"
 msgstr "Infotec IS 2425"
 
-#: src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:7035
 msgid "Infotec IS 2430"
 msgstr "Infotec IS 2430"
 
-#: src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Infotec IS 2435"
 msgstr "Infotec IS 2435"
 
-#: src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:7037
 msgid "Infotec IS 2445"
 msgstr "Infotec IS 2445"
 
-#: src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Infotec IS 3090"
 msgstr "Infotec IS 3090"
 
-#: src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:7039
 msgid "Infotec IS 3110"
 msgstr "Infotec IS 3110"
 
-#: src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:7040
 msgid "Infotec IS 3135"
 msgstr "Infotec IS 3135"
 
-#: src/xml/xmli18n-tmp.h:4819
+#: src/xml/xmli18n-tmp.h:7041
 msgid "Infotec MP 2550"
 msgstr "Infotec MP 2550"
 
-#: src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:7042
 msgid "Infotec MP 2550B"
 msgstr "Infotec MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:7043
 msgid "Infotec MP 3350"
 msgstr "Infotec MP 3350"
 
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:7044
 msgid "Infotec MP 3350B"
 msgstr "Infotec MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:7045
 msgid "Infotec MP 4000"
 msgstr "Infotec MP 4000"
 
-#: src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:7046
 msgid "Infotec MP 4000B"
 msgstr "Infotec MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:7047
 msgid "Infotec MP 5000"
 msgstr "Infotec MP 5000"
 
-#: src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:7048
 msgid "Infotec MP 5000B"
 msgstr "Infotec MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:7049
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:7050
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:7051
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:4830
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:7057
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:4837
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:4840
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:4842
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:4852
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/xml/xmli18n-tmp.h:4853
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/xml/xmli18n-tmp.h:4854
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/xml/xmli18n-tmp.h:4855
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:4866
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/xml/xmli18n-tmp.h:4867
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/xml/xmli18n-tmp.h:4873
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Lanier 5622"
 msgstr "Lanier 5622"
 
-#: src/xml/xmli18n-tmp.h:4874
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Lanier 5627"
 msgstr "Lanier 5627"
 
-#: src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Lanier 5632"
 msgstr "Lanier 5632"
 
-#: src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Lanier 5635"
 msgstr "Lanier 5635"
 
-#: src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Lanier 5645"
 msgstr "Lanier 5645"
 
-#: src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Lanier LD0105"
 msgstr "Lanier LD0105"
 
-#: src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Lanier LD015"
 msgstr "Lanier LD015"
 
-#: src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Lanier LD035"
 msgstr "Lanier LD035"
 
-#: src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Lanier LD045"
 msgstr "Lanier LD045"
 
-#: src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Lanier LD060"
 msgstr "Lanier LD060"
 
-#: src/xml/xmli18n-tmp.h:4883
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Lanier LD075"
 msgstr "Lanier LD075"
 
-#: src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Lanier LD090"
 msgstr "Lanier LD090"
 
-#: src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Lanier LD115"
 msgstr "Lanier LD115"
 
-#: src/xml/xmli18n-tmp.h:4886
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Lanier LD116"
 msgstr "Lanier LD116"
 
-#: src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Lanier LD118"
 msgstr "Lanier LD118"
 
-#: src/xml/xmli18n-tmp.h:4888
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Lanier LD118d"
 msgstr "Lanier LD118d"
 
-#: src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Lanier LD120"
 msgstr "Lanier LD120"
 
-#: src/xml/xmli18n-tmp.h:4890
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Lanier LD120d"
 msgstr "Lanier LD120d"
 
-#: src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Lanier LD122"
 msgstr "Lanier LD122"
 
-#: src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Lanier LD127"
 msgstr "Lanier LD127"
 
-#: src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Lanier LD132"
 msgstr "Lanier LD132"
 
-#: src/xml/xmli18n-tmp.h:4894
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Lanier LD135"
 msgstr "Lanier LD135"
 
-#: src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Lanier LD145"
 msgstr "Lanier LD145"
 
-#: src/xml/xmli18n-tmp.h:4896
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Lanier LD151"
 msgstr "Lanier LD151"
 
-#: src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Lanier LD160"
 msgstr "Lanier LD160"
 
-#: src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Lanier LD175"
 msgstr "Lanier LD175"
 
-#: src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Lanier LD225"
 msgstr "Lanier LD225"
 
-#: src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Lanier LD230"
 msgstr "Lanier LD230"
 
-#: src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Lanier LD235"
 msgstr "Lanier LD235"
 
-#: src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Lanier LD245"
 msgstr "Lanier LD245"
 
-#: src/xml/xmli18n-tmp.h:4903
-msgid "Lanier MP 2500"
+#: src/xml/xmli18n-tmp.h:7125
+#, fuzzy
+msgid "Lanier MP2500/LD125"
 msgstr "Lanier MP 2500"
 
-#: src/xml/xmli18n-tmp.h:4904
-msgid "Lanier LD125"
-msgstr "Lanier LD125"
-
-#: src/xml/xmli18n-tmp.h:4905
-msgid "Lanier MP 1100"
+#: src/xml/xmli18n-tmp.h:7126
+#, fuzzy
+msgid "Lanier MP 1100/LD1100"
 msgstr "Lanier MP 1100"
 
-#: src/xml/xmli18n-tmp.h:4906
-msgid "Lanier LD1100"
-msgstr "Lanier LD1100"
-
-#: src/xml/xmli18n-tmp.h:4907
-msgid "Lanier MP 1350"
+#: src/xml/xmli18n-tmp.h:7127
+#, fuzzy
+msgid "Lanier MP 1350/LD1135"
 msgstr "Lanier MP 1350"
 
-#: src/xml/xmli18n-tmp.h:4908
-msgid "Lanier LD1135"
-msgstr "Lanier LD1135"
-
-#: src/xml/xmli18n-tmp.h:4909
-msgid "Lanier MP 1600"
+#: src/xml/xmli18n-tmp.h:7128
+#, fuzzy
+msgid "Lanier MP 1600/LD316"
 msgstr "Lanier MP 1600"
 
-#: src/xml/xmli18n-tmp.h:4910
-msgid "Lanier LD316"
-msgstr "Lanier LD316"
-
-#: src/xml/xmli18n-tmp.h:4911
-msgid "Lanier MP 161"
+#: src/xml/xmli18n-tmp.h:7129
+#, fuzzy
+msgid "Lanier MP 161/LD016"
 msgstr "Lanier MP 161"
 
-#: src/xml/xmli18n-tmp.h:4912
-msgid "Lanier LD016"
-msgstr "Lanier LD016"
-
-#: src/xml/xmli18n-tmp.h:4913
-msgid "Lanier MP 2000"
+#: src/xml/xmli18n-tmp.h:7130
+#, fuzzy
+msgid "Lanier MP 2000/LD320d"
 msgstr "Lanier MP 2000"
 
-#: src/xml/xmli18n-tmp.h:4914
-msgid "Lanier LD320d"
-msgstr "Lanier LD320d"
-
-#: src/xml/xmli18n-tmp.h:4915
-msgid "Lanier MP 2510"
+#: src/xml/xmli18n-tmp.h:7131
+#, fuzzy
+msgid "Lanier MP 2510/LD325"
 msgstr "Lanier MP 2510"
 
-#: src/xml/xmli18n-tmp.h:4916
-msgid "Lanier LD325"
-msgstr "Lanier LD325"
-
-#: src/xml/xmli18n-tmp.h:4917
-msgid "Lanier MP 2550B"
+#: src/xml/xmli18n-tmp.h:7132
+#, fuzzy
+msgid "Lanier MP 2550B/LD425B"
 msgstr "Lanier MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:4918
-msgid "Lanier LD425B"
-msgstr "Lanier LD425B"
-
-#: src/xml/xmli18n-tmp.h:4919
-msgid "Lanier MP 2550"
+#: src/xml/xmli18n-tmp.h:7133
+#, fuzzy
+msgid "Lanier MP 2550/LD425"
 msgstr "Lanier MP 2550"
 
-#: src/xml/xmli18n-tmp.h:4920
-msgid "Lanier LD425"
-msgstr "Lanier LD425"
-
-#: src/xml/xmli18n-tmp.h:4921
-msgid "Lanier MP 3010"
+#: src/xml/xmli18n-tmp.h:7134
+#, fuzzy
+msgid "Lanier MP 3010/LD330"
 msgstr "Lanier MP 3010"
 
-#: src/xml/xmli18n-tmp.h:4922
-msgid "Lanier LD330"
-msgstr "Lanier LD330"
-
-#: src/xml/xmli18n-tmp.h:4923
-msgid "Lanier MP 3350B"
+#: src/xml/xmli18n-tmp.h:7135
+#, fuzzy
+msgid "Lanier MP 3350B/LD433B"
 msgstr "Lanier MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:4924
-msgid "Lanier LD433B"
-msgstr "Lanier LD433B"
-
-#: src/xml/xmli18n-tmp.h:4925
-msgid "Lanier MP 3350"
+#: src/xml/xmli18n-tmp.h:7136
+#, fuzzy
+msgid "Lanier MP 3350/LD433"
 msgstr "Lanier MP 3350"
 
-#: src/xml/xmli18n-tmp.h:4926
-msgid "Lanier LD433"
-msgstr "Lanier LD433"
-
-#: src/xml/xmli18n-tmp.h:4927
-msgid "Lanier MP 3500"
+#: src/xml/xmli18n-tmp.h:7137
+#, fuzzy
+msgid "Lanier MP 3500/LD335"
 msgstr "Lanier MP 3500"
 
-#: src/xml/xmli18n-tmp.h:4928
-msgid "Lanier LD335"
-msgstr "Lanier LD335"
-
-#: src/xml/xmli18n-tmp.h:4929
-msgid "Lanier MP 4000B"
+#: src/xml/xmli18n-tmp.h:7138
+#, fuzzy
+msgid "Lanier MP 4000B/LD040B"
 msgstr "Lanier MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:4930
-msgid "Lanier LD040B"
-msgstr "Lanier LD040B"
-
-#: src/xml/xmli18n-tmp.h:4931
-msgid "Lanier MP 4000"
+#: src/xml/xmli18n-tmp.h:7139
+#, fuzzy
+msgid "Lanier MP 4000/LD040"
 msgstr "Lanier MP 4000"
 
-#: src/xml/xmli18n-tmp.h:4932
-msgid "Lanier LD040"
-msgstr "Lanier LD040"
-
-#: src/xml/xmli18n-tmp.h:4933
-msgid "Lanier MP 4500"
+#: src/xml/xmli18n-tmp.h:7140
+#, fuzzy
+msgid "Lanier MP 4500/LD345"
 msgstr "Lanier MP 4500"
 
-#: src/xml/xmli18n-tmp.h:4934
-msgid "Lanier LD345"
-msgstr "Lanier LD345"
-
-#: src/xml/xmli18n-tmp.h:4935
-msgid "Lanier MP 5000B"
+#: src/xml/xmli18n-tmp.h:7141
+#, fuzzy
+msgid "Lanier MP 5000B/LD050B"
 msgstr "Lanier MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:4936
-msgid "Lanier LD050B"
-msgstr "Lanier LD050B"
-
-#: src/xml/xmli18n-tmp.h:4937
-msgid "Lanier MP 5000"
+#: src/xml/xmli18n-tmp.h:7142
+#, fuzzy
+msgid "Lanier MP 5000/LD050"
 msgstr "Lanier MP 5000"
 
-#: src/xml/xmli18n-tmp.h:4938
-msgid "Lanier LD050"
-msgstr "Lanier LD050"
-
-#: src/xml/xmli18n-tmp.h:4939
-msgid "Lanier MP 5500"
+#: src/xml/xmli18n-tmp.h:7143
+#, fuzzy
+msgid "Lanier MP 5500/LD255"
 msgstr "Lanier MP 5500"
 
-#: src/xml/xmli18n-tmp.h:4940
-msgid "Lanier LD255"
-msgstr "Lanier LD255"
-
-#: src/xml/xmli18n-tmp.h:4941
-msgid "Lanier MP 6500"
+#: src/xml/xmli18n-tmp.h:7144
+#, fuzzy
+msgid "Lanier MP 6500/LD265"
 msgstr "Lanier MP 6500"
 
-#: src/xml/xmli18n-tmp.h:4942
-msgid "Lanier LD265"
-msgstr "Lanier LD265"
-
-#: src/xml/xmli18n-tmp.h:4943
-msgid "Lanier MP 7500"
+#: src/xml/xmli18n-tmp.h:7145
+#, fuzzy
+msgid "Lanier MP 7500/LD275"
 msgstr "Lanier MP 7500"
 
-#: src/xml/xmli18n-tmp.h:4944
-msgid "Lanier LD275"
-msgstr "Lanier LD275"
-
-#: src/xml/xmli18n-tmp.h:4945
-msgid "Lanier MP 9000"
+#: src/xml/xmli18n-tmp.h:7146
+#, fuzzy
+msgid "Lanier MP 9000/LD190"
 msgstr "Lanier MP 9000"
 
-#: src/xml/xmli18n-tmp.h:4946
-msgid "Lanier LD190"
-msgstr "Lanier LD190"
-
-#: src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:7148
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/xml/xmli18n-tmp.h:4950
+#: src/xml/xmli18n-tmp.h:7150
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E220"
 
-#: src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:7151
 msgid "Lexmark Optra E321"
 msgstr "Lexmark Optra E321"
 
-#: src/xml/xmli18n-tmp.h:4952
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Lexmark Optra E323"
 msgstr "Lexmark Optra E323"
 
-#: src/xml/xmli18n-tmp.h:4953
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:7155
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/xml/xmli18n-tmp.h:4960
+#: src/xml/xmli18n-tmp.h:7160
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:7161
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:7162
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/xml/xmli18n-tmp.h:4963
+#: src/xml/xmli18n-tmp.h:7163
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:7164
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:7165
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/xml/xmli18n-tmp.h:4966
-msgid "NRG 10515"
+#: src/xml/xmli18n-tmp.h:7166
+#, fuzzy
+msgid "NRG 10515/10518/10512"
 msgstr "NRG 10515"
 
-#: src/xml/xmli18n-tmp.h:4967
-msgid "NRG 10518"
-msgstr "NRG 10518"
-
-#: src/xml/xmli18n-tmp.h:4968
-msgid "NRG 10512"
-msgstr "NRG 10512"
-
-#: src/xml/xmli18n-tmp.h:4969
-msgid "NRG 2205"
+#: src/xml/xmli18n-tmp.h:7167
+#, fuzzy
+msgid "NRG 2205/2238/2212"
 msgstr "NRG 2205"
 
-#: src/xml/xmli18n-tmp.h:4970
-msgid "NRG 2238"
+#: src/xml/xmli18n-tmp.h:7168
+#, fuzzy
+msgid "NRG 2705/2738/2712"
 msgstr "NRG 2238"
 
-#: src/xml/xmli18n-tmp.h:4971
-msgid "NRG 2212"
-msgstr "NRG 2212"
-
-#: src/xml/xmli18n-tmp.h:4972
-msgid "NRG 2705"
-msgstr "NRG 2705"
-
-#: src/xml/xmli18n-tmp.h:4973
-msgid "NRG 2738"
-msgstr "NRG 2738"
-
-#: src/xml/xmli18n-tmp.h:4974
-msgid "NRG 2712"
-msgstr "NRG 2712"
+#: src/xml/xmli18n-tmp.h:7169
+#, fuzzy
+msgid "NRG 3205/3238/3212"
+msgstr "NRG 2238"
 
-#: src/xml/xmli18n-tmp.h:4975
-msgid "NRG 3205"
+#: src/xml/xmli18n-tmp.h:7170
+#, fuzzy
+msgid "NRG 3525/3508/3502"
 msgstr "NRG 3205"
 
-#: src/xml/xmli18n-tmp.h:4976
-msgid "NRG 3238"
-msgstr "NRG 3238"
-
-#: src/xml/xmli18n-tmp.h:4977
-msgid "NRG 3212"
-msgstr "NRG 3212"
-
-#: src/xml/xmli18n-tmp.h:4978
-msgid "NRG 3525"
-msgstr "NRG 3525"
-
-#: src/xml/xmli18n-tmp.h:4979
-msgid "NRG 3508"
-msgstr "NRG 3508"
-
-#: src/xml/xmli18n-tmp.h:4980
-msgid "NRG 3502"
-msgstr "NRG 3502"
-
-#: src/xml/xmli18n-tmp.h:4981
-msgid "NRG 3545"
+#: src/xml/xmli18n-tmp.h:7171
+#, fuzzy
+msgid "NRG 3545/3518/3532"
 msgstr "NRG 3545"
 
-#: src/xml/xmli18n-tmp.h:4982
-msgid "NRG 3518"
-msgstr "NRG 3518"
-
-#: src/xml/xmli18n-tmp.h:4983
-msgid "NRG 3532"
-msgstr "NRG 3532"
-
-#: src/xml/xmli18n-tmp.h:4984
-msgid "NRG 4525"
+#: src/xml/xmli18n-tmp.h:7172
+#, fuzzy
+msgid "NRG 4525/4508/4502"
 msgstr "NRG 4525"
 
-#: src/xml/xmli18n-tmp.h:4985
-msgid "NRG 4508"
-msgstr "NRG 4508"
-
-#: src/xml/xmli18n-tmp.h:4986
-msgid "NRG 4502"
-msgstr "NRG 4502"
-
-#: src/xml/xmli18n-tmp.h:4987
-msgid "NRG 4545"
+#: src/xml/xmli18n-tmp.h:7173
+#, fuzzy
+msgid "NRG 4545/4518/4532"
 msgstr "NRG 4545"
 
-#: src/xml/xmli18n-tmp.h:4988
-msgid "NRG 4518"
-msgstr "NRG 4518"
-
-#: src/xml/xmli18n-tmp.h:4989
-msgid "NRG 4532"
-msgstr "NRG 4532"
-
-#: src/xml/xmli18n-tmp.h:4990
-msgid "NRG 6002"
+#: src/xml/xmli18n-tmp.h:7174
+#, fuzzy
+msgid "NRG 6002/6005/6008"
 msgstr "NRG 6002"
 
-#: src/xml/xmli18n-tmp.h:4991
-msgid "NRG 6005"
-msgstr "NRG 6005"
-
-#: src/xml/xmli18n-tmp.h:4992
-msgid "NRG 6008"
-msgstr "NRG 6008"
-
-#: src/xml/xmli18n-tmp.h:4993
-msgid "NRG 7502"
-msgstr "NRG 7502"
-
-#: src/xml/xmli18n-tmp.h:4994
-msgid "NRG 7505"
-msgstr "NRG 7505"
-
-#: src/xml/xmli18n-tmp.h:4995
-msgid "NRG 7508"
-msgstr "NRG 7508"
+#: src/xml/xmli18n-tmp.h:7175
+#, fuzzy
+msgid "NRG 7502/7505/7508"
+msgstr "NRG 2705"
 
-#: src/xml/xmli18n-tmp.h:4996
-msgid "NRG 9005"
+#: src/xml/xmli18n-tmp.h:7176
+#, fuzzy
+msgid "NRG 9005/9008/9002"
 msgstr "NRG 9005"
 
-#: src/xml/xmli18n-tmp.h:4997
-msgid "NRG 9008"
-msgstr "NRG 9008"
-
-#: src/xml/xmli18n-tmp.h:4998
-msgid "NRG 9002"
-msgstr "NRG 9002"
-
-#: src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:7177
 msgid "NRG DSm415"
 msgstr "NRG DSm415"
 
-#: src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:7178
 msgid "NRG DSm615"
 msgstr "NRG DSm615"
 
-#: src/xml/xmli18n-tmp.h:5001
+#: src/xml/xmli18n-tmp.h:7179
 msgid "NRG DSm616"
 msgstr "NRG DSm616"
 
-#: src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:7180
 msgid "NRG DSm618"
 msgstr "NRG DSm618"
 
-#: src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:7181
 msgid "NRG DSm618d"
 msgstr "NRG DSm618d"
 
-#: src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:7182
 msgid "NRG DSm620"
 msgstr "NRG DSm620"
 
-#: src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:7183
 msgid "NRG DSm620d"
 msgstr "NRG DSm620d"
 
-#: src/xml/xmli18n-tmp.h:5006
+#: src/xml/xmli18n-tmp.h:7184
 msgid "NRG DSm622"
 msgstr "NRG DSm622"
 
-#: src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:7185
 msgid "NRG DSm627"
 msgstr "NRG DSm627"
 
-#: src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:7186
 msgid "NRG DSm632"
 msgstr "NRG DSm632"
 
-#: src/xml/xmli18n-tmp.h:5009
+#: src/xml/xmli18n-tmp.h:7187
 msgid "NRG DSm635"
 msgstr "NRG DSm635"
 
-#: src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:7188
 msgid "NRG DSm645"
 msgstr "NRG DSm645"
 
-#: src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:7189
 msgid "NRG DSm651"
 msgstr "NRG DSm651"
 
-#: src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:7190
 msgid "NRG DSm660"
 msgstr "NRG DSm660"
 
-#: src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:7191
 msgid "NRG DSm675"
 msgstr "NRG DSm675"
 
-#: src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:7192
 msgid "NRG DSm725"
 msgstr "NRG DSm725"
 
-#: src/xml/xmli18n-tmp.h:5015
+#: src/xml/xmli18n-tmp.h:7193
 msgid "NRG DSm730"
 msgstr "NRG DSm730"
 
-#: src/xml/xmli18n-tmp.h:5016
+#: src/xml/xmli18n-tmp.h:7194
 msgid "NRG DSm735"
 msgstr "NRG DSm735"
 
-#: src/xml/xmli18n-tmp.h:5017
+#: src/xml/xmli18n-tmp.h:7195
 msgid "NRG DSm745"
 msgstr "NRG DSm745"
 
-#: src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:7196
 msgid "NRG MP 1100"
 msgstr "NRG MP 1100"
 
-#: src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:7197
 msgid "NRG MP 1350"
 msgstr "NRG MP 1350"
 
-#: src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:7198
 msgid "NRG MP 1600"
 msgstr "NRG MP 1600"
 
-#: src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:7199
 msgid "NRG MP 161"
 msgstr "NRG MP 161"
 
-#: src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:7200
 msgid "NRG MP 2000"
 msgstr "NRG MP 2000"
 
-#: src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:7201
 msgid "NRG MP 2500"
 msgstr "NRG MP 2500"
 
-#: src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:7202
 msgid "NRG MP 2510"
 msgstr "NRG MP 2510"
 
-#: src/xml/xmli18n-tmp.h:5025
+#: src/xml/xmli18n-tmp.h:7203
 msgid "NRG MP 2550"
 msgstr "NRG MP 2550"
 
-#: src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:7204
 msgid "NRG MP 2550B"
 msgstr "NRG MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:7205
 msgid "NRG MP 3010"
 msgstr "NRG MP 3010"
 
-#: src/xml/xmli18n-tmp.h:5028
+#: src/xml/xmli18n-tmp.h:7206
 msgid "NRG MP 3350"
 msgstr "NRG MP 3350"
 
-#: src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:7207
 msgid "NRG MP 3350B"
 msgstr "NRG MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:7208
 msgid "NRG MP 3500"
 msgstr "NRG MP 3500"
 
-#: src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:7209
 msgid "NRG MP 4000"
 msgstr "NRG MP 4000"
 
-#: src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:7210
 msgid "NRG MP 4000B"
 msgstr "NRG MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:5033
+#: src/xml/xmli18n-tmp.h:7211
 msgid "NRG MP 4500"
 msgstr "NRG MP 4500"
 
-#: src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:7212
 msgid "NRG MP 5000"
 msgstr "NRG MP 5000"
 
-#: src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:7213
 msgid "NRG MP 5000B"
 msgstr "NRG MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:7214
 msgid "NRG MP 5500"
 msgstr "NRG MP 5500"
 
-#: src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:7215
 msgid "NRG MP 6500"
 msgstr "NRG MP 6500"
 
-#: src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:7216
 msgid "NRG MP 7500"
 msgstr "NRG MP 7500"
 
-#: src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:7217
 msgid "NRG MP 9000"
 msgstr "NRG MP 9000"
 
-#: src/xml/xmli18n-tmp.h:5040
+#: src/xml/xmli18n-tmp.h:7218
 #, fuzzy
 msgid "Oki OL400"
 msgstr "Okidata OL400"
 
-#: src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:7219
 #, fuzzy
 msgid "Oki OL400e"
 msgstr "Okidata OL400e"
 
-#: src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:7220
 #, fuzzy
 msgid "Oki OL400ex"
 msgstr "Okidata OL400ex"
 
-#: src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:7221
 #, fuzzy
 msgid "Oki OL410e"
 msgstr "Okidata OL410e"
 
-#: src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:7222
 #, fuzzy
 msgid "Oki OL600e"
 msgstr "Okidata OL600e"
 
-#: src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:7223
 #, fuzzy
 msgid "Oki OL610e/S"
 msgstr "Okidata OL610e/S"
 
-#: src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:7224
 #, fuzzy
 msgid "Oki OL800"
 msgstr "Okidata OL800"
 
-#: src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:7225
 #, fuzzy
 msgid "Oki OL810ex"
 msgstr "Okidata OL810ex"
 
-#: src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:7226
 #, fuzzy
 msgid "Oki Okipage 6e"
 msgstr "Okidata Okipage 6e"
 
-#: src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:7227
 #, fuzzy
 msgid "Oki Okipage 6ex"
 msgstr "Okidata Okipage 6ex"
 
-#: src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:7228
 #, fuzzy
 msgid "Oki Okipage 8p"
 msgstr "Okidata Okipage 8p"
 
-#: src/xml/xmli18n-tmp.h:5051
+#: src/xml/xmli18n-tmp.h:7229
 #, fuzzy
 msgid "Oki Okipage 10e"
 msgstr "Okidata Okipage 10e"
 
-#: src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:7230
 #, fuzzy
 msgid "Oki Okipage 10ex"
 msgstr "Okidata Okipage 10ex"
 
-#: src/xml/xmli18n-tmp.h:5053
+#: src/xml/xmli18n-tmp.h:7231
 #, fuzzy
 msgid "Oki Okipage 14ex"
 msgstr "Okidata Okipage 14ex"
 
-#: src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Okidata Super 6e"
 
-#: src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:7234
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:7235
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/xml/xmli18n-tmp.h:5060
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/xml/xmli18n-tmp.h:5062
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5063
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Ricoh Aficio 1022"
 msgstr "Ricoh Aficio 1022"
 
-#: src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:7242
 msgid "Ricoh Aficio 1027"
 msgstr "Ricoh Aficio 1027"
 
-#: src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:7243
 msgid "Ricoh Aficio 1032"
 msgstr "Ricoh Aficio 1032"
 
-#: src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:7244
 msgid "Ricoh Aficio 1035"
 msgstr "Ricoh Aficio 1035"
 
-#: src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:7245
 msgid "Ricoh Aficio 1045"
 msgstr "Ricoh Aficio 1045"
 
-#: src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:7246
 msgid "Ricoh Aficio 1060"
 msgstr "Ricoh Aficio 1060"
 
-#: src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:7247
 msgid "Ricoh Aficio 1075"
 msgstr "Ricoh Aficio 1075"
 
-#: src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:7248
 msgid "Ricoh Aficio 1515"
 msgstr "Ricoh Aficio 1515"
 
-#: src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:7249
 msgid "Ricoh Aficio 2015"
 msgstr "Ricoh Aficio 2015"
 
-#: src/xml/xmli18n-tmp.h:5072
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Ricoh Aficio 2016"
 msgstr "Ricoh Aficio 2016"
 
-#: src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Ricoh Aficio 2018"
 msgstr "Ricoh Aficio 2018"
 
-#: src/xml/xmli18n-tmp.h:5074
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Ricoh Aficio 2018D"
 msgstr "Ricoh Aficio 2018D"
 
-#: src/xml/xmli18n-tmp.h:5075
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Ricoh Aficio 2020"
 msgstr "Ricoh Aficio 2020"
 
-#: src/xml/xmli18n-tmp.h:5076
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Ricoh Aficio 2020D"
 msgstr "Ricoh Aficio 2020D"
 
-#: src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:7255
 msgid "Ricoh Aficio 2022"
 msgstr "Ricoh Aficio 2022"
 
-#: src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Ricoh Aficio 2027"
 msgstr "Ricoh Aficio 2027"
 
-#: src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Ricoh Aficio 2032"
 msgstr "Ricoh Aficio 2032"
 
-#: src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:7258
 msgid "Ricoh Aficio 2035"
 msgstr "Ricoh Aficio 2035"
 
-#: src/xml/xmli18n-tmp.h:5081
+#: src/xml/xmli18n-tmp.h:7259
 msgid "Ricoh Aficio 2035e"
 msgstr "Ricoh Aficio 2035e"
 
-#: src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Ricoh Aficio 2045"
 msgstr "Ricoh Aficio 2045"
 
-#: src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Ricoh Aficio 2045e"
 msgstr "Ricoh Aficio 2045e"
 
-#: src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Ricoh Aficio 2051"
 msgstr "Ricoh Aficio 2051"
 
-#: src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:7263
 msgid "Ricoh Aficio 2060"
 msgstr "Ricoh Aficio 2060"
 
-#: src/xml/xmli18n-tmp.h:5086
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Ricoh Aficio 2075"
 msgstr "Ricoh Aficio 2075"
 
-#: src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Ricoh Aficio 2090"
 msgstr "Ricoh Aficio 2090"
 
-#: src/xml/xmli18n-tmp.h:5088
+#: src/xml/xmli18n-tmp.h:7266
 msgid "Ricoh Aficio 2105"
 msgstr "Ricoh Aficio 2105"
 
-#: src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:7267
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5090
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Ricoh Aficio 3025"
 msgstr "Ricoh Aficio 3025"
 
-#: src/xml/xmli18n-tmp.h:5091
+#: src/xml/xmli18n-tmp.h:7269
 msgid "Ricoh Aficio 3030"
 msgstr "Ricoh Aficio 3030"
 
-#: src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:7270
 msgid "Ricoh Aficio 3035"
 msgstr "Ricoh Aficio 3035"
 
-#: src/xml/xmli18n-tmp.h:5093
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Ricoh Aficio 3045"
 msgstr "Ricoh Aficio 3045"
 
-#: src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Ricoh Aficio MP 1100"
 msgstr "Ricoh Aficio MP 1100"
 
-#: src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Ricoh Aficio MP 1350"
 msgstr "Ricoh Aficio MP 1350"
 
-#: src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Ricoh Aficio MP 1600"
 msgstr "Ricoh Aficio MP 1600"
 
-#: src/xml/xmli18n-tmp.h:5099
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Ricoh Aficio MP 161"
 msgstr "Ricoh Aficio MP 161"
 
-#: src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Ricoh Aficio MP 2000"
 msgstr "Ricoh Aficio MP 2000"
 
-#: src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Ricoh Aficio MP 2500"
 msgstr "Ricoh Aficio MP 2500"
 
-#: src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Ricoh Aficio MP 2510"
 msgstr "Ricoh Aficio MP 2510"
 
-#: src/xml/xmli18n-tmp.h:5103
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Ricoh Aficio MP 2550"
 msgstr "Ricoh Aficio MP 2550"
 
-#: src/xml/xmli18n-tmp.h:5104
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Ricoh Aficio MP 2550B"
 msgstr "Ricoh Aficio MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Ricoh Aficio MP 3010"
 msgstr "Ricoh Aficio MP 3010"
 
-#: src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:7284
 msgid "Ricoh Aficio MP 3350"
 msgstr "Ricoh Aficio MP 3350"
 
-#: src/xml/xmli18n-tmp.h:5107
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Ricoh Aficio MP 3350B"
 msgstr "Ricoh Aficio MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:5108
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Ricoh Aficio MP 3500"
 msgstr "Ricoh Aficio MP 3500"
 
-#: src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Ricoh Aficio MP 4000"
 msgstr "Ricoh Aficio MP 4000"
 
-#: src/xml/xmli18n-tmp.h:5110
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Ricoh Aficio MP 4000B"
 msgstr "Ricoh Aficio MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Ricoh Aficio MP 4500"
 msgstr "Ricoh Aficio MP 4500"
 
-#: src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Ricoh Aficio MP 5000"
 msgstr "Ricoh Aficio MP 5000"
 
-#: src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Ricoh Aficio MP 5000B"
 msgstr "Ricoh Aficio MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Ricoh Aficio MP 5500"
 msgstr "Ricoh Aficio MP 5500"
 
-#: src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Ricoh Aficio MP 6500"
 msgstr "Ricoh Aficio MP 6500"
 
-#: src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Ricoh Aficio MP 7500"
 msgstr "Ricoh Aficio MP 7500"
 
-#: src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Ricoh Aficio MP 9000"
 msgstr "Ricoh Aficio MP 9000"
 
-#: src/xml/xmli18n-tmp.h:5118
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Samsung ML-1250"
 msgstr "Samsung ML-1250"
 
-#: src/xml/xmli18n-tmp.h:5120
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Samsung ML-1450"
 msgstr "Samsung ML-1450"
 
-#: src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Samsung ML-1450PS"
 msgstr "Samsung ML-1450PS"
 
-#: src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Samsung ML-1650"
 msgstr "Samsung ML-1650"
 
-#: src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Samsung ML-1651N"
 msgstr "Samsung ML-1651N"
 
-#: src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Samsung ML-1750"
 msgstr "Samsung ML-1750"
 
-#: src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Samsung ML-2150"
 msgstr "Samsung ML-2150"
 
-#: src/xml/xmli18n-tmp.h:5126
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Samsung ML-2150PS"
 msgstr "Samsung ML-2150PS"
 
-#: src/xml/xmli18n-tmp.h:5127
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Samsung ML-2151N"
 msgstr "Samsung ML-2151N"
 
-#: src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Samsung ML-2151NPS"
 msgstr "Samsung ML-2151NPS"
 
-#: src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Samsung ML-2152W"
 msgstr "Samsung ML-2152W"
 
-#: src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Samsung ML-2152WPS"
 msgstr "Samsung ML-2152WPS"
 
-#: src/xml/xmli18n-tmp.h:5131
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Samsung ML-2250"
 msgstr "Samsung ML-2250"
 
-#: src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Samsung ML-2550"
 msgstr "Samsung ML-2550"
 
-#: src/xml/xmli18n-tmp.h:5133
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Samsung ML-2551N"
 msgstr "Samsung ML-2551N"
 
-#: src/xml/xmli18n-tmp.h:5134
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Samsung ML-2552W"
 msgstr "Samsung ML-2552W"
 
-#: src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/xml/xmli18n-tmp.h:5138
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Samsung ML-7300"
 msgstr "Samsung ML-7300"
 
-#: src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Samsung ML-7300N"
 msgstr "Samsung ML-7300N"
 
-#: src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/xml/xmli18n-tmp.h:5146
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/xml/xmli18n-tmp.h:5147
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Savin 2522"
 msgstr "Savin 2522"
 
-#: src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Savin 2527"
 msgstr "Savin 2527"
 
-#: src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Savin 2532"
 msgstr "Savin 2532"
 
-#: src/xml/xmli18n-tmp.h:5150
-msgid "Savin 2535"
-msgstr "Savin 2535"
-
-#: src/xml/xmli18n-tmp.h:5151
-msgid "Savin 2235"
-msgstr "Savin 2235"
-
-#: src/xml/xmli18n-tmp.h:5152
-msgid "Savin 2545"
-msgstr "Savin 2545"
+#: src/xml/xmli18n-tmp.h:7328
+#, fuzzy
+msgid "Savin 2535/2235"
+msgstr "Savin 2522"
 
-#: src/xml/xmli18n-tmp.h:5153
-msgid "Savin 2245"
-msgstr "Savin 2245"
+#: src/xml/xmli18n-tmp.h:7329
+#, fuzzy
+msgid "Savin 2545/2245"
+msgstr "Savin 2522"
 
-#: src/xml/xmli18n-tmp.h:5154
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Savin 2560"
 msgstr "Savin 2560"
 
-#: src/xml/xmli18n-tmp.h:5155
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Savin 2575"
 msgstr "Savin 2575"
 
-#: src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Savin 3515"
 msgstr "Savin 3515"
 
-#: src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Savin 40105"
 msgstr "Savin 40105"
 
-#: src/xml/xmli18n-tmp.h:5158
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Savin 4015"
 msgstr "Savin 4015"
 
-#: src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Savin 4018"
 msgstr "Savin 4018"
 
-#: src/xml/xmli18n-tmp.h:5160
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Savin 4018d"
 msgstr "Savin 4018d"
 
-#: src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Savin 4022"
 msgstr "Savin 4022"
 
-#: src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Savin 4027"
 msgstr "Savin 4027"
 
-#: src/xml/xmli18n-tmp.h:5163
-msgid "Savin 4035"
-msgstr "Savin 4035"
-
-#: src/xml/xmli18n-tmp.h:5164
-msgid "Savin 4135g"
+#: src/xml/xmli18n-tmp.h:7339
+#, fuzzy
+msgid "Savin 4035/4135g"
 msgstr "Savin 4135g"
 
-#: src/xml/xmli18n-tmp.h:5165
-msgid "Savin 4035e"
-msgstr "Savin 4035e"
-
-#: src/xml/xmli18n-tmp.h:5166
-msgid "Savin 4135eG"
+#: src/xml/xmli18n-tmp.h:7340
+#, fuzzy
+msgid "Savin 4035e/4135eG"
 msgstr "Savin 4135eG"
 
-#: src/xml/xmli18n-tmp.h:5167
-msgid "Savin 4045"
-msgstr "Savin 4045"
-
-#: src/xml/xmli18n-tmp.h:5168
-msgid "Savin 4145g"
+#: src/xml/xmli18n-tmp.h:7341
+#, fuzzy
+msgid "Savin 4045/4145g"
 msgstr "Savin 4145g"
 
-#: src/xml/xmli18n-tmp.h:5169
-msgid "Savin 4045e"
-msgstr "Savin 4045e"
-
-#: src/xml/xmli18n-tmp.h:5170
-msgid "Savin 4145eG"
+#: src/xml/xmli18n-tmp.h:7342
+#, fuzzy
+msgid "Savin 4045e/4145eG"
 msgstr "Savin 4145eG"
 
-#: src/xml/xmli18n-tmp.h:5171
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Savin 4051"
 msgstr "Savin 4051"
 
-#: src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Savin 4060"
 msgstr "Savin 4060"
 
-#: src/xml/xmli18n-tmp.h:5173
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Savin 4075"
 msgstr "Savin 4075"
 
-#: src/xml/xmli18n-tmp.h:5174
+#: src/xml/xmli18n-tmp.h:7346
 msgid "Savin 4090"
 msgstr "Savin 4090"
 
-#: src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Savin 7025"
 msgstr "Savin 7025"
 
-#: src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:7348
 msgid "Savin 8016"
 msgstr "Savin 8016"
 
-#: src/xml/xmli18n-tmp.h:5177
+#: src/xml/xmli18n-tmp.h:7349
 msgid "Savin 8020"
 msgstr "Savin 8020"
 
-#: src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Savin 8020d"
 msgstr "Savin 8020d"
 
-#: src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Savin 8025"
 msgstr "Savin 8025"
 
-#: src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Savin 8025e"
 msgstr "Savin 8025e"
 
-#: src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:7353
 msgid "Savin 8030"
 msgstr "Savin 8030"
 
-#: src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Savin 8030e"
 msgstr "Savin 8030e"
 
-#: src/xml/xmli18n-tmp.h:5183
-msgid "Savin 8035"
-msgstr "Savin 8035"
-
-#: src/xml/xmli18n-tmp.h:5184
-msgid "Savin 8035g"
+#: src/xml/xmli18n-tmp.h:7355
+#, fuzzy
+msgid "Savin 8035/8035g"
 msgstr "Savin 8035g"
 
-#: src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Savin 8035e"
 msgstr "Savin 8035e"
 
-#: src/xml/xmli18n-tmp.h:5186
-msgid "Savin 8045"
-msgstr "Savin 8045"
-
-#: src/xml/xmli18n-tmp.h:5187
-msgid "Savin 8045g"
+#: src/xml/xmli18n-tmp.h:7357
+#, fuzzy
+msgid "Savin 8045/8045g"
 msgstr "Savin 8045g"
 
-#: src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Savin 8045e"
 msgstr "Savin 8045e"
 
-#: src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Savin 8055"
 msgstr "Savin 8055"
 
-#: src/xml/xmli18n-tmp.h:5190
+#: src/xml/xmli18n-tmp.h:7360
 msgid "Savin 8065"
 msgstr "Savin 8065"
 
-#: src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Savin 8075"
 msgstr "Savin 8075"
 
-#: src/xml/xmli18n-tmp.h:5192
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Savin 8090"
 msgstr "Savin 8090"
 
-#: src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Savin 8110"
 msgstr "Savin 8110"
 
-#: src/xml/xmli18n-tmp.h:5194
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Savin 8135"
 msgstr "Savin 8135"
 
-#: src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Savin 816"
 msgstr "Savin 816"
 
-#: src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Savin 9016"
 msgstr "Savin 9016"
 
-#: src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Savin 9021d"
 msgstr "Savin 9021d"
 
-#: src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Savin 9025"
 msgstr "Savin 9025"
 
-#: src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Savin 9025b"
 msgstr "Savin 9025b"
 
-#: src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:7370
 msgid "Savin 9033"
 msgstr "Savin 9033"
 
-#: src/xml/xmli18n-tmp.h:5201
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Savin 9033b"
 msgstr "Savin 9033b"
 
-#: src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Savin 9040"
 msgstr "Savin 9040"
 
-#: src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:7373
 msgid "Savin 9040b"
 msgstr "Savin 9040b"
 
-#: src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:7374
 msgid "Savin 9050"
 msgstr "Savin 9050"
 
-#: src/xml/xmli18n-tmp.h:5205
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Savin 9050b"
 msgstr "Savin 9050b"
 
-#: src/xml/xmli18n-tmp.h:5206
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Sharp AR-M257"
 msgstr "Sharp AR-M257"
 
-#: src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:7379
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/xml/xmli18n-tmp.h:5211
+#: src/xml/xmli18n-tmp.h:7381
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/xml/xmli18n-tmp.h:5212
+#: src/xml/xmli18n-tmp.h:7382
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/xml/xmli18n-tmp.h:5213
+#: src/xml/xmli18n-tmp.h:7383
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/xml/xmli18n-tmp.h:5216
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/xml/xmli18n-tmp.h:5221
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox WorkCentre M118"
 
-#: src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Compaq IJ1200"
 msgstr "Compaq IJ1200"
 
-#: src/xml/xmli18n-tmp.h:5224
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Lexmark X73"
 msgstr "Lexmark X73"
 
-#: src/xml/xmli18n-tmp.h:5225
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:5227
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:5230
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:7404
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/xml/xmli18n-tmp.h:5236
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:7409
 msgid "Olympus P-S100"
 msgstr "Olympus P-S100"
 
-#: src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:7410
 msgid "Canon CP-10"
 msgstr "Canon CP-10"
 
-#: src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/xml/xmli18n-tmp.h:5244
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Canon SELPHY-CP-400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:5247
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Canon SELPHY-CP-500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Canon SELPHY-CP-510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:5249
+#: src/xml/xmli18n-tmp.h:7419
+#, fuzzy
+msgid "Canon SELPHY-CP-520"
+msgstr "Canon SELPHY-CP-500"
+
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Canon SELPHY-CP-600"
 msgstr "Canon SELPHY-CP-600"
 
-#: src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Canon SELPHY-CP-710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Canon SELPHY-CP-720"
 msgstr "Canon SELPHY-CP-720"
 
-#: src/xml/xmli18n-tmp.h:5252
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Canon SELPHY-CP-730"
 msgstr "Canon SELPHY-CP-730"
 
-#: src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Canon SELPHY-CP-740"
 msgstr "Canon SELPHY-CP-740"
 
-#: src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Canon SELPHY-CP-750"
 msgstr "Canon SELPHY-CP-750"
 
-#: src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Canon SELPHY ES1"
 msgstr "Canon SELPHY ES1"
 
-#: src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Canon SELPHY ES2"
 msgstr "Canon SELPHY ES2"
 
-#: src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Canon SELPHY ES20"
 msgstr "Canon SELPHY ES20"
 
-#: src/xml/xmli18n-tmp.h:5258
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Sony DPP-EX5"
 msgstr "Sony DPP-EX5"
 
-#: src/xml/xmli18n-tmp.h:5259
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Sony DPP-EX7"
 msgstr "Sony DPP-EX7"
 
-#: src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR100"
 
-#: src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:7434
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm FinePix-NX-500"
 
-#: src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:7438
 msgid "Shinko CHC-S9045"
 msgstr "Shinko CHC-S9045"
 
-#: src/xml/xmli18n-tmp.h:5268
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Dai Nippon Printing DS40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Dai Nippon Printing DS80"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "RAW DATA 16 bit"
 msgstr "RAW DATA 16 bit"
 
-#: src/xml/xmli18n-tmp.h:5269
+#: src/xml/xmli18n-tmp.h:7442
 msgid "RAW DATA 8 bit"
 msgstr "RAW DATA 8 bit"
 
+#, fuzzy
+#~ msgid "Lower Front Tray"
+#~ msgstr "Front Tray"
+
+#, fuzzy
+#~ msgid "Upper Front Tray"
+#~ msgstr "Front Tray"
+
+#, fuzzy
+#~ msgid "Epson Stylus Offixe TX300F"
+#~ msgstr "Epson Stylus CX3100"
+
+#~ msgid "Gestetner 3532"
+#~ msgstr "Gestetner 3532"
+
+#~ msgid "Gestetner 4532"
+#~ msgstr "Gestetner 4532"
+
+#~ msgid "Gestetner DSm635"
+#~ msgstr "Gestetner DSm635"
+
+#~ msgid "Gestetner DS645G"
+#~ msgstr "Gestetner DS645G"
+
+#~ msgid "Gestetner DSm735"
+#~ msgstr "Gestetner DSm735"
+
+#~ msgid "Gestetner DSm745"
+#~ msgstr "Gestetner DSm745"
+
+#~ msgid "Gestetner MP1100"
+#~ msgstr "Gestetner MP1100"
+
+#~ msgid "Gestetner MP1350"
+#~ msgstr "Gestetner MP1350"
+
+#~ msgid "Gestetner DSm716"
+#~ msgstr "Gestetner DSm716"
+
+#~ msgid "Gestetner MP2000"
+#~ msgstr "Gestetner MP2000"
+
+#~ msgid "Gestetner DSm625"
+#~ msgstr "Gestetner DSm625"
+
+#~ msgid "Gestetner MP3500"
+#~ msgstr "Gestetner MP3500"
+
+#~ msgid "Gestetner MP4500"
+#~ msgstr "Gestetner MP4500"
+
+#~ msgid "Gestetner DSm755"
+#~ msgstr "Gestetner DSm755"
+
+#~ msgid "Gestetner DSm765"
+#~ msgstr "Gestetner DSm765"
+
+#~ msgid "Gestetner DSm775"
+#~ msgstr "Gestetner DSm775"
+
+#~ msgid "Gestetner DSm790"
+#~ msgstr "Gestetner DSm790"
+
+#~ msgid "Gestetner DSm416"
+#~ msgstr "Gestetner DSm416"
+
+#~ msgid "Gestetner DSm725e"
+#~ msgstr "Gestetner DSm725e"
+
+#~ msgid "Gestetner DSm730e"
+#~ msgstr "Gestetner DSm730e"
+
+#~ msgid "Lanier LD125"
+#~ msgstr "Lanier LD125"
+
+#~ msgid "Lanier LD1100"
+#~ msgstr "Lanier LD1100"
+
+#~ msgid "Lanier LD1135"
+#~ msgstr "Lanier LD1135"
+
+#~ msgid "Lanier LD316"
+#~ msgstr "Lanier LD316"
+
+#~ msgid "Lanier LD016"
+#~ msgstr "Lanier LD016"
+
+#~ msgid "Lanier LD320d"
+#~ msgstr "Lanier LD320d"
+
+#~ msgid "Lanier LD325"
+#~ msgstr "Lanier LD325"
+
+#~ msgid "Lanier LD425B"
+#~ msgstr "Lanier LD425B"
+
+#~ msgid "Lanier LD425"
+#~ msgstr "Lanier LD425"
+
+#~ msgid "Lanier LD330"
+#~ msgstr "Lanier LD330"
+
+#~ msgid "Lanier LD433B"
+#~ msgstr "Lanier LD433B"
+
+#~ msgid "Lanier LD433"
+#~ msgstr "Lanier LD433"
+
+#~ msgid "Lanier LD335"
+#~ msgstr "Lanier LD335"
+
+#~ msgid "Lanier LD040B"
+#~ msgstr "Lanier LD040B"
+
+#~ msgid "Lanier LD040"
+#~ msgstr "Lanier LD040"
+
+#~ msgid "Lanier LD345"
+#~ msgstr "Lanier LD345"
+
+#~ msgid "Lanier LD050B"
+#~ msgstr "Lanier LD050B"
+
+#~ msgid "Lanier LD050"
+#~ msgstr "Lanier LD050"
+
+#~ msgid "Lanier LD255"
+#~ msgstr "Lanier LD255"
+
+#~ msgid "Lanier LD265"
+#~ msgstr "Lanier LD265"
+
+#~ msgid "Lanier LD275"
+#~ msgstr "Lanier LD275"
+
+#~ msgid "Lanier LD190"
+#~ msgstr "Lanier LD190"
+
+#~ msgid "NRG 10518"
+#~ msgstr "NRG 10518"
+
+#~ msgid "NRG 10512"
+#~ msgstr "NRG 10512"
+
+#~ msgid "NRG 2212"
+#~ msgstr "NRG 2212"
+
+#~ msgid "NRG 2738"
+#~ msgstr "NRG 2738"
+
+#~ msgid "NRG 2712"
+#~ msgstr "NRG 2712"
+
+#~ msgid "NRG 3238"
+#~ msgstr "NRG 3238"
+
+#~ msgid "NRG 3212"
+#~ msgstr "NRG 3212"
+
+#~ msgid "NRG 3525"
+#~ msgstr "NRG 3525"
+
+#~ msgid "NRG 3508"
+#~ msgstr "NRG 3508"
+
+#~ msgid "NRG 3502"
+#~ msgstr "NRG 3502"
+
+#~ msgid "NRG 3518"
+#~ msgstr "NRG 3518"
+
+#~ msgid "NRG 3532"
+#~ msgstr "NRG 3532"
+
+#~ msgid "NRG 4508"
+#~ msgstr "NRG 4508"
+
+#~ msgid "NRG 4502"
+#~ msgstr "NRG 4502"
+
+#~ msgid "NRG 4518"
+#~ msgstr "NRG 4518"
+
+#~ msgid "NRG 4532"
+#~ msgstr "NRG 4532"
+
+#~ msgid "NRG 6005"
+#~ msgstr "NRG 6005"
+
+#~ msgid "NRG 6008"
+#~ msgstr "NRG 6008"
+
+#~ msgid "NRG 7502"
+#~ msgstr "NRG 7502"
+
+#~ msgid "NRG 7505"
+#~ msgstr "NRG 7505"
+
+#~ msgid "NRG 7508"
+#~ msgstr "NRG 7508"
+
+#~ msgid "NRG 9008"
+#~ msgstr "NRG 9008"
+
+#~ msgid "NRG 9002"
+#~ msgstr "NRG 9002"
+
+#~ msgid "Savin 2535"
+#~ msgstr "Savin 2535"
+
+#~ msgid "Savin 2235"
+#~ msgstr "Savin 2235"
+
+#~ msgid "Savin 2545"
+#~ msgstr "Savin 2545"
+
+#~ msgid "Savin 2245"
+#~ msgstr "Savin 2245"
+
+#~ msgid "Savin 4035"
+#~ msgstr "Savin 4035"
+
+#~ msgid "Savin 4035e"
+#~ msgstr "Savin 4035e"
+
+#~ msgid "Savin 4045"
+#~ msgstr "Savin 4045"
+
+#~ msgid "Savin 4045e"
+#~ msgstr "Savin 4045e"
+
+#~ msgid "Savin 8035"
+#~ msgstr "Savin 8035"
+
+#~ msgid "Savin 8045"
+#~ msgstr "Savin 8045"
+
 #~ msgid "ISOLatin1"
 #~ msgstr "UTF-8"
diff --git a/po/es.gmo b/po/es.gmo
index 8018667..f95e103 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 454a2e5..ece5f61 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-21 22:25-0500\n"
+"POT-Creation-Date: 2009-07-26 19:14-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"
@@ -18,7 +18,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2109 src/main/print-pcl.c:1779
+#: src/main/print-escp2.c:2314 src/main/print-pcl.c:1779
 #, fuzzy
 msgid "Default"
 msgstr "Establecer por Omisión"
@@ -99,15 +99,15 @@ msgstr "Densidad:"
 
 #: src/main/dither-main.c:91 src/main/print-canon.c:300
 #: src/main/print-canon.c:308 src/main/print-canon.c:316
-#: src/main/print-canon.c:324 src/main/print-escp2.c:439
-#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
-#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-canon.c:324 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: 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-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:1769
-#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
-#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1935
+#: src/main/print-olympus.c:1943 src/main/print-olympus.c:1951
+#: src/main/print-olympus.c:1959 src/main/print-pcl.c:1324
 #: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
 #: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
@@ -169,7 +169,7 @@ msgid "Dither algorithm"
 msgstr "Algoritmo de Entramado"
 
 #: src/main/print-canon.c:199 src/main/print-escp2.c:165
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1866
 #: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
@@ -187,8 +187,8 @@ msgstr "Tamaño"
 #: src/main/print-escp2.c:254 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:1704 src/main/print-olympus.c:1710
-#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-olympus.c:1866 src/main/print-olympus.c:1872
+#: src/main/print-olympus.c:1878 src/main/print-olympus.c:1884
 #: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
 #: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
 #: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
@@ -198,32 +198,32 @@ msgid "Basic Printer Setup"
 msgstr "Configuración de la Impresora"
 
 #: src/main/print-canon.c:200 src/main/print-escp2.c:166
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1867
 #: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Tamaño del papel al que desea imprimir"
 
 #: src/main/print-canon.c:205 src/main/print-escp2.c:171
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1259 src/cups/genppd.c:1339 src/cups/genppd.c:2001
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1872
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1372 src/cups/genppd.c:2035
 msgid "Media Type"
 msgstr "Tipo de Medio"
 
 #: src/main/print-canon.c:206 src/main/print-escp2.c:172
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1873
 #: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
 #: src/main/print-canon.c:211 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
-#: src/main/print-pcl.c:1265 src/cups/genppd.c:1368 src/cups/genppd.c:2020
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1878
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1401 src/cups/genppd.c:2054
 msgid "Media Source"
 msgstr "Fuente de Medio"
 
 #: src/main/print-canon.c:212 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1879
 #: src/main/print-pcl.c:1266
 #, fuzzy
 msgid "Source (input slot) of the media"
@@ -261,8 +261,8 @@ msgstr ""
 #: src/main/print-canon.c:235 src/main/print-canon.c:241
 #: src/main/print-canon.c:253 src/main/print-escp2.c:207
 #: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1906
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
@@ -277,25 +277,25 @@ msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:247 src/main/print-escp2.c:219
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
-#: src/main/print-pcl.c:1277 src/cups/genppd.c:1446 src/cups/genppd.c:2056
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1884
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1479 src/cups/genppd.c:2090
 msgid "Resolution"
 msgstr "Resolución"
 
 #: src/main/print-canon.c:248 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1723
+#: src/main/print-olympus.c:1885
 msgid "Resolution and quality of the print"
 msgstr "Resolución y calidad de la impresión"
 
 #: src/main/print-canon.c:253 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tipo de Tinta"
 
 #: src/main/print-canon.c:254 src/main/print-escp2.c:231
 #: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
+#: src/main/print-olympus.c:1891 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Tipo de tinta de la impresora"
@@ -313,17 +313,18 @@ msgstr ""
 #: 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-escp2.c:320 src/main/print-escp2.c:767
-#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
-#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
-#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
-#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:893 src/main/print-escp2.c:901
+#: src/main/print-escp2.c:909 src/main/print-escp2.c:925
+#: src/main/print-escp2.c:933 src/main/print-escp2.c:941
+#: src/main/print-escp2.c:949 src/main/print-escp2.c:957
+#: src/main/print-escp2.c:965 src/main/print-escp2.c:973
 #: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:265 src/main/print-escp2.c:326
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-canon.c:265 src/main/print-escp2.c:332
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1912
 #: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
@@ -331,16 +332,16 @@ msgstr "Modelo de Impresora:"
 
 #: src/main/print-canon.c:265 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:326
-#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-color.c:208 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1912 src/main/print-pcl.c:1295
 #: src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Papel Común"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:327
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-canon.c:266 src/main/print-escp2.c:333
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1913
 #: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
@@ -369,56 +370,56 @@ msgstr "720 PPP Altísima Calidad"
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:300 src/main/print-escp2.c:439
+#: src/main/print-canon.c:300 src/main/print-escp2.c:445
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Densidad:"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:301 src/main/print-escp2.c:446
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-canon.c:308 src/main/print-escp2.c:447
+#: src/main/print-canon.c:308 src/main/print-escp2.c:453
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:309 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-canon.c:316 src/main/print-escp2.c:455
+#: src/main/print-canon.c:316 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Densidad:"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:317 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-canon.c:324 src/main/print-escp2.c:463
+#: src/main/print-canon.c:324 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 #, fuzzy
 msgid "Black Density"
 msgstr "Densidad:"
 
-#: src/main/print-canon.c:325 src/main/print-escp2.c:464
+#: src/main/print-canon.c:325 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Ajustar el balance de cian de la impresión"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:333
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:541 src/main/print-escp2.c:542
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 #, fuzzy
@@ -426,29 +427,36 @@ msgid "Light Cyan Transition"
 msgstr "Cian Claro"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:340
-#: src/main/print-canon.c:348 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
-#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
-#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
-#: src/main/print-pcl.c:1364
+#: src/main/print-canon.c:348 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:541
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:557
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:573
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:589
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:605
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:621
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:637
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:653
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:669
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:685
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:701
+#: src/main/print-escp2.c:709 src/main/print-escp2.c:717
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:733
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:749
+#: src/main/print-escp2.c:757 src/main/print-escp2.c:765
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:781
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:797
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:813
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:829
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:845
+#: src/main/print-escp2.c:853 src/main/print-escp2.c:861
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:340 src/main/print-canon.c:341
-#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
+#: src/main/print-escp2.c:573 src/main/print-escp2.c:574
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #, fuzzy
@@ -460,14 +468,14 @@ msgstr "Magenta Claro"
 msgid "Light Yellow Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-canon.c:368 src/main/print-escp2.c:2283
-#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3609
-#: src/xml/xmli18n-tmp.h:3614 src/xml/xmli18n-tmp.h:3620
-#: src/xml/xmli18n-tmp.h:3627
+#: src/main/print-canon.c:368 src/main/print-escp2.c:2488
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5851 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5864
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:369 src/main/print-escp2.c:2285
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2490
 #: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
@@ -476,67 +484,68 @@ msgstr ""
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:646 src/main/print-escp2.c:2005
-#: src/xml/xmli18n-tmp.h:3676
+#: src/main/print-canon.c:646 src/main/print-escp2.c:2210
+#: src/xml/xmli18n-tmp.h:5913
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:648 src/main/print-escp2.c:2007
-#: src/xml/xmli18n-tmp.h:3677
+#: src/main/print-canon.c:648 src/main/print-escp2.c:2212
+#: src/xml/xmli18n-tmp.h:5914
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:650 src/main/print-escp2.c:2009
-#: src/xml/xmli18n-tmp.h:3678
+#: src/main/print-canon.c:650 src/main/print-escp2.c:2214
+#: src/xml/xmli18n-tmp.h:5915
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Personalizado"
 
-#: src/main/print-canon.c:673 src/main/print-escp2.c:2034
-#: src/cups/genppd.c:1323 src/cups/genppd.c:1572 src/cups/genppd.c:1988
-#: src/cups/genppd.c:2079
+#: src/main/print-canon.c:673 src/main/print-escp2.c:2239
+#: src/cups/genppd.c:1356 src/cups/genppd.c:1605 src/cups/genppd.c:2022
+#: src/cups/genppd.c:2113
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:675 src/main/print-escp2.c:2036
+#: src/main/print-canon.c:675 src/main/print-escp2.c:2241
 #, fuzzy
 msgid "Print To Hub"
 msgstr "¿Imprimir a un archivo?"
 
-#: src/main/print-canon.c:790 src/main/print-escp2.c:2447
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-canon.c:790 src/main/print-escp2.c:2652
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2167
 #: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
 #: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Color"
 
-#: src/main/print-canon.c:792 src/main/print-escp2.c:2449
+#: src/main/print-canon.c:792 src/main/print-escp2.c:2654
 #: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
 #: src/main/print-ps.c:331 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
 msgstr "Blanco y Negro"
 
-#: src/main/print-canon.c:831 src/main/print-escp2.c:2089
+#: src/main/print-canon.c:831 src/main/print-escp2.c:2294
 #: src/main/print-pcl.c:1797 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Tipo de salida:"
 
-#: src/main/print-canon.c:833 src/main/print-escp2.c:2131
-#: src/main/print-escp2.c:2229 src/main/print-escp2.c:2241
+#: src/main/print-canon.c:833 src/main/print-escp2.c:2336
+#: src/main/print-escp2.c:2434 src/main/print-escp2.c:2446
 #: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
 #: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
-#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1215
-#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1219
-#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
-#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3170
-#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3177
-#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3461
-#: src/xml/xmli18n-tmp.h:3464 src/xml/xmli18n-tmp.h:3632
-#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3648
-#: src/xml/xmli18n-tmp.h:3657 src/xml/xmli18n-tmp.h:3665
+#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1627 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3713 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3722 src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5902
 msgid "Standard"
 msgstr "Estándar"
 
@@ -575,7 +584,7 @@ msgid "Pre-Dithered"
 msgstr "Imprimir"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1268 src/cups/genppd.c:1971
+#: src/cups/genppd.c:1301 src/cups/genppd.c:2005
 msgid "Grayscale"
 msgstr "Tonos de gris"
 
@@ -592,11 +601,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1299 src/cups/genppd.c:1978
+#: src/main/print-color.c:129 src/cups/genppd.c:1332 src/cups/genppd.c:2012
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1306 src/cups/genppd.c:1979
+#: src/main/print-color.c:131 src/cups/genppd.c:1339 src/cups/genppd.c:2013
 msgid "KCMY"
 msgstr ""
 
@@ -662,7 +671,7 @@ msgid "Output image type"
 msgstr "Tipo de salida:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338
 msgid "Raw Channels"
 msgstr ""
 
@@ -733,56 +742,208 @@ msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
 #: src/escputil/escputil.c:997 src/escputil/escputil.c:1017
-#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:1812
-#: src/xml/xmli18n-tmp.h:1823 src/xml/xmli18n-tmp.h:1836
-#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1863
-#: src/xml/xmli18n-tmp.h:1876 src/xml/xmli18n-tmp.h:1889
-#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1918
-#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1949
-#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1975
-#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:1999
-#: src/xml/xmli18n-tmp.h:2013 src/xml/xmli18n-tmp.h:2027
-#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2051
-#: src/xml/xmli18n-tmp.h:2064 src/xml/xmli18n-tmp.h:2076
-#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2102
-#: src/xml/xmli18n-tmp.h:2116 src/xml/xmli18n-tmp.h:2130
-#: src/xml/xmli18n-tmp.h:2143 src/xml/xmli18n-tmp.h:2156
-#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2184
-#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2210
-#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2236
-#: src/xml/xmli18n-tmp.h:2249 src/xml/xmli18n-tmp.h:2262
-#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2290
-#: src/xml/xmli18n-tmp.h:2305 src/xml/xmli18n-tmp.h:2320
-#: src/xml/xmli18n-tmp.h:2332 src/xml/xmli18n-tmp.h:2343
-#: src/xml/xmli18n-tmp.h:2356 src/xml/xmli18n-tmp.h:2369
-#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2392
-#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2415
-#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2442
-#: src/xml/xmli18n-tmp.h:2454 src/xml/xmli18n-tmp.h:2466
-#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2496
-#: src/xml/xmli18n-tmp.h:2509 src/xml/xmli18n-tmp.h:2522
-#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
-#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2574
-#: src/xml/xmli18n-tmp.h:2586 src/xml/xmli18n-tmp.h:2598
-#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2623
-#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2653
-#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2683
-#: src/xml/xmli18n-tmp.h:2697 src/xml/xmli18n-tmp.h:2715
-#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2745
-#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
-#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2803
-#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2828
-#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2854
-#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2881
-#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2915
-#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2943
-#: src/xml/xmli18n-tmp.h:2959 src/xml/xmli18n-tmp.h:2976
-#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:3004
-#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3032
-#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3062
-#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3093
-#: src/xml/xmli18n-tmp.h:3107 src/xml/xmli18n-tmp.h:3125
-#: src/xml/xmli18n-tmp.h:3141
+#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2387
+#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2413
+#: src/xml/xmli18n-tmp.h:2426 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2499
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2551
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2575
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2708
+#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2786
+#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2814
+#: src/xml/xmli18n-tmp.h:2829 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2893
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2966
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3005 src/xml/xmli18n-tmp.h:3020
+#: src/xml/xmli18n-tmp.h:3033 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3061 src/xml/xmli18n-tmp.h:3073
+#: src/xml/xmli18n-tmp.h:3085 src/xml/xmli18n-tmp.h:3098
+#: src/xml/xmli18n-tmp.h:3110 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3377
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3616
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3648
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3766 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3775 src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:3794 src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:3805 src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3869 src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:3880 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3902 src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:3913 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:3948 src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:3970 src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:3983 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4023 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4064 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4075 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4088 src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:4103 src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:4118 src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:4143 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:4203 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4275 src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4309 src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4356 src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4421
+#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4449
+#: src/xml/xmli18n-tmp.h:4456 src/xml/xmli18n-tmp.h:4462
+#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4485 src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:4551 src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:4694 src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4717 src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:4818 src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:4829 src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4885 src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4935
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:5041 src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:5052 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:5121 src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5165
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5182 src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:5193 src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:5271 src/xml/xmli18n-tmp.h:5299
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5327 src/xml/xmli18n-tmp.h:5331
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5347
+#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5367 src/xml/xmli18n-tmp.h:5371
+#: src/xml/xmli18n-tmp.h:5383 src/xml/xmli18n-tmp.h:5388
+#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5440
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5461 src/xml/xmli18n-tmp.h:5468
+#: src/xml/xmli18n-tmp.h:5476 src/xml/xmli18n-tmp.h:5486
+#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5514
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5525
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5543
+#: src/xml/xmli18n-tmp.h:5550 src/xml/xmli18n-tmp.h:5556
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5574 src/xml/xmli18n-tmp.h:5582
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5592
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5625
+#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5649
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5662
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5690
+#: src/xml/xmli18n-tmp.h:5694 src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5731
+#: src/xml/xmli18n-tmp.h:5738 src/xml/xmli18n-tmp.h:5742
+#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5759
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5770
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5807
+#: src/xml/xmli18n-tmp.h:5811 src/xml/xmli18n-tmp.h:5817
+#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5828
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5843
 msgid "Cyan"
 msgstr "Cian"
 
@@ -793,56 +954,208 @@ msgstr "Ajustar el balance de cian de la impresión"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
 #: src/escputil/escputil.c:998 src/escputil/escputil.c:1018
-#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:1813
-#: src/xml/xmli18n-tmp.h:1824 src/xml/xmli18n-tmp.h:1837
-#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1864
-#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1890
-#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1919
-#: src/xml/xmli18n-tmp.h:1935 src/xml/xmli18n-tmp.h:1950
-#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1976
-#: src/xml/xmli18n-tmp.h:1988 src/xml/xmli18n-tmp.h:2000
-#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2028
-#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2052
-#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2077
-#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2103
-#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2131
-#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2157
-#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2185
-#: src/xml/xmli18n-tmp.h:2198 src/xml/xmli18n-tmp.h:2211
-#: src/xml/xmli18n-tmp.h:2224 src/xml/xmli18n-tmp.h:2237
-#: src/xml/xmli18n-tmp.h:2250 src/xml/xmli18n-tmp.h:2263
-#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2291
-#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2321
-#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2344
-#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2370
-#: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2393
-#: src/xml/xmli18n-tmp.h:2405 src/xml/xmli18n-tmp.h:2416
-#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2443
-#: src/xml/xmli18n-tmp.h:2455 src/xml/xmli18n-tmp.h:2467
-#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2497
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2523
-#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2575
-#: src/xml/xmli18n-tmp.h:2587 src/xml/xmli18n-tmp.h:2599
-#: src/xml/xmli18n-tmp.h:2611 src/xml/xmli18n-tmp.h:2624
-#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
-#: src/xml/xmli18n-tmp.h:2670 src/xml/xmli18n-tmp.h:2684
-#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2714
-#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2747
-#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2780
-#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
-#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2829
-#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2855
-#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2882
-#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2914
-#: src/xml/xmli18n-tmp.h:2931 src/xml/xmli18n-tmp.h:2944
-#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2975
-#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:3005
-#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3033
-#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3060
-#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3094
-#: src/xml/xmli18n-tmp.h:3108 src/xml/xmli18n-tmp.h:3124
-#: src/xml/xmli18n-tmp.h:3140
+#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2361
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2388
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2414
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2459 src/xml/xmli18n-tmp.h:2474
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2512 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2552
+#: src/xml/xmli18n-tmp.h:2564 src/xml/xmli18n-tmp.h:2576
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2787
+#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2815
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2868
+#: src/xml/xmli18n-tmp.h:2881 src/xml/xmli18n-tmp.h:2894
+#: src/xml/xmli18n-tmp.h:2905 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:2967
+#: src/xml/xmli18n-tmp.h:2979 src/xml/xmli18n-tmp.h:2991
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3062 src/xml/xmli18n-tmp.h:3074
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3099
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3135 src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:3163 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3353
+#: src/xml/xmli18n-tmp.h:3365 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
+#: src/xml/xmli18n-tmp.h:3420 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3542 src/xml/xmli18n-tmp.h:3556
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3600 src/xml/xmli18n-tmp.h:3617
+#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3647
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3751 src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:3784 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3795 src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:3806 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3837 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3903 src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3939 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3960 src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:3972 src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:3984 src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:3999 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:4039 src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:4104 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:4170 src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4194 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:4230 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:4276 src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4311 src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4338 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:4401 src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:4427 src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:4442 src/xml/xmli18n-tmp.h:4451
+#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4464
+#: src/xml/xmli18n-tmp.h:4470 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4486 src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:4511 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:4809 src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4909 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:5007 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5018 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5111 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5123 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5148 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:5240 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5250 src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:5261 src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5301
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5313
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5349
+#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5401
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5441
+#: src/xml/xmli18n-tmp.h:5453 src/xml/xmli18n-tmp.h:5458
+#: src/xml/xmli18n-tmp.h:5463 src/xml/xmli18n-tmp.h:5470
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5496 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5527
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5552 src/xml/xmli18n-tmp.h:5558
+#: src/xml/xmli18n-tmp.h:5564 src/xml/xmli18n-tmp.h:5568
+#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5593
+#: src/xml/xmli18n-tmp.h:5598 src/xml/xmli18n-tmp.h:5616
+#: src/xml/xmli18n-tmp.h:5620 src/xml/xmli18n-tmp.h:5626
+#: src/xml/xmli18n-tmp.h:5631 src/xml/xmli18n-tmp.h:5651
+#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
+#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5674
+#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5720
+#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5733
+#: src/xml/xmli18n-tmp.h:5739 src/xml/xmli18n-tmp.h:5743
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5818
+#: src/xml/xmli18n-tmp.h:5823 src/xml/xmli18n-tmp.h:5829
+#: src/xml/xmli18n-tmp.h:5833 src/xml/xmli18n-tmp.h:5839
+#: src/xml/xmli18n-tmp.h:5844
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -853,56 +1166,208 @@ msgstr "Ajusta el balance magenta de la impresión"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
 #: src/escputil/escputil.c:999 src/escputil/escputil.c:1019
-#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:1814
-#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
-#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1865
-#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1891
-#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1920
-#: src/xml/xmli18n-tmp.h:1936 src/xml/xmli18n-tmp.h:1951
-#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1977
-#: src/xml/xmli18n-tmp.h:1989 src/xml/xmli18n-tmp.h:2001
-#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2029
-#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2053
-#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2078
-#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2104
-#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
-#: src/xml/xmli18n-tmp.h:2145 src/xml/xmli18n-tmp.h:2158
-#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2186
-#: src/xml/xmli18n-tmp.h:2199 src/xml/xmli18n-tmp.h:2212
-#: src/xml/xmli18n-tmp.h:2225 src/xml/xmli18n-tmp.h:2238
-#: src/xml/xmli18n-tmp.h:2251 src/xml/xmli18n-tmp.h:2264
-#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2292
-#: src/xml/xmli18n-tmp.h:2307 src/xml/xmli18n-tmp.h:2322
-#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
-#: src/xml/xmli18n-tmp.h:2358 src/xml/xmli18n-tmp.h:2371
-#: src/xml/xmli18n-tmp.h:2382 src/xml/xmli18n-tmp.h:2394
-#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2417
-#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2444
-#: src/xml/xmli18n-tmp.h:2456 src/xml/xmli18n-tmp.h:2468
-#: src/xml/xmli18n-tmp.h:2483 src/xml/xmli18n-tmp.h:2498
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2524
-#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2551
-#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2576
-#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
-#: src/xml/xmli18n-tmp.h:2612 src/xml/xmli18n-tmp.h:2625
-#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2651
-#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2685
-#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2713
-#: src/xml/xmli18n-tmp.h:2734 src/xml/xmli18n-tmp.h:2749
-#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2779
-#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2805
-#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2830
-#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2856
-#: src/xml/xmli18n-tmp.h:2871 src/xml/xmli18n-tmp.h:2883
-#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2910
-#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2945
-#: src/xml/xmli18n-tmp.h:2960 src/xml/xmli18n-tmp.h:2974
-#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3006
-#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3034
-#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3061
-#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3095
-#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3120
-#: src/xml/xmli18n-tmp.h:3136
+#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2389
+#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2444
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2475
+#: src/xml/xmli18n-tmp.h:2488 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2513 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2565 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2602
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2762
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2788
+#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2816
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2846
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2906 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3022
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3048
+#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3075
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3124
+#: src/xml/xmli18n-tmp.h:3136 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3175
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3315 src/xml/xmli18n-tmp.h:3329
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3433
+#: src/xml/xmli18n-tmp.h:3455 src/xml/xmli18n-tmp.h:3468
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3497
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3601 src/xml/xmli18n-tmp.h:3618
+#: src/xml/xmli18n-tmp.h:3632 src/xml/xmli18n-tmp.h:3643
+#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3747 src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3834 src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:3844 src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:3867 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:3900 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3910 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3935 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:3967 src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:3979 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4005 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4062 src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4110 src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:4124 src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4167 src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:4272 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:4321 src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:4334 src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4367 src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4471
+#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4505 src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4549 src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:4562 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4580 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4602 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:4678 src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:4691 src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4770 src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4893 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4904 src/xml/xmli18n-tmp.h:4911
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:4971 src/xml/xmli18n-tmp.h:4978
+#: src/xml/xmli18n-tmp.h:5004 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5050 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5071 src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:5097 src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:5142 src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:5169 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5184
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5257 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5318
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5358
+#: src/xml/xmli18n-tmp.h:5364 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5385
+#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5438
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5454
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5465
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5511
+#: src/xml/xmli18n-tmp.h:5516 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5547 src/xml/xmli18n-tmp.h:5554
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5584 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5617 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5632
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5687
+#: src/xml/xmli18n-tmp.h:5692 src/xml/xmli18n-tmp.h:5698
+#: src/xml/xmli18n-tmp.h:5705 src/xml/xmli18n-tmp.h:5713
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5729
+#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
+#: src/xml/xmli18n-tmp.h:5744 src/xml/xmli18n-tmp.h:5756
+#: src/xml/xmli18n-tmp.h:5761 src/xml/xmli18n-tmp.h:5767
+#: src/xml/xmli18n-tmp.h:5774 src/xml/xmli18n-tmp.h:5782
+#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5792
+#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5803
+#: src/xml/xmli18n-tmp.h:5809 src/xml/xmli18n-tmp.h:5813
+#: src/xml/xmli18n-tmp.h:5819 src/xml/xmli18n-tmp.h:5824
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5845
 msgid "Yellow"
 msgstr "Amarillo"
 
@@ -913,9 +1378,17 @@ msgstr "Ajusta el balance amarillo de la impresión"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
 #: src/escputil/escputil.c:1006 src/escputil/escputil.c:1025
-#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2700
-#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2795
-#: src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:4041 src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:4056 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4091 src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:4155 src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5155
 msgid "Red"
 msgstr ""
 
@@ -935,8 +1408,13 @@ msgstr "Ajusta el balance magenta de la impresión"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
 #: src/escputil/escputil.c:1007 src/escputil/escputil.c:1026
-#: src/xml/xmli18n-tmp.h:2657 src/xml/xmli18n-tmp.h:2701
-#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4051 src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:4084 src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:5156
 msgid "Blue"
 msgstr ""
 
@@ -948,53 +1426,183 @@ msgstr "Ajustar el balance de cian de la impresión"
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
 #: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1016 src/escputil/escputil.c:1285
-#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
-#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
-#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1875
-#: src/xml/xmli18n-tmp.h:1888 src/xml/xmli18n-tmp.h:1901
-#: src/xml/xmli18n-tmp.h:1917 src/xml/xmli18n-tmp.h:1933
-#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1961
-#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1986
-#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2012
-#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2038
-#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2063
-#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2090
-#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2115
-#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2142
-#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2169
-#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
-#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
-#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2248
-#: src/xml/xmli18n-tmp.h:2261 src/xml/xmli18n-tmp.h:2274
-#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2304
-#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2331
-#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
-#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
-#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2403
-#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2420
-#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2441
-#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2465
-#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2495
-#: src/xml/xmli18n-tmp.h:2508 src/xml/xmli18n-tmp.h:2521
-#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
-#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2573
-#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2597
-#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2622
-#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2672
-#: src/xml/xmli18n-tmp.h:2682 src/xml/xmli18n-tmp.h:2731
-#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2764
-#: src/xml/xmli18n-tmp.h:2781 src/xml/xmli18n-tmp.h:2794
-#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2815
-#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2839
-#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2868
-#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2894
-#: src/xml/xmli18n-tmp.h:2911 src/xml/xmli18n-tmp.h:2929
-#: src/xml/xmli18n-tmp.h:2942 src/xml/xmli18n-tmp.h:2977
-#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:3003
-#: src/xml/xmli18n-tmp.h:3017 src/xml/xmli18n-tmp.h:3031
-#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3079
-#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3110
-#: src/xml/xmli18n-tmp.h:3121 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2372
+#: src/xml/xmli18n-tmp.h:2386 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2457
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2510
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2536
+#: src/xml/xmli18n-tmp.h:2550 src/xml/xmli18n-tmp.h:2562
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2599 src/xml/xmli18n-tmp.h:2614
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2639
+#: src/xml/xmli18n-tmp.h:2653 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2965
+#: src/xml/xmli18n-tmp.h:2977 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3019
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3060 src/xml/xmli18n-tmp.h:3072
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3133 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3196
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3526
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3680 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3755 src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:3804 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3819 src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:3831 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3846 src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3873 src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:3924 src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:3943 src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:4022 src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4059 src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:4142 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4164 src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:4179 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:4255 src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4289 src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:4308 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4413 src/xml/xmli18n-tmp.h:4420
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4455
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4507 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:4565 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:4604 src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:4702 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:4733 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:4786 src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4920 src/xml/xmli18n-tmp.h:4926
+#: src/xml/xmli18n-tmp.h:4934 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:4973 src/xml/xmli18n-tmp.h:4981
+#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:4993
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:5047 src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5151
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5186
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5223 src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5270
+#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5284
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5320
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5337
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5375
+#: src/xml/xmli18n-tmp.h:5378 src/xml/xmli18n-tmp.h:5380
+#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5435
+#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5447
+#: src/xml/xmli18n-tmp.h:5449 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5474
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5492
+#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5571
+#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5590
+#: src/xml/xmli18n-tmp.h:5596 src/xml/xmli18n-tmp.h:5602
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5614
+#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5629
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5655
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5680 src/xml/xmli18n-tmp.h:5682
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5700
+#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5716
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5749
+#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5769 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5794
+#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5806
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5836
+#: src/xml/xmli18n-tmp.h:5842
 msgid "Black"
 msgstr "Negro"
 
@@ -1003,7 +1611,7 @@ msgstr "Negro"
 msgid "Adjust the black gamma"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1769
+#: src/main/print-color.c:322 src/main/print-olympus.c:1935
 msgid "Cyan Balance"
 msgstr ""
 
@@ -1018,7 +1626,7 @@ msgstr "Tonos de gris"
 msgid "Adjust the cyan gray balance"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1777
+#: src/main/print-color.c:330 src/main/print-olympus.c:1943
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
@@ -1028,7 +1636,7 @@ msgstr "Magenta"
 msgid "Adjust the magenta gray balance"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1785
+#: src/main/print-color.c:338 src/main/print-olympus.c:1951
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Ajusta el balance amarillo de la impresión"
@@ -1060,11 +1668,11 @@ msgstr "Tipo de Tinta"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
-#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
-#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
-#: src/main/print-escp2.c:759
+#: src/main/print-escp2.c:344 src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356 src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368 src/main/print-escp2.c:374
+#: src/main/print-escp2.c:869 src/main/print-escp2.c:877
+#: src/main/print-escp2.c:885
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Tipo de salida:"
@@ -1073,27 +1681,27 @@ msgstr "Tipo de salida:"
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:743
+#: src/main/print-color.c:365 src/main/print-escp2.c:869
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:744
+#: src/main/print-color.c:366 src/main/print-escp2.c:870
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:751
+#: src/main/print-color.c:373 src/main/print-escp2.c:877
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:752
+#: src/main/print-color.c:374 src/main/print-escp2.c:878
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:759
+#: src/main/print-color.c:381 src/main/print-escp2.c:885
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:760
+#: src/main/print-color.c:382 src/main/print-escp2.c:886
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -1364,11 +1972,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1906
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1907
 msgid "Print without borders"
 msgstr ""
 
@@ -1381,7 +1989,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:266 src/main/print-escp2.c:267
-#: src/cups/genppd.c:1567 src/cups/genppd.c:2078
+#: src/cups/genppd.c:1600 src/cups/genppd.c:2112
 #, fuzzy
 msgid "Output Order"
 msgstr "Tipo de salida:"
@@ -1426,382 +2034,498 @@ msgstr ""
 
 #: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 #, fuzzy
+msgid "Raw Channel Names"
+msgstr "Cancelar"
+
+#: src/main/print-escp2.c:326 src/main/print-escp2.c:327
+#, fuzzy
 msgid "Channel Names"
 msgstr "Cancelar"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:339
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:344
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Cian"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:345
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Magenta"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:351
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Amarillo"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:357
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362
 #, fuzzy
 msgid "Blue Map"
 msgstr "Blanco y Negro"
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:363
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368
 #, fuzzy
 msgid "Orange Map"
 msgstr "Cian"
 
-#: src/main/print-escp2.c:363
+#: src/main/print-escp2.c:369
 #, fuzzy
 msgid "Adjust the orange map"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:374
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:369
+#: src/main/print-escp2.c:375
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-escp2.c:471
+#: src/main/print-escp2.c:477
 #, fuzzy
 msgid "Red Density"
 msgstr "Densidad:"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:478
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:485
 #, fuzzy
 msgid "Blue Density"
 msgstr "Densidad:"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:486
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:493
 #, fuzzy
 msgid "Orange Density"
 msgstr "Densidad:"
 
-#: src/main/print-escp2.c:488
+#: src/main/print-escp2.c:494
 #, fuzzy
 msgid "Adjust the orange density"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:501
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Película Brillante"
 
-#: src/main/print-escp2.c:496
+#: src/main/print-escp2.c:502
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:509
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:504
+#: src/main/print-escp2.c:510
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:517
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:512
+#: src/main/print-escp2.c:518
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:525
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:520
+#: src/main/print-escp2.c:526
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:534
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:550
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
+#: src/main/print-escp2.c:557 src/main/print-escp2.c:558
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "Magenta Claro"
 
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:566
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "Magenta Claro"
 
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:582
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "Amarillo"
 
-#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
+#: src/main/print-escp2.c:589 src/main/print-escp2.c:590
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:598
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "Amarillo"
 
-#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
+#: src/main/print-escp2.c:605 src/main/print-escp2.c:606
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:630
 #, fuzzy
 msgid "Gray Value"
 msgstr "Tonos de gris"
 
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
-#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:614
+#: src/main/print-escp2.c:637 src/main/print-escp2.c:638
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
+#: src/main/print-escp2.c:621 src/main/print-escp2.c:622
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:646
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "Tonos de gris"
 
-#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
+#: src/main/print-escp2.c:653 src/main/print-escp2.c:654
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:726
 #, fuzzy
 msgid "Light Gray Value"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
-#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:662
+#: src/main/print-escp2.c:733 src/main/print-escp2.c:734
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
-#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
+#: src/main/print-escp2.c:669 src/main/print-escp2.c:670
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:742
 #, fuzzy
 msgid "Light Gray Density Scale"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:678
 #, fuzzy
 msgid "Dark Gray Value"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
+#: src/main/print-escp2.c:685 src/main/print-escp2.c:686
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:694
 #, fuzzy
 msgid "Dark Gray Density Scale"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:701
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "Tonos de gris"
 
-#: src/main/print-escp2.c:696
+#: src/main/print-escp2.c:702
 #, fuzzy
 msgid "Medium Gray Value"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:709
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:704
+#: src/main/print-escp2.c:710
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:717
 #, fuzzy
 msgid "Mid Gray Density Scale"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:712
+#: src/main/print-escp2.c:718
 #, fuzzy
 msgid "Medium Gray Density Scale"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:767
+#: src/main/print-escp2.c:749
+#, fuzzy
+msgid "Hextone Gray 5 Value"
+msgstr "Tonos de gris"
+
+#: src/main/print-escp2.c:750
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:757
+#, fuzzy
+msgid "Hextone Gray 5 Transition"
+msgstr "Cian Claro"
+
+#: src/main/print-escp2.c:758
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr "Cian Claro"
+
+#: src/main/print-escp2.c:765
+#, fuzzy
+msgid "Hextone Gray 5 Density Scale"
+msgstr "Tonos de gris"
+
+#: src/main/print-escp2.c:766
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr "Cian Claro"
+
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:774
+#, fuzzy
+msgid "Hextone Gray 4 Value"
+msgstr "Tonos de gris"
+
+#: src/main/print-escp2.c:781 src/main/print-escp2.c:782
+#, fuzzy
+msgid "Hextone Gray 4 Transition"
+msgstr "Cian Claro"
+
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:790
+#, fuzzy
+msgid "Hextone Gray 4 Density Scale"
+msgstr "Tonos de gris"
+
+#: src/main/print-escp2.c:797 src/main/print-escp2.c:798
+#, fuzzy
+msgid "Hextone Gray 3 Value"
+msgstr "Tonos de gris"
+
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:806
+#, fuzzy
+msgid "Hextone Gray 3 Transition"
+msgstr "Cian Claro"
+
+#: src/main/print-escp2.c:813 src/main/print-escp2.c:814
+#, fuzzy
+msgid "Hextone Gray 3 Density Scale"
+msgstr "Tonos de gris"
+
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:822
+#, fuzzy
+msgid "Hextone Gray 2 Value"
+msgstr "Tonos de gris"
+
+#: src/main/print-escp2.c:829 src/main/print-escp2.c:830
+#, fuzzy
+msgid "Hextone Gray 2 Transition"
+msgstr "Cian Claro"
+
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:838
+#, fuzzy
+msgid "Hextone Gray 2 Density Scale"
+msgstr "Tonos de gris"
+
+#: src/main/print-escp2.c:845
+#, fuzzy
+msgid "Hextone Gray 1 Value"
+msgstr "Tonos de gris"
+
+#: src/main/print-escp2.c:846
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:853
+#, fuzzy
+msgid "Hextone Gray 1 Transition"
+msgstr "Cian Claro"
+
+#: src/main/print-escp2.c:854
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr "Magenta Claro"
+
+#: src/main/print-escp2.c:861
+#, fuzzy
+msgid "Hextone Gray 1 Density Scale"
+msgstr "Tonos de gris"
+
+#: src/main/print-escp2.c:862
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr "Magenta Claro"
+
+#: src/main/print-escp2.c:893
 msgid "Drying Time Per Page"
 msgstr ""
 
-#: src/main/print-escp2.c:768
+#: src/main/print-escp2.c:894
 msgid "Set drying time per page"
 msgstr ""
 
-#: src/main/print-escp2.c:775
+#: src/main/print-escp2.c:901
 msgid "Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:776
+#: src/main/print-escp2.c:902
 msgid "Set drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:783
+#: src/main/print-escp2.c:909
 msgid "Minimum Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:784
+#: src/main/print-escp2.c:910
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:799
+#: src/main/print-escp2.c:925
+msgid "Quality Enhancement"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Enhance print quality by additional passes"
+msgstr ""
+
+#: src/main/print-escp2.c:933
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "Tamaño"
 
-#: src/main/print-escp2.c:800
+#: src/main/print-escp2.c:934
 #, fuzzy
 msgid "Set printer paper thickness"
 msgstr "Establecer por Omisión"
 
-#: src/main/print-escp2.c:807
+#: src/main/print-escp2.c:941
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Densidad:"
 
-#: src/main/print-escp2.c:808
+#: src/main/print-escp2.c:942
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:815
+#: src/main/print-escp2.c:949
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:816
+#: src/main/print-escp2.c:950
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:823
+#: src/main/print-escp2.c:957
 #, fuzzy
 msgid "Print Method"
 msgstr "Modelo de Impresora:"
 
-#: src/main/print-escp2.c:824
+#: src/main/print-escp2.c:958
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:831
+#: src/main/print-escp2.c:965
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Papel Común"
 
-#: src/main/print-escp2.c:832
+#: src/main/print-escp2.c:966
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:839
+#: src/main/print-escp2.c:973
 msgid "Feed Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:840
-#, c-format
+#: src/main/print-escp2.c:975
+#, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:1992
+#: src/main/print-escp2.c:2197
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Tipo de salida:"
 
-#: src/main/print-escp2.c:1994
+#: src/main/print-escp2.c:2199
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2208 src/cups/genppd.c:1484 src/cups/genppd.c:2059
+#: src/main/print-escp2.c:2413 src/cups/genppd.c:1517 src/cups/genppd.c:2093
 #, fuzzy
 msgid "Automatic"
 msgstr "Tamaño"
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2415
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 PPP Unidireccional"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2417
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 PPP Unidireccional"
 
-#: src/main/print-escp2.c:2243
+#: src/main/print-escp2.c:2448
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2450
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2452
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2454
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2456
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2287
+#: src/main/print-escp2.c:2492
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:2858
+#: src/main/print-escp2.c:3100
 #, 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:4107 src/main/print-olympus.c:2472
+#: src/main/print-escp2.c:4355 src/main/print-olympus.c:2641
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1855,361 +2579,378 @@ msgid "test print"
 msgstr "prueba de impresión"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3205
-#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3217
-#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3233
-#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3255
-#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3276
-#: src/xml/xmli18n-tmp.h:3288 src/xml/xmli18n-tmp.h:3295
-#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3315
-#: src/xml/xmli18n-tmp.h:3327 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3368
-#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3380
-#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
-#: src/xml/xmli18n-tmp.h:3412 src/xml/xmli18n-tmp.h:3424
-#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3444
-#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3472
-#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3496
-#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3521
-#: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3544
-#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3556
-#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3581
-#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3598
-#: src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3754 src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:3809 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3863 src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:4058 src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:4163 src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:4227 src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:4335 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4467 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4594 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:4879 src/xml/xmli18n-tmp.h:4946
+#: src/xml/xmli18n-tmp.h:5000 src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:5243 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5365 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5512 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5667 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5784 src/xml/xmli18n-tmp.h:5805
+#: src/xml/xmli18n-tmp.h:5826
 msgid "Four Color Standard"
 msgstr "Cuatro Colores Estándard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3206
-#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3218
-#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3234
-#: src/xml/xmli18n-tmp.h:3244 src/xml/xmli18n-tmp.h:3251
-#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3268
-#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3289
-#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3306
-#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
-#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3354
-#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3377
-#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3389
-#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3413
-#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3435
-#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3455
-#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3485
-#: src/xml/xmli18n-tmp.h:3497 src/xml/xmli18n-tmp.h:3508
-#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3537
-#: src/xml/xmli18n-tmp.h:3545 src/xml/xmli18n-tmp.h:3549
-#: src/xml/xmli18n-tmp.h:3557 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3593
-#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3605
+#: src/xml/xmli18n-tmp.h:3759 src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3868 src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:4002 src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:4107 src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4472
+#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4817 src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5181 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5315 src/xml/xmli18n-tmp.h:5370
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5672
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5831
 msgid "Three Color Composite"
 msgstr "Tres Colores Compuestos"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3241
-#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3265
-#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3286
-#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
-#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3351
-#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3374
-#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3398
-#: src/xml/xmli18n-tmp.h:3410 src/xml/xmli18n-tmp.h:3422
-#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3452
-#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3470
-#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3494
-#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3519
-#: src/xml/xmli18n-tmp.h:3534 src/xml/xmli18n-tmp.h:3542
-#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3741 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4086 src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4933
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5421
+#: src/xml/xmli18n-tmp.h:5499 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5723
 msgid "Six Color Photo"
 msgstr "Fotografía de Seis Colores"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3242
-#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3266
-#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3287
-#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3326
-#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3352
-#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3375
-#: src/xml/xmli18n-tmp.h:3387 src/xml/xmli18n-tmp.h:3399
-#: src/xml/xmli18n-tmp.h:3411 src/xml/xmli18n-tmp.h:3423
-#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3453
-#: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3483
-#: src/xml/xmli18n-tmp.h:3495 src/xml/xmli18n-tmp.h:3506
-#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3535
-#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3566
-#: src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3748 src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:3989 src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:4094 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4267 src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4940
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5661
+#: src/xml/xmli18n-tmp.h:5730
 msgid "Five Color Photo Composite"
 msgstr "Fotografía Compuesta de Cinco Colores"
 
 #: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
-#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
-#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
-#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
-#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
-#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
-#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
-#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
-#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:849
-#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:963
-#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1077
-#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1170
-#: src/xml/xmli18n-tmp.h:1220 src/xml/xmli18n-tmp.h:1277
-#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1376
-#: src/xml/xmli18n-tmp.h:1439 src/xml/xmli18n-tmp.h:1502
-#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1619
-#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1739
-#: src/xml/xmli18n-tmp.h:1773
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1050
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1240
+#: src/xml/xmli18n-tmp.h:1335 src/xml/xmli18n-tmp.h:1449
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1580
+#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1862
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2200 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2297
 msgid "Plain Paper"
 msgstr "Papel Común"
 
-#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
-#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
-#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
-#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
-#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
-#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
-#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
-#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
-#: src/xml/xmli18n-tmp.h:819 src/xml/xmli18n-tmp.h:858
-#: src/xml/xmli18n-tmp.h:915 src/xml/xmli18n-tmp.h:972
-#: src/xml/xmli18n-tmp.h:1029 src/xml/xmli18n-tmp.h:1086
-#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1176
-#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1286
-#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1385
-#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1508
-#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1628
-#: src/xml/xmli18n-tmp.h:1685 src/xml/xmli18n-tmp.h:1743
-#: src/xml/xmli18n-tmp.h:1779
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:101 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:365 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1160 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1740
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1871
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2136
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2267
+#: src/xml/xmli18n-tmp.h:2303
 msgid "Glossy Film"
 msgstr "Película Brillante"
 
-#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
-#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
-#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
-#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
-#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
-#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
-#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
-#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
-#: src/xml/xmli18n-tmp.h:821 src/xml/xmli18n-tmp.h:861
-#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:975
-#: src/xml/xmli18n-tmp.h:1032 src/xml/xmli18n-tmp.h:1089
-#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1178
-#: src/xml/xmli18n-tmp.h:1232 src/xml/xmli18n-tmp.h:1289
-#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1388
-#: src/xml/xmli18n-tmp.h:1451 src/xml/xmli18n-tmp.h:1511
-#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1631
-#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1745
-#: src/xml/xmli18n-tmp.h:1781
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:845 src/xml/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:965 src/xml/xmli18n-tmp.h:1022
+#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1359
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1550
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1745 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2305
 msgid "Transparencies"
 msgstr "Transparencias"
 
-#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
-#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
-#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
-#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
-#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
-#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
-#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
-#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
-#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:823
-#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:921
-#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:1035
-#: src/xml/xmli18n-tmp.h:1092 src/xml/xmli18n-tmp.h:1142
-#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1235
-#: src/xml/xmli18n-tmp.h:1292 src/xml/xmli18n-tmp.h:1344
-#: src/xml/xmli18n-tmp.h:1391 src/xml/xmli18n-tmp.h:1454
-#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1577
-#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1691
-#: src/xml/xmli18n-tmp.h:1747 src/xml/xmli18n-tmp.h:1783
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:55 src/xml/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:151 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1024
+#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2215
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2307
 msgid "Envelopes"
 msgstr "Sobres"
 
-#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
-#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
-#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
-#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
-#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
-#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
-#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
-#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
-#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:827
-#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:927
-#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:1041
-#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1146
-#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1241
-#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1348
-#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1460
-#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1583
-#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1697
-#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1787
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:1028
+#: src/xml/xmli18n-tmp.h:1085 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1275 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1556
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1665
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1834
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2076
+#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2311
 msgid "Matte Paper"
 msgstr "Papel Opaco"
 
-#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
-#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
-#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
-#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
-#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
-#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
-#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
-#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
-#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:831
-#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:933
-#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:1047
-#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1150
-#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1247
-#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1352
-#: src/xml/xmli18n-tmp.h:1403 src/xml/xmli18n-tmp.h:1466
-#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1589
-#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1703
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1791
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:167 src/xml/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:569
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1032
+#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1285 src/xml/xmli18n-tmp.h:1389
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1675
+#: src/xml/xmli18n-tmp.h:1770 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1889 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2012 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2227
+#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2315
 msgid "Inkjet Paper"
 msgstr "Papel para Chorro de Tinta"
 
-#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
-#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
-#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
-#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
-#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
-#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
-#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
-#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
-#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:833
-#: src/xml/xmli18n-tmp.h:879 src/xml/xmli18n-tmp.h:936
-#: src/xml/xmli18n-tmp.h:993 src/xml/xmli18n-tmp.h:1050
-#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1152
-#: src/xml/xmli18n-tmp.h:1190 src/xml/xmli18n-tmp.h:1250
-#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1354
-#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1469
-#: src/xml/xmli18n-tmp.h:1529 src/xml/xmli18n-tmp.h:1592
-#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1706
-#: src/xml/xmli18n-tmp.h:1757 src/xml/xmli18n-tmp.h:1793
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:425 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:512 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1034
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1499 src/xml/xmli18n-tmp.h:1562
+#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1775 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1955
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2088
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2317
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papel de Calidad Fotográfica para Chorro de Tinta"
 
-#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
-#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
-#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
-#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
-#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
-#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
-#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
-#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
-#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:835
-#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:939
-#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:1053
-#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1154
-#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1253
-#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1356
-#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1472
-#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1595
-#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1709
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1795
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1036
+#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1200
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1504 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1842
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2233
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2319
 msgid "Photo Paper"
 msgstr "Papel para Fotografía"
 
-#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
-#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
-#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
-#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
-#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
-#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
-#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
-#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
-#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:837
-#: src/xml/xmli18n-tmp.h:885 src/xml/xmli18n-tmp.h:942
-#: src/xml/xmli18n-tmp.h:999 src/xml/xmli18n-tmp.h:1056
-#: src/xml/xmli18n-tmp.h:1113 src/xml/xmli18n-tmp.h:1156
-#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1212
-#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1256
-#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1358
-#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1475
-#: src/xml/xmli18n-tmp.h:1535 src/xml/xmli18n-tmp.h:1598
-#: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1712
-#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1797
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:179 src/xml/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:518 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:869 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1038
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1407
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1566
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1622
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1844
+#: src/xml/xmli18n-tmp.h:1898 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2321
 msgid "Premium Glossy Photo Paper"
 msgstr "Papel Brillante de Altísima Calidad Fotográfica"
 
-#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
-#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
-#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
-#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
-#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
-#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
-#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
-#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
-#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:841
-#: src/xml/xmli18n-tmp.h:891 src/xml/xmli18n-tmp.h:948
-#: src/xml/xmli18n-tmp.h:1005 src/xml/xmli18n-tmp.h:1062
-#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1160
-#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1262
-#: src/xml/xmli18n-tmp.h:1319 src/xml/xmli18n-tmp.h:1362
-#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1481
-#: src/xml/xmli18n-tmp.h:1541 src/xml/xmli18n-tmp.h:1604
-#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1718
-#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1801
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1042
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1419
+#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1570
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2027 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2242
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2325
 msgid "Premium Luster Photo Paper"
 msgstr "Papel de Fotografía Premium Luster"
 
-#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
-#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
-#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
-#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
-#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
-#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
-#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
-#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
-#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:843
-#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:951
-#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1065
-#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1162
-#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1265
-#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1368
-#: src/xml/xmli18n-tmp.h:1427 src/xml/xmli18n-tmp.h:1490
-#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1607
-#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1727
-#: src/xml/xmli18n-tmp.h:1767 src/xml/xmli18n-tmp.h:1803
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:91 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:191 src/xml/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:439 src/xml/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:787 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1044
+#: src/xml/xmli18n-tmp.h:1125 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1315 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1854
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2327
 msgid "Photo Quality Glossy Paper"
 msgstr "Papel Brillante de Calidad Fotográfica"
 
-#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
-#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
-#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
-#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
-#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
-#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
-#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
-#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:897
-#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:1011
-#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1125
-#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1206
-#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1325
-#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1430
-#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1553
-#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1667
-#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1805
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1130
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1320
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1616
+#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1856 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2329
 msgid "Ilford Heavy Paper"
 msgstr "Papel Pesado Ilford"
 
-#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
-#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
-#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
-#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
-#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
-#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
-#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
-#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
-#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:847
-#: src/xml/xmli18n-tmp.h:903 src/xml/xmli18n-tmp.h:960
-#: src/xml/xmli18n-tmp.h:1017 src/xml/xmli18n-tmp.h:1074
-#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1168
-#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1214
-#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1274
-#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1374
-#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1499
-#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1616
-#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1736
-#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1809
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:129
+#: src/xml/xmli18n-tmp.h:203 src/xml/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:542 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1048
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1443
+#: src/xml/xmli18n-tmp.h:1539 src/xml/xmli18n-tmp.h:1578
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1720
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1985
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2333
 msgid "Other"
 msgstr "Otro"
 
@@ -2225,58 +2966,62 @@ msgstr "Manual con Pausa"
 msgid "Manual without Pause"
 msgstr "Manual sin Pausa"
 
-#: src/main/print-olympus.c:279
+#: src/main/print-olympus.c:281
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:280 src/cups/genppd.c:1685 src/cups/genppd.c:1713
-#: src/cups/genppd.c:1745 src/cups/genppd.c:1800 src/cups/genppd.c:1846
-#: src/cups/genppd.c:2147 src/cups/genppd.c:2160 src/cups/genppd.c:2183
-#: src/cups/genppd.c:2204 src/cups/genppd.c:2221
+#: src/main/print-olympus.c:282 src/cups/genppd.c:1718 src/cups/genppd.c:1746
+#: src/cups/genppd.c:1778 src/cups/genppd.c:1833 src/cups/genppd.c:1879
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2194 src/cups/genppd.c:2217
+#: src/cups/genppd.c:2238 src/cups/genppd.c:2255
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
-#: src/main/print-olympus.c:1132
+#: src/main/print-olympus.c:998 src/main/print-olympus.c:1061
+#: src/main/print-olympus.c:1165
 #, fuzzy
 msgid "Glossy"
 msgstr "Película Brillante"
 
-#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
-#: src/main/print-olympus.c:1133
+#: src/main/print-olympus.c:999 src/main/print-olympus.c:1062
+#: src/main/print-olympus.c:1166
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
+#: src/main/print-olympus.c:1063 src/main/print-olympus.c:1167
 #, fuzzy
 msgid "Matte"
 msgstr "Papel Opaco"
 
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
+#. TRANSLATORS: 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.
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1901
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1770
+#: src/main/print-olympus.c:1936
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-olympus.c:1778
+#: src/main/print-olympus.c:1944
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1952
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-olympus.c:1793
+#: src/main/print-olympus.c:1959
 #, fuzzy
 msgid "Black Balance"
 msgstr "Blanco y Negro"
 
-#: src/main/print-olympus.c:1794
+#: src/main/print-olympus.c:1960
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Ajustar el balance de cian de la impresión"
@@ -2310,7 +3055,7 @@ msgstr "Fotografía de Secado Rápido"
 msgid "Quick-dry Transparency"
 msgstr "Transparencia de Secado Rápido"
 
-#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3687
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:5925
 msgid "Manual"
 msgstr "Manual"
 
@@ -2395,24 +3140,24 @@ msgid "2400x600 DPI"
 msgstr "2400x600 PPP"
 
 #: src/main/print-pcl.c:278 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3638
-#: src/xml/xmli18n-tmp.h:3647 src/xml/xmli18n-tmp.h:3656
-#: src/xml/xmli18n-tmp.h:3664
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5875
+#: src/xml/xmli18n-tmp.h:5884 src/xml/xmli18n-tmp.h:5893
+#: src/xml/xmli18n-tmp.h:5901
 msgid "Draft"
 msgstr ""
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:3633 src/xml/xmli18n-tmp.h:3641
-#: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3658
-#: src/xml/xmli18n-tmp.h:3666
+#: src/xml/xmli18n-tmp.h:5870 src/xml/xmli18n-tmp.h:5878
+#: src/xml/xmli18n-tmp.h:5886 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5903
 #, fuzzy
 msgid "High"
 msgstr "Altura:"
 
 #: src/main/print-pcl.c:282 src/main/print-pcl.c:283
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3634
-#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3650
-#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3667
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5896 src/xml/xmli18n-tmp.h:5904
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografía"
@@ -2448,15 +3193,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3671
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:5908
 msgid "Letter"
 msgstr "Carta"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3708
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:5946
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3823
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6061
 msgid "Custom"
 msgstr "Personalizado"
 
@@ -2464,35 +3209,44 @@ msgstr "Personalizado"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3629
-#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3654
+#: src/main/print-weave.c:1511
+msgid "Fatal error!"
+msgstr ""
+
+#: src/main/print-weave.c:1547
+msgid ""
+"Please report the above information to gimp-print-devel@lists.sourceforge.net"
+msgstr ""
+
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:5866
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5891
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3630
-#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3655
-#: src/xml/xmli18n-tmp.h:3663
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5900
 msgid "Economy"
 msgstr ""
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3635
-#: src/xml/xmli18n-tmp.h:3642 src/xml/xmli18n-tmp.h:3651
-#: src/xml/xmli18n-tmp.h:3660 src/xml/xmli18n-tmp.h:3668
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:5872
+#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3636
-#: src/xml/xmli18n-tmp.h:3643 src/xml/xmli18n-tmp.h:3652
-#: src/xml/xmli18n-tmp.h:3661 src/xml/xmli18n-tmp.h:3669
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:5873
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5889
+#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5906
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1326 src/cups/genppd.c:1989
-#: src/xml/xmli18n-tmp.h:3637 src/xml/xmli18n-tmp.h:3644
-#: src/xml/xmli18n-tmp.h:3653 src/xml/xmli18n-tmp.h:3662
-#: src/xml/xmli18n-tmp.h:3670
+#: src/main/generic-options.c:41 src/cups/genppd.c:1359 src/cups/genppd.c:2023
+#: src/xml/xmli18n-tmp.h:5874 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5899
+#: src/xml/xmli18n-tmp.h:5907
 msgid "Best"
 msgstr ""
 
@@ -3262,81 +4016,81 @@ msgstr ""
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:960
+#: src/cups/genppd.c:993
 msgid "English"
 msgstr "Spanish"
 
-#: src/cups/genppd.c:1159 src/cups/genppd.c:1175 src/cups/genppd.c:1934
-#: src/cups/genppd.c:1935
+#: src/cups/genppd.c:1192 src/cups/genppd.c:1208 src/cups/genppd.c:1968
+#: src/cups/genppd.c:1969
 #, fuzzy
 msgid "Media Size"
 msgstr "Tamaño del medio:"
 
-#: src/cups/genppd.c:1248 src/cups/genppd.c:1970
+#: src/cups/genppd.c:1281 src/cups/genppd.c:2004
 #, fuzzy
 msgid "Color Model"
 msgstr "Color"
 
-#: src/cups/genppd.c:1275 src/cups/genppd.c:1972
+#: src/cups/genppd.c:1308 src/cups/genppd.c:2006
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "Tonos de gris"
 
-#: src/cups/genppd.c:1285 src/cups/genppd.c:1976
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2010
 #, fuzzy
 msgid "RGB Color"
 msgstr "Color"
 
-#: src/cups/genppd.c:1292 src/cups/genppd.c:1977
+#: src/cups/genppd.c:1325 src/cups/genppd.c:2011
 msgid "CMY Color"
 msgstr "Color CMY (Cian/Mag/Amar)"
 
-#: src/cups/genppd.c:1317 src/cups/genppd.c:1987
+#: src/cups/genppd.c:1350 src/cups/genppd.c:2021
 msgid "Color Precision"
 msgstr ""
 
-#: src/cups/genppd.c:1573 src/cups/genppd.c:2080
+#: src/cups/genppd.c:1606 src/cups/genppd.c:2114
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:1590 src/cups/genppd.c:2096
+#: src/cups/genppd.c:1623 src/cups/genppd.c:2130
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:1615 src/cups/genppd.c:2113
+#: src/cups/genppd.c:1648 src/cups/genppd.c:2147
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1620 src/cups/genppd.c:2114
+#: src/cups/genppd.c:1653 src/cups/genppd.c:2148
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1621 src/cups/genppd.c:2115
+#: src/cups/genppd.c:1654 src/cups/genppd.c:2149
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1622 src/cups/genppd.c:2116
+#: src/cups/genppd.c:1655 src/cups/genppd.c:2150
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1716 src/cups/genppd.c:2162
+#: src/cups/genppd.c:1749 src/cups/genppd.c:2196
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1718 src/cups/genppd.c:2164
+#: src/cups/genppd.c:1751 src/cups/genppd.c:2198
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1757 src/cups/genppd.c:1820 src/cups/genppd.c:1864
-#: src/cups/genppd.c:2185 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+#: src/cups/genppd.c:1790 src/cups/genppd.c:1853 src/cups/genppd.c:1897
+#: src/cups/genppd.c:2219 src/cups/genppd.c:2249 src/cups/genppd.c:2266
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1762 src/cups/genppd.c:2189
+#: src/cups/genppd.c:1795 src/cups/genppd.c:2223
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/cups/genppd.c:1805 src/cups/genppd.c:2209
+#: src/cups/genppd.c:1838 src/cups/genppd.c:2243
 #, c-format
 msgid "%.1f mm"
 msgstr ""
@@ -3665,51 +4419,61 @@ msgstr ""
 "No puedo detectar el tipo de impresora.\n"
 "Favor de usar -m para especificar su modelo de impresora.\n"
 
-#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:383
-#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
-#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
-#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
-#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
-#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
-#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
-#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
-#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
-#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
-#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
-#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
-#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
-#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
-#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
-#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
-#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
-#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
-#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
-#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
-#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
-#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
-#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
-#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
-#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
-#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
-#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
-#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
-#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
-#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
-#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1503
-#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1509
-#: src/xml/xmli18n-tmp.h:1512 src/xml/xmli18n-tmp.h:1515
-#: src/xml/xmli18n-tmp.h:1518 src/xml/xmli18n-tmp.h:1521
-#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1527
-#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
-#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
-#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
-#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
-#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
-#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:2655
-#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2717
-#: src/xml/xmli18n-tmp.h:3045 src/xml/xmli18n-tmp.h:3252
-#: src/xml/xmli18n-tmp.h:3273 src/xml/xmli18n-tmp.h:3363
-#: src/xml/xmli18n-tmp.h:3531
+#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2001
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2010 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2025
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:4085 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4612 src/xml/xmli18n-tmp.h:5481
 #, fuzzy
 msgid "Photo Black"
 msgstr "Papel para Fotografía"
@@ -3721,131 +4485,303 @@ msgid "Unknown"
 msgstr ""
 
 #: src/escputil/escputil.c:1000 src/escputil/escputil.c:1289
-#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1921
-#: src/xml/xmli18n-tmp.h:1937 src/xml/xmli18n-tmp.h:2002
-#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2079
-#: src/xml/xmli18n-tmp.h:2105 src/xml/xmli18n-tmp.h:2119
-#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2173
-#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
-#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
-#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2293
-#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2346
-#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2418
-#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2445
-#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2469
-#: src/xml/xmli18n-tmp.h:2484 src/xml/xmli18n-tmp.h:2512
-#: src/xml/xmli18n-tmp.h:2525 src/xml/xmli18n-tmp.h:2564
-#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2626
-#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2746
-#: src/xml/xmli18n-tmp.h:2762 src/xml/xmli18n-tmp.h:2843
-#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2895
-#: src/xml/xmli18n-tmp.h:2912 src/xml/xmli18n-tmp.h:2946
-#: src/xml/xmli18n-tmp.h:3001 src/xml/xmli18n-tmp.h:3015
-#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3122
-#: src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2461 src/xml/xmli18n-tmp.h:2526
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2683 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2711 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3101 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3661
+#: src/xml/xmli18n-tmp.h:3678 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3750 src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:3782 src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:3932 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3964 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4388 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:4639 src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:4875 src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4936
+#: src/xml/xmli18n-tmp.h:4942 src/xml/xmli18n-tmp.h:4968
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5339 src/xml/xmli18n-tmp.h:5348
+#: src/xml/xmli18n-tmp.h:5355 src/xml/xmli18n-tmp.h:5361
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5417
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5430
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5477 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5502
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5536 src/xml/xmli18n-tmp.h:5544
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5557
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5657 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5719
+#: src/xml/xmli18n-tmp.h:5726 src/xml/xmli18n-tmp.h:5732
+#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5779
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Cian Claro"
 
 #: src/escputil/escputil.c:1001 src/escputil/escputil.c:1290
-#: src/xml/xmli18n-tmp.h:1906 src/xml/xmli18n-tmp.h:1922
-#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:2003
-#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2080
-#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2120
-#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2174
-#: src/xml/xmli18n-tmp.h:2188 src/xml/xmli18n-tmp.h:2201
-#: src/xml/xmli18n-tmp.h:2214 src/xml/xmli18n-tmp.h:2227
-#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2294
-#: src/xml/xmli18n-tmp.h:2309 src/xml/xmli18n-tmp.h:2347
-#: src/xml/xmli18n-tmp.h:2360 src/xml/xmli18n-tmp.h:2419
-#: src/xml/xmli18n-tmp.h:2432 src/xml/xmli18n-tmp.h:2446
-#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2470
-#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2513
-#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2565
-#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2627
-#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2748
-#: src/xml/xmli18n-tmp.h:2761 src/xml/xmli18n-tmp.h:2844
-#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2896
-#: src/xml/xmli18n-tmp.h:2913 src/xml/xmli18n-tmp.h:2947
-#: src/xml/xmli18n-tmp.h:3000 src/xml/xmli18n-tmp.h:3014
-#: src/xml/xmli18n-tmp.h:3028 src/xml/xmli18n-tmp.h:3123
-#: src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2446
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2527
+#: src/xml/xmli18n-tmp.h:2541 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2644
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2698
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2751
+#: src/xml/xmli18n-tmp.h:2803 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2956 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2994
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3381
+#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3662
+#: src/xml/xmli18n-tmp.h:3746 src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:3778 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3934 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3966 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:4265 src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:4390 src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:4428 src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4452
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4465
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4512 src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4586 src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:4641 src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4903
+#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4970
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:5044 src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5168
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5241 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5334
+#: src/xml/xmli18n-tmp.h:5341 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5363
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5419
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5471
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5504
+#: src/xml/xmli18n-tmp.h:5510 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5652
+#: src/xml/xmli18n-tmp.h:5659 src/xml/xmli18n-tmp.h:5665
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5721
+#: src/xml/xmli18n-tmp.h:5728 src/xml/xmli18n-tmp.h:5734
+#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5781
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Magenta Claro"
 
-#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2433
-#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:3002
-#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3030
+#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3679 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4409 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:4566 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4605 src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4664 src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5376 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5450
+#: src/xml/xmli18n-tmp.h:5475 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5533 src/xml/xmli18n-tmp.h:5542
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5678 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5717
+#: src/xml/xmli18n-tmp.h:5747 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5777
 #, fuzzy
 msgid "Light Black"
 msgstr "Negro"
 
-#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:384
-#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
-#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
-#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
-#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
-#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
-#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
-#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
-#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
-#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
-#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
-#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
-#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
-#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
-#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
-#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
-#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
-#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
-#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
-#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
-#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
-#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
-#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
-#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
-#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
-#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
-#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
-#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
-#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
-#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
-#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1504
-#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1510
-#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1516
-#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1522
-#: src/xml/xmli18n-tmp.h:1525 src/xml/xmli18n-tmp.h:1528
-#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1534
-#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1540
-#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1546
-#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1552
-#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1558
-#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:2654
-#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2716
-#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3264
-#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3371
-#: src/xml/xmli18n-tmp.h:3539
+#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:508 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:532 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:538 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:562 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:568 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
+#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
+#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
+#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
+#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
+#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
+#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
+#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
+#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
+#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
+#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
+#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2011 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2026
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2032
+#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2038
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:4044 src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:5530
 #, fuzzy
 msgid "Matte Black"
 msgstr "Papel Opaco"
 
-#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:2658
-#: src/xml/xmli18n-tmp.h:2702 src/xml/xmli18n-tmp.h:2720
-#: src/xml/xmli18n-tmp.h:3048
+#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3995 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4006 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4020 src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:4106 src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4148
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Película Brillante"
 
-#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:2760
-#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3013
-#: src/xml/xmli18n-tmp.h:3027
+#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3676
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4616 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5534 src/xml/xmli18n-tmp.h:5573
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Negro"
 
 #: src/escputil/escputil.c:1010 src/escputil/escputil.c:1029
-#: src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:4099 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4189
 #, fuzzy
 msgid "Orange"
 msgstr "Tamaño"
@@ -4510,8252 +5446,8380 @@ msgstr "Imprimiendo..."
 #: src/xml/xmli18n-tmp.h:68 src/xml/xmli18n-tmp.h:70 src/xml/xmli18n-tmp.h:72
 #: src/xml/xmli18n-tmp.h:74 src/xml/xmli18n-tmp.h:76 src/xml/xmli18n-tmp.h:78
 #: src/xml/xmli18n-tmp.h:80 src/xml/xmli18n-tmp.h:82 src/xml/xmli18n-tmp.h:84
-#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:92
-#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
-#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
-#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
-#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
-#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
-#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
-#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
-#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
-#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
-#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
-#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
-#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
-#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
-#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
-#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
-#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
-#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
-#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
-#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
-#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
-#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
-#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
-#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
-#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
-#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
-#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
-#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
-#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
-#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
-#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
-#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
-#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
-#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
-#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
-#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
-#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
-#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
-#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
-#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
-#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
-#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
-#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
-#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
-#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
-#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
-#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
-#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
-#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
-#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
-#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
-#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
-#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
-#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
-#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
-#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
-#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
-#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
-#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
-#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
-#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
-#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
-#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
-#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
-#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
-#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
-#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
-#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
-#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
-#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
-#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
-#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
-#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
-#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
-#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
-#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
-#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
-#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
-#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
-#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
-#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
-#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
-#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
-#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
-#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
-#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
-#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
-#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
-#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
-#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
-#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
-#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
-#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
-#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
-#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
-#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
-#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:92 src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:102 src/xml/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:106 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:114 src/xml/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:118 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:126 src/xml/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:130 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:136 src/xml/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:144 src/xml/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:168 src/xml/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:192 src/xml/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:216 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:232 src/xml/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:240 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:256 src/xml/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:264 src/xml/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:304 src/xml/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:312 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:320 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:328 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:336 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:344 src/xml/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:352 src/xml/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:384 src/xml/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:408 src/xml/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:412 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:432 src/xml/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:444 src/xml/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:448 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:468 src/xml/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:484 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:642 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:698 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:714 src/xml/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:722 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:738 src/xml/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:746 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:764 src/xml/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:780 src/xml/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:804 src/xml/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:814
 #: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:818
 #: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:822
 #: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:826
 #: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:830
-#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:834
-#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:838
-#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:842
-#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:846
-#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:850
-#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
-#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
-#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
-#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
-#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
-#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
-#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
-#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:898
-#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
-#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
-#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
-#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
-#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
-#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
-#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
-#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
-#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
-#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
-#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
-#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
-#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
-#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
-#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
-#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
-#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
-#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
-#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
-#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1018
-#: src/xml/xmli18n-tmp.h:1021 src/xml/xmli18n-tmp.h:1024
-#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1030
-#: src/xml/xmli18n-tmp.h:1033 src/xml/xmli18n-tmp.h:1036
-#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1042
-#: src/xml/xmli18n-tmp.h:1045 src/xml/xmli18n-tmp.h:1048
-#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1054
-#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1060
-#: src/xml/xmli18n-tmp.h:1063 src/xml/xmli18n-tmp.h:1066
-#: src/xml/xmli18n-tmp.h:1069 src/xml/xmli18n-tmp.h:1072
-#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1078
-#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1084
-#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1090
-#: src/xml/xmli18n-tmp.h:1093 src/xml/xmli18n-tmp.h:1096
-#: src/xml/xmli18n-tmp.h:1099 src/xml/xmli18n-tmp.h:1102
-#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1108
-#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1114
-#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1120
-#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1126
-#: src/xml/xmli18n-tmp.h:1129 src/xml/xmli18n-tmp.h:1132
-#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
-#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
-#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
-#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
-#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
-#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
-#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
-#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
-#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
-#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
-#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
-#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
-#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
-#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1189
-#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1193
-#: src/xml/xmli18n-tmp.h:1195 src/xml/xmli18n-tmp.h:1197
-#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1201
-#: src/xml/xmli18n-tmp.h:1203 src/xml/xmli18n-tmp.h:1205
-#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1209
-#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1221
-#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
-#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
-#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
-#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
-#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
-#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
-#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
-#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
-#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
-#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
-#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
-#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
-#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
-#: src/xml/xmli18n-tmp.h:1302 src/xml/xmli18n-tmp.h:1305
-#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1311
-#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1317
-#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1323
-#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1329
-#: src/xml/xmli18n-tmp.h:1332 src/xml/xmli18n-tmp.h:1335
-#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
-#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1343
-#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1347
-#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1351
-#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1355
-#: src/xml/xmli18n-tmp.h:1357 src/xml/xmli18n-tmp.h:1359
-#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1363
-#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1367
-#: src/xml/xmli18n-tmp.h:1369 src/xml/xmli18n-tmp.h:1371
-#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1375
-#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1566
-#: src/xml/xmli18n-tmp.h:1569 src/xml/xmli18n-tmp.h:1572
-#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1578
-#: src/xml/xmli18n-tmp.h:1581 src/xml/xmli18n-tmp.h:1584
-#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1590
-#: src/xml/xmli18n-tmp.h:1593 src/xml/xmli18n-tmp.h:1596
-#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1602
-#: src/xml/xmli18n-tmp.h:1605 src/xml/xmli18n-tmp.h:1608
-#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1614
-#: src/xml/xmli18n-tmp.h:1617 src/xml/xmli18n-tmp.h:1620
-#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1626
-#: src/xml/xmli18n-tmp.h:1629 src/xml/xmli18n-tmp.h:1632
-#: src/xml/xmli18n-tmp.h:1635 src/xml/xmli18n-tmp.h:1638
-#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1644
-#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
-#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
-#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
-#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
-#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
-#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
-#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
-#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
-#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
-#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
-#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
-#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
-#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
-#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
-#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:1778
-#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1782
-#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1786
-#: src/xml/xmli18n-tmp.h:1788 src/xml/xmli18n-tmp.h:1790
-#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1794
-#: src/xml/xmli18n-tmp.h:1796 src/xml/xmli18n-tmp.h:1798
-#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1802
-#: src/xml/xmli18n-tmp.h:1804 src/xml/xmli18n-tmp.h:1806
-#: src/xml/xmli18n-tmp.h:1808 src/xml/xmli18n-tmp.h:1810
-#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3204
-#: src/xml/xmli18n-tmp.h:3210 src/xml/xmli18n-tmp.h:3216
-#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3232
-#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3250
-#: src/xml/xmli18n-tmp.h:3294 src/xml/xmli18n-tmp.h:3302
-#: src/xml/xmli18n-tmp.h:3304 src/xml/xmli18n-tmp.h:3312
-#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3379
-#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
-#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3421
-#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3441
-#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3469
-#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3555
-#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3597
-#: src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:1017
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1025
+#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1035 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1047 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1056
+#: src/xml/xmli18n-tmp.h:1061 src/xml/xmli18n-tmp.h:1066
+#: src/xml/xmli18n-tmp.h:1071 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1086
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1096
+#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1116
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1126
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1136
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1161 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1181 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1206
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1216
+#: src/xml/xmli18n-tmp.h:1221 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1236
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1246
+#: src/xml/xmli18n-tmp.h:1251 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1261 src/xml/xmli18n-tmp.h:1266
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1281 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1291 src/xml/xmli18n-tmp.h:1296
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1311 src/xml/xmli18n-tmp.h:1316
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1326
+#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1336
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1378 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1414 src/xml/xmli18n-tmp.h:1420
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1432
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1450 src/xml/xmli18n-tmp.h:1455
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1465
+#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1480 src/xml/xmli18n-tmp.h:1485
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1540 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1551 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1583 src/xml/xmli18n-tmp.h:1585
+#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1603 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1607 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1646
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1666
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1676
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1716
+#: src/xml/xmli18n-tmp.h:1721 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1736
+#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1835
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1843
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1851
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:2049
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2057
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2065
+#: src/xml/xmli18n-tmp.h:2069 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2113
+#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2129
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2137
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2153
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2161
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2185
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2264
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2272
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2276
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2282 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2286 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2296
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2300
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2308
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2314 src/xml/xmli18n-tmp.h:2316
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2324
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:3787 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3895 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:4223 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5579
+#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5825
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Bright White Paper"
 msgstr "Papel Opaco"
 
-#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
-#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
-#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
-#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
-#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
-#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
-#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
-#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:817
-#: src/xml/xmli18n-tmp.h:855 src/xml/xmli18n-tmp.h:912
-#: src/xml/xmli18n-tmp.h:969 src/xml/xmli18n-tmp.h:1026
-#: src/xml/xmli18n-tmp.h:1083 src/xml/xmli18n-tmp.h:1136
-#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1226
-#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1338
-#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1445
-#: src/xml/xmli18n-tmp.h:1505 src/xml/xmli18n-tmp.h:1568
-#: src/xml/xmli18n-tmp.h:1625 src/xml/xmli18n-tmp.h:1682
-#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1777
-#: src/xml/xmli18n-tmp.h:3675
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:139 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:959 src/xml/xmli18n-tmp.h:1018
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1155
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1546
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1931
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:5912
 msgid "Postcard"
 msgstr "Postal"
 
-#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
-#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
-#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
-#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
-#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
-#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
-#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
-#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:825
-#: src/xml/xmli18n-tmp.h:867 src/xml/xmli18n-tmp.h:924
-#: src/xml/xmli18n-tmp.h:981 src/xml/xmli18n-tmp.h:1038
-#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1144
-#: src/xml/xmli18n-tmp.h:1182 src/xml/xmli18n-tmp.h:1238
-#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1346
-#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1457
-#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1580
-#: src/xml/xmli18n-tmp.h:1637 src/xml/xmli18n-tmp.h:1694
-#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1785
+#: src/xml/xmli18n-tmp.h:13 src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:155 src/xml/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:415 src/xml/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:851 src/xml/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1026
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1175
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1554
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1832
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2309
 #, fuzzy
 msgid "Back Light Film"
 msgstr "Back Light Film"
 
-#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
-#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
-#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
-#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
-#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
-#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
-#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
-#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:829
-#: src/xml/xmli18n-tmp.h:873 src/xml/xmli18n-tmp.h:930
-#: src/xml/xmli18n-tmp.h:987 src/xml/xmli18n-tmp.h:1044
-#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1148
-#: src/xml/xmli18n-tmp.h:1186 src/xml/xmli18n-tmp.h:1244
-#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1350
-#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1463
-#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1586
-#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1700
-#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1789
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:419 src/xml/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:857 src/xml/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1030
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1383
+#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1558
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2313
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Papel Opaco"
 
-#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
-#: src/xml/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:421
 #, fuzzy
 msgid "Premium Presentation Paper Matte"
 msgstr "Papel de Fotografía Premium Luster"
 
-#: src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:431
 #, fuzzy
-msgid "Premium Glossy Photo Paper 170 wt"
+msgid "Ultra Glossy Photo Paper"
+msgstr "Papel Brillante de Fotografía"
+
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1210
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1413
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1568
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1695
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1964
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2176 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2287 src/xml/xmli18n-tmp.h:2323
+#, fuzzy
+msgid "Premium Semigloss Photo Paper"
 msgstr "Papel Brillante de Altísima Calidad Fotográfica"
 
-#: src/xml/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:437
 #, fuzzy
-msgid "Premium Glossy Photo Paper 250 wt"
+msgid "Ultra Premium Photo Paper Luster"
 msgstr "Papel Brillante de Altísima Calidad Fotográfica"
 
-#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
-#: src/xml/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:37
+msgid "CD or DVD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:93 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1230
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1437
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2331
 #, fuzzy
-msgid "Ultra Glossy Photo Paper"
-msgstr "Papel Brillante de Fotografía"
+msgid "ColorLife Paper"
+msgstr "Papel Común"
 
-#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
-#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
-#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
-#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
-#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
-#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
-#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
-#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:839
-#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:945
-#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1059
-#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1158
-#: src/xml/xmli18n-tmp.h:1196 src/xml/xmli18n-tmp.h:1259
-#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1360
-#: src/xml/xmli18n-tmp.h:1415 src/xml/xmli18n-tmp.h:1478
-#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1601
-#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1715
-#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:73
 #, fuzzy
-msgid "Premium Semigloss Photo Paper"
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Papel Brillante de Altísima Calidad Fotográfica"
+
+#: src/xml/xmli18n-tmp.h:75
+#, fuzzy
+msgid "Premium Glossy Photo Paper 250 wt"
 msgstr "Papel Brillante de Altísima Calidad Fotográfica"
 
-#: src/xml/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:81
 #, fuzzy
 msgid "Premium Semigloss Photo Paper 170 wt"
 msgstr "Papel Brillante de Altísima Calidad Fotográfica"
 
-#: src/xml/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:83
 #, fuzzy
 msgid "Premium Semigloss Photo Paper 250 wt"
 msgstr "Papel Brillante de Altísima Calidad Fotográfica"
 
-#: src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:87
 #, fuzzy
 msgid "Premium Luster Photo Paper 250 wt"
 msgstr "Papel de Fotografía Premium Luster"
 
-#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
-#: src/xml/xmli18n-tmp.h:334
-#, fuzzy
-msgid "Ultra Premium Photo Paper Luster"
-msgstr "Papel Brillante de Altísima Calidad Fotográfica"
-
-#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
-#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
-#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
-#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
-#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
-#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
-#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
-#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:845
-#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:957
-#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1071
-#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1166
-#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1271
-#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1372
-#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1496
-#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1613
-#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1733
-#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1807
-#, fuzzy
-msgid "ColorLife Paper"
-msgstr "Papel Común"
-
-#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
-#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
-#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
-#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
-#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
-#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
-#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
-#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
-#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
-#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
-#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
-#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
-#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
-#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
-#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
-#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
-#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
-#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
-#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
-#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
-#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
-#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
-#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
-#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
-#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
-#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
-#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
-#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
-#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
-#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
-#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
-#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
-#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
-#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
-#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
-#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
-#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
-#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
-#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
-#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
-#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
-#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
-#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
-#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
-#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
-#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
-#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:851
-#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:857
-#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:863
-#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:869
-#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:875
-#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:881
-#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:887
-#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:893
-#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:899
-#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:905
-#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:911
-#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:917
-#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:923
-#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:929
-#: src/xml/xmli18n-tmp.h:932 src/xml/xmli18n-tmp.h:935
-#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:941
-#: src/xml/xmli18n-tmp.h:944 src/xml/xmli18n-tmp.h:947
-#: src/xml/xmli18n-tmp.h:950 src/xml/xmli18n-tmp.h:953
-#: src/xml/xmli18n-tmp.h:956 src/xml/xmli18n-tmp.h:959
-#: src/xml/xmli18n-tmp.h:962 src/xml/xmli18n-tmp.h:965
-#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:971
-#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:977
-#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:983
-#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:989
-#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:995
-#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1001
-#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1007
-#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1013
-#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1019
-#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1025
-#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1031
-#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1037
-#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1043
-#: src/xml/xmli18n-tmp.h:1046 src/xml/xmli18n-tmp.h:1049
-#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1055
-#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1061
-#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1067
-#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1073
-#: src/xml/xmli18n-tmp.h:1076 src/xml/xmli18n-tmp.h:1079
-#: src/xml/xmli18n-tmp.h:1082 src/xml/xmli18n-tmp.h:1085
-#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1091
-#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1097
-#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1103
-#: src/xml/xmli18n-tmp.h:1106 src/xml/xmli18n-tmp.h:1109
-#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1115
-#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1121
-#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1127
-#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1133
-#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1225
-#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1231
-#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1237
-#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1243
-#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1249
-#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1255
-#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1261
-#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1267
-#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1273
-#: src/xml/xmli18n-tmp.h:1276 src/xml/xmli18n-tmp.h:1279
-#: src/xml/xmli18n-tmp.h:1282 src/xml/xmli18n-tmp.h:1285
-#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1291
-#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1297
-#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1303
-#: src/xml/xmli18n-tmp.h:1306 src/xml/xmli18n-tmp.h:1309
-#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1315
-#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1321
-#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1327
-#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1333
-#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1567
-#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1573
-#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1579
-#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1585
-#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1591
-#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1597
-#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1603
-#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1609
-#: src/xml/xmli18n-tmp.h:1612 src/xml/xmli18n-tmp.h:1615
-#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1621
-#: src/xml/xmli18n-tmp.h:1624 src/xml/xmli18n-tmp.h:1627
-#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1633
-#: src/xml/xmli18n-tmp.h:1636 src/xml/xmli18n-tmp.h:1639
-#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1645
-#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1651
-#: src/xml/xmli18n-tmp.h:1654 src/xml/xmli18n-tmp.h:1657
-#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1663
-#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1669
-#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1675
-#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3223
-#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3231
-#: src/xml/xmli18n-tmp.h:3238 src/xml/xmli18n-tmp.h:3239
-#: src/xml/xmli18n-tmp.h:3300 src/xml/xmli18n-tmp.h:3301
-#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3311
-#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3396
-#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3408
-#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3420
-#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3432
-#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3440
-#: src/xml/xmli18n-tmp.h:3479 src/xml/xmli18n-tmp.h:3480
-#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3492
-#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3554
-#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:133 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:149 src/xml/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:173 src/xml/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:197 src/xml/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:205 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:221 src/xml/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:229 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:245 src/xml/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:253 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:261 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:269 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:277 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:285 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:293 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:301 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:309 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:317 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:325 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:333 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:341 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:349 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:357 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:619 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:643 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:667 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:691 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:707 src/xml/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:715 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:731 src/xml/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:739 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:755 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1062
+#: src/xml/xmli18n-tmp.h:1067 src/xml/xmli18n-tmp.h:1072
+#: src/xml/xmli18n-tmp.h:1077 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1092
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1102
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1112
+#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1122
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1132
+#: src/xml/xmli18n-tmp.h:1137 src/xml/xmli18n-tmp.h:1142
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1157 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1177 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1192
+#: src/xml/xmli18n-tmp.h:1197 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1212
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1222
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1242
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1252
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1272
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1287 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1297 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1327 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1385 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1445 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1461
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1516 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1647
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1657
+#: src/xml/xmli18n-tmp.h:1662 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1677
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1687
+#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1742 src/xml/xmli18n-tmp.h:1747
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1767
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1807
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2090 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2098 src/xml/xmli18n-tmp.h:2102
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2118
+#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2126
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2162 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2190
+#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:3884 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:4779 src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:4845 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4919
+#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4980
+#: src/xml/xmli18n-tmp.h:4986 src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5209 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5276
+#: src/xml/xmli18n-tmp.h:5277 src/xml/xmli18n-tmp.h:5283
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5607 src/xml/xmli18n-tmp.h:5633
+#: src/xml/xmli18n-tmp.h:5634 src/xml/xmli18n-tmp.h:5640
 msgid "Quadtone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
-#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
-#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
-#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
-#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:852
-#: src/xml/xmli18n-tmp.h:909 src/xml/xmli18n-tmp.h:966
-#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1080
-#: src/xml/xmli18n-tmp.h:1172 src/xml/xmli18n-tmp.h:1223
-#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1336
-#: src/xml/xmli18n-tmp.h:1379 src/xml/xmli18n-tmp.h:1442
-#: src/xml/xmli18n-tmp.h:1565 src/xml/xmli18n-tmp.h:1622
-#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1775
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:142 src/xml/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:150 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:174 src/xml/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:198 src/xml/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:214 src/xml/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:222 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:238 src/xml/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:246 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:262 src/xml/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:302 src/xml/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:310 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:318 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:326 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:334 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:342 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:350 src/xml/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:636 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:660 src/xml/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:708 src/xml/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:716 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:732 src/xml/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:756 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1103
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1123
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1158 src/xml/xmli18n-tmp.h:1163
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1183
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1193
+#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1213
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1223
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1238 src/xml/xmli18n-tmp.h:1243
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1253
+#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1283
+#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1313
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1333
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1362 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1374 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1462
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1472
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1487 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1502
+#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:1532
+#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1542
+#: src/xml/xmli18n-tmp.h:1633 src/xml/xmli18n-tmp.h:1638
+#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1648
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1658
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1713 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1728
+#: src/xml/xmli18n-tmp.h:1733 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1768
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2071
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2095
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2115 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2123 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2139 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2183
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2191
+#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2199
+msgid "MISQuadtone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1150 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2299
 msgid "Plain Paper Fast Load"
 msgstr "Papel Común Carga Rápida"
 
-#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
-#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
-#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1364
-#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1484
-#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1970 src/xml/xmli18n-tmp.h:2030
+#: src/xml/xmli18n-tmp.h:2245
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Papel Opaco"
 
-#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
-#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
-#: src/xml/xmli18n-tmp.h:1202 src/xml/xmli18n-tmp.h:1366
-#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1487
-#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:881 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2248
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
-#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
-#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
-#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
-#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
-#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
-#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
-#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
-#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
-#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
-#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1377
-#: src/xml/xmli18n-tmp.h:1380 src/xml/xmli18n-tmp.h:1383
-#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1389
-#: src/xml/xmli18n-tmp.h:1392 src/xml/xmli18n-tmp.h:1395
-#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1401
-#: src/xml/xmli18n-tmp.h:1404 src/xml/xmli18n-tmp.h:1407
-#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1413
-#: src/xml/xmli18n-tmp.h:1416 src/xml/xmli18n-tmp.h:1419
-#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1425
-#: src/xml/xmli18n-tmp.h:1428 src/xml/xmli18n-tmp.h:1431
-#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1437
-#: src/xml/xmli18n-tmp.h:1440 src/xml/xmli18n-tmp.h:1443
-#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1449
-#: src/xml/xmli18n-tmp.h:1452 src/xml/xmli18n-tmp.h:1455
-#: src/xml/xmli18n-tmp.h:1458 src/xml/xmli18n-tmp.h:1461
-#: src/xml/xmli18n-tmp.h:1464 src/xml/xmli18n-tmp.h:1467
-#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1473
-#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1479
-#: src/xml/xmli18n-tmp.h:1482 src/xml/xmli18n-tmp.h:1485
-#: src/xml/xmli18n-tmp.h:1488 src/xml/xmli18n-tmp.h:1491
-#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1497
-#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1677
-#: src/xml/xmli18n-tmp.h:1680 src/xml/xmli18n-tmp.h:1683
-#: src/xml/xmli18n-tmp.h:1686 src/xml/xmli18n-tmp.h:1689
-#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1695
-#: src/xml/xmli18n-tmp.h:1698 src/xml/xmli18n-tmp.h:1701
-#: src/xml/xmli18n-tmp.h:1704 src/xml/xmli18n-tmp.h:1707
-#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1713
-#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1719
-#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1725
-#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1731
-#: src/xml/xmli18n-tmp.h:1734 src/xml/xmli18n-tmp.h:1737
-#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3503
-#: src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:1863
+#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1881
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1893
+#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1905
+#: src/xml/xmli18n-tmp.h:1908 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1923
+#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:1950 src/xml/xmli18n-tmp.h:1953
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1968 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1983
+#: src/xml/xmli18n-tmp.h:1986 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2204 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2255
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5645
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Fotografía de Seis Colores"
 
-#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
-#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
-#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
-#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
-#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
-#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
-#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
-#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
-#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
-#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
-#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1378
-#: src/xml/xmli18n-tmp.h:1381 src/xml/xmli18n-tmp.h:1384
-#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1390
-#: src/xml/xmli18n-tmp.h:1393 src/xml/xmli18n-tmp.h:1396
-#: src/xml/xmli18n-tmp.h:1399 src/xml/xmli18n-tmp.h:1402
-#: src/xml/xmli18n-tmp.h:1405 src/xml/xmli18n-tmp.h:1408
-#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1414
-#: src/xml/xmli18n-tmp.h:1417 src/xml/xmli18n-tmp.h:1420
-#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1426
-#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1432
-#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1438
-#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1444
-#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1450
-#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1456
-#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1462
-#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1468
-#: src/xml/xmli18n-tmp.h:1471 src/xml/xmli18n-tmp.h:1474
-#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1480
-#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1486
-#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1492
-#: src/xml/xmli18n-tmp.h:1495 src/xml/xmli18n-tmp.h:1498
-#: src/xml/xmli18n-tmp.h:1501 src/xml/xmli18n-tmp.h:1678
-#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1684
-#: src/xml/xmli18n-tmp.h:1687 src/xml/xmli18n-tmp.h:1690
-#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1696
-#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1702
-#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1708
-#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1714
-#: src/xml/xmli18n-tmp.h:1717 src/xml/xmli18n-tmp.h:1720
-#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1726
-#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1732
-#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1738
-#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3517
-#: src/xml/xmli18n-tmp.h:3577
+#: src/xml/xmli18n-tmp.h:835 src/xml/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:841 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1879 src/xml/xmli18n-tmp.h:1882
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1894
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1909 src/xml/xmli18n-tmp.h:1912
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1924
+#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1954
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1969 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1984
+#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2208
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2229 src/xml/xmli18n-tmp.h:2232
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2238
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2244
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2253 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2259 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5714
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1826
-#: src/xml/xmli18n-tmp.h:1839 src/xml/xmli18n-tmp.h:1852
-#: src/xml/xmli18n-tmp.h:1907 src/xml/xmli18n-tmp.h:1923
-#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1952
-#: src/xml/xmli18n-tmp.h:1965 src/xml/xmli18n-tmp.h:2054
-#: src/xml/xmli18n-tmp.h:2081 src/xml/xmli18n-tmp.h:2146
-#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
-#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
-#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2348
-#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2407
-#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2899
-#: src/xml/xmli18n-tmp.h:2916 src/xml/xmli18n-tmp.h:3142
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1139
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1154 src/xml/xmli18n-tmp.h:1159
+#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1179
+#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1199
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1214 src/xml/xmli18n-tmp.h:1219
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1229
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1244 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1259
+#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1274 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1289
+#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1309
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1329
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1423
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1429
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1447
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1634
+#: src/xml/xmli18n-tmp.h:1639 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1664
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1764
+#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1784
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1799 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1819
+msgid "MIS Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1463 src/xml/xmli18n-tmp.h:1468
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1478
+#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1508
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1533 src/xml/xmli18n-tmp.h:1538
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4858 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:5289
+msgid "Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2489 src/xml/xmli18n-tmp.h:2578
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2713 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2752
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2885 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:3051 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3665
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1828
-#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1853
-#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1879
-#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
-#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1940
-#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1966
-#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2055
-#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2133
-#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2175
-#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
-#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
-#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2336
-#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
-#: src/xml/xmli18n-tmp.h:2408 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2699
+#: src/xml/xmli18n-tmp.h:2714 src/xml/xmli18n-tmp.h:2727
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2886
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:3052
 msgid "180 DPI Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1830
-#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1854
-#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1880
-#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
-#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1941
-#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1967
-#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
-#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2134
-#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2176
-#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
-#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
-#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2337
-#: src/xml/xmli18n-tmp.h:2350 src/xml/xmli18n-tmp.h:2363
-#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
-#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2434
-#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2459
-#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2529
-#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2601
-#: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2703
-#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2735
-#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2768
-#: src/xml/xmli18n-tmp.h:2872 src/xml/xmli18n-tmp.h:2884
-#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2917
-#: src/xml/xmli18n-tmp.h:2961 src/xml/xmli18n-tmp.h:3007
-#: src/xml/xmli18n-tmp.h:3021 src/xml/xmli18n-tmp.h:3035
-#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3126
-#: src/xml/xmli18n-tmp.h:3143
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2404
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2658
+#: src/xml/xmli18n-tmp.h:2672 src/xml/xmli18n-tmp.h:2700
+#: src/xml/xmli18n-tmp.h:2715 src/xml/xmli18n-tmp.h:2728
+#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2754
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2919 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3053
+#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3125
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3292
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3530
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3649
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3684
 #, fuzzy
 msgid "360 x 180 DPI Draft"
 msgstr "150x150 PPP"
 
-#: src/xml/xmli18n-tmp.h:1818 src/xml/xmli18n-tmp.h:1831
-#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1855
-#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1881
-#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
-#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1942
-#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1968
-#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2135
-#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2392 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2418 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2479 src/xml/xmli18n-tmp.h:2492
+#: src/xml/xmli18n-tmp.h:2581 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2862 src/xml/xmli18n-tmp.h:2934
 #, fuzzy
 msgid "360 DPI High Quality"
 msgstr "1440 x 360 PPP Alta Calidad"
 
-#: src/xml/xmli18n-tmp.h:1819 src/xml/xmli18n-tmp.h:1832
-#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1856
-#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1882
-#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
-#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1943
-#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1969
-#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1992
-#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2020
-#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
-#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
-#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2096
-#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2123
-#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2149
-#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2177
-#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2205
-#: src/xml/xmli18n-tmp.h:2218 src/xml/xmli18n-tmp.h:2231
-#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2254
-#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
-#: src/xml/xmli18n-tmp.h:2297 src/xml/xmli18n-tmp.h:2312
-#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2339
-#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
-#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2385
-#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2411
-#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2435
-#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2460
-#: src/xml/xmli18n-tmp.h:2473 src/xml/xmli18n-tmp.h:2488
-#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2516
-#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2541
-#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2591
-#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
-#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2645
-#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2675
-#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2704
-#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2736
-#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2769
-#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2808
-#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2833
-#: src/xml/xmli18n-tmp.h:2847 src/xml/xmli18n-tmp.h:2861
-#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2885
-#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2918
-#: src/xml/xmli18n-tmp.h:2935 src/xml/xmli18n-tmp.h:2950
-#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2987
-#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3022
-#: src/xml/xmli18n-tmp.h:3036 src/xml/xmli18n-tmp.h:3050
-#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3081
-#: src/xml/xmli18n-tmp.h:3098 src/xml/xmli18n-tmp.h:3113
-#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2369 src/xml/xmli18n-tmp.h:2380
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2406
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2493
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2544
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
+#: src/xml/xmli18n-tmp.h:2582 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2729
+#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2806
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2836
+#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
+#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3012
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3040
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3184 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3424 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3485 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3573
+#: src/xml/xmli18n-tmp.h:3587 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3650 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3685
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 PPP"
 
-#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1833
-#: src/xml/xmli18n-tmp.h:1846 src/xml/xmli18n-tmp.h:1857
-#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1883
-#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1912
-#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1944
-#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1970
-#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1993
-#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2021
-#: src/xml/xmli18n-tmp.h:2033 src/xml/xmli18n-tmp.h:2045
-#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
-#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2097
-#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2124
-#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2150
-#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2178
-#: src/xml/xmli18n-tmp.h:2193 src/xml/xmli18n-tmp.h:2206
-#: src/xml/xmli18n-tmp.h:2219 src/xml/xmli18n-tmp.h:2232
-#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2255
-#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
-#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2313
-#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2340
-#: src/xml/xmli18n-tmp.h:2352 src/xml/xmli18n-tmp.h:2365
-#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2386
-#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2412
-#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2436
-#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2461
-#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2489
-#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2517
-#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2542
-#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2567
-#: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2592
-#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2616
-#: src/xml/xmli18n-tmp.h:2631 src/xml/xmli18n-tmp.h:2646
-#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2676
-#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2705
-#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2737
-#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2770
-#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2809
-#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2834
-#: src/xml/xmli18n-tmp.h:2848 src/xml/xmli18n-tmp.h:2862
-#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2886
-#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2919
-#: src/xml/xmli18n-tmp.h:2936 src/xml/xmli18n-tmp.h:2951
-#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2988
-#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3023
-#: src/xml/xmli18n-tmp.h:3037 src/xml/xmli18n-tmp.h:3051
-#: src/xml/xmli18n-tmp.h:3066 src/xml/xmli18n-tmp.h:3083
-#: src/xml/xmli18n-tmp.h:3099 src/xml/xmli18n-tmp.h:3114
-#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:2344 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2452 src/xml/xmli18n-tmp.h:2468
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2494
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2557 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:2594
+#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2648
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2674
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2807
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2837
+#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
+#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3013
+#: src/xml/xmli18n-tmp.h:3026 src/xml/xmli18n-tmp.h:3041
+#: src/xml/xmli18n-tmp.h:3055 src/xml/xmli18n-tmp.h:3066
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3140
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3170
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3229
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3333
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3358
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3385
+#: src/xml/xmli18n-tmp.h:3397 src/xml/xmli18n-tmp.h:3409
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3442
+#: src/xml/xmli18n-tmp.h:3459 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3574
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3637
+#: src/xml/xmli18n-tmp.h:3651 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3686
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 PPP"
 
-#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1834
-#: src/xml/xmli18n-tmp.h:1847 src/xml/xmli18n-tmp.h:1858
-#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1884
-#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1913
-#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1945
-#: src/xml/xmli18n-tmp.h:1958 src/xml/xmli18n-tmp.h:1971
-#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:1994
-#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2022
-#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2046
-#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2071
-#: src/xml/xmli18n-tmp.h:2086 src/xml/xmli18n-tmp.h:2098
-#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2125
-#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2151
-#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2179
-#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2207
-#: src/xml/xmli18n-tmp.h:2220 src/xml/xmli18n-tmp.h:2233
-#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2256
-#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
-#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2314
-#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2341
-#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
-#: src/xml/xmli18n-tmp.h:2376 src/xml/xmli18n-tmp.h:2387
-#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2413
-#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2437
-#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2462
-#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2490
-#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2518
-#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2543
-#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
-#: src/xml/xmli18n-tmp.h:2580 src/xml/xmli18n-tmp.h:2593
-#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2617
-#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
-#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2677
-#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2706
-#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2738
-#: src/xml/xmli18n-tmp.h:2753 src/xml/xmli18n-tmp.h:2771
-#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2810
-#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2835
-#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
-#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2887
-#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2921
-#: src/xml/xmli18n-tmp.h:2937 src/xml/xmli18n-tmp.h:2952
-#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2990
-#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3024
-#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3052
-#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3085
-#: src/xml/xmli18n-tmp.h:3100 src/xml/xmli18n-tmp.h:3115
-#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:2345 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2469
+#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2546
+#: src/xml/xmli18n-tmp.h:2558 src/xml/xmli18n-tmp.h:2570
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2595
+#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2622
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2675
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2731
+#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2808
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2838
+#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2890
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2922 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3014
+#: src/xml/xmli18n-tmp.h:3027 src/xml/xmli18n-tmp.h:3042
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3067
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3186 src/xml/xmli18n-tmp.h:3201
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3334
+#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3359
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3444
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3475
+#: src/xml/xmli18n-tmp.h:3489 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3533 src/xml/xmli18n-tmp.h:3547
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3652 src/xml/xmli18n-tmp.h:3669
+#: src/xml/xmli18n-tmp.h:3687
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 PPP"
 
-#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
-#: src/xml/xmli18n-tmp.h:1978 src/xml/xmli18n-tmp.h:2004
-#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2030
-#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2067
-#: src/xml/xmli18n-tmp.h:2094 src/xml/xmli18n-tmp.h:2107
-#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2161
-#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2252
-#: src/xml/xmli18n-tmp.h:2280 src/xml/xmli18n-tmp.h:2295
-#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2323
-#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
-#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2486
-#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2552
-#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2613
-#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
-#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2686
-#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2806
-#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2831
-#: src/xml/xmli18n-tmp.h:2845 src/xml/xmli18n-tmp.h:2859
-#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2948
-#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3080
-#: src/xml/xmli18n-tmp.h:3097 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2554
+#: src/xml/xmli18n-tmp.h:2566 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2804 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2834 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3076
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3382
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3586 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3634
 #, fuzzy
 msgid "360 x 120 DPI Economy"
 msgstr "600x600 PPP monocromo"
 
-#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1842
-#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2005
-#: src/xml/xmli18n-tmp.h:2019 src/xml/xmli18n-tmp.h:2031
-#: src/xml/xmli18n-tmp.h:2043 src/xml/xmli18n-tmp.h:2068
-#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
-#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2162
-#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2253
-#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2296
-#: src/xml/xmli18n-tmp.h:2311 src/xml/xmli18n-tmp.h:2324
-#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2384
-#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2487
-#: src/xml/xmli18n-tmp.h:2500 src/xml/xmli18n-tmp.h:2553
-#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2614
-#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2644
-#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2687
-#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2807
-#: src/xml/xmli18n-tmp.h:2820 src/xml/xmli18n-tmp.h:2832
-#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
-#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2949
-#: src/xml/xmli18n-tmp.h:3112
+#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2555
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2632
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3077
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3211
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3383
+#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3635
 #, fuzzy
 msgid "360 x 240 DPI Draft"
 msgstr "600x600 PPP"
 
-#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1872
-#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1898
-#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1930
-#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1959
-#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:1995
-#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2023
-#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2047
-#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2087
-#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2112
-#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2139
-#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2166
-#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2328
-#: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2388
-#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2557
-#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2922
-#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2991
-#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3086
+#: src/xml/xmli18n-tmp.h:2383 src/xml/xmli18n-tmp.h:2396
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2422
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2470 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2507 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2704 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:3057 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3118 src/xml/xmli18n-tmp.h:3445
+#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3514
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3609
 #, fuzzy
 msgid "720 DPI High Quality"
 msgstr "1200 PPP alta calidad"
 
-#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1873
-#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1899
-#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1931
-#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1984
-#: src/xml/xmli18n-tmp.h:1996 src/xml/xmli18n-tmp.h:2010
-#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2036
-#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2061
-#: src/xml/xmli18n-tmp.h:2073 src/xml/xmli18n-tmp.h:2088
-#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2127
-#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2153
-#: src/xml/xmli18n-tmp.h:2167 src/xml/xmli18n-tmp.h:2181
-#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2208
-#: src/xml/xmli18n-tmp.h:2221 src/xml/xmli18n-tmp.h:2234
-#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2257
-#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2285
-#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2315
-#: src/xml/xmli18n-tmp.h:2329 src/xml/xmli18n-tmp.h:2354
-#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2389
-#: src/xml/xmli18n-tmp.h:2399 src/xml/xmli18n-tmp.h:2425
-#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2451
-#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
-#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2504
-#: src/xml/xmli18n-tmp.h:2519 src/xml/xmli18n-tmp.h:2534
-#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2558
-#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2605
-#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2633
-#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2663
-#: src/xml/xmli18n-tmp.h:2678 src/xml/xmli18n-tmp.h:2691
-#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2725
-#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2754
-#: src/xml/xmli18n-tmp.h:2772 src/xml/xmli18n-tmp.h:2787
-#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2811
-#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2836
-#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
-#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2888
-#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2923
-#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2953
-#: src/xml/xmli18n-tmp.h:2968 src/xml/xmli18n-tmp.h:2978
-#: src/xml/xmli18n-tmp.h:2992 src/xml/xmli18n-tmp.h:3011
-#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3039
-#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
-#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3101
-#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3130
-#: src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:2384 src/xml/xmli18n-tmp.h:2397
+#: src/xml/xmli18n-tmp.h:2410 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2548 src/xml/xmli18n-tmp.h:2560
+#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2691 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2794 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2839
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2923 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3105
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3129
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3231 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3311
+#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3335
+#: src/xml/xmli18n-tmp.h:3348 src/xml/xmli18n-tmp.h:3360
+#: src/xml/xmli18n-tmp.h:3372 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3427 src/xml/xmli18n-tmp.h:3446
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3576 src/xml/xmli18n-tmp.h:3593
+#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3688
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 PPP"
 
-#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1874
-#: src/xml/xmli18n-tmp.h:1887 src/xml/xmli18n-tmp.h:1900
-#: src/xml/xmli18n-tmp.h:1916 src/xml/xmli18n-tmp.h:1932
-#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1985
-#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2011
-#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2037
-#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2062
-#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2089
-#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2128
-#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2154
-#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2182
-#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2258
-#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
-#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2316
-#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2390
-#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2559
-#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2634
-#: src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2385 src/xml/xmli18n-tmp.h:2398
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2535
+#: src/xml/xmli18n-tmp.h:2549 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2782
+#: src/xml/xmli18n-tmp.h:2795 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3388
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 360 PPP Altísima Calidad "
 
-#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1960
-#: src/xml/xmli18n-tmp.h:2100 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2902
 #, fuzzy
 msgid "720 DPI Highest Quality"
 msgstr "1200 PPP altísima calidad"
 
-#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2259
-#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
-#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2317
-#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2477
-#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2505
-#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2606
-#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2635
-#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2740
-#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2866
-#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2796 src/xml/xmli18n-tmp.h:2811
+#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3216 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3412
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 PPP"
 
-#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2260
-#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
-#: src/xml/xmli18n-tmp.h:2303 src/xml/xmli18n-tmp.h:2318
-#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2771 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2812
+#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:3160 src/xml/xmli18n-tmp.h:3390
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1440 x 360 PPP Altísima Calidad "
 
-#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2439
-#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2493
-#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2546
-#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2582
-#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2620
-#: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2664
-#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
-#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2726
-#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2755
-#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2789
-#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2812
-#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2878
-#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
-#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2939
-#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2969
-#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2994
-#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
-#: src/xml/xmli18n-tmp.h:3088 src/xml/xmli18n-tmp.h:3102
-#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3131
-#: src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2963
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3070
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3106
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3297 src/xml/xmli18n-tmp.h:3313
+#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
+#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3401
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3492
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3577 src/xml/xmli18n-tmp.h:3594
+#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3671 src/xml/xmli18n-tmp.h:3689
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 PPP"
 
-#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2426
-#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2452
-#: src/xml/xmli18n-tmp.h:2464 src/xml/xmli18n-tmp.h:2479
-#: src/xml/xmli18n-tmp.h:2494 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2547
-#: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2583
-#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2621
-#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2665
-#: src/xml/xmli18n-tmp.h:2680 src/xml/xmli18n-tmp.h:2694
-#: src/xml/xmli18n-tmp.h:2709 src/xml/xmli18n-tmp.h:2727
-#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2756
-#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2790
-#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2813
-#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2837
-#: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2879
-#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
-#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2940
-#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2970
-#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2995
-#: src/xml/xmli18n-tmp.h:3012 src/xml/xmli18n-tmp.h:3026
-#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3055
-#: src/xml/xmli18n-tmp.h:3072 src/xml/xmli18n-tmp.h:3089
-#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3118
-#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3071
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3107
+#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3251
+#: src/xml/xmli18n-tmp.h:3266 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3298 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3324 src/xml/xmli18n-tmp.h:3337
+#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3374 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3463
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3535 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3563 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3612
+#: src/xml/xmli18n-tmp.h:3626 src/xml/xmli18n-tmp.h:3641
+#: src/xml/xmli18n-tmp.h:3655 src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:3690
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 PPP"
 
-#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:4374
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Amarillo"
 
-#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2584
-#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2711
-#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2743
-#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2776
-#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2908
-#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2972
-#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3057
-#: src/xml/xmli18n-tmp.h:3074 src/xml/xmli18n-tmp.h:3091
-#: src/xml/xmli18n-tmp.h:3105 src/xml/xmli18n-tmp.h:3134
-#: src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3108
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3267
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3495
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3614
+#: src/xml/xmli18n-tmp.h:3628 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3692
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 PPP"
 
-#: src/xml/xmli18n-tmp.h:2666 src/xml/xmli18n-tmp.h:2681
-#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2728
-#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2775
-#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2814
-#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2838
-#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2926
-#: src/xml/xmli18n-tmp.h:2941 src/xml/xmli18n-tmp.h:2971
-#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
-#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
-#: src/xml/xmli18n-tmp.h:3090 src/xml/xmli18n-tmp.h:3104
-#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3133
-#: src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3190 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3234 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3325 src/xml/xmli18n-tmp.h:3338
+#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3362
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3505
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3613
+#: src/xml/xmli18n-tmp.h:3627 src/xml/xmli18n-tmp.h:3642
+#: src/xml/xmli18n-tmp.h:3656 src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:3691
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 PPP"
 
-#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2712
-#: src/xml/xmli18n-tmp.h:2730 src/xml/xmli18n-tmp.h:2759
-#: src/xml/xmli18n-tmp.h:2777 src/xml/xmli18n-tmp.h:2909
-#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2973
-#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3058
-#: src/xml/xmli18n-tmp.h:3075 src/xml/xmli18n-tmp.h:3092
-#: src/xml/xmli18n-tmp.h:3106 src/xml/xmli18n-tmp.h:3135
-#: src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3301 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3496
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3615
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 PPP"
 
-#: src/xml/xmli18n-tmp.h:2798 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3502
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 PPP"
 
-#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2965
-#: src/xml/xmli18n-tmp.h:2989 src/xml/xmli18n-tmp.h:3067
-#: src/xml/xmli18n-tmp.h:3084
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:3607
 #, fuzzy
 msgid "720 x 360 DPI Enhanced"
 msgstr "720 x 360 PPP"
 
-#: src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:3479
 #, fuzzy
 msgid "Black 1"
 msgstr "Negro"
 
-#: src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3480
 #, fuzzy
 msgid "Black 2"
 msgstr "Negro"
 
-#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3065
-#: src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3605
 #, fuzzy
 msgid "360 DPI Enhanced"
 msgstr "720 x 360 PPP"
 
-#: src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3516
 #, fuzzy
 msgid "1440 x 720 DPI High Quality"
 msgstr "1440 x 360 PPP Altísima Calidad "
 
-#: src/xml/xmli18n-tmp.h:3153
-msgid "Lower Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3677
+#, fuzzy
+msgid "Vivid Light Magenta"
+msgstr "Magenta Claro"
 
-#: src/xml/xmli18n-tmp.h:3154
-msgid "Upper Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3682
+#, fuzzy
+msgid "Vivid Magenta"
+msgstr "Magenta"
+
+#: src/xml/xmli18n-tmp.h:3694
+#, fuzzy
+msgid "Main Tray"
+msgstr "Bandeja"
+
+#: src/xml/xmli18n-tmp.h:3695
+#, fuzzy
+msgid "Photo Tray"
+msgstr "Fotografía"
 
-#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3160
-#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3176
-#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3186
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3725 src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:3732
 #, fuzzy
 msgid "Print to CD"
 msgstr "¿Imprimir a un archivo?"
 
-#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3181
-#: src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:3730
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Bandeja"
 
-#: src/xml/xmli18n-tmp.h:3157 src/xml/xmli18n-tmp.h:3182
-#: src/xml/xmli18n-tmp.h:3185
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:3731
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3159 src/xml/xmli18n-tmp.h:3164
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3705
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manual"
 
-#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3709
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3710
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3171
-#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3180
-#: src/xml/xmli18n-tmp.h:3193
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3716 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3739
 msgid "Roll Feed"
 msgstr "Alimentación por Rollo"
 
-#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3714 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3723
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Manual"
 
-#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3715 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3724
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Manual"
 
-#: src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3733
 #, fuzzy
 msgid "Photo Board"
 msgstr "Papel para Fotografía"
 
-#: src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3734
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3735
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3190
+#: src/xml/xmli18n-tmp.h:3736
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Autoseleccionar"
 
-#: src/xml/xmli18n-tmp.h:3191
+#: src/xml/xmli18n-tmp.h:3737
 msgid "Manual Selection"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3199 src/xml/xmli18n-tmp.h:3207
-#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3219
-#: src/xml/xmli18n-tmp.h:3227 src/xml/xmli18n-tmp.h:3235
-#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3257
-#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3278
-#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3297
-#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3317
-#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3342
-#: src/xml/xmli18n-tmp.h:3356 src/xml/xmli18n-tmp.h:3382
-#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
-#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3426
-#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3446
-#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3474
-#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3498
-#: src/xml/xmli18n-tmp.h:3510 src/xml/xmli18n-tmp.h:3524
-#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3558
-#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:3584
-#: src/xml/xmli18n-tmp.h:3594 src/xml/xmli18n-tmp.h:3600
-#: src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3763 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3872 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:4067 src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4172 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4236 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:4754 src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5102 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5679 src/xml/xmli18n-tmp.h:5748
+#: src/xml/xmli18n-tmp.h:5793 src/xml/xmli18n-tmp.h:5814
+#: src/xml/xmli18n-tmp.h:5835
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3208
-#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3220
-#: src/xml/xmli18n-tmp.h:3228 src/xml/xmli18n-tmp.h:3236
-#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3259
-#: src/xml/xmli18n-tmp.h:3270 src/xml/xmli18n-tmp.h:3280
-#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3298
-#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3318
-#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3344
-#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3383
-#: src/xml/xmli18n-tmp.h:3391 src/xml/xmli18n-tmp.h:3403
-#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3427
-#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3447
-#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3475
-#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3499
-#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3526
-#: src/xml/xmli18n-tmp.h:3551 src/xml/xmli18n-tmp.h:3559
-#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3586
-#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3601
-#: src/xml/xmli18n-tmp.h:3607
+#: src/xml/xmli18n-tmp.h:3765 src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4484 src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:4756 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5321
+#: src/xml/xmli18n-tmp.h:5382 src/xml/xmli18n-tmp.h:5451
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5795 src/xml/xmli18n-tmp.h:5816
+#: src/xml/xmli18n-tmp.h:5837
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Tres Colores Compuestos"
 
-#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
-#: src/xml/xmli18n-tmp.h:3215 src/xml/xmli18n-tmp.h:3221
-#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3237
-#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3271
-#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3299
-#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3319
-#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3345
-#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3384
-#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
-#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3428
-#: src/xml/xmli18n-tmp.h:3438 src/xml/xmli18n-tmp.h:3448
-#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3463
-#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3476
-#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3500
-#: src/xml/xmli18n-tmp.h:3513 src/xml/xmli18n-tmp.h:3527
-#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3560
-#: src/xml/xmli18n-tmp.h:3573 src/xml/xmli18n-tmp.h:3587
-#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3602
-#: src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:3824 src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5325
+#: src/xml/xmli18n-tmp.h:5386 src/xml/xmli18n-tmp.h:5455
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5757
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5841
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Cuatro Colores Estándard"
 
-#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3248
-#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
-#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3360
-#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
-#: src/xml/xmli18n-tmp.h:3417 src/xml/xmli18n-tmp.h:3429
-#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3459
-#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3501 src/xml/xmli18n-tmp.h:3514
-#: src/xml/xmli18n-tmp.h:3528 src/xml/xmli18n-tmp.h:3574
-#: src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4424 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:5066 src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:5196 src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5391
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5762
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3249
-#: src/xml/xmli18n-tmp.h:3272 src/xml/xmli18n-tmp.h:3293
-#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3333
-#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3361
-#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
-#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3430
-#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3460
-#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3478
-#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3502
-#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3529
-#: src/xml/xmli18n-tmp.h:3575 src/xml/xmli18n-tmp.h:3589
+#: src/xml/xmli18n-tmp.h:3780 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:4078 src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:4430 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4972
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5150 src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5336
+#: src/xml/xmli18n-tmp.h:5397 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5768
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3919 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:4781 src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:4795 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4921
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:4996
+#: src/xml/xmli18n-tmp.h:5023 src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:5226 src/xml/xmli18n-tmp.h:5279
+#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5603 src/xml/xmli18n-tmp.h:5609
+#: src/xml/xmli18n-tmp.h:5636 src/xml/xmli18n-tmp.h:5642
+#, fuzzy
+msgid "Gray 3"
+msgstr "Bandeja 3"
+
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4782 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4796 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4916 src/xml/xmli18n-tmp.h:4922
+#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4983
+#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5286 src/xml/xmli18n-tmp.h:5294
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5643
+#, fuzzy
+msgid "Gray 2"
+msgstr "Bandeja 2"
+
+#: src/xml/xmli18n-tmp.h:3855 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:4856 src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:4931 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4998
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:5214 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5611
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5644
+#, fuzzy
+msgid "Gray 1"
+msgstr "Bandeja 1"
+
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4985 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5606 src/xml/xmli18n-tmp.h:5639
+msgid "MIS Quadtone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4114
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Siete Colores Mejorados"
 
-#: src/xml/xmli18n-tmp.h:3260 src/xml/xmli18n-tmp.h:3281
+#: src/xml/xmli18n-tmp.h:4016 src/xml/xmli18n-tmp.h:4121
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Tres Colores Compuestos"
 
-#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3282
+#: src/xml/xmli18n-tmp.h:4021 src/xml/xmli18n-tmp.h:4126
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Cuatro Colores Estándard"
 
-#: src/xml/xmli18n-tmp.h:3262 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4132
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Seis Colores Compuestos Mejorados"
 
-#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:4035 src/xml/xmli18n-tmp.h:4140
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Siete Colores Mejorados"
 
-#: src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:4141
+#, fuzzy
+msgid "MatteBlack"
+msgstr "Papel Opaco"
+
+#: src/xml/xmli18n-tmp.h:4224
 #, fuzzy
 msgid "Default Black"
 msgstr "Establecer por Omisión"
 
-#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
-#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3365
-#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3504
-#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3533
-#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3564
-#: src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4446 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4573 src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:5344
+#: src/xml/xmli18n-tmp.h:5413 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5715
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Fotografía de Seis Colores"
 
-#: src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:4315
 msgid "Six Color Enhanced Composite"
 msgstr "Seis Colores Compuestos Mejorados"
 
-#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3348
-#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3516
-#: src/xml/xmli18n-tmp.h:3530 src/xml/xmli18n-tmp.h:3576
-#: src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:4368 src/xml/xmli18n-tmp.h:4437
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:5404
+#: src/xml/xmli18n-tmp.h:5473 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5775
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3355
-#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3523
-#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5745
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Tonos de gris"
 
-#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3357
-#: src/xml/xmli18n-tmp.h:3511 src/xml/xmli18n-tmp.h:3525
-#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:4412 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5448
+#: src/xml/xmli18n-tmp.h:5681 src/xml/xmli18n-tmp.h:5750
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Cuatro Colores Estándard"
 
-#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3372
-#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3540
+#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5531
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Fotografía de Seis Colores"
 
-#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3378
-#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:4652 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5570
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/xml/xmli18n-tmp.h:3462 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:5288
+msgid "MIS Six Tone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:4994
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5291
+#, fuzzy
+msgid "Gray 5"
+msgstr "Bandeja 1"
+
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:4928 src/xml/xmli18n-tmp.h:4995
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5292
+#, fuzzy
+msgid "Gray 4"
+msgstr "Bandeja 4"
+
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5145
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Fotografía de Seis Colores"
 
-#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3615
-#: src/xml/xmli18n-tmp.h:3621
+#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5852
+#: src/xml/xmli18n-tmp.h:5858
 #, fuzzy
 msgid "Interleave"
 msgstr "Nombre de la Impresora:"
 
-#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3616
-#: src/xml/xmli18n-tmp.h:3622
+#: src/xml/xmli18n-tmp.h:5848 src/xml/xmli18n-tmp.h:5853
+#: src/xml/xmli18n-tmp.h:5859
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3612 src/xml/xmli18n-tmp.h:3617
-#: src/xml/xmli18n-tmp.h:3623
+#: src/xml/xmli18n-tmp.h:5849 src/xml/xmli18n-tmp.h:5854
+#: src/xml/xmli18n-tmp.h:5860
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3613 src/xml/xmli18n-tmp.h:3618
-#: src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5855
+#: src/xml/xmli18n-tmp.h:5861
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:5862
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Nombre de la Impresora:"
 
-#: src/xml/xmli18n-tmp.h:3626
+#: src/xml/xmli18n-tmp.h:5863
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Brillo:"
 
-#: src/xml/xmli18n-tmp.h:3628
+#: src/xml/xmli18n-tmp.h:5865
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:5909
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:5910
 msgid "Tabloid"
 msgstr "Tabloide"
 
-#: src/xml/xmli18n-tmp.h:3674
+#: src/xml/xmli18n-tmp.h:5911
 msgid "Executive"
 msgstr "Ejecutivo"
 
-#: src/xml/xmli18n-tmp.h:3679
+#: src/xml/xmli18n-tmp.h:5916
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:3680
+#: src/xml/xmli18n-tmp.h:5917
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:5918
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:3682
+#: src/xml/xmli18n-tmp.h:5919
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Papel Epson 4x6 de Fotografía"
 
-#: src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:5920
+#, fuzzy
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr "Papel Epson 4x6 de Fotografía"
+
+#: src/xml/xmli18n-tmp.h:5921
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:3684
+#: src/xml/xmli18n-tmp.h:5922
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:3685
+#: src/xml/xmli18n-tmp.h:5923
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:3686
+#: src/xml/xmli18n-tmp.h:5924
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:3688
+#: src/xml/xmli18n-tmp.h:5926
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:3689
+#: src/xml/xmli18n-tmp.h:5927
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/xml/xmli18n-tmp.h:3690
+#: src/xml/xmli18n-tmp.h:5928
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3691
+#: src/xml/xmli18n-tmp.h:5929
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:3692
+#: src/xml/xmli18n-tmp.h:5930
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:3693
+#: src/xml/xmli18n-tmp.h:5931
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:3694
+#: src/xml/xmli18n-tmp.h:5932
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:3695
+#: src/xml/xmli18n-tmp.h:5933
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:3696
+#: src/xml/xmli18n-tmp.h:5934
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:3697
+#: src/xml/xmli18n-tmp.h:5935
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:3698
+#: src/xml/xmli18n-tmp.h:5936
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:3699
+#: src/xml/xmli18n-tmp.h:5937
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3700
+#: src/xml/xmli18n-tmp.h:5938
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:5939
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:3702
+#: src/xml/xmli18n-tmp.h:5940
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:3703
+#: src/xml/xmli18n-tmp.h:5941
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:5942
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:3705
+#: src/xml/xmli18n-tmp.h:5943
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:3706
+#: src/xml/xmli18n-tmp.h:5944
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:3707
+#: src/xml/xmli18n-tmp.h:5945
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:3709
+#: src/xml/xmli18n-tmp.h:5947
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:3710
+#: src/xml/xmli18n-tmp.h:5948
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:5949
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:5950
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:3713
+#: src/xml/xmli18n-tmp.h:5951
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:3714
+#: src/xml/xmli18n-tmp.h:5952
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:3715
+#: src/xml/xmli18n-tmp.h:5953
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:3716
+#: src/xml/xmli18n-tmp.h:5954
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:5955
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:5956
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:5957
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:5958
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:5959
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:3722
+#: src/xml/xmli18n-tmp.h:5960
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:3723
+#: src/xml/xmli18n-tmp.h:5961
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:3724
+#: src/xml/xmli18n-tmp.h:5962
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:3725
+#: src/xml/xmli18n-tmp.h:5963
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:3726
+#: src/xml/xmli18n-tmp.h:5964
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:5965
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:5966
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:5967
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:3730
+#: src/xml/xmli18n-tmp.h:5968
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:3731
+#: src/xml/xmli18n-tmp.h:5969
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:3732
+#: src/xml/xmli18n-tmp.h:5970
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:3733
+#: src/xml/xmli18n-tmp.h:5971
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:3734
+#: src/xml/xmli18n-tmp.h:5972
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:3735
+#: src/xml/xmli18n-tmp.h:5973
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:3736
+#: src/xml/xmli18n-tmp.h:5974
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:3737
+#: src/xml/xmli18n-tmp.h:5975
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5976
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3739
+#: src/xml/xmli18n-tmp.h:5977
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:5978
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:3741
+#: src/xml/xmli18n-tmp.h:5979
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:5980
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:3743
+#: src/xml/xmli18n-tmp.h:5981
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:5982
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:5983
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:3746
+#: src/xml/xmli18n-tmp.h:5984
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:3747
+#: src/xml/xmli18n-tmp.h:5985
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:3748
+#: src/xml/xmli18n-tmp.h:5986
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:5987
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:3750
+#: src/xml/xmli18n-tmp.h:5988
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:3751
+#: src/xml/xmli18n-tmp.h:5989
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:5990
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:5991
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:3754
+#: src/xml/xmli18n-tmp.h:5992
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:3755
+#: src/xml/xmli18n-tmp.h:5993
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:3756
+#: src/xml/xmli18n-tmp.h:5994
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:5995
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:3758
+#: src/xml/xmli18n-tmp.h:5996
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:3759
+#: src/xml/xmli18n-tmp.h:5997
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:5998
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:3761
+#: src/xml/xmli18n-tmp.h:5999
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:6000
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:3763
+#: src/xml/xmli18n-tmp.h:6001
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:6002
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:3765
+#: src/xml/xmli18n-tmp.h:6003
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:3766
+#: src/xml/xmli18n-tmp.h:6004
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:6005
 #, fuzzy
 msgid "DL landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:3768
+#: src/xml/xmli18n-tmp.h:6006
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:3769
+#: src/xml/xmli18n-tmp.h:6007
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:3770
+#: src/xml/xmli18n-tmp.h:6008
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:6009
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:3772
+#: src/xml/xmli18n-tmp.h:6010
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:6011
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:3774
+#: src/xml/xmli18n-tmp.h:6012
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:3775
+#: src/xml/xmli18n-tmp.h:6013
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:6014
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:6015
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Apaisado"
 
-#: src/xml/xmli18n-tmp.h:3778
+#: src/xml/xmli18n-tmp.h:6016
 #, fuzzy
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:3779
+#: src/xml/xmli18n-tmp.h:6017
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3780
+#: src/xml/xmli18n-tmp.h:6018
 #, fuzzy
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:6019
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3782
+#: src/xml/xmli18n-tmp.h:6020
 #, fuzzy
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:6021
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3784
+#: src/xml/xmli18n-tmp.h:6022
 #, fuzzy
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:6023
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:6024
 #, fuzzy
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:3787
+#: src/xml/xmli18n-tmp.h:6025
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:6026
 #, fuzzy
 msgid "American foolscap"
 msgstr "Foolscap Americano"
 
-#: src/xml/xmli18n-tmp.h:3789
+#: src/xml/xmli18n-tmp.h:6027
 #, fuzzy
 msgid "European foolscap"
 msgstr "Foolscap Europeo"
 
-#: src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:6028
 #, fuzzy
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:6029
 #, fuzzy
 msgid "Large Crown Quarto"
 msgstr "Crown Quarto Grande"
 
-#: src/xml/xmli18n-tmp.h:3792
+#: src/xml/xmli18n-tmp.h:6030
 #, fuzzy
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:6031
 #, fuzzy
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/xml/xmli18n-tmp.h:3794
+#: src/xml/xmli18n-tmp.h:6032
 #, fuzzy
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:3795
+#: src/xml/xmli18n-tmp.h:6033
 #, fuzzy
 msgid "Large Crown Octavo"
 msgstr "Crown Octavo Grande"
 
-#: src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:6034
 #, fuzzy
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:6035
 #, fuzzy
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:6036
 #, fuzzy
 msgid "Small paperback"
 msgstr "Paperback pequeño"
 
-#: src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:6037
 #, fuzzy
 msgid "Penguin small paperback"
 msgstr "Penguin paperback pequeño"
 
-#: src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:6038
 #, fuzzy
 msgid "Penguin large paperback"
 msgstr "Penguin paperback grande"
 
-#: src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:6039
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3802
+#: src/xml/xmli18n-tmp.h:6040
 msgid "Hagaki Card"
 msgstr "Tarjeta Hagaki"
 
-#: src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:6041
 msgid "Oufuku Card"
 msgstr "Tarjeta Oufuku"
 
-#: src/xml/xmli18n-tmp.h:3804
+#: src/xml/xmli18n-tmp.h:6042
 msgid "Japanese long envelope #3"
 msgstr "Sobre Japonés grande #3"
 
-#: src/xml/xmli18n-tmp.h:3805
+#: src/xml/xmli18n-tmp.h:6043
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "Sobre Japonés grande #3"
 
-#: src/xml/xmli18n-tmp.h:3806
+#: src/xml/xmli18n-tmp.h:6044
 msgid "Japanese long envelope #4"
 msgstr "Sobre Japonés grande #4"
 
-#: src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:6045
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "Sobre Japonés grande #4"
 
-#: src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:6046
 msgid "Japanese Kaku envelope #4"
 msgstr "Sobre Japonés Kaku #4"
 
-#: src/xml/xmli18n-tmp.h:3809
+#: src/xml/xmli18n-tmp.h:6047
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Sobre Japonés Kaku #4"
 
-#: src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:6048
 msgid "Commercial 10"
 msgstr "Comercial 10"
 
-#: src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:6049
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Comercial 10"
 
-#: src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:6050
 msgid "A2 Invitation"
 msgstr "A2 Invitación"
 
-#: src/xml/xmli18n-tmp.h:3813
+#: src/xml/xmli18n-tmp.h:6051
 #, fuzzy
 msgid "Monarch Envelope"
 msgstr "Sobre"
 
-#: src/xml/xmli18n-tmp.h:3814
+#: src/xml/xmli18n-tmp.h:6052
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Sobre"
 
-#: src/xml/xmli18n-tmp.h:3815
+#: src/xml/xmli18n-tmp.h:6053
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3816
+#: src/xml/xmli18n-tmp.h:6054
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:6055
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3818
+#: src/xml/xmli18n-tmp.h:6056
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3819
+#: src/xml/xmli18n-tmp.h:6057
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Postal"
 
-#: src/xml/xmli18n-tmp.h:3820
+#: src/xml/xmli18n-tmp.h:6058
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:6059
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:6060
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3824
+#: src/xml/xmli18n-tmp.h:6062
 msgid "89 mm Roll Paper"
 msgstr "Rollo de Papel de 89 mm"
 
-#: src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:6063
 msgid "4 Inch Roll Paper"
 msgstr "Rollo de Papel de 4 Pulgadas"
 
-#: src/xml/xmli18n-tmp.h:3826
+#: src/xml/xmli18n-tmp.h:6064
 msgid "5 Inch Roll Paper"
 msgstr "Rollo de Papel de 5 Pulgadas"
 
-#: src/xml/xmli18n-tmp.h:3827
+#: src/xml/xmli18n-tmp.h:6065
 msgid "210 mm Roll Paper"
 msgstr "Rollo de Papel de 210 mm"
 
-#: src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:6066
 msgid "13 Inch Roll Paper"
 msgstr "Rollo de Papel de 13 Pulgadas"
 
-#: src/xml/xmli18n-tmp.h:3829
+#: src/xml/xmli18n-tmp.h:6067
 #, fuzzy
 msgid "17 Inch Roll Paper"
 msgstr "Rollo de Papel de 13 Pulgadas"
 
-#: src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:6068
 msgid "22 Inch Roll Paper"
 msgstr "Rollo de Papel de 22 Pulgadas"
 
-#: src/xml/xmli18n-tmp.h:3831
+#: src/xml/xmli18n-tmp.h:6069
 msgid "24 Inch Roll Paper"
 msgstr "Rollo de Papel de 24 Pulgadas"
 
-#: src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:6070
 msgid "36 Inch Roll Paper"
 msgstr "Rollo de Papel de 36 Pulgadas"
 
-#: src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:6071
 msgid "44 Inch Roll Paper"
 msgstr "Rollo de Papel de 44 Pulgadas"
 
-#: src/xml/xmli18n-tmp.h:3834
+#: src/xml/xmli18n-tmp.h:6072
 #, fuzzy
 msgid "60 Inch Roll Paper"
 msgstr "Rollo de Papel de 36 Pulgadas"
 
-#: src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:6073
 #, fuzzy
 msgid "64 Inch Roll Paper"
 msgstr "Rollo de Papel de 4 Pulgadas"
 
-#: src/xml/xmli18n-tmp.h:3836
+#: src/xml/xmli18n-tmp.h:6074
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3837
+#: src/xml/xmli18n-tmp.h:6075
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:6076
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:6077
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:6078
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:6079
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:6080
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:6081
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3844
+#: src/xml/xmli18n-tmp.h:6082
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:6083
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3846
+#: src/xml/xmli18n-tmp.h:6084
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3847
+#: src/xml/xmli18n-tmp.h:6085
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3848
+#: src/xml/xmli18n-tmp.h:6086
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:6087
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3850
+#: src/xml/xmli18n-tmp.h:6088
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:6089
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:6090
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3853
+#: src/xml/xmli18n-tmp.h:6091
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3854
+#: src/xml/xmli18n-tmp.h:6092
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3855
+#: src/xml/xmli18n-tmp.h:6093
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3856
+#: src/xml/xmli18n-tmp.h:6094
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3857
+#: src/xml/xmli18n-tmp.h:6095
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3858
+#: src/xml/xmli18n-tmp.h:6096
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:6097
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:6098
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:6099
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:6100
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3863
+#: src/xml/xmli18n-tmp.h:6101
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:6102
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:6103
 msgid "Canon S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:6104
 msgid "Canon S200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3867
+#: src/xml/xmli18n-tmp.h:6105
 msgid "Canon S300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3868
+#: src/xml/xmli18n-tmp.h:6106
 msgid "Canon S400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3869
+#: src/xml/xmli18n-tmp.h:6107
 msgid "Canon S450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3870
+#: src/xml/xmli18n-tmp.h:6108
 msgid "Canon S500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:6109
 msgid "Canon S600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3872
+#: src/xml/xmli18n-tmp.h:6110
 msgid "Canon S630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3873
+#: src/xml/xmli18n-tmp.h:6111
 msgid "Canon S800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3874
+#: src/xml/xmli18n-tmp.h:6112
 msgid "Canon S4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:6113
 msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:6114
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3877
+#: src/xml/xmli18n-tmp.h:6115
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3878
+#: src/xml/xmli18n-tmp.h:6116
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:6117
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3880
+#: src/xml/xmli18n-tmp.h:6118
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3881
+#: src/xml/xmli18n-tmp.h:6119
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:6120
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:6121
 msgid "Canon PIXMA iP4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3884
+#: src/xml/xmli18n-tmp.h:6122
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3885
+#: src/xml/xmli18n-tmp.h:6123
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3886
+#: src/xml/xmli18n-tmp.h:6124
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3887
+#: src/xml/xmli18n-tmp.h:6125
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3888
+#: src/xml/xmli18n-tmp.h:6126
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:6127
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:6128
+msgid "Canon PIXMA iX4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6129
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:6130
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:6131
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:6132
 msgid "Canon PIXMA MP160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:6133
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3895
+#: src/xml/xmli18n-tmp.h:6134
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:6135
 msgid "Canon PIXMA MP220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3897
+#: src/xml/xmli18n-tmp.h:6136
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:6137
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:6138
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3900
+#: src/xml/xmli18n-tmp.h:6139
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:6140
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3902
+#: src/xml/xmli18n-tmp.h:6141
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3903
+#: src/xml/xmli18n-tmp.h:6142
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:6143
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:6144
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:6145
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:6146
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:6147
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:6148
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3910
+#: src/xml/xmli18n-tmp.h:6149
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:6150
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3912
+#: src/xml/xmli18n-tmp.h:6151
 msgid "Canon i80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3913
+#: src/xml/xmli18n-tmp.h:6152
 msgid "Canon i560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3914
+#: src/xml/xmli18n-tmp.h:6153
 msgid "Canon i850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:6154
 msgid "Canon i860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3916
+#: src/xml/xmli18n-tmp.h:6155
 msgid "Canon i865"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:6156
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:6157
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3919
+#: src/xml/xmli18n-tmp.h:6158
 #, fuzzy
 msgid "Epson B-300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3920
+#: src/xml/xmli18n-tmp.h:6159
 #, fuzzy
 msgid "Epson B-308"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3921
+#: src/xml/xmli18n-tmp.h:6160
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3922
+#: src/xml/xmli18n-tmp.h:6161
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3923
+#: src/xml/xmli18n-tmp.h:6162
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:3924
+#: src/xml/xmli18n-tmp.h:6163
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:6164
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:6165
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:6166
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:6167
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:6168
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:6169
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:6170
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3932
+#: src/xml/xmli18n-tmp.h:6171
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:6172
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3934
+#: src/xml/xmli18n-tmp.h:6173
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3935
+#: src/xml/xmli18n-tmp.h:6174
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:6175
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3937
+#: src/xml/xmli18n-tmp.h:6176
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:6177
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3939
+#: src/xml/xmli18n-tmp.h:6178
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:6179
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:6180
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3942
+#: src/xml/xmli18n-tmp.h:6181
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3943
+#: src/xml/xmli18n-tmp.h:6182
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:6183
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:6184
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3946
+#: src/xml/xmli18n-tmp.h:6185
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3947
+#: src/xml/xmli18n-tmp.h:6186
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3948
+#: src/xml/xmli18n-tmp.h:6187
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3949
+#: src/xml/xmli18n-tmp.h:6188
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:6189
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3951
+#: src/xml/xmli18n-tmp.h:6190
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:6191
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3953
+#: src/xml/xmli18n-tmp.h:6192
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:6193
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:6194
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3956
+#: src/xml/xmli18n-tmp.h:6195
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3957
+#: src/xml/xmli18n-tmp.h:6196
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3958
+#: src/xml/xmli18n-tmp.h:6197
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3959
+#: src/xml/xmli18n-tmp.h:6198
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3960
+#: src/xml/xmli18n-tmp.h:6199
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:6200
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:6201
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:6202
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3964
+#: src/xml/xmli18n-tmp.h:6203
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:6204
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3966
+#: src/xml/xmli18n-tmp.h:6205
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3967
+#: src/xml/xmli18n-tmp.h:6206
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:6207
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:6208
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3970
+#: src/xml/xmli18n-tmp.h:6209
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:6210
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:3972
+#: src/xml/xmli18n-tmp.h:6211
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:6212
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:6213
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:3975
+#: src/xml/xmli18n-tmp.h:6214
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:6215
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:6216
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:6217
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:3979
+#: src/xml/xmli18n-tmp.h:6218
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:6219
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:3981
+#: src/xml/xmli18n-tmp.h:6220
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:3982
+#: src/xml/xmli18n-tmp.h:6221
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:3983
+#: src/xml/xmli18n-tmp.h:6222
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:3984
+#: src/xml/xmli18n-tmp.h:6223
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:6224
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:6225
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:3987
+#: src/xml/xmli18n-tmp.h:6226
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:6227
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:3989
+#: src/xml/xmli18n-tmp.h:6228
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:6229
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:6230
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:3992
+#: src/xml/xmli18n-tmp.h:6231
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:3993
+#: src/xml/xmli18n-tmp.h:6232
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:6233
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:3995
+#: src/xml/xmli18n-tmp.h:6234
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:6235
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:6236
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3998
+#: src/xml/xmli18n-tmp.h:6237
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3999
+#: src/xml/xmli18n-tmp.h:6238
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:6239
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:6240
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:4002
+#: src/xml/xmli18n-tmp.h:6241
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:6242
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:6243
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4005
+#: src/xml/xmli18n-tmp.h:6244
 #, fuzzy
-msgid "Epson Stylus Offixe TX300F"
+msgid "Epson Stylus Office TX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4006
+#: src/xml/xmli18n-tmp.h:6245
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:6246
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:4008
+#: src/xml/xmli18n-tmp.h:6247
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4009
+#: src/xml/xmli18n-tmp.h:6248
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:6249
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:6250
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:6251
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4013
+#: src/xml/xmli18n-tmp.h:6252
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4014
+#: src/xml/xmli18n-tmp.h:6253
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:6254
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:4016
+#: src/xml/xmli18n-tmp.h:6255
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:6256
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:6257
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4019
+#: src/xml/xmli18n-tmp.h:6258
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4020
+#: src/xml/xmli18n-tmp.h:6259
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4021
+#: src/xml/xmli18n-tmp.h:6260
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:4022
+#: src/xml/xmli18n-tmp.h:6261
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:4023
+#: src/xml/xmli18n-tmp.h:6262
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:4024
+#: src/xml/xmli18n-tmp.h:6263
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:6264
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:6265
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4027
+#: src/xml/xmli18n-tmp.h:6266
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:6267
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:6268
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:6269
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:4031
+#: src/xml/xmli18n-tmp.h:6270
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:6271
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4033
+#: src/xml/xmli18n-tmp.h:6272
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4034
+#: src/xml/xmli18n-tmp.h:6273
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4035
+#: src/xml/xmli18n-tmp.h:6274
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:6275
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4037
+#: src/xml/xmli18n-tmp.h:6276
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:4038
+#: src/xml/xmli18n-tmp.h:6277
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4039
+#: src/xml/xmli18n-tmp.h:6278
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:6279
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4041
+#: src/xml/xmli18n-tmp.h:6280
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:6281
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:6282
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4044
+#: src/xml/xmli18n-tmp.h:6283
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:6284
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:6285
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:6286
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:6287
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4049
+#: src/xml/xmli18n-tmp.h:6288
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:6289
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4051
+#: src/xml/xmli18n-tmp.h:6290
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:6291
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4053
+#: src/xml/xmli18n-tmp.h:6292
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4054
+#: src/xml/xmli18n-tmp.h:6293
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:6294
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4056
+#: src/xml/xmli18n-tmp.h:6295
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:6296
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4058
+#: src/xml/xmli18n-tmp.h:6297
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4059
+#: src/xml/xmli18n-tmp.h:6298
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:6299
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:6300
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4062
+#: src/xml/xmli18n-tmp.h:6301
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:6302
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4064
+#: src/xml/xmli18n-tmp.h:6303
+#, fuzzy
+msgid "Epson Stylus Photo R2880"
+msgstr "Stylus Photo 1280"
+
+#: src/xml/xmli18n-tmp.h:6304
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4065
+#: src/xml/xmli18n-tmp.h:6305
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:6306
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4067
+#: src/xml/xmli18n-tmp.h:6307
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:6308
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4069
+#: src/xml/xmli18n-tmp.h:6309
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:6310
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:6311
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4072
+#: src/xml/xmli18n-tmp.h:6312
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:6313
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4074
+#: src/xml/xmli18n-tmp.h:6314
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4075
+#: src/xml/xmli18n-tmp.h:6315
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4076
+#: src/xml/xmli18n-tmp.h:6316
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:6317
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4078
+#: src/xml/xmli18n-tmp.h:6318
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:6319
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:6320
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:6321
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4082
+#: src/xml/xmli18n-tmp.h:6322
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:6323
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4084
+#: src/xml/xmli18n-tmp.h:6324
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4085
+#: src/xml/xmli18n-tmp.h:6325
 #, fuzzy
-msgid "Epson Stylus Photo TX800W"
+msgid "Epson Stylus Photo TX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4086
+#: src/xml/xmli18n-tmp.h:6326
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:4087
+#: src/xml/xmli18n-tmp.h:6327
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:4088
+#: src/xml/xmli18n-tmp.h:6328
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4089
+#: src/xml/xmli18n-tmp.h:6329
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:6330
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4091
+#: src/xml/xmli18n-tmp.h:6331
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:6332
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4093
+#: src/xml/xmli18n-tmp.h:6333
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4094
+#: src/xml/xmli18n-tmp.h:6334
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:6335
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:6336
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4097
+#: src/xml/xmli18n-tmp.h:6337
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:6338
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4099
+#: src/xml/xmli18n-tmp.h:6339
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:6340
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:6341
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:6342
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:6343
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:6344
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:6345
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:6346
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:6347
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:6348
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:6349
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4110
+#: src/xml/xmli18n-tmp.h:6350
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:6351
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:6352
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4113
+#: src/xml/xmli18n-tmp.h:6353
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:6354
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:6355
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4116
+#: src/xml/xmli18n-tmp.h:6356
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:6357
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4118
+#: src/xml/xmli18n-tmp.h:6358
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4119
+#: src/xml/xmli18n-tmp.h:6359
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:6360
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4121
+#: src/xml/xmli18n-tmp.h:6361
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:6362
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:6363
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4124
+#: src/xml/xmli18n-tmp.h:6364
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:6365
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4126
+#: src/xml/xmli18n-tmp.h:6366
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4127
+#: src/xml/xmli18n-tmp.h:6367
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4128
+#: src/xml/xmli18n-tmp.h:6368
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4129
+#: src/xml/xmli18n-tmp.h:6369
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:6370
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:6371
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:6372
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:6373
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:6374
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:6375
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:6376
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:6377
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:6378
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:6379
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:6380
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:6381
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:6382
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:6383
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4144
+#: src/xml/xmli18n-tmp.h:6384
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:6385
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:6386
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:6387
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:6388
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:6389
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:6390
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:6391
+#, fuzzy
+msgid "Epson Stylus DX4000"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:6392
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:6393
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:6394
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4154
+#: src/xml/xmli18n-tmp.h:6395
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:6396
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:6397
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:6398
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:6399
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:6400
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:6401
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:6402
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:6403
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:6404
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:6405
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:6406
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:6407
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:6408
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:6409
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:6410
 #, fuzzy
-msgid "Epson Stylus PX700FW"
+msgid "Epson Stylus PX700W"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:6411
 #, fuzzy
 msgid "Epson Stylus PX800FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:6412
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4172
+#: src/xml/xmli18n-tmp.h:6413
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:6414
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4174
+#: src/xml/xmli18n-tmp.h:6415
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:6416
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:6417
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4177
+#: src/xml/xmli18n-tmp.h:6418
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4178
+#: src/xml/xmli18n-tmp.h:6419
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4179
+#: src/xml/xmli18n-tmp.h:6420
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4180
+#: src/xml/xmli18n-tmp.h:6421
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4181
+#: src/xml/xmli18n-tmp.h:6422
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:6423
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:6424
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:6425
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:6426
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:6427
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4187
+#: src/xml/xmli18n-tmp.h:6428
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4188
+#: src/xml/xmli18n-tmp.h:6429
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:6430
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:6431
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:6432
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4192
+#: src/xml/xmli18n-tmp.h:6433
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:6434
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:6435
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:6436
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4196
+#: src/xml/xmli18n-tmp.h:6437
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:6438
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:6439
 msgid "Epson PictureMate 215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4199
+#: src/xml/xmli18n-tmp.h:6440
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:6441
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:6442
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:6443
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4204
+#: src/xml/xmli18n-tmp.h:6445
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:6446
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:6447
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4207
+#: src/xml/xmli18n-tmp.h:6448
 msgid "Epson WorkForce 30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:6449
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:6450
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:6451
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:6452
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4212
+#: src/xml/xmli18n-tmp.h:6453
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:6454
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:6455
 msgid "Epson E 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4215
+#: src/xml/xmli18n-tmp.h:6456
 msgid "Epson E 150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4216
+#: src/xml/xmli18n-tmp.h:6457
 msgid "Epson E 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:6458
 msgid "Epson E 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:6459
 msgid "Epson E 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4219
+#: src/xml/xmli18n-tmp.h:6460
 msgid "Epson E 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:6461
 msgid "Epson E 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:6462
 msgid "Epson E 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:6463
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:6464
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4224
+#: src/xml/xmli18n-tmp.h:6465
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:6466
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:6467
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:6468
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4228
+#: src/xml/xmli18n-tmp.h:6469
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4229
+#: src/xml/xmli18n-tmp.h:6470
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:6471
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:6472
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:6473
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:6474
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:6475
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:6476
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:6477
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:6478
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4238
+#: src/xml/xmli18n-tmp.h:6479
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:6480
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:6481
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:6482
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4242
+#: src/xml/xmli18n-tmp.h:6483
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4243
+#: src/xml/xmli18n-tmp.h:6484
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:6485
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:6486
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4246
+#: src/xml/xmli18n-tmp.h:6487
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:6488
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:6490
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4251
+#: src/xml/xmli18n-tmp.h:6492
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4253
+#: src/xml/xmli18n-tmp.h:6494
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4254
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:6496
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:6497
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:6498
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:6499
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4259
+#: src/xml/xmli18n-tmp.h:6500
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4260
+#: src/xml/xmli18n-tmp.h:6501
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:6502
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4262
+#: src/xml/xmli18n-tmp.h:6503
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4263
+#: src/xml/xmli18n-tmp.h:6504
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4264
+#: src/xml/xmli18n-tmp.h:6505
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4265
+#: src/xml/xmli18n-tmp.h:6506
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:6507
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:6508
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:6509
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:6510
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:6511
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:6512
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:6513
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:6514
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4274
+#: src/xml/xmli18n-tmp.h:6515
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4275
+#: src/xml/xmli18n-tmp.h:6516
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4276
+#: src/xml/xmli18n-tmp.h:6517
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:6518
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:6519
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:6520
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:6521
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:6522
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:6523
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:6524
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:6525
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4285
+#: src/xml/xmli18n-tmp.h:6526
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4286
+#: src/xml/xmli18n-tmp.h:6527
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:6528
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:6529
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:6530
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:6531
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:6532
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4292
+#: src/xml/xmli18n-tmp.h:6533
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:6534
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:6535
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4295
+#: src/xml/xmli18n-tmp.h:6536
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4296
+#: src/xml/xmli18n-tmp.h:6537
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4297
+#: src/xml/xmli18n-tmp.h:6538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:6539
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4299
+#: src/xml/xmli18n-tmp.h:6540
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:6541
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:6542
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:6543
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:6544
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4305
+#: src/xml/xmli18n-tmp.h:6546
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:6547
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4307
+#: src/xml/xmli18n-tmp.h:6548
+#, fuzzy
+msgid "Epson PX G5600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6549
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4308
+#: src/xml/xmli18n-tmp.h:6550
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4309
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4310
+#: src/xml/xmli18n-tmp.h:6552
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:6553
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:6554
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4313
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:6556
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4315
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:6559
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:6560
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:6561
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:6562
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:6563
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:6564
 msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:6565
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4324
+#: src/xml/xmli18n-tmp.h:6566
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:6567
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4326
+#: src/xml/xmli18n-tmp.h:6568
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4327
+#: src/xml/xmli18n-tmp.h:6569
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:6570
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:6571
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Brother HL-1430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:6576
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Brother HL-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4337
+#: src/xml/xmli18n-tmp.h:6579
 msgid "Brother HL-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:6580
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:6581
 msgid "Brother HL-1670N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:6582
 msgid "Brother HL-1850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:6583
 msgid "Brother HL-1870N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:6584
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:6585
 msgid "Brother HL-2460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:6586
 msgid "Brother HL-2460N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:6587
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4346
+#: src/xml/xmli18n-tmp.h:6588
 msgid "Brother HL-5030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:6589
 msgid "Brother HL-5040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:6590
 msgid "Brother HL-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:6591
 msgid "Brother HL-5070N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4350
+#: src/xml/xmli18n-tmp.h:6592
 msgid "Brother HL-5140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4351
+#: src/xml/xmli18n-tmp.h:6593
 msgid "Brother HL-5150D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:6594
 msgid "Brother HL-5170DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:6595
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4354
+#: src/xml/xmli18n-tmp.h:6596
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:6597
 msgid "Brother HL-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:6598
 msgid "Brother HL-7050N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4357
+#: src/xml/xmli18n-tmp.h:6599
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4358
+#: src/xml/xmli18n-tmp.h:6600
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:6601
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:6602
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:6603
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:6604
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:6605
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:6606
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:6607
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:6608
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:6609
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:6610
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:6611
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:6612
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:6613
 msgid "DEC 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:6614
 msgid "DEC LN17"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4373
+#: src/xml/xmli18n-tmp.h:6615
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4374
+#: src/xml/xmli18n-tmp.h:6616
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:6617
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4376
+#: src/xml/xmli18n-tmp.h:6618
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:6619
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:6620
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:6621
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:6622
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:6623
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:6624
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:6625
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4384
+#: src/xml/xmli18n-tmp.h:6626
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4385
+#: src/xml/xmli18n-tmp.h:6627
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4386
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4387
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:6630
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4389
+#: src/xml/xmli18n-tmp.h:6631
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4392
+#: src/xml/xmli18n-tmp.h:6634
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:6635
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:6636
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:6637
 msgid "Epson EPL-N2050PS+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4397
+#: src/xml/xmli18n-tmp.h:6639
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:6640
 #, fuzzy
 msgid "Epson EPL-N2500PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4400
+#: src/xml/xmli18n-tmp.h:6642
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:6643
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4403
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:6646
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:6647
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/xml/xmli18n-tmp.h:4406
+#: src/xml/xmli18n-tmp.h:6648
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/xml/xmli18n-tmp.h:4407
+#: src/xml/xmli18n-tmp.h:6649
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/xml/xmli18n-tmp.h:4408
+#: src/xml/xmli18n-tmp.h:6650
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:6651
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:6652
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:6653
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:6654
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:6656
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:6657
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4416
+#: src/xml/xmli18n-tmp.h:6658
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:6659
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:6660
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:6661
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4420
-msgid "Gestetner 3532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4421
-msgid "Gestetner 4235g"
+#: src/xml/xmli18n-tmp.h:6662
+msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:6663
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4423
-msgid "Gestetner 4532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4424
-msgid "Gestetner 4245g"
+#: src/xml/xmli18n-tmp.h:6664
+msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:6665
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:6666
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:6668
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:6669
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:6670
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4431
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:6672
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:6673
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:6674
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:6675
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4436
+#: src/xml/xmli18n-tmp.h:6676
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4437
-msgid "Gestetner DSm635"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4438
-msgid "Gestetner DSm635G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4439
-msgid "Gestetner DSm645"
+#: src/xml/xmli18n-tmp.h:6677
+msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4440
-msgid "Gestetner DS645G"
+#: src/xml/xmli18n-tmp.h:6678
+msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:6679
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:6680
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4443
+#: src/xml/xmli18n-tmp.h:6681
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:6682
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:6683
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4446
-msgid "Gestetner DSm735"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4447
-msgid "Gestetner DSm735G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4448
-msgid "Gestetner DSm745"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4449
-msgid "Gestetner DSm745G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4450
-msgid "Gestetner MP1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4451
-msgid "Gestetner DSm7110"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4452
-msgid "Gestetner MP1350"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4453
-msgid "Gestetner DSm7135"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4454
-msgid "Gestetner MP1600"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4455
-msgid "Gestetner DSm716"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4456
-msgid "Gestetner MP2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4457
-msgid "Gestetner DSm721d"
+#: src/xml/xmli18n-tmp.h:6684
+msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4458
-msgid "Gestetner MP2500"
+#: src/xml/xmli18n-tmp.h:6685
+msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4459
-msgid "Gestetner DSm625"
+#: src/xml/xmli18n-tmp.h:6686
+msgid "Gestetner MP1100/DSm7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4460
-msgid "Gestetner MP3500"
+#: src/xml/xmli18n-tmp.h:6687
+msgid "Gestetner MP1350/DSm7135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4461
-msgid "Gestetner DSm735e"
+#: src/xml/xmli18n-tmp.h:6688
+msgid "Gestetner MP1600/DSm716"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4462
-msgid "Gestetner MP4500"
+#: src/xml/xmli18n-tmp.h:6689
+msgid "Gestetner MP2000/DSm721d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4463
-msgid "Gestetner DSm745e"
+#: src/xml/xmli18n-tmp.h:6690
+msgid "Gestetner MP2500/DSm625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4464
-msgid "Gestetner MP5500"
+#: src/xml/xmli18n-tmp.h:6691
+msgid "Gestetner MP3500/DSm735e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4465
-msgid "Gestetner DSm755"
+#: src/xml/xmli18n-tmp.h:6692
+msgid "Gestetner MP4500/DSm745e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4466
-msgid "Gestetner MP6500"
+#: src/xml/xmli18n-tmp.h:6693
+msgid "Gestetner MP5500/DSm755"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4467
-msgid "Gestetner DSm765"
+#: src/xml/xmli18n-tmp.h:6694
+msgid "Gestetner MP6500/DSm765"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4468
-msgid "Gestetner MP7500"
+#: src/xml/xmli18n-tmp.h:6695
+msgid "Gestetner MP7500/DSm775"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4469
-msgid "Gestetner DSm775"
+#: src/xml/xmli18n-tmp.h:6696
+msgid "Gestetner MP9000/DSm790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4470
-msgid "Gestetner MP9000"
+#: src/xml/xmli18n-tmp.h:6697
+msgid "Gestetner MP 161/DSm416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4471
-msgid "Gestetner DSm790"
+#: src/xml/xmli18n-tmp.h:6698
+msgid "Gestetner MP 2510/DSm725e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4472
-msgid "Gestetner MP 161"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4473
-msgid "Gestetner DSm416"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4474
-msgid "Gestetner MP 2510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4475
-msgid "Gestetner DSm725e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:6699
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:6700
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4478
-msgid "Gestetner MP 3010"
+#: src/xml/xmli18n-tmp.h:6701
+msgid "Gestetner MP 3010/DSm730e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4479
-msgid "Gestetner DSm730e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4480
+#: src/xml/xmli18n-tmp.h:6702
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:6703
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:6704
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:6705
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Gestetner MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:6707
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:6708
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:6709
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:6710
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4489
+#: src/xml/xmli18n-tmp.h:6711
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:6712
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:6713
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4492
+#: src/xml/xmli18n-tmp.h:6714
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:6715
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:6716
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4495
+#: src/xml/xmli18n-tmp.h:6717
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4496
+#: src/xml/xmli18n-tmp.h:6718
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4497
+#: src/xml/xmli18n-tmp.h:6719
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:6720
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:6721
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:6722
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:6723
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:6724
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:6725
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:6726
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:6727
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4506
+#: src/xml/xmli18n-tmp.h:6728
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:6729
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4508
+#: src/xml/xmli18n-tmp.h:6730
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4509
+#: src/xml/xmli18n-tmp.h:6731
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4510
+#: src/xml/xmli18n-tmp.h:6732
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:6733
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:6734
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:6735
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:6736
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:6737
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:6738
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:6739
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4518
+#: src/xml/xmli18n-tmp.h:6740
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:6741
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:6742
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:6743
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:6744
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4523
+#: src/xml/xmli18n-tmp.h:6745
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:6746
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:6747
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:6748
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:6749
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4528
+#: src/xml/xmli18n-tmp.h:6750
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4529
+#: src/xml/xmli18n-tmp.h:6751
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4530
+#: src/xml/xmli18n-tmp.h:6752
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:6753
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4532
+#: src/xml/xmli18n-tmp.h:6754
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:6755
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:6756
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:6757
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:6758
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:6759
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:6760
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4539
+#: src/xml/xmli18n-tmp.h:6761
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4540
+#: src/xml/xmli18n-tmp.h:6762
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4541
+#: src/xml/xmli18n-tmp.h:6763
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4542
+#: src/xml/xmli18n-tmp.h:6764
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4543
+#: src/xml/xmli18n-tmp.h:6765
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:6766
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:6767
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4546
+#: src/xml/xmli18n-tmp.h:6768
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:6769
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:6770
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:6771
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:6772
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:6773
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4552
+#: src/xml/xmli18n-tmp.h:6774
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:6775
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:6776
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:6777
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:6778
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:6779
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:6780
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:6781
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:6782
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:6783
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:6784
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:6785
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:6786
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:6787
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:6788
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4567
+#: src/xml/xmli18n-tmp.h:6789
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4568
+#: src/xml/xmli18n-tmp.h:6790
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:6791
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4570
+#: src/xml/xmli18n-tmp.h:6792
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4571
+#: src/xml/xmli18n-tmp.h:6793
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:6794
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:6795
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:6796
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:6797
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:6798
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:6799
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:6800
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:6801
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:6802
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:6803
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4582
+#: src/xml/xmli18n-tmp.h:6804
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4583
+#: src/xml/xmli18n-tmp.h:6805
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4584
+#: src/xml/xmli18n-tmp.h:6806
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4585
+#: src/xml/xmli18n-tmp.h:6807
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:6808
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:6809
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:6810
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:6811
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:6812
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:6813
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:6814
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4593
+#: src/xml/xmli18n-tmp.h:6815
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4594
+#: src/xml/xmli18n-tmp.h:6816
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:6817
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:6818
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4597
+#: src/xml/xmli18n-tmp.h:6819
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:6820
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:6821
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:6822
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:6823
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4602
+#: src/xml/xmli18n-tmp.h:6824
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:6825
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:6826
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:6827
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:6828
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4607
+#: src/xml/xmli18n-tmp.h:6829
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:6830
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4609
+#: src/xml/xmli18n-tmp.h:6831
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4610
+#: src/xml/xmli18n-tmp.h:6832
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:6833
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:6834
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4613
+#: src/xml/xmli18n-tmp.h:6835
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:6836
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:6837
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:6838
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:6839
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:6840
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:6841
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:6842
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:6843
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:6844
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:6845
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4624
+#: src/xml/xmli18n-tmp.h:6846
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4625
+#: src/xml/xmli18n-tmp.h:6847
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:6848
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4627
+#: src/xml/xmli18n-tmp.h:6849
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4628
+#: src/xml/xmli18n-tmp.h:6850
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:6851
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:6852
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:6853
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:6854
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:6855
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:6856
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:6857
 msgid "HP LaserJet 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4636
+#: src/xml/xmli18n-tmp.h:6858
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4637
+#: src/xml/xmli18n-tmp.h:6859
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4638
+#: src/xml/xmli18n-tmp.h:6860
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:6861
 msgid "HP LaserJet 1320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4640
+#: src/xml/xmli18n-tmp.h:6862
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:6863
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:6864
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:6865
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4644
+#: src/xml/xmli18n-tmp.h:6866
 msgid "HP LaserJet 2410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:6867
 msgid "HP LaserJet 2420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:6868
 msgid "HP LaserJet 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4647
+#: src/xml/xmli18n-tmp.h:6869
 msgid "HP LaserJet 3015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4648
+#: src/xml/xmli18n-tmp.h:6870
 msgid "HP LaserJet 3020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:6871
 msgid "HP LaserJet 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4650
+#: src/xml/xmli18n-tmp.h:6872
 msgid "HP LaserJet 3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:6873
 msgid "HP LaserJet 3052"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:6874
 msgid "HP LaserJet 3055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:6875
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:6876
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:6877
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:6878
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:6879
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:6880
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:6881
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4660
+#: src/xml/xmli18n-tmp.h:6882
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:6883
 msgid "HP LaserJet 3380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:6884
 msgid "HP LaserJet 3390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4663
+#: src/xml/xmli18n-tmp.h:6885
 msgid "HP LaserJet 3392"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:6886
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:6887
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:6888
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4667
+#: src/xml/xmli18n-tmp.h:6889
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:6890
 msgid "HP LaserJet 4240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:6891
 msgid "HP LaserJet 4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:6892
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4671
+#: src/xml/xmli18n-tmp.h:6893
 msgid "HP LaserJet 4345 mfp"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:6894
 msgid "HP LaserJet 4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:6895
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:6896
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:6897
 msgid "HP LaserJet 5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:6898
 msgid "HP LaserJet 5200L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:6899
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:6900
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:6901
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4680
+#: src/xml/xmli18n-tmp.h:6902
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:6903
 msgid "HP LaserJet 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4682
+#: src/xml/xmli18n-tmp.h:6904
 msgid "HP LaserJet 9040 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4683
+#: src/xml/xmli18n-tmp.h:6905
 msgid "HP LaserJet 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4684
+#: src/xml/xmli18n-tmp.h:6906
 msgid "HP LaserJet 9050 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:6907
 msgid "HP LaserJet M3027 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:6908
 msgid "HP LaserJet M3035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:6909
 msgid "HP LaserJet M4345 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:6910
 msgid "HP LaserJet M5025 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:6911
 msgid "HP LaserJet M5035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:6912
 msgid "HP LaserJet P2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:6913
 msgid "HP LaserJet P2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:6914
 msgid "HP LaserJet P3004"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:6915
 msgid "HP LaserJet P3005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:6916
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4695
+#: src/xml/xmli18n-tmp.h:6917
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:6918
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:6919
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:6920
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:6921
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4700
+#: src/xml/xmli18n-tmp.h:6922
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:6923
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:6924
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4703
+#: src/xml/xmli18n-tmp.h:6925
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:6926
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:6927
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4706
+#: src/xml/xmli18n-tmp.h:6928
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4707
+#: src/xml/xmli18n-tmp.h:6929
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:6930
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:6931
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4710
+#: src/xml/xmli18n-tmp.h:6932
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:6933
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:6934
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:6935
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:6936
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:6937
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:6938
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:6939
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4718
+#: src/xml/xmli18n-tmp.h:6940
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:6941
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:6942
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4721
+#: src/xml/xmli18n-tmp.h:6943
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:6944
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:6945
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:6946
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4725
+#: src/xml/xmli18n-tmp.h:6947
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:6948
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:6949
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4728
+#: src/xml/xmli18n-tmp.h:6950
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4729
+#: src/xml/xmli18n-tmp.h:6951
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:6952
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:6953
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4732
+#: src/xml/xmli18n-tmp.h:6954
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:6955
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:6956
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:6957
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:6958
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:6959
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:6960
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4739
+#: src/xml/xmli18n-tmp.h:6961
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4740
+#: src/xml/xmli18n-tmp.h:6962
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4741
+#: src/xml/xmli18n-tmp.h:6963
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4742
+#: src/xml/xmli18n-tmp.h:6964
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:6965
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:6966
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4745
+#: src/xml/xmli18n-tmp.h:6967
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:6968
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:6969
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:6970
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4749
+#: src/xml/xmli18n-tmp.h:6971
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:6972
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:6973
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4752
+#: src/xml/xmli18n-tmp.h:6974
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:6975
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:6976
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4755
+#: src/xml/xmli18n-tmp.h:6977
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:6978
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:6979
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:6980
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4759
+#: src/xml/xmli18n-tmp.h:6981
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4760
+#: src/xml/xmli18n-tmp.h:6982
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:6983
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4762
+#: src/xml/xmli18n-tmp.h:6984
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:6985
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:6986
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4765
+#: src/xml/xmli18n-tmp.h:6987
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:6988
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:6989
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Nombre de la Impresora:"
 
-#: src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:6991
 msgid "IBM 4019"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:6992
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:6993
 msgid "IBM 4312"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4772
+#: src/xml/xmli18n-tmp.h:6994
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:6995
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4774
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4775
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4776
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:6999
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:7000
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:7002
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:7003
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:7004
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:7005
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:7006
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:7007
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:7008
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:7009
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:7010
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:7011
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4790
+#: src/xml/xmli18n-tmp.h:7012
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:7013
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:7014
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:7015
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4794
+#: src/xml/xmli18n-tmp.h:7016
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:7017
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:7018
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4797
+#: src/xml/xmli18n-tmp.h:7019
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:7020
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:7021
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:7022
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:7023
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:7025
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:7026
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:7027
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:7028
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4807
+#: src/xml/xmli18n-tmp.h:7029
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4808
+#: src/xml/xmli18n-tmp.h:7030
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:7031
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:7032
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:7034
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:7035
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:7037
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:7039
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:7040
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4819
+#: src/xml/xmli18n-tmp.h:7041
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:7042
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:7043
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:7044
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:7045
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:7046
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:7047
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:7048
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:7049
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:7050
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:7051
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4830
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:7057
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4837
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4840
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4842
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4852
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4853
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4854
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4855
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4866
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4867
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4873
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4874
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4883
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4886
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4888
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4890
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4894
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4896
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4903
-msgid "Lanier MP 2500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4904
-msgid "Lanier LD125"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4905
-msgid "Lanier MP 1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4906
-msgid "Lanier LD1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4907
-msgid "Lanier MP 1350"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4908
-msgid "Lanier LD1135"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4909
-msgid "Lanier MP 1600"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4910
-msgid "Lanier LD316"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4911
-msgid "Lanier MP 161"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4912
-msgid "Lanier LD016"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4913
-msgid "Lanier MP 2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4914
-msgid "Lanier LD320d"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4915
-msgid "Lanier MP 2510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4916
-msgid "Lanier LD325"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4917
-msgid "Lanier MP 2550B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4918
-msgid "Lanier LD425B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4919
-msgid "Lanier MP 2550"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4920
-msgid "Lanier LD425"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4921
-msgid "Lanier MP 3010"
+#: src/xml/xmli18n-tmp.h:7125
+msgid "Lanier MP2500/LD125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4922
-msgid "Lanier LD330"
+#: src/xml/xmli18n-tmp.h:7126
+msgid "Lanier MP 1100/LD1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4923
-msgid "Lanier MP 3350B"
+#: src/xml/xmli18n-tmp.h:7127
+msgid "Lanier MP 1350/LD1135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4924
-msgid "Lanier LD433B"
+#: src/xml/xmli18n-tmp.h:7128
+msgid "Lanier MP 1600/LD316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4925
-msgid "Lanier MP 3350"
+#: src/xml/xmli18n-tmp.h:7129
+msgid "Lanier MP 161/LD016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4926
-msgid "Lanier LD433"
+#: src/xml/xmli18n-tmp.h:7130
+msgid "Lanier MP 2000/LD320d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4927
-msgid "Lanier MP 3500"
+#: src/xml/xmli18n-tmp.h:7131
+msgid "Lanier MP 2510/LD325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4928
-msgid "Lanier LD335"
+#: src/xml/xmli18n-tmp.h:7132
+msgid "Lanier MP 2550B/LD425B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4929
-msgid "Lanier MP 4000B"
+#: src/xml/xmli18n-tmp.h:7133
+msgid "Lanier MP 2550/LD425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4930
-msgid "Lanier LD040B"
+#: src/xml/xmli18n-tmp.h:7134
+msgid "Lanier MP 3010/LD330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4931
-msgid "Lanier MP 4000"
+#: src/xml/xmli18n-tmp.h:7135
+msgid "Lanier MP 3350B/LD433B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4932
-msgid "Lanier LD040"
+#: src/xml/xmli18n-tmp.h:7136
+msgid "Lanier MP 3350/LD433"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4933
-msgid "Lanier MP 4500"
+#: src/xml/xmli18n-tmp.h:7137
+msgid "Lanier MP 3500/LD335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4934
-msgid "Lanier LD345"
+#: src/xml/xmli18n-tmp.h:7138
+msgid "Lanier MP 4000B/LD040B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4935
-msgid "Lanier MP 5000B"
+#: src/xml/xmli18n-tmp.h:7139
+msgid "Lanier MP 4000/LD040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4936
-msgid "Lanier LD050B"
+#: src/xml/xmli18n-tmp.h:7140
+msgid "Lanier MP 4500/LD345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4937
-msgid "Lanier MP 5000"
+#: src/xml/xmli18n-tmp.h:7141
+msgid "Lanier MP 5000B/LD050B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4938
-msgid "Lanier LD050"
+#: src/xml/xmli18n-tmp.h:7142
+msgid "Lanier MP 5000/LD050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4939
-msgid "Lanier MP 5500"
+#: src/xml/xmli18n-tmp.h:7143
+msgid "Lanier MP 5500/LD255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4940
-msgid "Lanier LD255"
+#: src/xml/xmli18n-tmp.h:7144
+msgid "Lanier MP 6500/LD265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4941
-msgid "Lanier MP 6500"
+#: src/xml/xmli18n-tmp.h:7145
+msgid "Lanier MP 7500/LD275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4942
-msgid "Lanier LD265"
+#: src/xml/xmli18n-tmp.h:7146
+msgid "Lanier MP 9000/LD190"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4943
-msgid "Lanier MP 7500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4944
-msgid "Lanier LD275"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4945
-msgid "Lanier MP 9000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4946
-msgid "Lanier LD190"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:7148
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4950
+#: src/xml/xmli18n-tmp.h:7150
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:7151
 msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4952
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4953
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:7155
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4960
+#: src/xml/xmli18n-tmp.h:7160
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:7161
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:7162
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4963
+#: src/xml/xmli18n-tmp.h:7163
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:7164
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:7165
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4966
-msgid "NRG 10515"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4967
-msgid "NRG 10518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4968
-msgid "NRG 10512"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4969
-msgid "NRG 2205"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4970
-msgid "NRG 2238"
+#: src/xml/xmli18n-tmp.h:7166
+msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4971
-msgid "NRG 2212"
+#: src/xml/xmli18n-tmp.h:7167
+msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4972
-msgid "NRG 2705"
+#: src/xml/xmli18n-tmp.h:7168
+msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4973
-msgid "NRG 2738"
+#: src/xml/xmli18n-tmp.h:7169
+msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4974
-msgid "NRG 2712"
+#: src/xml/xmli18n-tmp.h:7170
+msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4975
-msgid "NRG 3205"
+#: src/xml/xmli18n-tmp.h:7171
+msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4976
-msgid "NRG 3238"
+#: src/xml/xmli18n-tmp.h:7172
+msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4977
-msgid "NRG 3212"
+#: src/xml/xmli18n-tmp.h:7173
+msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4978
-msgid "NRG 3525"
+#: src/xml/xmli18n-tmp.h:7174
+msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4979
-msgid "NRG 3508"
+#: src/xml/xmli18n-tmp.h:7175
+msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4980
-msgid "NRG 3502"
+#: src/xml/xmli18n-tmp.h:7176
+msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4981
-msgid "NRG 3545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4982
-msgid "NRG 3518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4983
-msgid "NRG 3532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4984
-msgid "NRG 4525"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4985
-msgid "NRG 4508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4986
-msgid "NRG 4502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4987
-msgid "NRG 4545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4988
-msgid "NRG 4518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4989
-msgid "NRG 4532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4990
-msgid "NRG 6002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4991
-msgid "NRG 6005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4992
-msgid "NRG 6008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4993
-msgid "NRG 7502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4994
-msgid "NRG 7505"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4995
-msgid "NRG 7508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4996
-msgid "NRG 9005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4997
-msgid "NRG 9008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4998
-msgid "NRG 9002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:7177
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:7178
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5001
+#: src/xml/xmli18n-tmp.h:7179
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:7180
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:7181
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:7182
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:7183
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5006
+#: src/xml/xmli18n-tmp.h:7184
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:7185
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:7186
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5009
+#: src/xml/xmli18n-tmp.h:7187
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:7188
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:7189
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:7190
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:7191
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:7192
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5015
+#: src/xml/xmli18n-tmp.h:7193
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5016
+#: src/xml/xmli18n-tmp.h:7194
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5017
+#: src/xml/xmli18n-tmp.h:7195
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:7196
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:7197
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:7198
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:7199
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:7200
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:7201
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:7202
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5025
+#: src/xml/xmli18n-tmp.h:7203
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:7204
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:7205
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5028
+#: src/xml/xmli18n-tmp.h:7206
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:7207
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:7208
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:7209
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:7210
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5033
+#: src/xml/xmli18n-tmp.h:7211
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:7212
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:7213
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:7214
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:7215
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:7216
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:7217
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5040
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5051
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5053
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:7234
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:7235
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5060
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5062
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5063
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:7242
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:7243
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:7244
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:7245
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:7246
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:7247
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:7248
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:7249
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5072
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5074
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5075
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5076
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:7255
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:7258
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5081
+#: src/xml/xmli18n-tmp.h:7259
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:7263
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5086
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5088
+#: src/xml/xmli18n-tmp.h:7266
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:7267
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5090
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5091
+#: src/xml/xmli18n-tmp.h:7269
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:7270
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5093
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5099
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5103
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5104
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:7284
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5107
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5108
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5110
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5118
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5120
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5126
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5127
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5131
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5133
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5134
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5138
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5146
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5147
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5150
-msgid "Savin 2535"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5151
-msgid "Savin 2235"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5152
-msgid "Savin 2545"
+#: src/xml/xmli18n-tmp.h:7328
+msgid "Savin 2535/2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5153
-msgid "Savin 2245"
+#: src/xml/xmli18n-tmp.h:7329
+msgid "Savin 2545/2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5154
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Savin 2560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5155
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5158
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5160
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5163
-msgid "Savin 4035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5164
-msgid "Savin 4135g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5165
-msgid "Savin 4035e"
+#: src/xml/xmli18n-tmp.h:7339
+msgid "Savin 4035/4135g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5166
-msgid "Savin 4135eG"
+#: src/xml/xmli18n-tmp.h:7340
+msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5167
-msgid "Savin 4045"
+#: src/xml/xmli18n-tmp.h:7341
+msgid "Savin 4045/4145g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5168
-msgid "Savin 4145g"
+#: src/xml/xmli18n-tmp.h:7342
+msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5169
-msgid "Savin 4045e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5170
-msgid "Savin 4145eG"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5171
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Savin 4060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5173
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5174
+#: src/xml/xmli18n-tmp.h:7346
 msgid "Savin 4090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:7348
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5177
+#: src/xml/xmli18n-tmp.h:7349
 msgid "Savin 8020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:7353
 msgid "Savin 8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5183
-msgid "Savin 8035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5184
-msgid "Savin 8035g"
+#: src/xml/xmli18n-tmp.h:7355
+msgid "Savin 8035/8035g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5186
-msgid "Savin 8045"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5187
-msgid "Savin 8045g"
+#: src/xml/xmli18n-tmp.h:7357
+msgid "Savin 8045/8045g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5190
+#: src/xml/xmli18n-tmp.h:7360
 msgid "Savin 8065"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5192
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Savin 8090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5194
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:7370
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5201
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:7373
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:7374
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5205
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5206
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:7379
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5211
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Configuración de la Impresora"
 
-#: src/xml/xmli18n-tmp.h:5212
+#: src/xml/xmli18n-tmp.h:7382
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5213
+#: src/xml/xmli18n-tmp.h:7383
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5216
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5221
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5224
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5225
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5227
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5230
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:7404
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5236
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:7409
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:7410
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5244
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5247
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5249
+#: src/xml/xmli18n-tmp.h:7419
+msgid "Canon SELPHY-CP-520"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Canon SELPHY-CP-720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5252
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Canon SELPHY-CP-730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Canon SELPHY-CP-740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Canon SELPHY-CP-750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Canon SELPHY ES1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Canon SELPHY ES2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Canon SELPHY ES20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5258
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5259
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:7434
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:7438
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5268
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Dai Nippon Printing DS40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Dai Nippon Printing DS80"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5269
+#: src/xml/xmli18n-tmp.h:7442
 msgid "RAW DATA 8 bit"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Epson Stylus Offixe TX300F"
+#~ msgstr "Stylus C20sx"
+
 #~ msgid "ISOLatin1"
 #~ msgstr "ISOLatin1"
 
diff --git a/po/fr.gmo b/po/fr.gmo
index 687de05..17eeab4 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index a431613..93f18e5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 5.0.0\n"
 "Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-21 22:25-0500\n"
+"POT-Creation-Date: 2009-07-26 19:14-0400\n"
 "PO-Revision-Date: 2007-11-23 11:55-0500\n"
 "Last-Translator: regis rampnoux <regisr@pobox.com>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2109 src/main/print-pcl.c:1779
+#: src/main/print-escp2.c:2314 src/main/print-pcl.c:1779
 msgid "Default"
 msgstr "Défaut"
 
@@ -96,15 +96,15 @@ msgstr "Densité"
 
 #: src/main/dither-main.c:91 src/main/print-canon.c:300
 #: src/main/print-canon.c:308 src/main/print-canon.c:316
-#: src/main/print-canon.c:324 src/main/print-escp2.c:439
-#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
-#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-canon.c:324 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: 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-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:1769
-#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
-#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1935
+#: src/main/print-olympus.c:1943 src/main/print-olympus.c:1951
+#: src/main/print-olympus.c:1959 src/main/print-pcl.c:1324
 #: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
 #: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
@@ -164,7 +164,7 @@ msgid "Dither algorithm"
 msgstr "Algorithme de tramage"
 
 #: src/main/print-canon.c:199 src/main/print-escp2.c:165
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1866
 #: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Format papier "
@@ -181,8 +181,8 @@ msgstr "Format papier "
 #: src/main/print-escp2.c:254 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:1704 src/main/print-olympus.c:1710
-#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-olympus.c:1866 src/main/print-olympus.c:1872
+#: src/main/print-olympus.c:1878 src/main/print-olympus.c:1884
 #: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
 #: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
 #: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
@@ -191,31 +191,31 @@ msgid "Basic Printer Setup"
 msgstr "Configuration de base de l'imprimante"
 
 #: src/main/print-canon.c:200 src/main/print-escp2.c:166
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1867
 #: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr "Taille du papier sur lequel vous imprimez"
 
 #: src/main/print-canon.c:205 src/main/print-escp2.c:171
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1259 src/cups/genppd.c:1339 src/cups/genppd.c:2001
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1872
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1372 src/cups/genppd.c:2035
 msgid "Media Type"
 msgstr "Type de support"
 
 #: src/main/print-canon.c:206 src/main/print-escp2.c:172
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1873
 #: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Type de support (papier ordinaire, papier photo etc.)"
 
 #: src/main/print-canon.c:211 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
-#: src/main/print-pcl.c:1265 src/cups/genppd.c:1368 src/cups/genppd.c:2020
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1878
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1401 src/cups/genppd.c:2054
 msgid "Media Source"
 msgstr "Source du support"
 
 #: src/main/print-canon.c:212 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1879
 #: src/main/print-pcl.c:1266
 msgid "Source (input slot) of the media"
 msgstr "Source (bac) du support vers lequel vous imprimez"
@@ -255,8 +255,8 @@ msgstr "Réglage horizontal précis du CD"
 #: src/main/print-canon.c:235 src/main/print-canon.c:241
 #: src/main/print-canon.c:253 src/main/print-escp2.c:207
 #: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1906
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr "Réglages imprimante avancés"
@@ -271,25 +271,25 @@ msgid "CD Vertical Fine Adjustment"
 msgstr "Réglage vertical précis du CD"
 
 #: src/main/print-canon.c:247 src/main/print-escp2.c:219
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
-#: src/main/print-pcl.c:1277 src/cups/genppd.c:1446 src/cups/genppd.c:2056
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1884
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1479 src/cups/genppd.c:2090
 msgid "Resolution"
 msgstr "Résolution"
 
 #: src/main/print-canon.c:248 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1723
+#: src/main/print-olympus.c:1885
 msgid "Resolution and quality of the print"
 msgstr "Résolution et qualité de l'impression"
 
 #: src/main/print-canon.c:253 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Type d'encre"
 
 #: src/main/print-canon.c:254 src/main/print-escp2.c:231
 #: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
+#: src/main/print-olympus.c:1891 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Encres installées"
@@ -307,32 +307,33 @@ msgstr "Encres (canaux)"
 #: 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-escp2.c:320 src/main/print-escp2.c:767
-#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
-#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
-#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
-#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:893 src/main/print-escp2.c:901
+#: src/main/print-escp2.c:909 src/main/print-escp2.c:925
+#: src/main/print-escp2.c:933 src/main/print-escp2.c:941
+#: src/main/print-escp2.c:949 src/main/print-escp2.c:957
+#: src/main/print-escp2.c:965 src/main/print-escp2.c:973
 #: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr "Fonctionalités avancées"
 
-#: src/main/print-canon.c:265 src/main/print-escp2.c:326
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-canon.c:265 src/main/print-escp2.c:332
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1912
 #: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Mode d'impression"
 
 #: src/main/print-canon.c:265 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:326
-#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-color.c:208 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1912 src/main/print-pcl.c:1295
 #: src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr "Paramètres principaux"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:327
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-canon.c:266 src/main/print-escp2.c:333
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1913
 #: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Mode de sortie"
@@ -360,77 +361,84 @@ msgstr "Qualité d'impression"
 msgid "Basic Output Adjustment"
 msgstr "Réglage de base"
 
-#: src/main/print-canon.c:300 src/main/print-escp2.c:439
+#: src/main/print-canon.c:300 src/main/print-escp2.c:445
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 msgid "Cyan Density"
 msgstr "Densité cyan"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:301 src/main/print-escp2.c:446
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 msgid "Adjust the cyan density"
 msgstr "Ajustement de la densité de cyan"
 
-#: src/main/print-canon.c:308 src/main/print-escp2.c:447
+#: src/main/print-canon.c:308 src/main/print-escp2.c:453
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 msgid "Magenta Density"
 msgstr "Densité magenta"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:309 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 msgid "Adjust the magenta density"
 msgstr "Ajustement de la densité de magenta"
 
-#: src/main/print-canon.c:316 src/main/print-escp2.c:455
+#: src/main/print-canon.c:316 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 msgid "Yellow Density"
 msgstr "Densité jaune"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:317 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 msgid "Adjust the yellow density"
 msgstr "Ajustement de la densité de jaune"
 
-#: src/main/print-canon.c:324 src/main/print-escp2.c:463
+#: src/main/print-canon.c:324 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 msgid "Black Density"
 msgstr "Densité du noir"
 
-#: src/main/print-canon.c:325 src/main/print-escp2.c:464
+#: src/main/print-canon.c:325 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 msgid "Adjust the black density"
 msgstr "Ajustement du niveau de densité"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:333
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:541 src/main/print-escp2.c:542
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 msgid "Light Cyan Transition"
 msgstr "Passage cyan clair"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:340
-#: src/main/print-canon.c:348 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
-#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
-#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
-#: src/main/print-pcl.c:1364
+#: src/main/print-canon.c:348 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:541
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:557
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:573
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:589
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:605
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:621
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:637
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:653
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:669
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:685
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:701
+#: src/main/print-escp2.c:709 src/main/print-escp2.c:717
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:733
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:749
+#: src/main/print-escp2.c:757 src/main/print-escp2.c:765
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:781
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:797
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:813
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:829
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:845
+#: src/main/print-escp2.c:853 src/main/print-escp2.c:861
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr "Réglage avancé des encres"
 
 #: src/main/print-canon.c:340 src/main/print-canon.c:341
-#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
+#: src/main/print-escp2.c:573 src/main/print-escp2.c:574
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 msgid "Light Magenta Transition"
@@ -440,14 +448,14 @@ msgstr "Transition magenta clair"
 msgid "Light Yellow Transition"
 msgstr "Transition jaune clair"
 
-#: src/main/print-canon.c:368 src/main/print-escp2.c:2283
-#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3609
-#: src/xml/xmli18n-tmp.h:3614 src/xml/xmli18n-tmp.h:3620
-#: src/xml/xmli18n-tmp.h:3627
+#: src/main/print-canon.c:368 src/main/print-escp2.c:2488
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5851 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5864
 msgid "Off"
 msgstr "Désactivé"
 
-#: src/main/print-canon.c:369 src/main/print-escp2.c:2285
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2490
 #: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr "Côté long (standard)"
@@ -456,64 +464,65 @@ msgstr "Côté long (standard)"
 msgid "Short Edge (Flip)"
 msgstr "Côté court (retourné)"
 
-#: src/main/print-canon.c:646 src/main/print-escp2.c:2005
-#: src/xml/xmli18n-tmp.h:3676
+#: src/main/print-canon.c:646 src/main/print-escp2.c:2210
+#: src/xml/xmli18n-tmp.h:5913
 msgid "CD - 5 inch"
 msgstr "CD - 5 pouces"
 
-#: src/main/print-canon.c:648 src/main/print-escp2.c:2007
-#: src/xml/xmli18n-tmp.h:3677
+#: src/main/print-canon.c:648 src/main/print-escp2.c:2212
+#: src/xml/xmli18n-tmp.h:5914
 msgid "CD - 3 inch"
 msgstr "CD - 3 pouces"
 
-#: src/main/print-canon.c:650 src/main/print-escp2.c:2009
-#: src/xml/xmli18n-tmp.h:3678
+#: src/main/print-canon.c:650 src/main/print-escp2.c:2214
+#: src/xml/xmli18n-tmp.h:5915
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Personnalisé"
 
-#: src/main/print-canon.c:673 src/main/print-escp2.c:2034
-#: src/cups/genppd.c:1323 src/cups/genppd.c:1572 src/cups/genppd.c:1988
-#: src/cups/genppd.c:2079
+#: src/main/print-canon.c:673 src/main/print-escp2.c:2239
+#: src/cups/genppd.c:1356 src/cups/genppd.c:1605 src/cups/genppd.c:2022
+#: src/cups/genppd.c:2113
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-canon.c:675 src/main/print-escp2.c:2036
+#: src/main/print-canon.c:675 src/main/print-escp2.c:2241
 msgid "Print To Hub"
 msgstr "Imprimer sue le moyeu"
 
-#: src/main/print-canon.c:790 src/main/print-escp2.c:2447
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-canon.c:790 src/main/print-escp2.c:2652
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2167
 #: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
 #: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Couleur"
 
-#: src/main/print-canon.c:792 src/main/print-escp2.c:2449
+#: src/main/print-canon.c:792 src/main/print-escp2.c:2654
 #: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
 #: src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "Noir et blanc"
 
-#: src/main/print-canon.c:831 src/main/print-escp2.c:2089
+#: src/main/print-canon.c:831 src/main/print-escp2.c:2294
 #: src/main/print-pcl.c:1797 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr "Controle manuel"
 
-#: src/main/print-canon.c:833 src/main/print-escp2.c:2131
-#: src/main/print-escp2.c:2229 src/main/print-escp2.c:2241
+#: src/main/print-canon.c:833 src/main/print-escp2.c:2336
+#: src/main/print-escp2.c:2434 src/main/print-escp2.c:2446
 #: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
 #: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
-#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1215
-#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1219
-#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
-#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3170
-#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3177
-#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3461
-#: src/xml/xmli18n-tmp.h:3464 src/xml/xmli18n-tmp.h:3632
-#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3648
-#: src/xml/xmli18n-tmp.h:3657 src/xml/xmli18n-tmp.h:3665
+#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1627 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3713 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3722 src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5902
 msgid "Standard"
 msgstr "Standard"
 
@@ -550,7 +559,7 @@ msgid "Pre-Dithered"
 msgstr "Pré-tramé"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1268 src/cups/genppd.c:1971
+#: src/cups/genppd.c:1301 src/cups/genppd.c:2005
 msgid "Grayscale"
 msgstr "Niveaux de gris"
 
@@ -566,11 +575,11 @@ msgstr "RVB"
 msgid "CMY"
 msgstr "CMJ"
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1299 src/cups/genppd.c:1978
+#: src/main/print-color.c:129 src/cups/genppd.c:1332 src/cups/genppd.c:2012
 msgid "CMYK"
 msgstr "CMJN"
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1306 src/cups/genppd.c:1979
+#: src/main/print-color.c:131 src/cups/genppd.c:1339 src/cups/genppd.c:2013
 msgid "KCMY"
 msgstr "NCMJ"
 
@@ -630,7 +639,7 @@ msgid "Output image type"
 msgstr "Type de sortie :"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338
 msgid "Raw Channels"
 msgstr "Canaux raw"
 
@@ -695,56 +704,208 @@ msgstr "Valeur gamma prévue par l'application"
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
 #: src/escputil/escputil.c:997 src/escputil/escputil.c:1017
-#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:1812
-#: src/xml/xmli18n-tmp.h:1823 src/xml/xmli18n-tmp.h:1836
-#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1863
-#: src/xml/xmli18n-tmp.h:1876 src/xml/xmli18n-tmp.h:1889
-#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1918
-#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1949
-#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1975
-#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:1999
-#: src/xml/xmli18n-tmp.h:2013 src/xml/xmli18n-tmp.h:2027
-#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2051
-#: src/xml/xmli18n-tmp.h:2064 src/xml/xmli18n-tmp.h:2076
-#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2102
-#: src/xml/xmli18n-tmp.h:2116 src/xml/xmli18n-tmp.h:2130
-#: src/xml/xmli18n-tmp.h:2143 src/xml/xmli18n-tmp.h:2156
-#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2184
-#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2210
-#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2236
-#: src/xml/xmli18n-tmp.h:2249 src/xml/xmli18n-tmp.h:2262
-#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2290
-#: src/xml/xmli18n-tmp.h:2305 src/xml/xmli18n-tmp.h:2320
-#: src/xml/xmli18n-tmp.h:2332 src/xml/xmli18n-tmp.h:2343
-#: src/xml/xmli18n-tmp.h:2356 src/xml/xmli18n-tmp.h:2369
-#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2392
-#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2415
-#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2442
-#: src/xml/xmli18n-tmp.h:2454 src/xml/xmli18n-tmp.h:2466
-#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2496
-#: src/xml/xmli18n-tmp.h:2509 src/xml/xmli18n-tmp.h:2522
-#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
-#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2574
-#: src/xml/xmli18n-tmp.h:2586 src/xml/xmli18n-tmp.h:2598
-#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2623
-#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2653
-#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2683
-#: src/xml/xmli18n-tmp.h:2697 src/xml/xmli18n-tmp.h:2715
-#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2745
-#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
-#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2803
-#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2828
-#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2854
-#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2881
-#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2915
-#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2943
-#: src/xml/xmli18n-tmp.h:2959 src/xml/xmli18n-tmp.h:2976
-#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:3004
-#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3032
-#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3062
-#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3093
-#: src/xml/xmli18n-tmp.h:3107 src/xml/xmli18n-tmp.h:3125
-#: src/xml/xmli18n-tmp.h:3141
+#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2387
+#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2413
+#: src/xml/xmli18n-tmp.h:2426 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2499
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2551
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2575
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2708
+#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2786
+#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2814
+#: src/xml/xmli18n-tmp.h:2829 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2893
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2966
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3005 src/xml/xmli18n-tmp.h:3020
+#: src/xml/xmli18n-tmp.h:3033 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3061 src/xml/xmli18n-tmp.h:3073
+#: src/xml/xmli18n-tmp.h:3085 src/xml/xmli18n-tmp.h:3098
+#: src/xml/xmli18n-tmp.h:3110 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3377
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3616
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3648
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3766 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3775 src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:3794 src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:3805 src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3869 src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:3880 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3902 src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:3913 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:3948 src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:3970 src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:3983 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4023 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4064 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4075 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4088 src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:4103 src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:4118 src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:4143 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:4203 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4275 src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4309 src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4356 src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4421
+#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4449
+#: src/xml/xmli18n-tmp.h:4456 src/xml/xmli18n-tmp.h:4462
+#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4485 src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:4551 src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:4694 src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4717 src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:4818 src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:4829 src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4885 src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4935
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:5041 src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:5052 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:5121 src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5165
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5182 src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:5193 src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:5271 src/xml/xmli18n-tmp.h:5299
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5327 src/xml/xmli18n-tmp.h:5331
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5347
+#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5367 src/xml/xmli18n-tmp.h:5371
+#: src/xml/xmli18n-tmp.h:5383 src/xml/xmli18n-tmp.h:5388
+#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5440
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5461 src/xml/xmli18n-tmp.h:5468
+#: src/xml/xmli18n-tmp.h:5476 src/xml/xmli18n-tmp.h:5486
+#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5514
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5525
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5543
+#: src/xml/xmli18n-tmp.h:5550 src/xml/xmli18n-tmp.h:5556
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5574 src/xml/xmli18n-tmp.h:5582
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5592
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5625
+#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5649
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5662
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5690
+#: src/xml/xmli18n-tmp.h:5694 src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5731
+#: src/xml/xmli18n-tmp.h:5738 src/xml/xmli18n-tmp.h:5742
+#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5759
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5770
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5807
+#: src/xml/xmli18n-tmp.h:5811 src/xml/xmli18n-tmp.h:5817
+#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5828
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5843
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -754,56 +915,208 @@ msgstr "Réglage du gamma pour le cyan"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
 #: src/escputil/escputil.c:998 src/escputil/escputil.c:1018
-#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:1813
-#: src/xml/xmli18n-tmp.h:1824 src/xml/xmli18n-tmp.h:1837
-#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1864
-#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1890
-#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1919
-#: src/xml/xmli18n-tmp.h:1935 src/xml/xmli18n-tmp.h:1950
-#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1976
-#: src/xml/xmli18n-tmp.h:1988 src/xml/xmli18n-tmp.h:2000
-#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2028
-#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2052
-#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2077
-#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2103
-#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2131
-#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2157
-#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2185
-#: src/xml/xmli18n-tmp.h:2198 src/xml/xmli18n-tmp.h:2211
-#: src/xml/xmli18n-tmp.h:2224 src/xml/xmli18n-tmp.h:2237
-#: src/xml/xmli18n-tmp.h:2250 src/xml/xmli18n-tmp.h:2263
-#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2291
-#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2321
-#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2344
-#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2370
-#: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2393
-#: src/xml/xmli18n-tmp.h:2405 src/xml/xmli18n-tmp.h:2416
-#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2443
-#: src/xml/xmli18n-tmp.h:2455 src/xml/xmli18n-tmp.h:2467
-#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2497
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2523
-#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2575
-#: src/xml/xmli18n-tmp.h:2587 src/xml/xmli18n-tmp.h:2599
-#: src/xml/xmli18n-tmp.h:2611 src/xml/xmli18n-tmp.h:2624
-#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
-#: src/xml/xmli18n-tmp.h:2670 src/xml/xmli18n-tmp.h:2684
-#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2714
-#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2747
-#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2780
-#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
-#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2829
-#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2855
-#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2882
-#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2914
-#: src/xml/xmli18n-tmp.h:2931 src/xml/xmli18n-tmp.h:2944
-#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2975
-#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:3005
-#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3033
-#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3060
-#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3094
-#: src/xml/xmli18n-tmp.h:3108 src/xml/xmli18n-tmp.h:3124
-#: src/xml/xmli18n-tmp.h:3140
+#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2361
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2388
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2414
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2459 src/xml/xmli18n-tmp.h:2474
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2512 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2552
+#: src/xml/xmli18n-tmp.h:2564 src/xml/xmli18n-tmp.h:2576
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2787
+#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2815
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2868
+#: src/xml/xmli18n-tmp.h:2881 src/xml/xmli18n-tmp.h:2894
+#: src/xml/xmli18n-tmp.h:2905 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:2967
+#: src/xml/xmli18n-tmp.h:2979 src/xml/xmli18n-tmp.h:2991
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3062 src/xml/xmli18n-tmp.h:3074
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3099
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3135 src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:3163 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3353
+#: src/xml/xmli18n-tmp.h:3365 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
+#: src/xml/xmli18n-tmp.h:3420 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3542 src/xml/xmli18n-tmp.h:3556
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3600 src/xml/xmli18n-tmp.h:3617
+#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3647
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3751 src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:3784 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3795 src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:3806 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3837 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3903 src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3939 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3960 src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:3972 src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:3984 src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:3999 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:4039 src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:4104 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:4170 src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4194 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:4230 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:4276 src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4311 src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4338 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:4401 src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:4427 src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:4442 src/xml/xmli18n-tmp.h:4451
+#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4464
+#: src/xml/xmli18n-tmp.h:4470 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4486 src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:4511 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:4809 src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4909 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:5007 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5018 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5111 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5123 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5148 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:5240 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5250 src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:5261 src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5301
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5313
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5349
+#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5401
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5441
+#: src/xml/xmli18n-tmp.h:5453 src/xml/xmli18n-tmp.h:5458
+#: src/xml/xmli18n-tmp.h:5463 src/xml/xmli18n-tmp.h:5470
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5496 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5527
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5552 src/xml/xmli18n-tmp.h:5558
+#: src/xml/xmli18n-tmp.h:5564 src/xml/xmli18n-tmp.h:5568
+#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5593
+#: src/xml/xmli18n-tmp.h:5598 src/xml/xmli18n-tmp.h:5616
+#: src/xml/xmli18n-tmp.h:5620 src/xml/xmli18n-tmp.h:5626
+#: src/xml/xmli18n-tmp.h:5631 src/xml/xmli18n-tmp.h:5651
+#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
+#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5674
+#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5720
+#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5733
+#: src/xml/xmli18n-tmp.h:5739 src/xml/xmli18n-tmp.h:5743
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5818
+#: src/xml/xmli18n-tmp.h:5823 src/xml/xmli18n-tmp.h:5829
+#: src/xml/xmli18n-tmp.h:5833 src/xml/xmli18n-tmp.h:5839
+#: src/xml/xmli18n-tmp.h:5844
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -813,56 +1126,208 @@ msgstr "Réglage du gamma pour le magenta"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
 #: src/escputil/escputil.c:999 src/escputil/escputil.c:1019
-#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:1814
-#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
-#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1865
-#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1891
-#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1920
-#: src/xml/xmli18n-tmp.h:1936 src/xml/xmli18n-tmp.h:1951
-#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1977
-#: src/xml/xmli18n-tmp.h:1989 src/xml/xmli18n-tmp.h:2001
-#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2029
-#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2053
-#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2078
-#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2104
-#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
-#: src/xml/xmli18n-tmp.h:2145 src/xml/xmli18n-tmp.h:2158
-#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2186
-#: src/xml/xmli18n-tmp.h:2199 src/xml/xmli18n-tmp.h:2212
-#: src/xml/xmli18n-tmp.h:2225 src/xml/xmli18n-tmp.h:2238
-#: src/xml/xmli18n-tmp.h:2251 src/xml/xmli18n-tmp.h:2264
-#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2292
-#: src/xml/xmli18n-tmp.h:2307 src/xml/xmli18n-tmp.h:2322
-#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
-#: src/xml/xmli18n-tmp.h:2358 src/xml/xmli18n-tmp.h:2371
-#: src/xml/xmli18n-tmp.h:2382 src/xml/xmli18n-tmp.h:2394
-#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2417
-#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2444
-#: src/xml/xmli18n-tmp.h:2456 src/xml/xmli18n-tmp.h:2468
-#: src/xml/xmli18n-tmp.h:2483 src/xml/xmli18n-tmp.h:2498
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2524
-#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2551
-#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2576
-#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
-#: src/xml/xmli18n-tmp.h:2612 src/xml/xmli18n-tmp.h:2625
-#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2651
-#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2685
-#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2713
-#: src/xml/xmli18n-tmp.h:2734 src/xml/xmli18n-tmp.h:2749
-#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2779
-#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2805
-#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2830
-#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2856
-#: src/xml/xmli18n-tmp.h:2871 src/xml/xmli18n-tmp.h:2883
-#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2910
-#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2945
-#: src/xml/xmli18n-tmp.h:2960 src/xml/xmli18n-tmp.h:2974
-#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3006
-#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3034
-#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3061
-#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3095
-#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3120
-#: src/xml/xmli18n-tmp.h:3136
+#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2389
+#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2444
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2475
+#: src/xml/xmli18n-tmp.h:2488 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2513 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2565 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2602
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2762
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2788
+#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2816
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2846
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2906 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3022
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3048
+#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3075
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3124
+#: src/xml/xmli18n-tmp.h:3136 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3175
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3315 src/xml/xmli18n-tmp.h:3329
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3433
+#: src/xml/xmli18n-tmp.h:3455 src/xml/xmli18n-tmp.h:3468
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3497
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3601 src/xml/xmli18n-tmp.h:3618
+#: src/xml/xmli18n-tmp.h:3632 src/xml/xmli18n-tmp.h:3643
+#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3747 src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3834 src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:3844 src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:3867 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:3900 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3910 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3935 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:3967 src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:3979 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4005 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4062 src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4110 src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:4124 src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4167 src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:4272 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:4321 src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:4334 src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4367 src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4471
+#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4505 src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4549 src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:4562 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4580 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4602 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:4678 src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:4691 src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4770 src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4893 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4904 src/xml/xmli18n-tmp.h:4911
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:4971 src/xml/xmli18n-tmp.h:4978
+#: src/xml/xmli18n-tmp.h:5004 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5050 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5071 src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:5097 src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:5142 src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:5169 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5184
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5257 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5318
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5358
+#: src/xml/xmli18n-tmp.h:5364 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5385
+#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5438
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5454
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5465
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5511
+#: src/xml/xmli18n-tmp.h:5516 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5547 src/xml/xmli18n-tmp.h:5554
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5584 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5617 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5632
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5687
+#: src/xml/xmli18n-tmp.h:5692 src/xml/xmli18n-tmp.h:5698
+#: src/xml/xmli18n-tmp.h:5705 src/xml/xmli18n-tmp.h:5713
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5729
+#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
+#: src/xml/xmli18n-tmp.h:5744 src/xml/xmli18n-tmp.h:5756
+#: src/xml/xmli18n-tmp.h:5761 src/xml/xmli18n-tmp.h:5767
+#: src/xml/xmli18n-tmp.h:5774 src/xml/xmli18n-tmp.h:5782
+#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5792
+#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5803
+#: src/xml/xmli18n-tmp.h:5809 src/xml/xmli18n-tmp.h:5813
+#: src/xml/xmli18n-tmp.h:5819 src/xml/xmli18n-tmp.h:5824
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5845
 msgid "Yellow"
 msgstr "Jaune"
 
@@ -872,9 +1337,17 @@ msgstr "Réglage du gamma pour le jaune"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
 #: src/escputil/escputil.c:1006 src/escputil/escputil.c:1025
-#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2700
-#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2795
-#: src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:4041 src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:4056 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4091 src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:4155 src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5155
 msgid "Red"
 msgstr "Rouge"
 
@@ -892,8 +1365,13 @@ msgstr "Réglage du gamma pour le vert"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
 #: src/escputil/escputil.c:1007 src/escputil/escputil.c:1026
-#: src/xml/xmli18n-tmp.h:2657 src/xml/xmli18n-tmp.h:2701
-#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4051 src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:4084 src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:5156
 msgid "Blue"
 msgstr "Bleu"
 
@@ -904,53 +1382,183 @@ msgstr "Réglage du gamma pour le bleu"
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
 #: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1016 src/escputil/escputil.c:1285
-#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
-#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
-#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1875
-#: src/xml/xmli18n-tmp.h:1888 src/xml/xmli18n-tmp.h:1901
-#: src/xml/xmli18n-tmp.h:1917 src/xml/xmli18n-tmp.h:1933
-#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1961
-#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1986
-#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2012
-#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2038
-#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2063
-#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2090
-#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2115
-#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2142
-#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2169
-#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
-#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
-#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2248
-#: src/xml/xmli18n-tmp.h:2261 src/xml/xmli18n-tmp.h:2274
-#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2304
-#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2331
-#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
-#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
-#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2403
-#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2420
-#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2441
-#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2465
-#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2495
-#: src/xml/xmli18n-tmp.h:2508 src/xml/xmli18n-tmp.h:2521
-#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
-#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2573
-#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2597
-#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2622
-#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2672
-#: src/xml/xmli18n-tmp.h:2682 src/xml/xmli18n-tmp.h:2731
-#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2764
-#: src/xml/xmli18n-tmp.h:2781 src/xml/xmli18n-tmp.h:2794
-#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2815
-#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2839
-#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2868
-#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2894
-#: src/xml/xmli18n-tmp.h:2911 src/xml/xmli18n-tmp.h:2929
-#: src/xml/xmli18n-tmp.h:2942 src/xml/xmli18n-tmp.h:2977
-#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:3003
-#: src/xml/xmli18n-tmp.h:3017 src/xml/xmli18n-tmp.h:3031
-#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3079
-#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3110
-#: src/xml/xmli18n-tmp.h:3121 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2372
+#: src/xml/xmli18n-tmp.h:2386 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2457
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2510
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2536
+#: src/xml/xmli18n-tmp.h:2550 src/xml/xmli18n-tmp.h:2562
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2599 src/xml/xmli18n-tmp.h:2614
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2639
+#: src/xml/xmli18n-tmp.h:2653 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2965
+#: src/xml/xmli18n-tmp.h:2977 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3019
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3060 src/xml/xmli18n-tmp.h:3072
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3133 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3196
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3526
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3680 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3755 src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:3804 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3819 src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:3831 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3846 src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3873 src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:3924 src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:3943 src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:4022 src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4059 src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:4142 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4164 src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:4179 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:4255 src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4289 src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:4308 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4413 src/xml/xmli18n-tmp.h:4420
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4455
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4507 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:4565 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:4604 src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:4702 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:4733 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:4786 src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4920 src/xml/xmli18n-tmp.h:4926
+#: src/xml/xmli18n-tmp.h:4934 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:4973 src/xml/xmli18n-tmp.h:4981
+#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:4993
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:5047 src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5151
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5186
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5223 src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5270
+#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5284
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5320
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5337
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5375
+#: src/xml/xmli18n-tmp.h:5378 src/xml/xmli18n-tmp.h:5380
+#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5435
+#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5447
+#: src/xml/xmli18n-tmp.h:5449 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5474
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5492
+#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5571
+#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5590
+#: src/xml/xmli18n-tmp.h:5596 src/xml/xmli18n-tmp.h:5602
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5614
+#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5629
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5655
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5680 src/xml/xmli18n-tmp.h:5682
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5700
+#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5716
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5749
+#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5769 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5794
+#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5806
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5836
+#: src/xml/xmli18n-tmp.h:5842
 msgid "Black"
 msgstr "Noir"
 
@@ -958,7 +1566,7 @@ msgstr "Noir"
 msgid "Adjust the black gamma"
 msgstr "Réglage du gamma pour le noir"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1769
+#: src/main/print-color.c:322 src/main/print-olympus.c:1935
 msgid "Cyan Balance"
 msgstr "Niveau de cyan"
 
@@ -971,7 +1579,7 @@ msgstr "Balance des gris"
 msgid "Adjust the cyan gray balance"
 msgstr "Réglage du cyan pour la balance des gris"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1777
+#: src/main/print-color.c:330 src/main/print-olympus.c:1943
 msgid "Magenta Balance"
 msgstr "Niveau de magenta"
 
@@ -979,7 +1587,7 @@ msgstr "Niveau de magenta"
 msgid "Adjust the magenta gray balance"
 msgstr "Réglage du magenta pour la balance des gris"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1785
+#: src/main/print-color.c:338 src/main/print-olympus.c:1951
 msgid "Yellow Balance"
 msgstr "Niveau de jaune"
 
@@ -1007,11 +1615,11 @@ msgstr "Limite d'encrage"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
-#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
-#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
-#: src/main/print-escp2.c:759
+#: src/main/print-escp2.c:344 src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356 src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368 src/main/print-escp2.c:374
+#: src/main/print-escp2.c:869 src/main/print-escp2.c:877
+#: src/main/print-escp2.c:885
 msgid "Advanced Output Control"
 msgstr "Controle avancé de la sortie"
 
@@ -1021,27 +1629,27 @@ msgstr ""
 "Limite l'encre utilisée au total\n"
 "(peut être laissé au nombre d'encres)"
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:743
+#: src/main/print-color.c:365 src/main/print-escp2.c:869
 msgid "GCR Transition"
 msgstr "Transition GCR"
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:744
+#: src/main/print-color.c:366 src/main/print-escp2.c:870
 msgid "Adjust the gray component transition rate"
 msgstr "Régle le taux de transition de la composante gris"
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:751
+#: src/main/print-color.c:373 src/main/print-escp2.c:877
 msgid "GCR Lower Bound"
 msgstr "Limite basse GCR"
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:752
+#: src/main/print-color.c:374 src/main/print-escp2.c:878
 msgid "Lower bound of gray component reduction"
 msgstr "Limite basse de la composante gris"
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:759
+#: src/main/print-color.c:381 src/main/print-escp2.c:885
 msgid "GCR Upper Bound"
 msgstr "Limite haute GCR"
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:760
+#: src/main/print-color.c:382 src/main/print-escp2.c:886
 msgid "Upper bound of gray component reduction"
 msgstr "Limite haute de la composante gris"
 
@@ -1295,11 +1903,11 @@ msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 "Sens d'impression (unidirectionnel est de meilleure qualité mais plus lent)"
 
-#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1906
 msgid "Borderless"
 msgstr "sans marges"
 
-#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1907
 msgid "Print without borders"
 msgstr "Impression sans marges"
 
@@ -1312,7 +1920,7 @@ msgid "Interleave pattern to use"
 msgstr "Motif d'entrelacement"
 
 #: src/main/print-escp2.c:266 src/main/print-escp2.c:267
-#: src/cups/genppd.c:1567 src/cups/genppd.c:2078
+#: src/cups/genppd.c:1600 src/cups/genppd.c:2112
 msgid "Output Order"
 msgstr "Ordre de sortie"
 
@@ -1354,361 +1962,478 @@ msgid "Has multiple choices of ink cartridges"
 msgstr ""
 
 #: src/main/print-escp2.c:320 src/main/print-escp2.c:321
+#, fuzzy
+msgid "Raw Channel Names"
+msgstr "Nom des canaux"
+
+#: src/main/print-escp2.c:326 src/main/print-escp2.c:327
 msgid "Channel Names"
 msgstr "Nom des canaux"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:339
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:344
 msgid "Cyan Map"
 msgstr "Carte du cyan"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:345
 msgid "Adjust the cyan map"
 msgstr "Modification de la carte du cyan"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350
 msgid "Magenta Map"
 msgstr "Carte du magenta"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:351
 msgid "Adjust the magenta map"
 msgstr "Modification de la carte du majenta"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356
 msgid "Yellow Map"
 msgstr "Carte du jaune"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:357
 msgid "Adjust the yellow map"
 msgstr "Modification de la carte du jaune"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362
 msgid "Blue Map"
 msgstr "Carte du bleu"
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:363
 msgid "Adjust the blue map"
 msgstr "Modification de la carte du bleu"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368
 #, fuzzy
 msgid "Orange Map"
 msgstr "Carte du cyan"
 
-#: src/main/print-escp2.c:363
+#: src/main/print-escp2.c:369
 #, fuzzy
 msgid "Adjust the orange map"
 msgstr "Modification de la carte du rouge"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:374
 msgid "Red Map"
 msgstr "Carte du rouge"
 
-#: src/main/print-escp2.c:369
+#: src/main/print-escp2.c:375
 msgid "Adjust the red map"
 msgstr "Modification de la carte du rouge"
 
-#: src/main/print-escp2.c:471
+#: src/main/print-escp2.c:477
 msgid "Red Density"
 msgstr "Densité du rouge"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:478
 msgid "Adjust the red density"
 msgstr "Ajuste la densité du rouge"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:485
 msgid "Blue Density"
 msgstr "Densité du bleu"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:486
 msgid "Adjust the blue density"
 msgstr "Ajuste la densité du bleu"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:493
 #, fuzzy
 msgid "Orange Density"
 msgstr "Densité cyan"
 
-#: src/main/print-escp2.c:488
+#: src/main/print-escp2.c:494
 #, fuzzy
 msgid "Adjust the orange density"
 msgstr "Ajuste la densité du rouge"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:501
 msgid "Gloss Level"
 msgstr "Niveau de brillance"
 
-#: src/main/print-escp2.c:496
+#: src/main/print-escp2.c:502
 msgid "Adjust the gloss level"
 msgstr "Ajuste le niveau de brillance"
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:509
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:504
+#: src/main/print-escp2.c:510
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:517
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:512
+#: src/main/print-escp2.c:518
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:525
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:520
+#: src/main/print-escp2.c:526
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:534
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "Cyan clair"
 
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:550
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "Densité cyan"
 
-#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
+#: src/main/print-escp2.c:557 src/main/print-escp2.c:558
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "Magenta clair"
 
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:566
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "Densité magenta"
 
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:582
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "Jaune foncé"
 
-#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
+#: src/main/print-escp2.c:589 src/main/print-escp2.c:590
 msgid "Dark Yellow Transition"
 msgstr "transition jaune foncé"
 
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:598
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "Densité jaune"
 
-#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
+#: src/main/print-escp2.c:605 src/main/print-escp2.c:606
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:630
 #, fuzzy
 msgid "Gray Value"
 msgstr "Niveaux de gris"
 
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
-#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:614
+#: src/main/print-escp2.c:637 src/main/print-escp2.c:638
 msgid "Gray Transition"
 msgstr "Transition gris"
 
-#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
+#: src/main/print-escp2.c:621 src/main/print-escp2.c:622
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:646
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "Niveaux de gris"
 
-#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
+#: src/main/print-escp2.c:653 src/main/print-escp2.c:654
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:726
 #, fuzzy
 msgid "Light Gray Value"
 msgstr "Transition cyan clair"
 
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
-#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:662
+#: src/main/print-escp2.c:733 src/main/print-escp2.c:734
 msgid "Light Gray Transition"
 msgstr "Transition cyan clair"
 
-#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
-#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
+#: src/main/print-escp2.c:669 src/main/print-escp2.c:670
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:742
 #, fuzzy
 msgid "Light Gray Density Scale"
 msgstr "Transition cyan clair"
 
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:678
 #, fuzzy
 msgid "Dark Gray Value"
 msgstr "Transition gris foncé"
 
-#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
+#: src/main/print-escp2.c:685 src/main/print-escp2.c:686
 msgid "Dark Gray Transition"
 msgstr "Transition gris foncé"
 
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:694
 #, fuzzy
 msgid "Dark Gray Density Scale"
 msgstr "Transition gris foncé"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:701
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "Niveaux de gris"
 
-#: src/main/print-escp2.c:696
+#: src/main/print-escp2.c:702
 #, fuzzy
 msgid "Medium Gray Value"
 msgstr "Transition gris moyen"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:709
 msgid "Mid Gray Transition"
 msgstr "Transition gris médian"
 
-#: src/main/print-escp2.c:704
+#: src/main/print-escp2.c:710
 msgid "Medium Gray Transition"
 msgstr "Transition gris moyen"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:717
 #, fuzzy
 msgid "Mid Gray Density Scale"
 msgstr "Transition gris médian"
 
-#: src/main/print-escp2.c:712
+#: src/main/print-escp2.c:718
 #, fuzzy
 msgid "Medium Gray Density Scale"
 msgstr "Transition gris moyen"
 
-#: src/main/print-escp2.c:767
+#: src/main/print-escp2.c:749
+#, fuzzy
+msgid "Hextone Gray 5 Value"
+msgstr "Niveaux de gris"
+
+#: src/main/print-escp2.c:750
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:757
+#, fuzzy
+msgid "Hextone Gray 5 Transition"
+msgstr "Transition gris"
+
+#: src/main/print-escp2.c:758
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr "Transition cyan clair"
+
+#: src/main/print-escp2.c:765
+#, fuzzy
+msgid "Hextone Gray 5 Density Scale"
+msgstr "Niveaux de gris"
+
+#: src/main/print-escp2.c:766
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr "Transition cyan clair"
+
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:774
+#, fuzzy
+msgid "Hextone Gray 4 Value"
+msgstr "Niveaux de gris"
+
+#: src/main/print-escp2.c:781 src/main/print-escp2.c:782
+#, fuzzy
+msgid "Hextone Gray 4 Transition"
+msgstr "Transition gris"
+
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:790
+#, fuzzy
+msgid "Hextone Gray 4 Density Scale"
+msgstr "Niveaux de gris"
+
+#: src/main/print-escp2.c:797 src/main/print-escp2.c:798
+#, fuzzy
+msgid "Hextone Gray 3 Value"
+msgstr "Niveaux de gris"
+
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:806
+#, fuzzy
+msgid "Hextone Gray 3 Transition"
+msgstr "Transition gris"
+
+#: src/main/print-escp2.c:813 src/main/print-escp2.c:814
+#, fuzzy
+msgid "Hextone Gray 3 Density Scale"
+msgstr "Niveaux de gris"
+
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:822
+#, fuzzy
+msgid "Hextone Gray 2 Value"
+msgstr "Niveaux de gris"
+
+#: src/main/print-escp2.c:829 src/main/print-escp2.c:830
+#, fuzzy
+msgid "Hextone Gray 2 Transition"
+msgstr "Transition gris"
+
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:838
+#, fuzzy
+msgid "Hextone Gray 2 Density Scale"
+msgstr "Niveaux de gris"
+
+#: src/main/print-escp2.c:845
+#, fuzzy
+msgid "Hextone Gray 1 Value"
+msgstr "Niveaux de gris"
+
+#: src/main/print-escp2.c:846
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:853
+#, fuzzy
+msgid "Hextone Gray 1 Transition"
+msgstr "Transition gris"
+
+#: src/main/print-escp2.c:854
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr "Transition magenta clair"
+
+#: src/main/print-escp2.c:861
+#, fuzzy
+msgid "Hextone Gray 1 Density Scale"
+msgstr "Niveaux de gris"
+
+#: src/main/print-escp2.c:862
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr "Densité magenta"
+
+#: src/main/print-escp2.c:893
 msgid "Drying Time Per Page"
 msgstr ""
 
-#: src/main/print-escp2.c:768
+#: src/main/print-escp2.c:894
 msgid "Set drying time per page"
 msgstr ""
 
-#: src/main/print-escp2.c:775
+#: src/main/print-escp2.c:901
 msgid "Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:776
+#: src/main/print-escp2.c:902
 msgid "Set drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:783
+#: src/main/print-escp2.c:909
 msgid "Minimum Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:784
+#: src/main/print-escp2.c:910
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:799
+#: src/main/print-escp2.c:925
+#, fuzzy
+msgid "Quality Enhancement"
+msgstr "Ajouter l'amélioration de brillance"
+
+#: src/main/print-escp2.c:926
+msgid "Enhance print quality by additional passes"
+msgstr ""
+
+#: src/main/print-escp2.c:933
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "Taille du papier"
 
-#: src/main/print-escp2.c:800
+#: src/main/print-escp2.c:934
 #, fuzzy
 msgid "Set printer paper thickness"
 msgstr "Valeurs par défaut"
 
-#: src/main/print-escp2.c:807
+#: src/main/print-escp2.c:941
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Densité du noir"
 
-#: src/main/print-escp2.c:808
+#: src/main/print-escp2.c:942
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:815
+#: src/main/print-escp2.c:949
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:816
+#: src/main/print-escp2.c:950
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:823
+#: src/main/print-escp2.c:957
 #, fuzzy
 msgid "Print Method"
 msgstr "Mode d'impression"
 
-#: src/main/print-escp2.c:824
+#: src/main/print-escp2.c:958
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:831
+#: src/main/print-escp2.c:965
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Papier ordinaire"
 
-#: src/main/print-escp2.c:832
+#: src/main/print-escp2.c:966
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:839
+#: src/main/print-escp2.c:973
 #, fuzzy
 msgid "Feed Adjustment"
 msgstr "Réglage fin"
 
-#: src/main/print-escp2.c:840
-#, c-format
+#: src/main/print-escp2.c:975
+#, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:1992
+#: src/main/print-escp2.c:2197
 msgid "Full Manual Control"
 msgstr "Contrôle manuel complet"
 
-#: src/main/print-escp2.c:1994
+#: src/main/print-escp2.c:2199
 msgid "Automatic Setting Control"
 msgstr "Controle réglage automatique"
 
-#: src/main/print-escp2.c:2208 src/cups/genppd.c:1484 src/cups/genppd.c:2059
+#: src/main/print-escp2.c:2413 src/cups/genppd.c:1517 src/cups/genppd.c:2093
 msgid "Automatic"
 msgstr "Automatique"
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2415
 msgid "Bidirectional"
 msgstr "Bidirectionnel"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2417
 msgid "Unidirectional"
 msgstr "Unirectionnel"
 
-#: src/main/print-escp2.c:2243
+#: src/main/print-escp2.c:2448
 msgid "Alternate Fill"
 msgstr "en alternance"
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2450
 msgid "Ascending Fill"
 msgstr "en montant"
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2452
 msgid "Descending Fill"
 msgstr "en descendant"
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2454
 msgid "Ascending Double"
 msgstr "en montant - double"
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2456
 msgid "Nearest Neighbor Avoidance"
 msgstr "en évitant les voisins"
 
-#: src/main/print-escp2.c:2287
+#: src/main/print-escp2.c:2492
 #, fuzzy
 msgid "Short Edge(Flip)"
 msgstr "Côté court (retourné)"
 
-#: src/main/print-escp2.c:2858
+#: src/main/print-escp2.c:3100
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "L'imprimante ne supporte pas les sorties directes en %d bits\n"
 
-#: src/main/print-escp2.c:4107 src/main/print-olympus.c:2472
+#: src/main/print-escp2.c:4355 src/main/print-olympus.c:2641
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr "Options d'impression non vérifiées: ne peut pas imprimer.\n"
@@ -1762,361 +2487,378 @@ msgid "test print"
 msgstr "test d'impression"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3205
-#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3217
-#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3233
-#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3255
-#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3276
-#: src/xml/xmli18n-tmp.h:3288 src/xml/xmli18n-tmp.h:3295
-#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3315
-#: src/xml/xmli18n-tmp.h:3327 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3368
-#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3380
-#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
-#: src/xml/xmli18n-tmp.h:3412 src/xml/xmli18n-tmp.h:3424
-#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3444
-#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3472
-#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3496
-#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3521
-#: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3544
-#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3556
-#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3581
-#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3598
-#: src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3754 src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:3809 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3863 src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:4058 src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:4163 src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:4227 src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:4335 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4467 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4594 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:4879 src/xml/xmli18n-tmp.h:4946
+#: src/xml/xmli18n-tmp.h:5000 src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:5243 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5365 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5512 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5667 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5784 src/xml/xmli18n-tmp.h:5805
+#: src/xml/xmli18n-tmp.h:5826
 msgid "Four Color Standard"
 msgstr "Quatre couleurs standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3206
-#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3218
-#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3234
-#: src/xml/xmli18n-tmp.h:3244 src/xml/xmli18n-tmp.h:3251
-#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3268
-#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3289
-#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3306
-#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
-#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3354
-#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3377
-#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3389
-#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3413
-#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3435
-#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3455
-#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3485
-#: src/xml/xmli18n-tmp.h:3497 src/xml/xmli18n-tmp.h:3508
-#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3537
-#: src/xml/xmli18n-tmp.h:3545 src/xml/xmli18n-tmp.h:3549
-#: src/xml/xmli18n-tmp.h:3557 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3593
-#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3605
+#: src/xml/xmli18n-tmp.h:3759 src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3868 src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:4002 src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:4107 src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4472
+#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4817 src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5181 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5315 src/xml/xmli18n-tmp.h:5370
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5672
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5831
 msgid "Three Color Composite"
 msgstr "Trois couleurs composite"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3241
-#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3265
-#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3286
-#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
-#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3351
-#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3374
-#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3398
-#: src/xml/xmli18n-tmp.h:3410 src/xml/xmli18n-tmp.h:3422
-#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3452
-#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3470
-#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3494
-#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3519
-#: src/xml/xmli18n-tmp.h:3534 src/xml/xmli18n-tmp.h:3542
-#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3741 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4086 src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4933
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5421
+#: src/xml/xmli18n-tmp.h:5499 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5723
 msgid "Six Color Photo"
 msgstr "Six couleurs photo"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3242
-#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3266
-#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3287
-#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3326
-#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3352
-#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3375
-#: src/xml/xmli18n-tmp.h:3387 src/xml/xmli18n-tmp.h:3399
-#: src/xml/xmli18n-tmp.h:3411 src/xml/xmli18n-tmp.h:3423
-#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3453
-#: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3483
-#: src/xml/xmli18n-tmp.h:3495 src/xml/xmli18n-tmp.h:3506
-#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3535
-#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3566
-#: src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3748 src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:3989 src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:4094 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4267 src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4940
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5661
+#: src/xml/xmli18n-tmp.h:5730
 msgid "Five Color Photo Composite"
 msgstr "Cinq couleurs photo composite"
 
 #: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
-#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
-#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
-#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
-#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
-#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
-#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
-#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
-#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:849
-#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:963
-#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1077
-#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1170
-#: src/xml/xmli18n-tmp.h:1220 src/xml/xmli18n-tmp.h:1277
-#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1376
-#: src/xml/xmli18n-tmp.h:1439 src/xml/xmli18n-tmp.h:1502
-#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1619
-#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1739
-#: src/xml/xmli18n-tmp.h:1773
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1050
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1240
+#: src/xml/xmli18n-tmp.h:1335 src/xml/xmli18n-tmp.h:1449
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1580
+#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1862
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2200 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2297
 msgid "Plain Paper"
 msgstr "Papier ordinaire"
 
-#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
-#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
-#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
-#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
-#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
-#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
-#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
-#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
-#: src/xml/xmli18n-tmp.h:819 src/xml/xmli18n-tmp.h:858
-#: src/xml/xmli18n-tmp.h:915 src/xml/xmli18n-tmp.h:972
-#: src/xml/xmli18n-tmp.h:1029 src/xml/xmli18n-tmp.h:1086
-#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1176
-#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1286
-#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1385
-#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1508
-#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1628
-#: src/xml/xmli18n-tmp.h:1685 src/xml/xmli18n-tmp.h:1743
-#: src/xml/xmli18n-tmp.h:1779
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:101 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:365 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1160 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1740
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1871
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2136
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2267
+#: src/xml/xmli18n-tmp.h:2303
 msgid "Glossy Film"
 msgstr "Film brillant"
 
-#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
-#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
-#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
-#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
-#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
-#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
-#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
-#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
-#: src/xml/xmli18n-tmp.h:821 src/xml/xmli18n-tmp.h:861
-#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:975
-#: src/xml/xmli18n-tmp.h:1032 src/xml/xmli18n-tmp.h:1089
-#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1178
-#: src/xml/xmli18n-tmp.h:1232 src/xml/xmli18n-tmp.h:1289
-#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1388
-#: src/xml/xmli18n-tmp.h:1451 src/xml/xmli18n-tmp.h:1511
-#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1631
-#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1745
-#: src/xml/xmli18n-tmp.h:1781
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:845 src/xml/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:965 src/xml/xmli18n-tmp.h:1022
+#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1359
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1550
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1745 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2305
 msgid "Transparencies"
 msgstr "Transparents"
 
-#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
-#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
-#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
-#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
-#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
-#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
-#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
-#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
-#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:823
-#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:921
-#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:1035
-#: src/xml/xmli18n-tmp.h:1092 src/xml/xmli18n-tmp.h:1142
-#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1235
-#: src/xml/xmli18n-tmp.h:1292 src/xml/xmli18n-tmp.h:1344
-#: src/xml/xmli18n-tmp.h:1391 src/xml/xmli18n-tmp.h:1454
-#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1577
-#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1691
-#: src/xml/xmli18n-tmp.h:1747 src/xml/xmli18n-tmp.h:1783
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:55 src/xml/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:151 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1024
+#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2215
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2307
 msgid "Envelopes"
 msgstr "Enveloppes"
 
-#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
-#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
-#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
-#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
-#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
-#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
-#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
-#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
-#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:827
-#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:927
-#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:1041
-#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1146
-#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1241
-#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1348
-#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1460
-#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1583
-#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1697
-#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1787
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:1028
+#: src/xml/xmli18n-tmp.h:1085 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1275 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1556
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1665
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1834
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2076
+#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2311
 msgid "Matte Paper"
 msgstr "Papier Mat"
 
-#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
-#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
-#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
-#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
-#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
-#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
-#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
-#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
-#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:831
-#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:933
-#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:1047
-#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1150
-#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1247
-#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1352
-#: src/xml/xmli18n-tmp.h:1403 src/xml/xmli18n-tmp.h:1466
-#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1589
-#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1703
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1791
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:167 src/xml/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:569
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1032
+#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1285 src/xml/xmli18n-tmp.h:1389
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1675
+#: src/xml/xmli18n-tmp.h:1770 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1889 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2012 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2227
+#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2315
 msgid "Inkjet Paper"
 msgstr "Papier jet d'encre"
 
-#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
-#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
-#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
-#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
-#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
-#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
-#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
-#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
-#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:833
-#: src/xml/xmli18n-tmp.h:879 src/xml/xmli18n-tmp.h:936
-#: src/xml/xmli18n-tmp.h:993 src/xml/xmli18n-tmp.h:1050
-#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1152
-#: src/xml/xmli18n-tmp.h:1190 src/xml/xmli18n-tmp.h:1250
-#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1354
-#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1469
-#: src/xml/xmli18n-tmp.h:1529 src/xml/xmli18n-tmp.h:1592
-#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1706
-#: src/xml/xmli18n-tmp.h:1757 src/xml/xmli18n-tmp.h:1793
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:425 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:512 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1034
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1499 src/xml/xmli18n-tmp.h:1562
+#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1775 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1955
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2088
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2317
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papier jet d'encre qualité photo"
 
-#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
-#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
-#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
-#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
-#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
-#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
-#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
-#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
-#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:835
-#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:939
-#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:1053
-#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1154
-#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1253
-#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1356
-#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1472
-#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1595
-#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1709
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1795
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1036
+#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1200
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1504 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1842
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2233
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2319
 msgid "Photo Paper"
 msgstr "Papier photo"
 
-#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
-#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
-#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
-#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
-#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
-#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
-#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
-#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
-#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:837
-#: src/xml/xmli18n-tmp.h:885 src/xml/xmli18n-tmp.h:942
-#: src/xml/xmli18n-tmp.h:999 src/xml/xmli18n-tmp.h:1056
-#: src/xml/xmli18n-tmp.h:1113 src/xml/xmli18n-tmp.h:1156
-#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1212
-#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1256
-#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1358
-#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1475
-#: src/xml/xmli18n-tmp.h:1535 src/xml/xmli18n-tmp.h:1598
-#: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1712
-#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1797
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:179 src/xml/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:518 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:869 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1038
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1407
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1566
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1622
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1844
+#: src/xml/xmli18n-tmp.h:1898 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2321
 msgid "Premium Glossy Photo Paper"
 msgstr "Papier glacé photo Premium"
 
-#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
-#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
-#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
-#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
-#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
-#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
-#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
-#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
-#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:841
-#: src/xml/xmli18n-tmp.h:891 src/xml/xmli18n-tmp.h:948
-#: src/xml/xmli18n-tmp.h:1005 src/xml/xmli18n-tmp.h:1062
-#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1160
-#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1262
-#: src/xml/xmli18n-tmp.h:1319 src/xml/xmli18n-tmp.h:1362
-#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1481
-#: src/xml/xmli18n-tmp.h:1541 src/xml/xmli18n-tmp.h:1604
-#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1718
-#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1801
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1042
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1419
+#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1570
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2027 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2242
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2325
 msgid "Premium Luster Photo Paper"
 msgstr "Papier photo Premium Luster"
 
-#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
-#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
-#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
-#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
-#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
-#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
-#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
-#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
-#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:843
-#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:951
-#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1065
-#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1162
-#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1265
-#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1368
-#: src/xml/xmli18n-tmp.h:1427 src/xml/xmli18n-tmp.h:1490
-#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1607
-#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1727
-#: src/xml/xmli18n-tmp.h:1767 src/xml/xmli18n-tmp.h:1803
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:91 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:191 src/xml/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:439 src/xml/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:787 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1044
+#: src/xml/xmli18n-tmp.h:1125 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1315 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1854
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2327
 msgid "Photo Quality Glossy Paper"
 msgstr "Papier glacé qualité photo"
 
-#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
-#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
-#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
-#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
-#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
-#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
-#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
-#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:897
-#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:1011
-#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1125
-#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1206
-#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1325
-#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1430
-#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1553
-#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1667
-#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1805
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1130
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1320
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1616
+#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1856 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2329
 msgid "Ilford Heavy Paper"
 msgstr "Papier épais Ilford"
 
-#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
-#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
-#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
-#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
-#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
-#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
-#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
-#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
-#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:847
-#: src/xml/xmli18n-tmp.h:903 src/xml/xmli18n-tmp.h:960
-#: src/xml/xmli18n-tmp.h:1017 src/xml/xmli18n-tmp.h:1074
-#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1168
-#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1214
-#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1274
-#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1374
-#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1499
-#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1616
-#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1736
-#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1809
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:129
+#: src/xml/xmli18n-tmp.h:203 src/xml/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:542 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1048
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1443
+#: src/xml/xmli18n-tmp.h:1539 src/xml/xmli18n-tmp.h:1578
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1720
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1985
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2333
 msgid "Other"
 msgstr "Autre"
 
@@ -2132,52 +2874,56 @@ msgstr "Manuel avec pause"
 msgid "Manual without Pause"
 msgstr "Manuel sans pause"
 
-#: src/main/print-olympus.c:279
+#: src/main/print-olympus.c:281
 msgid "Coated"
 msgstr "Couché"
 
-#: src/main/print-olympus.c:280 src/cups/genppd.c:1685 src/cups/genppd.c:1713
-#: src/cups/genppd.c:1745 src/cups/genppd.c:1800 src/cups/genppd.c:1846
-#: src/cups/genppd.c:2147 src/cups/genppd.c:2160 src/cups/genppd.c:2183
-#: src/cups/genppd.c:2204 src/cups/genppd.c:2221
+#: src/main/print-olympus.c:282 src/cups/genppd.c:1718 src/cups/genppd.c:1746
+#: src/cups/genppd.c:1778 src/cups/genppd.c:1833 src/cups/genppd.c:1879
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2194 src/cups/genppd.c:2217
+#: src/cups/genppd.c:2238 src/cups/genppd.c:2255
 msgid "None"
 msgstr "Aucun"
 
-#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
-#: src/main/print-olympus.c:1132
+#: src/main/print-olympus.c:998 src/main/print-olympus.c:1061
+#: src/main/print-olympus.c:1165
 msgid "Glossy"
 msgstr "Brillant"
 
-#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
-#: src/main/print-olympus.c:1133
+#: src/main/print-olympus.c:999 src/main/print-olympus.c:1062
+#: src/main/print-olympus.c:1166
 msgid "Texture"
 msgstr "Texture"
 
-#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
+#: src/main/print-olympus.c:1063 src/main/print-olympus.c:1167
 msgid "Matte"
 msgstr "Mat"
 
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
+#. TRANSLATORS: 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.
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1901
 msgid "Laminate Pattern"
 msgstr "Motif du vernis protecteur"
 
-#: src/main/print-olympus.c:1770
+#: src/main/print-olympus.c:1936
 msgid "Adjust the cyan balance"
 msgstr "Réglage balance cyan"
 
-#: src/main/print-olympus.c:1778
+#: src/main/print-olympus.c:1944
 msgid "Adjust the magenta balance"
 msgstr "Réglage balance magenta"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1952
 msgid "Adjust the yellow balance"
 msgstr "Réglage balance jaune"
 
-#: src/main/print-olympus.c:1793
+#: src/main/print-olympus.c:1959
 msgid "Black Balance"
 msgstr "Balance du noir"
 
-#: src/main/print-olympus.c:1794
+#: src/main/print-olympus.c:1960
 msgid "Adjust the black balance"
 msgstr "Réglage de la balance du noir"
 
@@ -2209,7 +2955,7 @@ msgstr "Photo séchage rapide"
 msgid "Quick-dry Transparency"
 msgstr "Transparent séchage rapide"
 
-#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3687
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:5925
 msgid "Manual"
 msgstr "Manuel"
 
@@ -2294,23 +3040,23 @@ msgid "2400x600 DPI"
 msgstr "2400 x 600 ppp"
 
 #: src/main/print-pcl.c:278 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3638
-#: src/xml/xmli18n-tmp.h:3647 src/xml/xmli18n-tmp.h:3656
-#: src/xml/xmli18n-tmp.h:3664
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5875
+#: src/xml/xmli18n-tmp.h:5884 src/xml/xmli18n-tmp.h:5893
+#: src/xml/xmli18n-tmp.h:5901
 msgid "Draft"
 msgstr "Brouillon"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:3633 src/xml/xmli18n-tmp.h:3641
-#: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3658
-#: src/xml/xmli18n-tmp.h:3666
+#: src/xml/xmli18n-tmp.h:5870 src/xml/xmli18n-tmp.h:5878
+#: src/xml/xmli18n-tmp.h:5886 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5903
 msgid "High"
 msgstr "Hauteur"
 
 #: src/main/print-pcl.c:282 src/main/print-pcl.c:283
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3634
-#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3650
-#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3667
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5896 src/xml/xmli18n-tmp.h:5904
 msgid "Photo"
 msgstr "Photo"
 
@@ -2343,15 +3089,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3671
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:5908
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3708
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:5946
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3823
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6061
 msgid "Custom"
 msgstr "Personnalisé"
 
@@ -2359,33 +3105,43 @@ msgstr "Personnalisé"
 msgid "Image dimensions must match paper dimensions"
 msgstr "Les dimensions de l'image doivent correspondre à celles du papier"
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3629
-#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3654
+#: src/main/print-weave.c:1511
+#, fuzzy
+msgid "Fatal error!"
+msgstr "Erreur: Erreur fatale\n"
+
+#: src/main/print-weave.c:1547
+msgid ""
+"Please report the above information to gimp-print-devel@lists.sourceforge.net"
+msgstr ""
+
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:5866
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5891
 msgid "Fast Economy"
 msgstr "Rapide (économique)"
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3630
-#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3655
-#: src/xml/xmli18n-tmp.h:3663
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5900
 msgid "Economy"
 msgstr "Economique"
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3635
-#: src/xml/xmli18n-tmp.h:3642 src/xml/xmli18n-tmp.h:3651
-#: src/xml/xmli18n-tmp.h:3660 src/xml/xmli18n-tmp.h:3668
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:5872
+#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
 msgid "Super Photo"
 msgstr "Super Photo"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3636
-#: src/xml/xmli18n-tmp.h:3643 src/xml/xmli18n-tmp.h:3652
-#: src/xml/xmli18n-tmp.h:3661 src/xml/xmli18n-tmp.h:3669
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:5873
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5889
+#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5906
 msgid "Ultra Photo"
 msgstr "Ultra photo"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1326 src/cups/genppd.c:1989
-#: src/xml/xmli18n-tmp.h:3637 src/xml/xmli18n-tmp.h:3644
-#: src/xml/xmli18n-tmp.h:3653 src/xml/xmli18n-tmp.h:3662
-#: src/xml/xmli18n-tmp.h:3670
+#: src/main/generic-options.c:41 src/cups/genppd.c:1359 src/cups/genppd.c:2023
+#: src/xml/xmli18n-tmp.h:5874 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5899
+#: src/xml/xmli18n-tmp.h:5907
 msgid "Best"
 msgstr "Meilleur"
 
@@ -3113,85 +3869,85 @@ msgstr "Extra5"
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:960
+#: src/cups/genppd.c:993
 msgid "English"
 msgstr "French"
 
-#: src/cups/genppd.c:1159 src/cups/genppd.c:1175 src/cups/genppd.c:1934
-#: src/cups/genppd.c:1935
+#: src/cups/genppd.c:1192 src/cups/genppd.c:1208 src/cups/genppd.c:1968
+#: src/cups/genppd.c:1969
 #, fuzzy
 msgid "Media Size"
 msgstr "Source du support"
 
-#: src/cups/genppd.c:1248 src/cups/genppd.c:1970
+#: src/cups/genppd.c:1281 src/cups/genppd.c:2004
 #, fuzzy
 msgid "Color Model"
 msgstr "Mode de travail"
 
-#: src/cups/genppd.c:1275 src/cups/genppd.c:1972
+#: src/cups/genppd.c:1308 src/cups/genppd.c:2006
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "Niveaux de gris"
 
-#: src/cups/genppd.c:1285 src/cups/genppd.c:1976
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2010
 #, fuzzy
 msgid "RGB Color"
 msgstr "Couleur"
 
-#: src/cups/genppd.c:1292 src/cups/genppd.c:1977
+#: src/cups/genppd.c:1325 src/cups/genppd.c:2011
 msgid "CMY Color"
 msgstr "Couleur CMJ"
 
-#: src/cups/genppd.c:1317 src/cups/genppd.c:1987
+#: src/cups/genppd.c:1350 src/cups/genppd.c:2021
 #, fuzzy
 msgid "Color Precision"
 msgstr "Correction des couleurs"
 
-#: src/cups/genppd.c:1573 src/cups/genppd.c:2080
+#: src/cups/genppd.c:1606 src/cups/genppd.c:2114
 #, fuzzy
 msgid "Reverse"
 msgstr "Meilleur"
 
-#: src/cups/genppd.c:1590 src/cups/genppd.c:2096
+#: src/cups/genppd.c:1623 src/cups/genppd.c:2130
 #, fuzzy
 msgid "2-Sided Printing"
 msgstr "Impression double face"
 
-#: src/cups/genppd.c:1615 src/cups/genppd.c:2113
+#: src/cups/genppd.c:1648 src/cups/genppd.c:2147
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1620 src/cups/genppd.c:2114
+#: src/cups/genppd.c:1653 src/cups/genppd.c:2148
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1621 src/cups/genppd.c:2115
+#: src/cups/genppd.c:1654 src/cups/genppd.c:2149
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1622 src/cups/genppd.c:2116
+#: src/cups/genppd.c:1655 src/cups/genppd.c:2150
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1716 src/cups/genppd.c:2162
+#: src/cups/genppd.c:1749 src/cups/genppd.c:2196
 msgid "No"
 msgstr "Non"
 
-#: src/cups/genppd.c:1718 src/cups/genppd.c:2164
+#: src/cups/genppd.c:1751 src/cups/genppd.c:2198
 msgid "Yes"
 msgstr "Oui"
 
-#: src/cups/genppd.c:1757 src/cups/genppd.c:1820 src/cups/genppd.c:1864
-#: src/cups/genppd.c:2185 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+#: src/cups/genppd.c:1790 src/cups/genppd.c:1853 src/cups/genppd.c:1897
+#: src/cups/genppd.c:2219 src/cups/genppd.c:2249 src/cups/genppd.c:2266
 #, fuzzy
 msgid "Value"
 msgstr "Bleu"
 
-#: src/cups/genppd.c:1762 src/cups/genppd.c:2189
+#: src/cups/genppd.c:1795 src/cups/genppd.c:2223
 msgid "Fine Adjustment"
 msgstr "Réglage fin"
 
-#: src/cups/genppd.c:1805 src/cups/genppd.c:2209
+#: src/cups/genppd.c:1838 src/cups/genppd.c:2243
 #, c-format
 msgid "%.1f mm"
 msgstr ""
@@ -3528,51 +4284,61 @@ 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:995 src/xml/xmli18n-tmp.h:383
-#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
-#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
-#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
-#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
-#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
-#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
-#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
-#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
-#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
-#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
-#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
-#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
-#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
-#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
-#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
-#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
-#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
-#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
-#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
-#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
-#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
-#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
-#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
-#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
-#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
-#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
-#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
-#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
-#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
-#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1503
-#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1509
-#: src/xml/xmli18n-tmp.h:1512 src/xml/xmli18n-tmp.h:1515
-#: src/xml/xmli18n-tmp.h:1518 src/xml/xmli18n-tmp.h:1521
-#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1527
-#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
-#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
-#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
-#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
-#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
-#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:2655
-#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2717
-#: src/xml/xmli18n-tmp.h:3045 src/xml/xmli18n-tmp.h:3252
-#: src/xml/xmli18n-tmp.h:3273 src/xml/xmli18n-tmp.h:3363
-#: src/xml/xmli18n-tmp.h:3531
+#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2001
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2010 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2025
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:4085 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4612 src/xml/xmli18n-tmp.h:5481
 msgid "Photo Black"
 msgstr "Noir photo"
 
@@ -3583,125 +4349,297 @@ msgid "Unknown"
 msgstr "Inconnu"
 
 #: src/escputil/escputil.c:1000 src/escputil/escputil.c:1289
-#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1921
-#: src/xml/xmli18n-tmp.h:1937 src/xml/xmli18n-tmp.h:2002
-#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2079
-#: src/xml/xmli18n-tmp.h:2105 src/xml/xmli18n-tmp.h:2119
-#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2173
-#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
-#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
-#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2293
-#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2346
-#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2418
-#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2445
-#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2469
-#: src/xml/xmli18n-tmp.h:2484 src/xml/xmli18n-tmp.h:2512
-#: src/xml/xmli18n-tmp.h:2525 src/xml/xmli18n-tmp.h:2564
-#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2626
-#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2746
-#: src/xml/xmli18n-tmp.h:2762 src/xml/xmli18n-tmp.h:2843
-#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2895
-#: src/xml/xmli18n-tmp.h:2912 src/xml/xmli18n-tmp.h:2946
-#: src/xml/xmli18n-tmp.h:3001 src/xml/xmli18n-tmp.h:3015
-#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3122
-#: src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2461 src/xml/xmli18n-tmp.h:2526
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2683 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2711 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3101 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3661
+#: src/xml/xmli18n-tmp.h:3678 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3750 src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:3782 src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:3932 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3964 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4388 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:4639 src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:4875 src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4936
+#: src/xml/xmli18n-tmp.h:4942 src/xml/xmli18n-tmp.h:4968
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5339 src/xml/xmli18n-tmp.h:5348
+#: src/xml/xmli18n-tmp.h:5355 src/xml/xmli18n-tmp.h:5361
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5417
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5430
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5477 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5502
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5536 src/xml/xmli18n-tmp.h:5544
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5557
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5657 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5719
+#: src/xml/xmli18n-tmp.h:5726 src/xml/xmli18n-tmp.h:5732
+#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5779
 msgid "Light Cyan"
 msgstr "Cyan clair"
 
 #: src/escputil/escputil.c:1001 src/escputil/escputil.c:1290
-#: src/xml/xmli18n-tmp.h:1906 src/xml/xmli18n-tmp.h:1922
-#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:2003
-#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2080
-#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2120
-#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2174
-#: src/xml/xmli18n-tmp.h:2188 src/xml/xmli18n-tmp.h:2201
-#: src/xml/xmli18n-tmp.h:2214 src/xml/xmli18n-tmp.h:2227
-#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2294
-#: src/xml/xmli18n-tmp.h:2309 src/xml/xmli18n-tmp.h:2347
-#: src/xml/xmli18n-tmp.h:2360 src/xml/xmli18n-tmp.h:2419
-#: src/xml/xmli18n-tmp.h:2432 src/xml/xmli18n-tmp.h:2446
-#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2470
-#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2513
-#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2565
-#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2627
-#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2748
-#: src/xml/xmli18n-tmp.h:2761 src/xml/xmli18n-tmp.h:2844
-#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2896
-#: src/xml/xmli18n-tmp.h:2913 src/xml/xmli18n-tmp.h:2947
-#: src/xml/xmli18n-tmp.h:3000 src/xml/xmli18n-tmp.h:3014
-#: src/xml/xmli18n-tmp.h:3028 src/xml/xmli18n-tmp.h:3123
-#: src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2446
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2527
+#: src/xml/xmli18n-tmp.h:2541 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2644
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2698
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2751
+#: src/xml/xmli18n-tmp.h:2803 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2956 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2994
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3381
+#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3662
+#: src/xml/xmli18n-tmp.h:3746 src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:3778 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3934 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3966 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:4265 src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:4390 src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:4428 src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4452
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4465
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4512 src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4586 src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:4641 src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4903
+#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4970
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:5044 src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5168
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5241 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5334
+#: src/xml/xmli18n-tmp.h:5341 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5363
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5419
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5471
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5504
+#: src/xml/xmli18n-tmp.h:5510 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5652
+#: src/xml/xmli18n-tmp.h:5659 src/xml/xmli18n-tmp.h:5665
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5721
+#: src/xml/xmli18n-tmp.h:5728 src/xml/xmli18n-tmp.h:5734
+#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5781
 msgid "Light Magenta"
 msgstr "Magenta clair"
 
-#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2433
-#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:3002
-#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3030
+#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3679 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4409 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:4566 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4605 src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4664 src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5376 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5450
+#: src/xml/xmli18n-tmp.h:5475 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5533 src/xml/xmli18n-tmp.h:5542
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5678 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5717
+#: src/xml/xmli18n-tmp.h:5747 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5777
 msgid "Light Black"
 msgstr "Noir clair"
 
-#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:384
-#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
-#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
-#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
-#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
-#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
-#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
-#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
-#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
-#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
-#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
-#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
-#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
-#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
-#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
-#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
-#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
-#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
-#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
-#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
-#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
-#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
-#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
-#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
-#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
-#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
-#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
-#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
-#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
-#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
-#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1504
-#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1510
-#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1516
-#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1522
-#: src/xml/xmli18n-tmp.h:1525 src/xml/xmli18n-tmp.h:1528
-#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1534
-#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1540
-#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1546
-#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1552
-#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1558
-#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:2654
-#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2716
-#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3264
-#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3371
-#: src/xml/xmli18n-tmp.h:3539
+#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:508 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:532 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:538 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:562 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:568 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
+#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
+#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
+#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
+#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
+#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
+#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
+#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
+#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
+#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
+#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
+#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2011 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2026
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2032
+#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2038
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:4044 src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:5530
 msgid "Matte Black"
 msgstr "Noir Mat"
 
-#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:2658
-#: src/xml/xmli18n-tmp.h:2702 src/xml/xmli18n-tmp.h:2720
-#: src/xml/xmli18n-tmp.h:3048
+#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3995 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4006 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4020 src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:4106 src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Gloss Optimizer"
 msgstr "Optimiseur de brillance"
 
-#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:2760
-#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3013
-#: src/xml/xmli18n-tmp.h:3027
+#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3676
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4616 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5534 src/xml/xmli18n-tmp.h:5573
 msgid "Light Light Black"
 msgstr "Noir très clair"
 
 #: src/escputil/escputil.c:1010 src/escputil/escputil.c:1029
-#: src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:4099 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4189
 #, fuzzy
 msgid "Orange"
 msgstr "Page"
@@ -4381,8276 +5319,8456 @@ msgstr "Impression en cours..."
 #: src/xml/xmli18n-tmp.h:68 src/xml/xmli18n-tmp.h:70 src/xml/xmli18n-tmp.h:72
 #: src/xml/xmli18n-tmp.h:74 src/xml/xmli18n-tmp.h:76 src/xml/xmli18n-tmp.h:78
 #: src/xml/xmli18n-tmp.h:80 src/xml/xmli18n-tmp.h:82 src/xml/xmli18n-tmp.h:84
-#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:92
-#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
-#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
-#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
-#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
-#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
-#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
-#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
-#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
-#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
-#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
-#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
-#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
-#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
-#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
-#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
-#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
-#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
-#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
-#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
-#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
-#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
-#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
-#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
-#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
-#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
-#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
-#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
-#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
-#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
-#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
-#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
-#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
-#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
-#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
-#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
-#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
-#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
-#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
-#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
-#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
-#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
-#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
-#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
-#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
-#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
-#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
-#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
-#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
-#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
-#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
-#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
-#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
-#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
-#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
-#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
-#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
-#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
-#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
-#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
-#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
-#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
-#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
-#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
-#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
-#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
-#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
-#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
-#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
-#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
-#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
-#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
-#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
-#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
-#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
-#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
-#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
-#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
-#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
-#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
-#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
-#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
-#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
-#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
-#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
-#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
-#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
-#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
-#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
-#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
-#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
-#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
-#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
-#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
-#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
-#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
-#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:92 src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:102 src/xml/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:106 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:114 src/xml/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:118 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:126 src/xml/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:130 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:136 src/xml/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:144 src/xml/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:168 src/xml/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:192 src/xml/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:216 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:232 src/xml/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:240 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:256 src/xml/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:264 src/xml/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:304 src/xml/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:312 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:320 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:328 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:336 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:344 src/xml/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:352 src/xml/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:384 src/xml/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:408 src/xml/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:412 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:432 src/xml/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:444 src/xml/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:448 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:468 src/xml/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:484 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:642 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:698 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:714 src/xml/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:722 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:738 src/xml/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:746 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:764 src/xml/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:780 src/xml/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:804 src/xml/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:814
 #: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:818
 #: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:822
 #: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:826
 #: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:830
-#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:834
-#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:838
-#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:842
-#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:846
-#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:850
-#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
-#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
-#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
-#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
-#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
-#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
-#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
-#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:898
-#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
-#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
-#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
-#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
-#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
-#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
-#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
-#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
-#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
-#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
-#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
-#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
-#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
-#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
-#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
-#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
-#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
-#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
-#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
-#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1018
-#: src/xml/xmli18n-tmp.h:1021 src/xml/xmli18n-tmp.h:1024
-#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1030
-#: src/xml/xmli18n-tmp.h:1033 src/xml/xmli18n-tmp.h:1036
-#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1042
-#: src/xml/xmli18n-tmp.h:1045 src/xml/xmli18n-tmp.h:1048
-#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1054
-#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1060
-#: src/xml/xmli18n-tmp.h:1063 src/xml/xmli18n-tmp.h:1066
-#: src/xml/xmli18n-tmp.h:1069 src/xml/xmli18n-tmp.h:1072
-#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1078
-#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1084
-#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1090
-#: src/xml/xmli18n-tmp.h:1093 src/xml/xmli18n-tmp.h:1096
-#: src/xml/xmli18n-tmp.h:1099 src/xml/xmli18n-tmp.h:1102
-#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1108
-#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1114
-#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1120
-#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1126
-#: src/xml/xmli18n-tmp.h:1129 src/xml/xmli18n-tmp.h:1132
-#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
-#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
-#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
-#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
-#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
-#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
-#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
-#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
-#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
-#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
-#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
-#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
-#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
-#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1189
-#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1193
-#: src/xml/xmli18n-tmp.h:1195 src/xml/xmli18n-tmp.h:1197
-#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1201
-#: src/xml/xmli18n-tmp.h:1203 src/xml/xmli18n-tmp.h:1205
-#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1209
-#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1221
-#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
-#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
-#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
-#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
-#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
-#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
-#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
-#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
-#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
-#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
-#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
-#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
-#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
-#: src/xml/xmli18n-tmp.h:1302 src/xml/xmli18n-tmp.h:1305
-#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1311
-#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1317
-#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1323
-#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1329
-#: src/xml/xmli18n-tmp.h:1332 src/xml/xmli18n-tmp.h:1335
-#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
-#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1343
-#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1347
-#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1351
-#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1355
-#: src/xml/xmli18n-tmp.h:1357 src/xml/xmli18n-tmp.h:1359
-#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1363
-#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1367
-#: src/xml/xmli18n-tmp.h:1369 src/xml/xmli18n-tmp.h:1371
-#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1375
-#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1566
-#: src/xml/xmli18n-tmp.h:1569 src/xml/xmli18n-tmp.h:1572
-#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1578
-#: src/xml/xmli18n-tmp.h:1581 src/xml/xmli18n-tmp.h:1584
-#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1590
-#: src/xml/xmli18n-tmp.h:1593 src/xml/xmli18n-tmp.h:1596
-#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1602
-#: src/xml/xmli18n-tmp.h:1605 src/xml/xmli18n-tmp.h:1608
-#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1614
-#: src/xml/xmli18n-tmp.h:1617 src/xml/xmli18n-tmp.h:1620
-#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1626
-#: src/xml/xmli18n-tmp.h:1629 src/xml/xmli18n-tmp.h:1632
-#: src/xml/xmli18n-tmp.h:1635 src/xml/xmli18n-tmp.h:1638
-#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1644
-#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
-#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
-#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
-#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
-#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
-#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
-#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
-#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
-#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
-#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
-#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
-#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
-#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
-#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
-#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:1778
-#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1782
-#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1786
-#: src/xml/xmli18n-tmp.h:1788 src/xml/xmli18n-tmp.h:1790
-#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1794
-#: src/xml/xmli18n-tmp.h:1796 src/xml/xmli18n-tmp.h:1798
-#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1802
-#: src/xml/xmli18n-tmp.h:1804 src/xml/xmli18n-tmp.h:1806
-#: src/xml/xmli18n-tmp.h:1808 src/xml/xmli18n-tmp.h:1810
-#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3204
-#: src/xml/xmli18n-tmp.h:3210 src/xml/xmli18n-tmp.h:3216
-#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3232
-#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3250
-#: src/xml/xmli18n-tmp.h:3294 src/xml/xmli18n-tmp.h:3302
-#: src/xml/xmli18n-tmp.h:3304 src/xml/xmli18n-tmp.h:3312
-#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3379
-#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
-#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3421
-#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3441
-#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3469
-#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3555
-#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3597
-#: src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:1017
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1025
+#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1035 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1047 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1056
+#: src/xml/xmli18n-tmp.h:1061 src/xml/xmli18n-tmp.h:1066
+#: src/xml/xmli18n-tmp.h:1071 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1086
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1096
+#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1116
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1126
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1136
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1161 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1181 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1206
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1216
+#: src/xml/xmli18n-tmp.h:1221 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1236
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1246
+#: src/xml/xmli18n-tmp.h:1251 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1261 src/xml/xmli18n-tmp.h:1266
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1281 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1291 src/xml/xmli18n-tmp.h:1296
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1311 src/xml/xmli18n-tmp.h:1316
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1326
+#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1336
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1378 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1414 src/xml/xmli18n-tmp.h:1420
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1432
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1450 src/xml/xmli18n-tmp.h:1455
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1465
+#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1480 src/xml/xmli18n-tmp.h:1485
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1540 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1551 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1583 src/xml/xmli18n-tmp.h:1585
+#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1603 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1607 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1646
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1666
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1676
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1716
+#: src/xml/xmli18n-tmp.h:1721 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1736
+#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1835
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1843
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1851
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:2049
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2057
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2065
+#: src/xml/xmli18n-tmp.h:2069 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2113
+#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2129
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2137
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2153
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2161
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2185
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2264
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2272
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2276
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2282 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2286 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2296
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2300
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2308
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2314 src/xml/xmli18n-tmp.h:2316
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2324
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:3787 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3895 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:4223 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5579
+#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5825
 msgid "EPSON Standard Inks"
 msgstr "Encres standard EPSON"
 
-#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Bright White Paper"
 msgstr "Papier Mat"
 
-#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
-#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
-#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
-#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
-#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
-#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
-#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
-#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:817
-#: src/xml/xmli18n-tmp.h:855 src/xml/xmli18n-tmp.h:912
-#: src/xml/xmli18n-tmp.h:969 src/xml/xmli18n-tmp.h:1026
-#: src/xml/xmli18n-tmp.h:1083 src/xml/xmli18n-tmp.h:1136
-#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1226
-#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1338
-#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1445
-#: src/xml/xmli18n-tmp.h:1505 src/xml/xmli18n-tmp.h:1568
-#: src/xml/xmli18n-tmp.h:1625 src/xml/xmli18n-tmp.h:1682
-#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1777
-#: src/xml/xmli18n-tmp.h:3675
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:139 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:959 src/xml/xmli18n-tmp.h:1018
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1155
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1546
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1931
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:5912
 msgid "Postcard"
 msgstr "Carte postale"
 
-#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
-#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
-#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
-#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
-#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
-#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
-#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
-#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:825
-#: src/xml/xmli18n-tmp.h:867 src/xml/xmli18n-tmp.h:924
-#: src/xml/xmli18n-tmp.h:981 src/xml/xmli18n-tmp.h:1038
-#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1144
-#: src/xml/xmli18n-tmp.h:1182 src/xml/xmli18n-tmp.h:1238
-#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1346
-#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1457
-#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1580
-#: src/xml/xmli18n-tmp.h:1637 src/xml/xmli18n-tmp.h:1694
-#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1785
+#: src/xml/xmli18n-tmp.h:13 src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:155 src/xml/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:415 src/xml/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:851 src/xml/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1026
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1175
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1554
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1832
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2309
 msgid "Back Light Film"
 msgstr "Film back light"
 
-#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
-#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
-#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
-#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
-#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
-#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
-#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
-#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:829
-#: src/xml/xmli18n-tmp.h:873 src/xml/xmli18n-tmp.h:930
-#: src/xml/xmli18n-tmp.h:987 src/xml/xmli18n-tmp.h:1044
-#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1148
-#: src/xml/xmli18n-tmp.h:1186 src/xml/xmli18n-tmp.h:1244
-#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1350
-#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1463
-#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1586
-#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1700
-#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1789
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:419 src/xml/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:857 src/xml/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1030
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1383
+#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1558
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2313
 msgid "Matte Paper Heavyweight"
 msgstr "Papier Mat Heavyweight"
 
-#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
-#: src/xml/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:421
 #, fuzzy
 msgid "Premium Presentation Paper Matte"
 msgstr "Papier photo Premium Luster"
 
-#: src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:431
 #, fuzzy
-msgid "Premium Glossy Photo Paper 170 wt"
-msgstr "Papier glacé photo Premium"
+msgid "Ultra Glossy Photo Paper"
+msgstr "Papier brillant qualité photo"
+
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1210
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1413
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1568
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1695
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1964
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2176 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2287 src/xml/xmli18n-tmp.h:2323
+msgid "Premium Semigloss Photo Paper"
+msgstr "Papier semi-brillant photo Premium"
 
-#: src/xml/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:437
 #, fuzzy
-msgid "Premium Glossy Photo Paper 250 wt"
+msgid "Ultra Premium Photo Paper Luster"
 msgstr "Papier glacé photo Premium"
 
-#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
-#: src/xml/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:37
+msgid "CD or DVD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:93 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1230
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1437
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2331
+msgid "ColorLife Paper"
+msgstr "Papier Colorlife"
+
+#: src/xml/xmli18n-tmp.h:73
 #, fuzzy
-msgid "Ultra Glossy Photo Paper"
-msgstr "Papier brillant qualité photo"
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Papier glacé photo Premium"
 
-#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
-#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
-#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
-#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
-#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
-#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
-#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
-#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:839
-#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:945
-#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1059
-#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1158
-#: src/xml/xmli18n-tmp.h:1196 src/xml/xmli18n-tmp.h:1259
-#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1360
-#: src/xml/xmli18n-tmp.h:1415 src/xml/xmli18n-tmp.h:1478
-#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1601
-#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1715
-#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1799
-msgid "Premium Semigloss Photo Paper"
-msgstr "Papier semi-brillant photo Premium"
+#: src/xml/xmli18n-tmp.h:75
+#, fuzzy
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "Papier glacé photo Premium"
 
-#: src/xml/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:81
 #, fuzzy
 msgid "Premium Semigloss Photo Paper 170 wt"
 msgstr "Papier semi-brillant photo Premium"
 
-#: src/xml/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:83
 #, fuzzy
 msgid "Premium Semigloss Photo Paper 250 wt"
 msgstr "Papier semi-brillant photo Premium"
 
-#: src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:87
 #, fuzzy
 msgid "Premium Luster Photo Paper 250 wt"
 msgstr "Papier photo Premium Luster"
 
-#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
-#: src/xml/xmli18n-tmp.h:334
-#, fuzzy
-msgid "Ultra Premium Photo Paper Luster"
-msgstr "Papier glacé photo Premium"
-
-#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
-#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
-#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
-#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
-#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
-#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
-#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
-#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:845
-#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:957
-#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1071
-#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1166
-#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1271
-#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1372
-#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1496
-#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1613
-#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1733
-#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1807
-msgid "ColorLife Paper"
-msgstr "Papier Colorlife"
-
-#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
-#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
-#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
-#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
-#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
-#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
-#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
-#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
-#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
-#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
-#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
-#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
-#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
-#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
-#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
-#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
-#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
-#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
-#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
-#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
-#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
-#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
-#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
-#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
-#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
-#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
-#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
-#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
-#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
-#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
-#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
-#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
-#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
-#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
-#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
-#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
-#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
-#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
-#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
-#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
-#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
-#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
-#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
-#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
-#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
-#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
-#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:851
-#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:857
-#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:863
-#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:869
-#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:875
-#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:881
-#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:887
-#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:893
-#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:899
-#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:905
-#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:911
-#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:917
-#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:923
-#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:929
-#: src/xml/xmli18n-tmp.h:932 src/xml/xmli18n-tmp.h:935
-#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:941
-#: src/xml/xmli18n-tmp.h:944 src/xml/xmli18n-tmp.h:947
-#: src/xml/xmli18n-tmp.h:950 src/xml/xmli18n-tmp.h:953
-#: src/xml/xmli18n-tmp.h:956 src/xml/xmli18n-tmp.h:959
-#: src/xml/xmli18n-tmp.h:962 src/xml/xmli18n-tmp.h:965
-#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:971
-#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:977
-#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:983
-#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:989
-#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:995
-#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1001
-#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1007
-#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1013
-#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1019
-#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1025
-#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1031
-#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1037
-#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1043
-#: src/xml/xmli18n-tmp.h:1046 src/xml/xmli18n-tmp.h:1049
-#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1055
-#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1061
-#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1067
-#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1073
-#: src/xml/xmli18n-tmp.h:1076 src/xml/xmli18n-tmp.h:1079
-#: src/xml/xmli18n-tmp.h:1082 src/xml/xmli18n-tmp.h:1085
-#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1091
-#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1097
-#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1103
-#: src/xml/xmli18n-tmp.h:1106 src/xml/xmli18n-tmp.h:1109
-#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1115
-#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1121
-#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1127
-#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1133
-#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1225
-#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1231
-#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1237
-#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1243
-#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1249
-#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1255
-#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1261
-#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1267
-#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1273
-#: src/xml/xmli18n-tmp.h:1276 src/xml/xmli18n-tmp.h:1279
-#: src/xml/xmli18n-tmp.h:1282 src/xml/xmli18n-tmp.h:1285
-#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1291
-#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1297
-#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1303
-#: src/xml/xmli18n-tmp.h:1306 src/xml/xmli18n-tmp.h:1309
-#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1315
-#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1321
-#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1327
-#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1333
-#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1567
-#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1573
-#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1579
-#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1585
-#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1591
-#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1597
-#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1603
-#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1609
-#: src/xml/xmli18n-tmp.h:1612 src/xml/xmli18n-tmp.h:1615
-#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1621
-#: src/xml/xmli18n-tmp.h:1624 src/xml/xmli18n-tmp.h:1627
-#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1633
-#: src/xml/xmli18n-tmp.h:1636 src/xml/xmli18n-tmp.h:1639
-#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1645
-#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1651
-#: src/xml/xmli18n-tmp.h:1654 src/xml/xmli18n-tmp.h:1657
-#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1663
-#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1669
-#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1675
-#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3223
-#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3231
-#: src/xml/xmli18n-tmp.h:3238 src/xml/xmli18n-tmp.h:3239
-#: src/xml/xmli18n-tmp.h:3300 src/xml/xmli18n-tmp.h:3301
-#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3311
-#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3396
-#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3408
-#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3420
-#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3432
-#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3440
-#: src/xml/xmli18n-tmp.h:3479 src/xml/xmli18n-tmp.h:3480
-#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3492
-#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3554
-#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:133 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:149 src/xml/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:173 src/xml/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:197 src/xml/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:205 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:221 src/xml/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:229 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:245 src/xml/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:253 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:261 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:269 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:277 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:285 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:293 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:301 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:309 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:317 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:325 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:333 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:341 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:349 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:357 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:619 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:643 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:667 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:691 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:707 src/xml/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:715 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:731 src/xml/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:739 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:755 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1062
+#: src/xml/xmli18n-tmp.h:1067 src/xml/xmli18n-tmp.h:1072
+#: src/xml/xmli18n-tmp.h:1077 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1092
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1102
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1112
+#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1122
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1132
+#: src/xml/xmli18n-tmp.h:1137 src/xml/xmli18n-tmp.h:1142
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1157 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1177 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1192
+#: src/xml/xmli18n-tmp.h:1197 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1212
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1222
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1242
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1252
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1272
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1287 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1297 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1327 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1385 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1445 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1461
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1516 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1647
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1657
+#: src/xml/xmli18n-tmp.h:1662 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1677
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1687
+#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1742 src/xml/xmli18n-tmp.h:1747
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1767
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1807
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2090 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2098 src/xml/xmli18n-tmp.h:2102
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2118
+#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2126
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2162 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2190
+#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:3884 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:4779 src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:4845 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4919
+#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4980
+#: src/xml/xmli18n-tmp.h:4986 src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5209 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5276
+#: src/xml/xmli18n-tmp.h:5277 src/xml/xmli18n-tmp.h:5283
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5607 src/xml/xmli18n-tmp.h:5633
+#: src/xml/xmli18n-tmp.h:5634 src/xml/xmli18n-tmp.h:5640
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
-#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
-#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
-#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
-#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:852
-#: src/xml/xmli18n-tmp.h:909 src/xml/xmli18n-tmp.h:966
-#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1080
-#: src/xml/xmli18n-tmp.h:1172 src/xml/xmli18n-tmp.h:1223
-#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1336
-#: src/xml/xmli18n-tmp.h:1379 src/xml/xmli18n-tmp.h:1442
-#: src/xml/xmli18n-tmp.h:1565 src/xml/xmli18n-tmp.h:1622
-#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1775
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:142 src/xml/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:150 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:174 src/xml/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:198 src/xml/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:214 src/xml/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:222 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:238 src/xml/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:246 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:262 src/xml/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:302 src/xml/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:310 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:318 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:326 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:334 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:342 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:350 src/xml/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:636 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:660 src/xml/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:708 src/xml/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:716 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:732 src/xml/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:756 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1103
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1123
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1158 src/xml/xmli18n-tmp.h:1163
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1183
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1193
+#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1213
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1223
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1238 src/xml/xmli18n-tmp.h:1243
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1253
+#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1283
+#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1313
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1333
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1362 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1374 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1462
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1472
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1487 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1502
+#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:1532
+#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1542
+#: src/xml/xmli18n-tmp.h:1633 src/xml/xmli18n-tmp.h:1638
+#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1648
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1658
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1713 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1728
+#: src/xml/xmli18n-tmp.h:1733 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1768
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2071
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2095
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2115 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2123 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2139 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2183
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2191
+#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2199
+#, fuzzy
+msgid "MISQuadtone"
+msgstr "Quadtone"
+
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1150 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2299
 msgid "Plain Paper Fast Load"
 msgstr "Papier normal chargement rapide"
 
-#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
-#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
-#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1364
-#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1484
-#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1970 src/xml/xmli18n-tmp.h:2030
+#: src/xml/xmli18n-tmp.h:2245
 msgid "Archival Matte Paper"
 msgstr "Papier Mat Archival"
 
-#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
-#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
-#: src/xml/xmli18n-tmp.h:1202 src/xml/xmli18n-tmp.h:1366
-#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1487
-#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:881 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2248
 msgid "Watercolor Paper - Radiant White"
 msgstr "Papier aquarelle - radiant white"
 
-#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
-#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
-#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
-#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
-#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
-#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
-#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
-#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
-#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
-#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
-#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1377
-#: src/xml/xmli18n-tmp.h:1380 src/xml/xmli18n-tmp.h:1383
-#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1389
-#: src/xml/xmli18n-tmp.h:1392 src/xml/xmli18n-tmp.h:1395
-#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1401
-#: src/xml/xmli18n-tmp.h:1404 src/xml/xmli18n-tmp.h:1407
-#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1413
-#: src/xml/xmli18n-tmp.h:1416 src/xml/xmli18n-tmp.h:1419
-#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1425
-#: src/xml/xmli18n-tmp.h:1428 src/xml/xmli18n-tmp.h:1431
-#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1437
-#: src/xml/xmli18n-tmp.h:1440 src/xml/xmli18n-tmp.h:1443
-#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1449
-#: src/xml/xmli18n-tmp.h:1452 src/xml/xmli18n-tmp.h:1455
-#: src/xml/xmli18n-tmp.h:1458 src/xml/xmli18n-tmp.h:1461
-#: src/xml/xmli18n-tmp.h:1464 src/xml/xmli18n-tmp.h:1467
-#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1473
-#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1479
-#: src/xml/xmli18n-tmp.h:1482 src/xml/xmli18n-tmp.h:1485
-#: src/xml/xmli18n-tmp.h:1488 src/xml/xmli18n-tmp.h:1491
-#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1497
-#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1677
-#: src/xml/xmli18n-tmp.h:1680 src/xml/xmli18n-tmp.h:1683
-#: src/xml/xmli18n-tmp.h:1686 src/xml/xmli18n-tmp.h:1689
-#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1695
-#: src/xml/xmli18n-tmp.h:1698 src/xml/xmli18n-tmp.h:1701
-#: src/xml/xmli18n-tmp.h:1704 src/xml/xmli18n-tmp.h:1707
-#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1713
-#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1719
-#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1725
-#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1731
-#: src/xml/xmli18n-tmp.h:1734 src/xml/xmli18n-tmp.h:1737
-#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3503
-#: src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:1863
+#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1881
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1893
+#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1905
+#: src/xml/xmli18n-tmp.h:1908 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1923
+#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:1950 src/xml/xmli18n-tmp.h:1953
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1968 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1983
+#: src/xml/xmli18n-tmp.h:1986 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2204 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2255
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5645
 msgid "UltraChrome Photo Black"
 msgstr "Ultrachrome noir photo"
 
-#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
-#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
-#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
-#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
-#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
-#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
-#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
-#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
-#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
-#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
-#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1378
-#: src/xml/xmli18n-tmp.h:1381 src/xml/xmli18n-tmp.h:1384
-#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1390
-#: src/xml/xmli18n-tmp.h:1393 src/xml/xmli18n-tmp.h:1396
-#: src/xml/xmli18n-tmp.h:1399 src/xml/xmli18n-tmp.h:1402
-#: src/xml/xmli18n-tmp.h:1405 src/xml/xmli18n-tmp.h:1408
-#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1414
-#: src/xml/xmli18n-tmp.h:1417 src/xml/xmli18n-tmp.h:1420
-#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1426
-#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1432
-#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1438
-#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1444
-#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1450
-#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1456
-#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1462
-#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1468
-#: src/xml/xmli18n-tmp.h:1471 src/xml/xmli18n-tmp.h:1474
-#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1480
-#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1486
-#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1492
-#: src/xml/xmli18n-tmp.h:1495 src/xml/xmli18n-tmp.h:1498
-#: src/xml/xmli18n-tmp.h:1501 src/xml/xmli18n-tmp.h:1678
-#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1684
-#: src/xml/xmli18n-tmp.h:1687 src/xml/xmli18n-tmp.h:1690
-#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1696
-#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1702
-#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1708
-#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1714
-#: src/xml/xmli18n-tmp.h:1717 src/xml/xmli18n-tmp.h:1720
-#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1726
-#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1732
-#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1738
-#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3517
-#: src/xml/xmli18n-tmp.h:3577
+#: src/xml/xmli18n-tmp.h:835 src/xml/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:841 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1879 src/xml/xmli18n-tmp.h:1882
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1894
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1909 src/xml/xmli18n-tmp.h:1912
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1924
+#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1954
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1969 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1984
+#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2208
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2229 src/xml/xmli18n-tmp.h:2232
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2238
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2244
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2253 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2259 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5714
 msgid "UltraChrome Matte Black"
 msgstr "Ultrachrome noir mat"
 
-#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1826
-#: src/xml/xmli18n-tmp.h:1839 src/xml/xmli18n-tmp.h:1852
-#: src/xml/xmli18n-tmp.h:1907 src/xml/xmli18n-tmp.h:1923
-#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1952
-#: src/xml/xmli18n-tmp.h:1965 src/xml/xmli18n-tmp.h:2054
-#: src/xml/xmli18n-tmp.h:2081 src/xml/xmli18n-tmp.h:2146
-#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
-#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
-#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2348
-#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2407
-#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2899
-#: src/xml/xmli18n-tmp.h:2916 src/xml/xmli18n-tmp.h:3142
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1139
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1154 src/xml/xmli18n-tmp.h:1159
+#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1179
+#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1199
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1214 src/xml/xmli18n-tmp.h:1219
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1229
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1244 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1259
+#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1274 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1289
+#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1309
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1329
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1423
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1429
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1447
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1634
+#: src/xml/xmli18n-tmp.h:1639 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1664
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1764
+#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1784
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1799 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1819
+msgid "MIS Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1463 src/xml/xmli18n-tmp.h:1468
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1478
+#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1508
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1533 src/xml/xmli18n-tmp.h:1538
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4858 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:5289
+msgid "Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2489 src/xml/xmli18n-tmp.h:2578
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2713 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2752
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2885 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:3051 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3665
 msgid "360 x 90 DPI Fast Economy"
 msgstr "360x90 ppp rapide économique"
 
-#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1828
-#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1853
-#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1879
-#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
-#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1940
-#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1966
-#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2055
-#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2133
-#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2175
-#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
-#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
-#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2336
-#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
-#: src/xml/xmli18n-tmp.h:2408 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2699
+#: src/xml/xmli18n-tmp.h:2714 src/xml/xmli18n-tmp.h:2727
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2886
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:3052
 msgid "180 DPI Economy"
 msgstr "180 ppp Economique"
 
-#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1830
-#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1854
-#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1880
-#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
-#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1941
-#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1967
-#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
-#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2134
-#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2176
-#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
-#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
-#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2337
-#: src/xml/xmli18n-tmp.h:2350 src/xml/xmli18n-tmp.h:2363
-#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
-#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2434
-#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2459
-#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2529
-#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2601
-#: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2703
-#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2735
-#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2768
-#: src/xml/xmli18n-tmp.h:2872 src/xml/xmli18n-tmp.h:2884
-#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2917
-#: src/xml/xmli18n-tmp.h:2961 src/xml/xmli18n-tmp.h:3007
-#: src/xml/xmli18n-tmp.h:3021 src/xml/xmli18n-tmp.h:3035
-#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3126
-#: src/xml/xmli18n-tmp.h:3143
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2404
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2658
+#: src/xml/xmli18n-tmp.h:2672 src/xml/xmli18n-tmp.h:2700
+#: src/xml/xmli18n-tmp.h:2715 src/xml/xmli18n-tmp.h:2728
+#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2754
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2919 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3053
+#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3125
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3292
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3530
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3649
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3684
 msgid "360 x 180 DPI Draft"
 msgstr "360 x 180 ppp brouillon"
 
-#: src/xml/xmli18n-tmp.h:1818 src/xml/xmli18n-tmp.h:1831
-#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1855
-#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1881
-#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
-#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1942
-#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1968
-#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2135
-#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2392 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2418 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2479 src/xml/xmli18n-tmp.h:2492
+#: src/xml/xmli18n-tmp.h:2581 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2862 src/xml/xmli18n-tmp.h:2934
 msgid "360 DPI High Quality"
 msgstr "360 ppp Haute qualité"
 
-#: src/xml/xmli18n-tmp.h:1819 src/xml/xmli18n-tmp.h:1832
-#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1856
-#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1882
-#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
-#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1943
-#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1969
-#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1992
-#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2020
-#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
-#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
-#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2096
-#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2123
-#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2149
-#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2177
-#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2205
-#: src/xml/xmli18n-tmp.h:2218 src/xml/xmli18n-tmp.h:2231
-#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2254
-#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
-#: src/xml/xmli18n-tmp.h:2297 src/xml/xmli18n-tmp.h:2312
-#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2339
-#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
-#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2385
-#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2411
-#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2435
-#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2460
-#: src/xml/xmli18n-tmp.h:2473 src/xml/xmli18n-tmp.h:2488
-#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2516
-#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2541
-#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2591
-#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
-#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2645
-#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2675
-#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2704
-#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2736
-#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2769
-#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2808
-#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2833
-#: src/xml/xmli18n-tmp.h:2847 src/xml/xmli18n-tmp.h:2861
-#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2885
-#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2918
-#: src/xml/xmli18n-tmp.h:2935 src/xml/xmli18n-tmp.h:2950
-#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2987
-#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3022
-#: src/xml/xmli18n-tmp.h:3036 src/xml/xmli18n-tmp.h:3050
-#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3081
-#: src/xml/xmli18n-tmp.h:3098 src/xml/xmli18n-tmp.h:3113
-#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2369 src/xml/xmli18n-tmp.h:2380
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2406
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2493
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2544
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
+#: src/xml/xmli18n-tmp.h:2582 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2729
+#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2806
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2836
+#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
+#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3012
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3040
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3184 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3424 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3485 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3573
+#: src/xml/xmli18n-tmp.h:3587 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3650 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3685
 msgid "360 DPI"
 msgstr "360 ppp"
 
-#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1833
-#: src/xml/xmli18n-tmp.h:1846 src/xml/xmli18n-tmp.h:1857
-#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1883
-#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1912
-#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1944
-#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1970
-#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1993
-#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2021
-#: src/xml/xmli18n-tmp.h:2033 src/xml/xmli18n-tmp.h:2045
-#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
-#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2097
-#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2124
-#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2150
-#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2178
-#: src/xml/xmli18n-tmp.h:2193 src/xml/xmli18n-tmp.h:2206
-#: src/xml/xmli18n-tmp.h:2219 src/xml/xmli18n-tmp.h:2232
-#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2255
-#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
-#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2313
-#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2340
-#: src/xml/xmli18n-tmp.h:2352 src/xml/xmli18n-tmp.h:2365
-#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2386
-#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2412
-#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2436
-#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2461
-#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2489
-#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2517
-#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2542
-#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2567
-#: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2592
-#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2616
-#: src/xml/xmli18n-tmp.h:2631 src/xml/xmli18n-tmp.h:2646
-#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2676
-#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2705
-#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2737
-#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2770
-#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2809
-#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2834
-#: src/xml/xmli18n-tmp.h:2848 src/xml/xmli18n-tmp.h:2862
-#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2886
-#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2919
-#: src/xml/xmli18n-tmp.h:2936 src/xml/xmli18n-tmp.h:2951
-#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2988
-#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3023
-#: src/xml/xmli18n-tmp.h:3037 src/xml/xmli18n-tmp.h:3051
-#: src/xml/xmli18n-tmp.h:3066 src/xml/xmli18n-tmp.h:3083
-#: src/xml/xmli18n-tmp.h:3099 src/xml/xmli18n-tmp.h:3114
-#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:2344 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2452 src/xml/xmli18n-tmp.h:2468
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2494
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2557 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:2594
+#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2648
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2674
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2807
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2837
+#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
+#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3013
+#: src/xml/xmli18n-tmp.h:3026 src/xml/xmli18n-tmp.h:3041
+#: src/xml/xmli18n-tmp.h:3055 src/xml/xmli18n-tmp.h:3066
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3140
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3170
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3229
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3333
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3358
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3385
+#: src/xml/xmli18n-tmp.h:3397 src/xml/xmli18n-tmp.h:3409
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3442
+#: src/xml/xmli18n-tmp.h:3459 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3574
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3637
+#: src/xml/xmli18n-tmp.h:3651 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3686
 msgid "720 x 360 DPI"
 msgstr "720 x 360 ppp"
 
-#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1834
-#: src/xml/xmli18n-tmp.h:1847 src/xml/xmli18n-tmp.h:1858
-#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1884
-#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1913
-#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1945
-#: src/xml/xmli18n-tmp.h:1958 src/xml/xmli18n-tmp.h:1971
-#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:1994
-#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2022
-#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2046
-#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2071
-#: src/xml/xmli18n-tmp.h:2086 src/xml/xmli18n-tmp.h:2098
-#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2125
-#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2151
-#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2179
-#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2207
-#: src/xml/xmli18n-tmp.h:2220 src/xml/xmli18n-tmp.h:2233
-#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2256
-#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
-#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2314
-#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2341
-#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
-#: src/xml/xmli18n-tmp.h:2376 src/xml/xmli18n-tmp.h:2387
-#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2413
-#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2437
-#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2462
-#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2490
-#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2518
-#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2543
-#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
-#: src/xml/xmli18n-tmp.h:2580 src/xml/xmli18n-tmp.h:2593
-#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2617
-#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
-#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2677
-#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2706
-#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2738
-#: src/xml/xmli18n-tmp.h:2753 src/xml/xmli18n-tmp.h:2771
-#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2810
-#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2835
-#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
-#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2887
-#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2921
-#: src/xml/xmli18n-tmp.h:2937 src/xml/xmli18n-tmp.h:2952
-#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2990
-#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3024
-#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3052
-#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3085
-#: src/xml/xmli18n-tmp.h:3100 src/xml/xmli18n-tmp.h:3115
-#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:2345 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2469
+#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2546
+#: src/xml/xmli18n-tmp.h:2558 src/xml/xmli18n-tmp.h:2570
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2595
+#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2622
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2675
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2731
+#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2808
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2838
+#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2890
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2922 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3014
+#: src/xml/xmli18n-tmp.h:3027 src/xml/xmli18n-tmp.h:3042
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3067
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3186 src/xml/xmli18n-tmp.h:3201
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3334
+#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3359
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3444
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3475
+#: src/xml/xmli18n-tmp.h:3489 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3533 src/xml/xmli18n-tmp.h:3547
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3652 src/xml/xmli18n-tmp.h:3669
+#: src/xml/xmli18n-tmp.h:3687
 msgid "720 DPI"
 msgstr "720 ppp"
 
-#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
-#: src/xml/xmli18n-tmp.h:1978 src/xml/xmli18n-tmp.h:2004
-#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2030
-#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2067
-#: src/xml/xmli18n-tmp.h:2094 src/xml/xmli18n-tmp.h:2107
-#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2161
-#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2252
-#: src/xml/xmli18n-tmp.h:2280 src/xml/xmli18n-tmp.h:2295
-#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2323
-#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
-#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2486
-#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2552
-#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2613
-#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
-#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2686
-#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2806
-#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2831
-#: src/xml/xmli18n-tmp.h:2845 src/xml/xmli18n-tmp.h:2859
-#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2948
-#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3080
-#: src/xml/xmli18n-tmp.h:3097 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2554
+#: src/xml/xmli18n-tmp.h:2566 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2804 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2834 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3076
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3382
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3586 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3634
 msgid "360 x 120 DPI Economy"
 msgstr "360 x 120 ppp Economique"
 
-#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1842
-#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2005
-#: src/xml/xmli18n-tmp.h:2019 src/xml/xmli18n-tmp.h:2031
-#: src/xml/xmli18n-tmp.h:2043 src/xml/xmli18n-tmp.h:2068
-#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
-#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2162
-#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2253
-#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2296
-#: src/xml/xmli18n-tmp.h:2311 src/xml/xmli18n-tmp.h:2324
-#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2384
-#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2487
-#: src/xml/xmli18n-tmp.h:2500 src/xml/xmli18n-tmp.h:2553
-#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2614
-#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2644
-#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2687
-#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2807
-#: src/xml/xmli18n-tmp.h:2820 src/xml/xmli18n-tmp.h:2832
-#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
-#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2949
-#: src/xml/xmli18n-tmp.h:3112
+#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2555
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2632
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3077
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3211
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3383
+#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3635
 msgid "360 x 240 DPI Draft"
 msgstr "360 x 240 ppp brouillon"
 
-#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1872
-#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1898
-#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1930
-#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1959
-#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:1995
-#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2023
-#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2047
-#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2087
-#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2112
-#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2139
-#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2166
-#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2328
-#: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2388
-#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2557
-#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2922
-#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2991
-#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3086
+#: src/xml/xmli18n-tmp.h:2383 src/xml/xmli18n-tmp.h:2396
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2422
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2470 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2507 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2704 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:3057 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3118 src/xml/xmli18n-tmp.h:3445
+#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3514
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3609
 msgid "720 DPI High Quality"
 msgstr "720 ppp Haute qualité"
 
-#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1873
-#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1899
-#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1931
-#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1984
-#: src/xml/xmli18n-tmp.h:1996 src/xml/xmli18n-tmp.h:2010
-#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2036
-#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2061
-#: src/xml/xmli18n-tmp.h:2073 src/xml/xmli18n-tmp.h:2088
-#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2127
-#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2153
-#: src/xml/xmli18n-tmp.h:2167 src/xml/xmli18n-tmp.h:2181
-#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2208
-#: src/xml/xmli18n-tmp.h:2221 src/xml/xmli18n-tmp.h:2234
-#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2257
-#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2285
-#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2315
-#: src/xml/xmli18n-tmp.h:2329 src/xml/xmli18n-tmp.h:2354
-#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2389
-#: src/xml/xmli18n-tmp.h:2399 src/xml/xmli18n-tmp.h:2425
-#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2451
-#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
-#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2504
-#: src/xml/xmli18n-tmp.h:2519 src/xml/xmli18n-tmp.h:2534
-#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2558
-#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2605
-#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2633
-#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2663
-#: src/xml/xmli18n-tmp.h:2678 src/xml/xmli18n-tmp.h:2691
-#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2725
-#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2754
-#: src/xml/xmli18n-tmp.h:2772 src/xml/xmli18n-tmp.h:2787
-#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2811
-#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2836
-#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
-#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2888
-#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2923
-#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2953
-#: src/xml/xmli18n-tmp.h:2968 src/xml/xmli18n-tmp.h:2978
-#: src/xml/xmli18n-tmp.h:2992 src/xml/xmli18n-tmp.h:3011
-#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3039
-#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
-#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3101
-#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3130
-#: src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:2384 src/xml/xmli18n-tmp.h:2397
+#: src/xml/xmli18n-tmp.h:2410 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2548 src/xml/xmli18n-tmp.h:2560
+#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2691 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2794 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2839
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2923 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3105
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3129
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3231 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3311
+#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3335
+#: src/xml/xmli18n-tmp.h:3348 src/xml/xmli18n-tmp.h:3360
+#: src/xml/xmli18n-tmp.h:3372 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3427 src/xml/xmli18n-tmp.h:3446
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3576 src/xml/xmli18n-tmp.h:3593
+#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3688
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 ppp"
 
-#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1874
-#: src/xml/xmli18n-tmp.h:1887 src/xml/xmli18n-tmp.h:1900
-#: src/xml/xmli18n-tmp.h:1916 src/xml/xmli18n-tmp.h:1932
-#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1985
-#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2011
-#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2037
-#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2062
-#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2089
-#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2128
-#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2154
-#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2182
-#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2258
-#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
-#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2316
-#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2390
-#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2559
-#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2634
-#: src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2385 src/xml/xmli18n-tmp.h:2398
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2535
+#: src/xml/xmli18n-tmp.h:2549 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2782
+#: src/xml/xmli18n-tmp.h:2795 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3388
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 720 ppp Trés haute qualité"
 
-#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1960
-#: src/xml/xmli18n-tmp.h:2100 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2902
 msgid "720 DPI Highest Quality"
 msgstr "720 ppp Qualité maximale"
 
-#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2259
-#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
-#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2317
-#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2477
-#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2505
-#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2606
-#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2635
-#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2740
-#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2866
-#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2796 src/xml/xmli18n-tmp.h:2811
+#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3216 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3412
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 ppp"
 
-#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2260
-#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
-#: src/xml/xmli18n-tmp.h:2303 src/xml/xmli18n-tmp.h:2318
-#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2771 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2812
+#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:3160 src/xml/xmli18n-tmp.h:3390
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 x 720 ppp Trés haute qualité"
 
-#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2439
-#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2493
-#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2546
-#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2582
-#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2620
-#: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2664
-#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
-#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2726
-#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2755
-#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2789
-#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2812
-#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2878
-#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
-#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2939
-#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2969
-#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2994
-#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
-#: src/xml/xmli18n-tmp.h:3088 src/xml/xmli18n-tmp.h:3102
-#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3131
-#: src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2963
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3070
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3106
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3297 src/xml/xmli18n-tmp.h:3313
+#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
+#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3401
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3492
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3577 src/xml/xmli18n-tmp.h:3594
+#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3671 src/xml/xmli18n-tmp.h:3689
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 ppp"
 
-#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2426
-#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2452
-#: src/xml/xmli18n-tmp.h:2464 src/xml/xmli18n-tmp.h:2479
-#: src/xml/xmli18n-tmp.h:2494 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2547
-#: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2583
-#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2621
-#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2665
-#: src/xml/xmli18n-tmp.h:2680 src/xml/xmli18n-tmp.h:2694
-#: src/xml/xmli18n-tmp.h:2709 src/xml/xmli18n-tmp.h:2727
-#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2756
-#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2790
-#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2813
-#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2837
-#: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2879
-#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
-#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2940
-#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2970
-#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2995
-#: src/xml/xmli18n-tmp.h:3012 src/xml/xmli18n-tmp.h:3026
-#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3055
-#: src/xml/xmli18n-tmp.h:3072 src/xml/xmli18n-tmp.h:3089
-#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3118
-#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3071
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3107
+#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3251
+#: src/xml/xmli18n-tmp.h:3266 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3298 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3324 src/xml/xmli18n-tmp.h:3337
+#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3374 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3463
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3535 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3563 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3612
+#: src/xml/xmli18n-tmp.h:3626 src/xml/xmli18n-tmp.h:3641
+#: src/xml/xmli18n-tmp.h:3655 src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:3690
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 ppp"
 
-#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:4374
 msgid "Dark Yellow"
 msgstr "Jaune foncé"
 
-#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2584
-#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2711
-#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2743
-#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2776
-#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2908
-#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2972
-#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3057
-#: src/xml/xmli18n-tmp.h:3074 src/xml/xmli18n-tmp.h:3091
-#: src/xml/xmli18n-tmp.h:3105 src/xml/xmli18n-tmp.h:3134
-#: src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3108
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3267
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3495
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3614
+#: src/xml/xmli18n-tmp.h:3628 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3692
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 ppp"
 
-#: src/xml/xmli18n-tmp.h:2666 src/xml/xmli18n-tmp.h:2681
-#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2728
-#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2775
-#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2814
-#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2838
-#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2926
-#: src/xml/xmli18n-tmp.h:2941 src/xml/xmli18n-tmp.h:2971
-#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
-#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
-#: src/xml/xmli18n-tmp.h:3090 src/xml/xmli18n-tmp.h:3104
-#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3133
-#: src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3190 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3234 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3325 src/xml/xmli18n-tmp.h:3338
+#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3362
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3505
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3613
+#: src/xml/xmli18n-tmp.h:3627 src/xml/xmli18n-tmp.h:3642
+#: src/xml/xmli18n-tmp.h:3656 src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:3691
 msgid "5760 x 1440 DPI"
 msgstr "5760 x 1440 ppp"
 
-#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2712
-#: src/xml/xmli18n-tmp.h:2730 src/xml/xmli18n-tmp.h:2759
-#: src/xml/xmli18n-tmp.h:2777 src/xml/xmli18n-tmp.h:2909
-#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2973
-#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3058
-#: src/xml/xmli18n-tmp.h:3075 src/xml/xmli18n-tmp.h:3092
-#: src/xml/xmli18n-tmp.h:3106 src/xml/xmli18n-tmp.h:3135
-#: src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3301 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3496
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3615
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
 msgid "5760 x 2880 DPI"
 msgstr "5760 x 2880 ppp"
 
-#: src/xml/xmli18n-tmp.h:2798 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3502
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 ppp Transposé"
 
-#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2965
-#: src/xml/xmli18n-tmp.h:2989 src/xml/xmli18n-tmp.h:3067
-#: src/xml/xmli18n-tmp.h:3084
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:3607
 #, fuzzy
 msgid "720 x 360 DPI Enhanced"
 msgstr "720 x 360 ppp"
 
-#: src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:3479
 #, fuzzy
 msgid "Black 1"
 msgstr "Noir"
 
-#: src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3480
 #, fuzzy
 msgid "Black 2"
 msgstr "Noir"
 
-#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3065
-#: src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3605
 #, fuzzy
 msgid "360 DPI Enhanced"
 msgstr "720 x 360 ppp"
 
-#: src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3516
 #, fuzzy
 msgid "1440 x 720 DPI High Quality"
 msgstr "1440 x 720 ppp Trés haute qualité"
 
-#: src/xml/xmli18n-tmp.h:3153
+#: src/xml/xmli18n-tmp.h:3677
 #, fuzzy
-msgid "Lower Front Tray"
-msgstr "Bac avant"
+msgid "Vivid Light Magenta"
+msgstr "Magenta clair"
 
-#: src/xml/xmli18n-tmp.h:3154
+#: src/xml/xmli18n-tmp.h:3682
 #, fuzzy
-msgid "Upper Front Tray"
-msgstr "Bac avant"
+msgid "Vivid Magenta"
+msgstr "Magenta"
+
+#: src/xml/xmli18n-tmp.h:3694
+#, fuzzy
+msgid "Main Tray"
+msgstr "Bac arrière"
+
+#: src/xml/xmli18n-tmp.h:3695
+#, fuzzy
+msgid "Photo Tray"
+msgstr "Photographie"
 
-#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3160
-#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3176
-#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3186
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3725 src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:3732
 msgid "Print to CD"
 msgstr "Imprimer un CD"
 
-#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3181
-#: src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:3730
 msgid "Rear Tray"
 msgstr "Bac arrière"
 
-#: src/xml/xmli18n-tmp.h:3157 src/xml/xmli18n-tmp.h:3182
-#: src/xml/xmli18n-tmp.h:3185
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:3731
 msgid "Front Tray"
 msgstr "Bac avant"
 
-#: src/xml/xmli18n-tmp.h:3159 src/xml/xmli18n-tmp.h:3164
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3705
 msgid "Manual Feed"
 msgstr "Alimentation manuelle"
 
-#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3709
 msgid "Roll Feed (cut each page)"
 msgstr "Alimentation rouleau (couper chaque page)"
 
-#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3710
 msgid "Roll Feed (do not cut)"
 msgstr "Alimentation rouleau (sans découpe des pages)"
 
-#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3171
-#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3180
-#: src/xml/xmli18n-tmp.h:3193
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3716 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3739
 msgid "Roll Feed"
 msgstr "Alimentation rouleau"
 
-#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3714 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3723
 msgid "Manual Sheet Guide"
 msgstr "Alimentation guide par feuille (arrière)"
 
-#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3715 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3724
 msgid "Manual Feed (Front)"
 msgstr "Alimentation manuelle (avant)"
 
-#: src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3733
 msgid "Photo Board"
 msgstr "Carte photo"
 
-#: src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3734
 msgid "Cut Sheet Bin 1"
 msgstr "Coupe papier Bin 1"
 
-#: src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3735
 msgid "Cut Sheet Bin 2"
 msgstr "Coupe papier Bin 2"
 
-#: src/xml/xmli18n-tmp.h:3190
+#: src/xml/xmli18n-tmp.h:3736
 msgid "Cut Sheet Autoselect"
 msgstr "Sélection de coupe automatique"
 
-#: src/xml/xmli18n-tmp.h:3191
+#: src/xml/xmli18n-tmp.h:3737
 msgid "Manual Selection"
 msgstr "Sélection manuelle"
 
-#: src/xml/xmli18n-tmp.h:3199 src/xml/xmli18n-tmp.h:3207
-#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3219
-#: src/xml/xmli18n-tmp.h:3227 src/xml/xmli18n-tmp.h:3235
-#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3257
-#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3278
-#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3297
-#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3317
-#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3342
-#: src/xml/xmli18n-tmp.h:3356 src/xml/xmli18n-tmp.h:3382
-#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
-#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3426
-#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3446
-#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3474
-#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3498
-#: src/xml/xmli18n-tmp.h:3510 src/xml/xmli18n-tmp.h:3524
-#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3558
-#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:3584
-#: src/xml/xmli18n-tmp.h:3594 src/xml/xmli18n-tmp.h:3600
-#: src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3763 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3872 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:4067 src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4172 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4236 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:4754 src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5102 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5679 src/xml/xmli18n-tmp.h:5748
+#: src/xml/xmli18n-tmp.h:5793 src/xml/xmli18n-tmp.h:5814
+#: src/xml/xmli18n-tmp.h:5835
 msgid "One Color Raw"
 msgstr "Une couleur de base"
 
-#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3208
-#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3220
-#: src/xml/xmli18n-tmp.h:3228 src/xml/xmli18n-tmp.h:3236
-#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3259
-#: src/xml/xmli18n-tmp.h:3270 src/xml/xmli18n-tmp.h:3280
-#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3298
-#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3318
-#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3344
-#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3383
-#: src/xml/xmli18n-tmp.h:3391 src/xml/xmli18n-tmp.h:3403
-#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3427
-#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3447
-#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3475
-#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3499
-#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3526
-#: src/xml/xmli18n-tmp.h:3551 src/xml/xmli18n-tmp.h:3559
-#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3586
-#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3601
-#: src/xml/xmli18n-tmp.h:3607
+#: src/xml/xmli18n-tmp.h:3765 src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4484 src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:4756 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5321
+#: src/xml/xmli18n-tmp.h:5382 src/xml/xmli18n-tmp.h:5451
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5795 src/xml/xmli18n-tmp.h:5816
+#: src/xml/xmli18n-tmp.h:5837
 msgid "Three Color Raw"
 msgstr "Trois couleurs de base"
 
-#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
-#: src/xml/xmli18n-tmp.h:3215 src/xml/xmli18n-tmp.h:3221
-#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3237
-#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3271
-#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3299
-#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3319
-#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3345
-#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3384
-#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
-#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3428
-#: src/xml/xmli18n-tmp.h:3438 src/xml/xmli18n-tmp.h:3448
-#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3463
-#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3476
-#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3500
-#: src/xml/xmli18n-tmp.h:3513 src/xml/xmli18n-tmp.h:3527
-#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3560
-#: src/xml/xmli18n-tmp.h:3573 src/xml/xmli18n-tmp.h:3587
-#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3602
-#: src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:3824 src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5325
+#: src/xml/xmli18n-tmp.h:5386 src/xml/xmli18n-tmp.h:5455
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5757
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5841
 msgid "Four Color Raw"
 msgstr "Quatre couleurs de base"
 
-#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3248
-#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
-#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3360
-#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
-#: src/xml/xmli18n-tmp.h:3417 src/xml/xmli18n-tmp.h:3429
-#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3459
-#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3501 src/xml/xmli18n-tmp.h:3514
-#: src/xml/xmli18n-tmp.h:3528 src/xml/xmli18n-tmp.h:3574
-#: src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4424 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:5066 src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:5196 src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5391
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5762
 msgid "Five Color Raw"
 msgstr "Cinq couleurs de base"
 
-#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3249
-#: src/xml/xmli18n-tmp.h:3272 src/xml/xmli18n-tmp.h:3293
-#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3333
-#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3361
-#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
-#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3430
-#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3460
-#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3478
-#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3502
-#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3529
-#: src/xml/xmli18n-tmp.h:3575 src/xml/xmli18n-tmp.h:3589
+#: src/xml/xmli18n-tmp.h:3780 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:4078 src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:4430 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4972
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5150 src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5336
+#: src/xml/xmli18n-tmp.h:5397 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5768
 msgid "Six Color Raw"
 msgstr "Six couleurs de base"
 
-#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3919 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:4781 src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:4795 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4921
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:4996
+#: src/xml/xmli18n-tmp.h:5023 src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:5226 src/xml/xmli18n-tmp.h:5279
+#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5603 src/xml/xmli18n-tmp.h:5609
+#: src/xml/xmli18n-tmp.h:5636 src/xml/xmli18n-tmp.h:5642
+#, fuzzy
+msgid "Gray 3"
+msgstr "Bac 3"
+
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4782 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4796 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4916 src/xml/xmli18n-tmp.h:4922
+#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4983
+#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5286 src/xml/xmli18n-tmp.h:5294
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5643
+#, fuzzy
+msgid "Gray 2"
+msgstr "Bac 2"
+
+#: src/xml/xmli18n-tmp.h:3855 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:4856 src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:4931 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4998
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:5214 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5611
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5644
+#, fuzzy
+msgid "Gray 1"
+msgstr "Bac 1"
+
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4985 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5606 src/xml/xmli18n-tmp.h:5639
+#, fuzzy
+msgid "MIS Quadtone"
+msgstr "Quadtone"
+
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4114
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Une couleur de base optimiseur de brillance"
 
-#: src/xml/xmli18n-tmp.h:3260 src/xml/xmli18n-tmp.h:3281
+#: src/xml/xmli18n-tmp.h:4016 src/xml/xmli18n-tmp.h:4121
 msgid "Three Color Raw Gloss"
 msgstr "Trois couleurs de base brillant"
 
-#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3282
+#: src/xml/xmli18n-tmp.h:4021 src/xml/xmli18n-tmp.h:4126
 msgid "Four Color Raw Gloss"
 msgstr "Quatre couleurs de base brillant"
 
-#: src/xml/xmli18n-tmp.h:3262 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4132
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Six couleurs de base Optimiseur de brillance"
 
-#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:4035 src/xml/xmli18n-tmp.h:4140
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sept couleurs de base Optimiseur de brillance"
 
-#: src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:4141
+#, fuzzy
+msgid "MatteBlack"
+msgstr "Noir Mat"
+
+#: src/xml/xmli18n-tmp.h:4224
 #, fuzzy
 msgid "Default Black"
 msgstr "Défaut"
 
-#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
-#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3365
-#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3504
-#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3533
-#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3564
-#: src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4446 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4573 src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:5344
+#: src/xml/xmli18n-tmp.h:5413 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Seven Color Photo"
 msgstr "Photo sept couleurs"
 
-#: src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:4315
 msgid "Six Color Enhanced Composite"
 msgstr "Six couleurs amélioré composite"
 
-#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3348
-#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3516
-#: src/xml/xmli18n-tmp.h:3530 src/xml/xmli18n-tmp.h:3576
-#: src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:4368 src/xml/xmli18n-tmp.h:4437
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:5404
+#: src/xml/xmli18n-tmp.h:5473 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5775
 msgid "Seven Color Raw"
 msgstr "Sept couleurs de base"
 
-#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3355
-#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3523
-#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5745
 msgid "Two Level Grayscale"
 msgstr "EChelle de gris à deux niveaux"
 
-#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3357
-#: src/xml/xmli18n-tmp.h:3511 src/xml/xmli18n-tmp.h:3525
-#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:4412 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5448
+#: src/xml/xmli18n-tmp.h:5681 src/xml/xmli18n-tmp.h:5750
 msgid "Two Color Raw"
 msgstr "Deux couleurs de base"
 
-#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3372
-#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3540
+#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5531
 msgid "Eight Color Photo"
 msgstr "Huit couleurs photo"
 
-#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3378
-#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:4652 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5570
 msgid "Eight Color Raw"
 msgstr "Huit couleurs de base"
 
-#: src/xml/xmli18n-tmp.h:3462 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:5288
+msgid "MIS Six Tone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:4994
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5291
+#, fuzzy
+msgid "Gray 5"
+msgstr "Bac 1"
+
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:4928 src/xml/xmli18n-tmp.h:4995
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5292
+#, fuzzy
+msgid "Gray 4"
+msgstr "Bac 4"
+
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5145
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Six couleurs photo"
 
-#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3615
-#: src/xml/xmli18n-tmp.h:3621
+#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5852
+#: src/xml/xmli18n-tmp.h:5858
 msgid "Interleave"
 msgstr "Entrelacement"
 
-#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3616
-#: src/xml/xmli18n-tmp.h:3622
+#: src/xml/xmli18n-tmp.h:5848 src/xml/xmli18n-tmp.h:5853
+#: src/xml/xmli18n-tmp.h:5859
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3612 src/xml/xmli18n-tmp.h:3617
-#: src/xml/xmli18n-tmp.h:3623
+#: src/xml/xmli18n-tmp.h:5849 src/xml/xmli18n-tmp.h:5854
+#: src/xml/xmli18n-tmp.h:5860
 msgid "Four Pass"
 msgstr "quatre passes"
 
-#: src/xml/xmli18n-tmp.h:3613 src/xml/xmli18n-tmp.h:3618
-#: src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5855
+#: src/xml/xmli18n-tmp.h:5861
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:5862
 msgid "Interleave 2"
 msgstr "Entrelancement 2"
 
-#: src/xml/xmli18n-tmp.h:3626
+#: src/xml/xmli18n-tmp.h:5863
 msgid "Eight Pass"
 msgstr "huit passes"
 
-#: src/xml/xmli18n-tmp.h:3628
+#: src/xml/xmli18n-tmp.h:5865
 msgid "On"
 msgstr "Actif"
 
-#: src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:5909
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:5910
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:3674
+#: src/xml/xmli18n-tmp.h:5911
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:3679
+#: src/xml/xmli18n-tmp.h:5916
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:3680
+#: src/xml/xmli18n-tmp.h:5917
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:5918
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:3682
+#: src/xml/xmli18n-tmp.h:5919
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Papier photo Epson 4x6 (bordures pré-découpées)"
 
-#: src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:5920
+#, fuzzy
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr "Papier photo Epson 4x6 (bordures pré-découpées)"
+
+#: src/xml/xmli18n-tmp.h:5921
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:3684
+#: src/xml/xmli18n-tmp.h:5922
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:3685
+#: src/xml/xmli18n-tmp.h:5923
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:3686
+#: src/xml/xmli18n-tmp.h:5924
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:3688
+#: src/xml/xmli18n-tmp.h:5926
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:3689
+#: src/xml/xmli18n-tmp.h:5927
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/xml/xmli18n-tmp.h:3690
+#: src/xml/xmli18n-tmp.h:5928
 msgid "Engineering C 17x22"
 msgstr "Engineering C 17x22"
 
-#: src/xml/xmli18n-tmp.h:3691
+#: src/xml/xmli18n-tmp.h:5929
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:3692
+#: src/xml/xmli18n-tmp.h:5930
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:3693
+#: src/xml/xmli18n-tmp.h:5931
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:3694
+#: src/xml/xmli18n-tmp.h:5932
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:3695
+#: src/xml/xmli18n-tmp.h:5933
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:3696
+#: src/xml/xmli18n-tmp.h:5934
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:3697
+#: src/xml/xmli18n-tmp.h:5935
 msgid "22x30"
 msgstr "22x30"
 
-#: src/xml/xmli18n-tmp.h:3698
+#: src/xml/xmli18n-tmp.h:5936
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:3699
+#: src/xml/xmli18n-tmp.h:5937
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/xml/xmli18n-tmp.h:3700
+#: src/xml/xmli18n-tmp.h:5938
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:5939
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:3702
+#: src/xml/xmli18n-tmp.h:5940
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:3703
+#: src/xml/xmli18n-tmp.h:5941
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:5942
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:3705
+#: src/xml/xmli18n-tmp.h:5943
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:3706
+#: src/xml/xmli18n-tmp.h:5944
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:3707
+#: src/xml/xmli18n-tmp.h:5945
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:3709
+#: src/xml/xmli18n-tmp.h:5947
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:3710
+#: src/xml/xmli18n-tmp.h:5948
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:5949
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:5950
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:3713
+#: src/xml/xmli18n-tmp.h:5951
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:3714
+#: src/xml/xmli18n-tmp.h:5952
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:3715
+#: src/xml/xmli18n-tmp.h:5953
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:3716
+#: src/xml/xmli18n-tmp.h:5954
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:5955
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:5956
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:5957
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:5958
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:5959
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:3722
+#: src/xml/xmli18n-tmp.h:5960
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:3723
+#: src/xml/xmli18n-tmp.h:5961
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:3724
+#: src/xml/xmli18n-tmp.h:5962
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:3725
+#: src/xml/xmli18n-tmp.h:5963
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:3726
+#: src/xml/xmli18n-tmp.h:5964
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:5965
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:5966
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:5967
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:3730
+#: src/xml/xmli18n-tmp.h:5968
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:3731
+#: src/xml/xmli18n-tmp.h:5969
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:3732
+#: src/xml/xmli18n-tmp.h:5970
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:3733
+#: src/xml/xmli18n-tmp.h:5971
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:3734
+#: src/xml/xmli18n-tmp.h:5972
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:3735
+#: src/xml/xmli18n-tmp.h:5973
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:3736
+#: src/xml/xmli18n-tmp.h:5974
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:3737
+#: src/xml/xmli18n-tmp.h:5975
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5976
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3739
+#: src/xml/xmli18n-tmp.h:5977
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:5978
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:3741
+#: src/xml/xmli18n-tmp.h:5979
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:5980
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:3743
+#: src/xml/xmli18n-tmp.h:5981
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:5982
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:5983
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:3746
+#: src/xml/xmli18n-tmp.h:5984
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:3747
+#: src/xml/xmli18n-tmp.h:5985
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:3748
+#: src/xml/xmli18n-tmp.h:5986
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:5987
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:3750
+#: src/xml/xmli18n-tmp.h:5988
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:3751
+#: src/xml/xmli18n-tmp.h:5989
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:5990
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:5991
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:3754
+#: src/xml/xmli18n-tmp.h:5992
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:3755
+#: src/xml/xmli18n-tmp.h:5993
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:3756
+#: src/xml/xmli18n-tmp.h:5994
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:5995
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:3758
+#: src/xml/xmli18n-tmp.h:5996
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:3759
+#: src/xml/xmli18n-tmp.h:5997
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:5998
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:3761
+#: src/xml/xmli18n-tmp.h:5999
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:6000
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:3763
+#: src/xml/xmli18n-tmp.h:6001
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:6002
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:3765
+#: src/xml/xmli18n-tmp.h:6003
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:3766
+#: src/xml/xmli18n-tmp.h:6004
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:6005
 #, fuzzy
 msgid "DL landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:3768
+#: src/xml/xmli18n-tmp.h:6006
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:3769
+#: src/xml/xmli18n-tmp.h:6007
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:3770
+#: src/xml/xmli18n-tmp.h:6008
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:6009
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:3772
+#: src/xml/xmli18n-tmp.h:6010
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:6011
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:3774
+#: src/xml/xmli18n-tmp.h:6012
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:3775
+#: src/xml/xmli18n-tmp.h:6013
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:6014
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:6015
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Paysage"
 
-#: src/xml/xmli18n-tmp.h:3778
+#: src/xml/xmli18n-tmp.h:6016
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:3779
+#: src/xml/xmli18n-tmp.h:6017
 msgid "ArchA transposed"
 msgstr "ArchA sens paysage"
 
-#: src/xml/xmli18n-tmp.h:3780
+#: src/xml/xmli18n-tmp.h:6018
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:6019
 msgid "ArchB transposed"
 msgstr "ArchB sens paysage"
 
-#: src/xml/xmli18n-tmp.h:3782
+#: src/xml/xmli18n-tmp.h:6020
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:6021
 msgid "ArchC transposed"
 msgstr "ArcgC sens paysage"
 
-#: src/xml/xmli18n-tmp.h:3784
+#: src/xml/xmli18n-tmp.h:6022
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:6023
 msgid "ArchD transposed"
 msgstr "ArchD sens paysage"
 
-#: src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:6024
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:3787
+#: src/xml/xmli18n-tmp.h:6025
 msgid "ArchE transposed"
 msgstr "ArchE sens paysage"
 
-#: src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:6026
 msgid "American foolscap"
 msgstr "Foolscap américain"
 
-#: src/xml/xmli18n-tmp.h:3789
+#: src/xml/xmli18n-tmp.h:6027
 msgid "European foolscap"
 msgstr "Foolscap européen"
 
-#: src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:6028
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:6029
 msgid "Large Crown Quarto"
 msgstr "Quatro couronne large"
 
-#: src/xml/xmli18n-tmp.h:3792
+#: src/xml/xmli18n-tmp.h:6030
 msgid "Demy Quarto"
 msgstr "Demi-quatro"
 
-#: src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:6031
 msgid "Royal Quarto"
 msgstr "Quatro royal"
 
-#: src/xml/xmli18n-tmp.h:3794
+#: src/xml/xmli18n-tmp.h:6032
 msgid "Crown Octavo"
 msgstr "Octave couronne"
 
-#: src/xml/xmli18n-tmp.h:3795
+#: src/xml/xmli18n-tmp.h:6033
 msgid "Large Crown Octavo"
 msgstr "Octave couronne large"
 
-#: src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:6034
 msgid "Demy Octavo"
 msgstr "Demi-octave"
 
-#: src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:6035
 msgid "Royal Octavo"
 msgstr "Octave royale"
 
-#: src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:6036
 msgid "Small paperback"
 msgstr "Petite reliure"
 
-#: src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:6037
 msgid "Penguin small paperback"
 msgstr "Petite reliure Penguin"
 
-#: src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:6038
 msgid "Penguin large paperback"
 msgstr "Grande reliure Penguin"
 
-#: src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:6039
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/xml/xmli18n-tmp.h:3802
+#: src/xml/xmli18n-tmp.h:6040
 msgid "Hagaki Card"
 msgstr "Carte Hagaki"
 
-#: src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:6041
 msgid "Oufuku Card"
 msgstr "Carte Oufuku"
 
-#: src/xml/xmli18n-tmp.h:3804
+#: src/xml/xmli18n-tmp.h:6042
 msgid "Japanese long envelope #3"
 msgstr "Enveloppe longue japonaise n°3"
 
-#: src/xml/xmli18n-tmp.h:3805
+#: src/xml/xmli18n-tmp.h:6043
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "Enveloppe longue japonaise n°3"
 
-#: src/xml/xmli18n-tmp.h:3806
+#: src/xml/xmli18n-tmp.h:6044
 msgid "Japanese long envelope #4"
 msgstr "Enveloppe longue japonaise n°4"
 
-#: src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:6045
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "Enveloppe longue japonaise n°4"
 
-#: src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:6046
 msgid "Japanese Kaku envelope #4"
 msgstr "Enveloppe Kaku japonaise n°4"
 
-#: src/xml/xmli18n-tmp.h:3809
+#: src/xml/xmli18n-tmp.h:6047
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Enveloppe Kaku japonaise n°4"
 
-#: src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:6048
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:6049
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:6050
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/xml/xmli18n-tmp.h:3813
+#: src/xml/xmli18n-tmp.h:6051
 msgid "Monarch Envelope"
 msgstr "Enveloppe Monarch"
 
-#: src/xml/xmli18n-tmp.h:3814
+#: src/xml/xmli18n-tmp.h:6052
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Enveloppe Monarch"
 
-#: src/xml/xmli18n-tmp.h:3815
+#: src/xml/xmli18n-tmp.h:6053
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/xml/xmli18n-tmp.h:3816
+#: src/xml/xmli18n-tmp.h:6054
 msgid "4x7"
 msgstr "4x7"
 
-#: src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:6055
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/xml/xmli18n-tmp.h:3818
+#: src/xml/xmli18n-tmp.h:6056
 msgid "Card"
 msgstr "Carte"
 
-#: src/xml/xmli18n-tmp.h:3819
+#: src/xml/xmli18n-tmp.h:6057
 msgid "Wide Postcard"
 msgstr "Carte postale large"
 
-#: src/xml/xmli18n-tmp.h:3820
+#: src/xml/xmli18n-tmp.h:6058
 msgid "Chilean Office"
 msgstr "Chilean Office"
 
-#: src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:6059
 msgid "Chilean Double Letter"
 msgstr "Chilean Double Letter"
 
-#: src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:6060
 msgid "Chilean Double Office"
 msgstr "Chilean Double Office"
 
-#: src/xml/xmli18n-tmp.h:3824
+#: src/xml/xmli18n-tmp.h:6062
 msgid "89 mm Roll Paper"
 msgstr "Rouleau 89mm"
 
-#: src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:6063
 msgid "4 Inch Roll Paper"
 msgstr "Rouleau 4 pouces"
 
-#: src/xml/xmli18n-tmp.h:3826
+#: src/xml/xmli18n-tmp.h:6064
 msgid "5 Inch Roll Paper"
 msgstr "Rouleau 5 pouces"
 
-#: src/xml/xmli18n-tmp.h:3827
+#: src/xml/xmli18n-tmp.h:6065
 msgid "210 mm Roll Paper"
 msgstr "Rouleau 210mm"
 
-#: src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:6066
 msgid "13 Inch Roll Paper"
 msgstr "Rouleau 13 pouces"
 
-#: src/xml/xmli18n-tmp.h:3829
+#: src/xml/xmli18n-tmp.h:6067
 #, fuzzy
 msgid "17 Inch Roll Paper"
 msgstr "Rouleau 13 pouces"
 
-#: src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:6068
 msgid "22 Inch Roll Paper"
 msgstr "Rouleau 22 pouces"
 
-#: src/xml/xmli18n-tmp.h:3831
+#: src/xml/xmli18n-tmp.h:6069
 msgid "24 Inch Roll Paper"
 msgstr "Rouleau 24 pouces"
 
-#: src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:6070
 msgid "36 Inch Roll Paper"
 msgstr "Rouleau 36 pouces"
 
-#: src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:6071
 msgid "44 Inch Roll Paper"
 msgstr "Rouleau 44 pouces"
 
-#: src/xml/xmli18n-tmp.h:3834
+#: src/xml/xmli18n-tmp.h:6072
 #, fuzzy
 msgid "60 Inch Roll Paper"
 msgstr "Rouleau 36 pouces"
 
-#: src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:6073
 #, fuzzy
 msgid "64 Inch Roll Paper"
 msgstr "Rouleau 4 pouces"
 
-#: src/xml/xmli18n-tmp.h:3836
+#: src/xml/xmli18n-tmp.h:6074
 msgid "PostScript Level 1"
 msgstr "Postscript level 1"
 
-#: src/xml/xmli18n-tmp.h:3837
+#: src/xml/xmli18n-tmp.h:6075
 msgid "PostScript Level 2"
 msgstr "Postscript level 2"
 
-#: src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:6076
 msgid "Canon BJ-30"
 msgstr "Canon BJC-30"
 
-#: src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:6077
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:6078
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:6079
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:6080
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:6081
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/xml/xmli18n-tmp.h:3844
+#: src/xml/xmli18n-tmp.h:6082
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:6083
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/xml/xmli18n-tmp.h:3846
+#: src/xml/xmli18n-tmp.h:6084
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:3847
+#: src/xml/xmli18n-tmp.h:6085
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/xml/xmli18n-tmp.h:3848
+#: src/xml/xmli18n-tmp.h:6086
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:6087
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/xml/xmli18n-tmp.h:3850
+#: src/xml/xmli18n-tmp.h:6088
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:6089
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:6090
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/xml/xmli18n-tmp.h:3853
+#: src/xml/xmli18n-tmp.h:6091
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/xml/xmli18n-tmp.h:3854
+#: src/xml/xmli18n-tmp.h:6092
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/xml/xmli18n-tmp.h:3855
+#: src/xml/xmli18n-tmp.h:6093
 #, fuzzy
 msgid "Canon BJC-5100"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:3856
+#: src/xml/xmli18n-tmp.h:6094
 #, fuzzy
 msgid "Canon BJC-5500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:3857
+#: src/xml/xmli18n-tmp.h:6095
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/xml/xmli18n-tmp.h:3858
+#: src/xml/xmli18n-tmp.h:6096
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:6097
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:6098
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:6099
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:6100
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/xml/xmli18n-tmp.h:3863
+#: src/xml/xmli18n-tmp.h:6101
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:6102
 #, fuzzy
 msgid "Canon BJC-8500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:6103
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:6104
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/xml/xmli18n-tmp.h:3867
+#: src/xml/xmli18n-tmp.h:6105
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/xml/xmli18n-tmp.h:3868
+#: src/xml/xmli18n-tmp.h:6106
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:3869
+#: src/xml/xmli18n-tmp.h:6107
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:3870
+#: src/xml/xmli18n-tmp.h:6108
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:6109
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:3872
+#: src/xml/xmli18n-tmp.h:6110
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/xml/xmli18n-tmp.h:3873
+#: src/xml/xmli18n-tmp.h:6111
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:3874
+#: src/xml/xmli18n-tmp.h:6112
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:6113
 #, fuzzy
 msgid "Canon PIXMA iP2000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:6114
 #, fuzzy
 msgid "Canon PIXMA iP3000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3877
+#: src/xml/xmli18n-tmp.h:6115
 #, fuzzy
 msgid "Canon PIXMA iP3100"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:3878
+#: src/xml/xmli18n-tmp.h:6116
 #, fuzzy
 msgid "Canon PIXMA iP4000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:6117
 #, fuzzy
 msgid "Canon PIXMA iP4100"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3880
+#: src/xml/xmli18n-tmp.h:6118
 #, fuzzy
 msgid "Canon PIXMA iP4200"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3881
+#: src/xml/xmli18n-tmp.h:6119
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:6120
 #, fuzzy
 msgid "Canon PIXMA iP4500"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:6121
 #, fuzzy
 msgid "Canon PIXMA iP4600"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3884
+#: src/xml/xmli18n-tmp.h:6122
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3885
+#: src/xml/xmli18n-tmp.h:6123
 #, fuzzy
 msgid "Canon PIXMA iP5200"
 msgstr "Canon CP-200"
 
-#: src/xml/xmli18n-tmp.h:3886
+#: src/xml/xmli18n-tmp.h:6124
 #, fuzzy
 msgid "Canon PIXMA iP5300"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3887
+#: src/xml/xmli18n-tmp.h:6125
 #, fuzzy
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3888
+#: src/xml/xmli18n-tmp.h:6126
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:6127
 #, fuzzy
 msgid "Canon PIXMA iP8500"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:6128
+#, fuzzy
+msgid "Canon PIXMA iX4000"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6129
 #, fuzzy
 msgid "Canon PIXMA iX5000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:6130
 #, fuzzy
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:6131
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:6132
 #, fuzzy
 msgid "Canon PIXMA MP160"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:6133
 #, fuzzy
 msgid "Canon PIXMA MP170"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:3895
+#: src/xml/xmli18n-tmp.h:6134
 #, fuzzy
 msgid "Canon PIXMA MP180"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:6135
 #, fuzzy
 msgid "Canon PIXMA MP220"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:3897
+#: src/xml/xmli18n-tmp.h:6136
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:6137
 #, fuzzy
 msgid "Canon PIXMA MP520"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:6138
 #, fuzzy
 msgid "Canon PIXMA MP610"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:3900
+#: src/xml/xmli18n-tmp.h:6139
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:6140
 #, fuzzy
 msgid "Canon PIXMA MP710"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:3902
+#: src/xml/xmli18n-tmp.h:6141
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3903
+#: src/xml/xmli18n-tmp.h:6142
 #, fuzzy
 msgid "Canon PIXMA MP740"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:6143
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:6144
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:6145
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:6146
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:6147
 #, fuzzy
 msgid "Canon PIXMA MP790"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:6148
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3910
+#: src/xml/xmli18n-tmp.h:6149
 #, fuzzy
 msgid "Canon PIXUS iP3100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:6150
 #, fuzzy
 msgid "Canon PIXUS iP4100"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3912
+#: src/xml/xmli18n-tmp.h:6151
 #, fuzzy
 msgid "Canon i80"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:3913
+#: src/xml/xmli18n-tmp.h:6152
 #, fuzzy
 msgid "Canon i560"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:3914
+#: src/xml/xmli18n-tmp.h:6153
 #, fuzzy
 msgid "Canon i850"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:6154
 #, fuzzy
 msgid "Canon i860"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:3916
+#: src/xml/xmli18n-tmp.h:6155
 #, fuzzy
 msgid "Canon i865"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:6156
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:6157
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3919
+#: src/xml/xmli18n-tmp.h:6158
 #, fuzzy
 msgid "Epson B-300"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:3920
+#: src/xml/xmli18n-tmp.h:6159
 #, fuzzy
 msgid "Epson B-308"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:3921
+#: src/xml/xmli18n-tmp.h:6160
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:3922
+#: src/xml/xmli18n-tmp.h:6161
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:3923
+#: src/xml/xmli18n-tmp.h:6162
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:3924
+#: src/xml/xmli18n-tmp.h:6163
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:6164
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:6165
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:6166
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:6167
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:6168
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:6169
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:6170
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/xml/xmli18n-tmp.h:3932
+#: src/xml/xmli18n-tmp.h:6171
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:6172
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:3934
+#: src/xml/xmli18n-tmp.h:6173
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/xml/xmli18n-tmp.h:3935
+#: src/xml/xmli18n-tmp.h:6174
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:6175
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:3937
+#: src/xml/xmli18n-tmp.h:6176
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:6177
 msgid "Epson Stylus C44"
 msgstr "EPSON Stylus C44"
 
-#: src/xml/xmli18n-tmp.h:3939
+#: src/xml/xmli18n-tmp.h:6178
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:6179
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:6180
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:3942
+#: src/xml/xmli18n-tmp.h:6181
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:3943
+#: src/xml/xmli18n-tmp.h:6182
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:6183
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:6184
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3946
+#: src/xml/xmli18n-tmp.h:6185
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:3947
+#: src/xml/xmli18n-tmp.h:6186
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:3948
+#: src/xml/xmli18n-tmp.h:6187
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/xml/xmli18n-tmp.h:3949
+#: src/xml/xmli18n-tmp.h:6188
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:6189
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/xml/xmli18n-tmp.h:3951
+#: src/xml/xmli18n-tmp.h:6190
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:6191
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/xml/xmli18n-tmp.h:3953
+#: src/xml/xmli18n-tmp.h:6192
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:6193
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:6194
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3956
+#: src/xml/xmli18n-tmp.h:6195
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:3957
+#: src/xml/xmli18n-tmp.h:6196
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/xml/xmli18n-tmp.h:3958
+#: src/xml/xmli18n-tmp.h:6197
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/xml/xmli18n-tmp.h:3959
+#: src/xml/xmli18n-tmp.h:6198
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/xml/xmli18n-tmp.h:3960
+#: src/xml/xmli18n-tmp.h:6199
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:6200
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:6201
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:6202
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:3964
+#: src/xml/xmli18n-tmp.h:6203
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:6204
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3966
+#: src/xml/xmli18n-tmp.h:6205
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/xml/xmli18n-tmp.h:3967
+#: src/xml/xmli18n-tmp.h:6206
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:6207
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:6208
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/xml/xmli18n-tmp.h:3970
+#: src/xml/xmli18n-tmp.h:6209
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:6210
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:3972
+#: src/xml/xmli18n-tmp.h:6211
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:6212
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:6213
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:3975
+#: src/xml/xmli18n-tmp.h:6214
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:6215
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:6216
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:6217
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:3979
+#: src/xml/xmli18n-tmp.h:6218
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:6219
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:3981
+#: src/xml/xmli18n-tmp.h:6220
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:3982
+#: src/xml/xmli18n-tmp.h:6221
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:3983
+#: src/xml/xmli18n-tmp.h:6222
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:3984
+#: src/xml/xmli18n-tmp.h:6223
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:6224
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:6225
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:3987
+#: src/xml/xmli18n-tmp.h:6226
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:6227
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:3989
+#: src/xml/xmli18n-tmp.h:6228
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:6229
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:6230
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:3992
+#: src/xml/xmli18n-tmp.h:6231
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:3993
+#: src/xml/xmli18n-tmp.h:6232
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:6233
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:3995
+#: src/xml/xmli18n-tmp.h:6234
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:6235
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:6236
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:3998
+#: src/xml/xmli18n-tmp.h:6237
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:3999
+#: src/xml/xmli18n-tmp.h:6238
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:6239
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:6240
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:4002
+#: src/xml/xmli18n-tmp.h:6241
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:6242
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:6243
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4005
+#: src/xml/xmli18n-tmp.h:6244
 #, fuzzy
-msgid "Epson Stylus Offixe TX300F"
+msgid "Epson Stylus Office TX300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4006
+#: src/xml/xmli18n-tmp.h:6245
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:6246
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:4008
+#: src/xml/xmli18n-tmp.h:6247
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4009
+#: src/xml/xmli18n-tmp.h:6248
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:6249
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:6250
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:6251
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4013
+#: src/xml/xmli18n-tmp.h:6252
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4014
+#: src/xml/xmli18n-tmp.h:6253
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:6254
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:4016
+#: src/xml/xmli18n-tmp.h:6255
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:6256
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:6257
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/xml/xmli18n-tmp.h:4019
+#: src/xml/xmli18n-tmp.h:6258
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:4020
+#: src/xml/xmli18n-tmp.h:6259
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/xml/xmli18n-tmp.h:4021
+#: src/xml/xmli18n-tmp.h:6260
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:4022
+#: src/xml/xmli18n-tmp.h:6261
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:4023
+#: src/xml/xmli18n-tmp.h:6262
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:4024
+#: src/xml/xmli18n-tmp.h:6263
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:6264
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:6265
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:4027
+#: src/xml/xmli18n-tmp.h:6266
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:6267
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:6268
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:6269
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:4031
+#: src/xml/xmli18n-tmp.h:6270
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:6271
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4033
+#: src/xml/xmli18n-tmp.h:6272
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4034
+#: src/xml/xmli18n-tmp.h:6273
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4035
+#: src/xml/xmli18n-tmp.h:6274
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:6275
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4037
+#: src/xml/xmli18n-tmp.h:6276
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:4038
+#: src/xml/xmli18n-tmp.h:6277
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:4039
+#: src/xml/xmli18n-tmp.h:6278
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:6279
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:4041
+#: src/xml/xmli18n-tmp.h:6280
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:6281
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:6282
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:4044
+#: src/xml/xmli18n-tmp.h:6283
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:6284
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:6285
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:6286
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:6287
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4049
+#: src/xml/xmli18n-tmp.h:6288
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:6289
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4051
+#: src/xml/xmli18n-tmp.h:6290
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:6291
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:4053
+#: src/xml/xmli18n-tmp.h:6292
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/xml/xmli18n-tmp.h:4054
+#: src/xml/xmli18n-tmp.h:6293
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:6294
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/xml/xmli18n-tmp.h:4056
+#: src/xml/xmli18n-tmp.h:6295
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:6296
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:4058
+#: src/xml/xmli18n-tmp.h:6297
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:4059
+#: src/xml/xmli18n-tmp.h:6298
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:6299
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:6300
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:4062
+#: src/xml/xmli18n-tmp.h:6301
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:6302
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:4064
+#: src/xml/xmli18n-tmp.h:6303
+#, fuzzy
+msgid "Epson Stylus Photo R2880"
+msgstr "Epson Stylus Photo 1280"
+
+#: src/xml/xmli18n-tmp.h:6304
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:4065
+#: src/xml/xmli18n-tmp.h:6305
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:6306
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4067
+#: src/xml/xmli18n-tmp.h:6307
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:6308
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4069
+#: src/xml/xmli18n-tmp.h:6309
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:6310
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:6311
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4072
+#: src/xml/xmli18n-tmp.h:6312
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:6313
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4074
+#: src/xml/xmli18n-tmp.h:6314
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4075
+#: src/xml/xmli18n-tmp.h:6315
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:4076
+#: src/xml/xmli18n-tmp.h:6316
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:6317
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/xml/xmli18n-tmp.h:4078
+#: src/xml/xmli18n-tmp.h:6318
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:6319
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:6320
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:6321
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4082
+#: src/xml/xmli18n-tmp.h:6322
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:6323
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:4084
+#: src/xml/xmli18n-tmp.h:6324
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:4085
+#: src/xml/xmli18n-tmp.h:6325
 #, fuzzy
-msgid "Epson Stylus Photo TX800W"
+msgid "Epson Stylus Photo TX800FW"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:4086
+#: src/xml/xmli18n-tmp.h:6326
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:4087
+#: src/xml/xmli18n-tmp.h:6327
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:4088
+#: src/xml/xmli18n-tmp.h:6328
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4089
+#: src/xml/xmli18n-tmp.h:6329
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:6330
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:4091
+#: src/xml/xmli18n-tmp.h:6331
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:6332
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4093
+#: src/xml/xmli18n-tmp.h:6333
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4094
+#: src/xml/xmli18n-tmp.h:6334
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:6335
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:6336
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4097
+#: src/xml/xmli18n-tmp.h:6337
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:6338
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4099
+#: src/xml/xmli18n-tmp.h:6339
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:6340
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:6341
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:6342
 msgid "Epson Stylus CX1500"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:6343
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:6344
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:6345
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:6346
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:6347
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:6348
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:6349
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:4110
+#: src/xml/xmli18n-tmp.h:6350
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:6351
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:6352
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4113
+#: src/xml/xmli18n-tmp.h:6353
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:6354
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:6355
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/xml/xmli18n-tmp.h:4116
+#: src/xml/xmli18n-tmp.h:6356
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:6357
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/xml/xmli18n-tmp.h:4118
+#: src/xml/xmli18n-tmp.h:6358
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/xml/xmli18n-tmp.h:4119
+#: src/xml/xmli18n-tmp.h:6359
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:6360
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4121
+#: src/xml/xmli18n-tmp.h:6361
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:6362
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:6363
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/xml/xmli18n-tmp.h:4124
+#: src/xml/xmli18n-tmp.h:6364
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:6365
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/xml/xmli18n-tmp.h:4126
+#: src/xml/xmli18n-tmp.h:6366
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4127
+#: src/xml/xmli18n-tmp.h:6367
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4128
+#: src/xml/xmli18n-tmp.h:6368
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/xml/xmli18n-tmp.h:4129
+#: src/xml/xmli18n-tmp.h:6369
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:6370
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:6371
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:6372
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:6373
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:6374
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:6375
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:6376
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:6377
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:6378
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:6379
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:6380
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:6381
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:6382
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:6383
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4144
+#: src/xml/xmli18n-tmp.h:6384
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:6385
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:6386
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:6387
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:6388
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:6389
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3600"
 
-#: src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:6390
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:6391
+#, fuzzy
+msgid "Epson Stylus DX4000"
+msgstr "Epson Stylus DX4200"
+
+#: src/xml/xmli18n-tmp.h:6392
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:6393
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:6394
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:4154
+#: src/xml/xmli18n-tmp.h:6395
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:6396
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:6397
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:6398
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:6399
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:6400
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:6401
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:6402
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:6403
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:6404
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:6405
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:6406
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:6407
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:6408
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:6409
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:6410
 #, fuzzy
-msgid "Epson Stylus PX700FW"
+msgid "Epson Stylus PX700W"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:6411
 #, fuzzy
 msgid "Epson Stylus PX800FW"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:6412
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:4172
+#: src/xml/xmli18n-tmp.h:6413
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:6414
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4174
+#: src/xml/xmli18n-tmp.h:6415
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:6416
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:6417
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4177
+#: src/xml/xmli18n-tmp.h:6418
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:4178
+#: src/xml/xmli18n-tmp.h:6419
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:4179
+#: src/xml/xmli18n-tmp.h:6420
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4180
+#: src/xml/xmli18n-tmp.h:6421
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4181
+#: src/xml/xmli18n-tmp.h:6422
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:6423
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:6424
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:6425
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:6426
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:6427
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Epson  Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4187
+#: src/xml/xmli18n-tmp.h:6428
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4188
+#: src/xml/xmli18n-tmp.h:6429
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:6430
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:6431
 #, fuzzy
 msgid "Epson PictureMate Dash"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:6432
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/xml/xmli18n-tmp.h:4192
+#: src/xml/xmli18n-tmp.h:6433
 #, fuzzy
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:6434
 #, fuzzy
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:6435
 #, fuzzy
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:6436
 #, fuzzy
 msgid "Epson PictureMate 100"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4196
+#: src/xml/xmli18n-tmp.h:6437
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:6438
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:6439
 #, fuzzy
 msgid "Epson PictureMate 215"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4199
+#: src/xml/xmli18n-tmp.h:6440
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:6441
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:6442
 #, fuzzy
 msgid "Epson PictureMate 260"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:6443
 #, fuzzy
 msgid "Epson PictureMate 270"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:6444
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4204
+#: src/xml/xmli18n-tmp.h:6445
 #, fuzzy
 msgid "Epson PictureMate 290"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:6446
 #, fuzzy
 msgid "Epson PictureMate 500"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:6447
 #, fuzzy
 msgid "Epson PictureMate 2005"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4207
+#: src/xml/xmli18n-tmp.h:6448
 #, fuzzy
 msgid "Epson WorkForce 30"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:6449
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:6450
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:6451
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:6452
 msgid "Epson CL 700"
 msgstr "Canon CL 700"
 
-#: src/xml/xmli18n-tmp.h:4212
+#: src/xml/xmli18n-tmp.h:6453
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:6454
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:6455
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4215
+#: src/xml/xmli18n-tmp.h:6456
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:4216
+#: src/xml/xmli18n-tmp.h:6457
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:6458
 #, fuzzy
 msgid "Epson E 300"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:6459
 #, fuzzy
 msgid "Epson E 500"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4219
+#: src/xml/xmli18n-tmp.h:6460
 #, fuzzy
 msgid "Epson E 520"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:6461
 #, fuzzy
 msgid "Epson E 700"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:6462
 #, fuzzy
 msgid "Epson E 720"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:6463
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:6464
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/xml/xmli18n-tmp.h:4224
+#: src/xml/xmli18n-tmp.h:6465
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:6466
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:6467
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:6468
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:4228
+#: src/xml/xmli18n-tmp.h:6469
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4229
+#: src/xml/xmli18n-tmp.h:6470
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:6471
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:6472
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:6473
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:6474
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:6475
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:6476
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:6477
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:6478
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/xml/xmli18n-tmp.h:4238
+#: src/xml/xmli18n-tmp.h:6479
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:6480
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:6481
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:6482
 #, fuzzy
 msgid "Epson PM 670C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:4242
+#: src/xml/xmli18n-tmp.h:6483
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:4243
+#: src/xml/xmli18n-tmp.h:6484
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:6485
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:6486
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/xml/xmli18n-tmp.h:4246
+#: src/xml/xmli18n-tmp.h:6487
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:6488
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:6490
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/xml/xmli18n-tmp.h:4251
+#: src/xml/xmli18n-tmp.h:6492
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:4253
+#: src/xml/xmli18n-tmp.h:6494
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/xml/xmli18n-tmp.h:4254
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:6496
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:6497
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:6498
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:6499
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/xml/xmli18n-tmp.h:4259
+#: src/xml/xmli18n-tmp.h:6500
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/xml/xmli18n-tmp.h:4260
+#: src/xml/xmli18n-tmp.h:6501
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:6502
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/xml/xmli18n-tmp.h:4262
+#: src/xml/xmli18n-tmp.h:6503
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/xml/xmli18n-tmp.h:4263
+#: src/xml/xmli18n-tmp.h:6504
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/xml/xmli18n-tmp.h:4264
+#: src/xml/xmli18n-tmp.h:6505
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/xml/xmli18n-tmp.h:4265
+#: src/xml/xmli18n-tmp.h:6506
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:6507
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:6508
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:6509
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:6510
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:6511
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:6512
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:6513
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:6514
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:4274
+#: src/xml/xmli18n-tmp.h:6515
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/xml/xmli18n-tmp.h:4275
+#: src/xml/xmli18n-tmp.h:6516
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:4276
+#: src/xml/xmli18n-tmp.h:6517
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:6518
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:6519
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:6520
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:6521
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:6522
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:6523
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:6524
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:6525
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/xml/xmli18n-tmp.h:4285
+#: src/xml/xmli18n-tmp.h:6526
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/xml/xmli18n-tmp.h:4286
+#: src/xml/xmli18n-tmp.h:6527
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:6528
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:6529
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:6530
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:6531
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:6532
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4292
+#: src/xml/xmli18n-tmp.h:6533
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:6534
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:6535
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4295
+#: src/xml/xmli18n-tmp.h:6536
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:4296
+#: src/xml/xmli18n-tmp.h:6537
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4297
+#: src/xml/xmli18n-tmp.h:6538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:6539
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:4299
+#: src/xml/xmli18n-tmp.h:6540
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:6541
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:6542
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:6543
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:6544
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/xml/xmli18n-tmp.h:4305
+#: src/xml/xmli18n-tmp.h:6546
 #, fuzzy
 msgid "Epson PX V780"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:6547
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/xml/xmli18n-tmp.h:4307
+#: src/xml/xmli18n-tmp.h:6548
+#, fuzzy
+msgid "Epson PX G5600"
+msgstr "Epson PX G5000"
+
+#: src/xml/xmli18n-tmp.h:6549
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/xml/xmli18n-tmp.h:4308
+#: src/xml/xmli18n-tmp.h:6550
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/xml/xmli18n-tmp.h:4309
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/xml/xmli18n-tmp.h:4310
+#: src/xml/xmli18n-tmp.h:6552
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:6553
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:6554
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/xml/xmli18n-tmp.h:4313
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:6556
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/xml/xmli18n-tmp.h:4315
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:6559
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:6560
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:6561
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:6562
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:6563
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:6564
 #, fuzzy
 msgid "Brother DCP-8045D"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:6565
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:4324
+#: src/xml/xmli18n-tmp.h:6566
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:6567
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/xml/xmli18n-tmp.h:4326
+#: src/xml/xmli18n-tmp.h:6568
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:4327
+#: src/xml/xmli18n-tmp.h:6569
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:6570
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:6571
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:6575
 #, fuzzy
 msgid "Brother HL-1430"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:6576
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:6577
 #, fuzzy
 msgid "Brother HL-1450"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:6578
 #, fuzzy
 msgid "Brother HL-1470N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:4337
+#: src/xml/xmli18n-tmp.h:6579
 #, fuzzy
 msgid "Brother HL-1650"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:6580
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:6581
 #, fuzzy
 msgid "Brother HL-1670N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:6582
 #, fuzzy
 msgid "Brother HL-1850"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:6583
 #, fuzzy
 msgid "Brother HL-1870N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:6584
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:6585
 #, fuzzy
 msgid "Brother HL-2460"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:6586
 #, fuzzy
 msgid "Brother HL-2460N"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:6587
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/xml/xmli18n-tmp.h:4346
+#: src/xml/xmli18n-tmp.h:6588
 #, fuzzy
 msgid "Brother HL-5030"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:6589
 #, fuzzy
 msgid "Brother HL-5040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:6590
 #, fuzzy
 msgid "Brother HL-5050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:6591
 #, fuzzy
 msgid "Brother HL-5070N"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:4350
+#: src/xml/xmli18n-tmp.h:6592
 #, fuzzy
 msgid "Brother HL-5140"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:4351
+#: src/xml/xmli18n-tmp.h:6593
 #, fuzzy
 msgid "Brother HL-5150D"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:6594
 #, fuzzy
 msgid "Brother HL-5170DN"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:6595
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:4354
+#: src/xml/xmli18n-tmp.h:6596
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:6597
 #, fuzzy
 msgid "Brother HL-7050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:6598
 #, fuzzy
 msgid "Brother HL-7050N"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4357
+#: src/xml/xmli18n-tmp.h:6599
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/xml/xmli18n-tmp.h:4358
+#: src/xml/xmli18n-tmp.h:6600
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:6601
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:6602
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:6603
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:6604
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:6605
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:6606
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:6607
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:6608
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:6609
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:6610
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:6611
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:6612
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:6613
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:6614
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/xml/xmli18n-tmp.h:4373
+#: src/xml/xmli18n-tmp.h:6615
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/xml/xmli18n-tmp.h:4374
+#: src/xml/xmli18n-tmp.h:6616
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:6617
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/xml/xmli18n-tmp.h:4376
+#: src/xml/xmli18n-tmp.h:6618
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:6619
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:6620
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:6621
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:6622
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:6623
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:6624
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:6625
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/xml/xmli18n-tmp.h:4384
+#: src/xml/xmli18n-tmp.h:6626
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:4385
+#: src/xml/xmli18n-tmp.h:6627
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:4386
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:4387
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:6630
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/xml/xmli18n-tmp.h:4389
+#: src/xml/xmli18n-tmp.h:6631
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/xml/xmli18n-tmp.h:4392
+#: src/xml/xmli18n-tmp.h:6634
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:6635
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:6636
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:6637
 #, fuzzy
 msgid "Epson EPL-N2050PS+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:4397
+#: src/xml/xmli18n-tmp.h:6639
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:6640
 #, fuzzy
 msgid "Epson EPL-N2500PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:4400
+#: src/xml/xmli18n-tmp.h:6642
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:6643
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/xml/xmli18n-tmp.h:4403
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:6646
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:6647
 msgid "Generic PCL 4 Printer"
 msgstr "Imprimante générique PCL 4"
 
-#: src/xml/xmli18n-tmp.h:4406
+#: src/xml/xmli18n-tmp.h:6648
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Imprimante générique PCL 4"
 
-#: src/xml/xmli18n-tmp.h:4407
+#: src/xml/xmli18n-tmp.h:6649
 msgid "Generic PCL 5 Printer"
 msgstr "Imprimante générique PCL 5"
 
-#: src/xml/xmli18n-tmp.h:4408
+#: src/xml/xmli18n-tmp.h:6650
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Imprimante générique PCL 5"
 
-#: src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:6651
 msgid "Generic PCL 5c Printer"
 msgstr "Imprimante générique PCL5 c"
 
-#: src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:6652
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Imprimante générique PCL5 c"
 
-#: src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:6653
 msgid "Generic PCL 5e Printer"
 msgstr "Imprimante générique PCL 5e"
 
-#: src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:6654
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Imprimante générique PCL 5e"
 
-#: src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Imprimante générique PCL 6/PCL XL"
 
-#: src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:6656
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Imprimante générique PCL 6/PCL XL"
 
-#: src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:6657
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4416
+#: src/xml/xmli18n-tmp.h:6658
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:6659
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:6660
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:6661
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4420
-msgid "Gestetner 3532"
+#: src/xml/xmli18n-tmp.h:6662
+msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4421
-msgid "Gestetner 4235g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:6663
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4423
-msgid "Gestetner 4532"
+#: src/xml/xmli18n-tmp.h:6664
+msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4424
-msgid "Gestetner 4245g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:6665
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:6666
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:6668
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:6669
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:6670
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4431
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:6672
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:6673
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:6674
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:6675
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4436
+#: src/xml/xmli18n-tmp.h:6676
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4437
-msgid "Gestetner DSm635"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4438
-msgid "Gestetner DSm635G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4439
-msgid "Gestetner DSm645"
+#: src/xml/xmli18n-tmp.h:6677
+msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4440
-msgid "Gestetner DS645G"
+#: src/xml/xmli18n-tmp.h:6678
+msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:6679
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:6680
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4443
+#: src/xml/xmli18n-tmp.h:6681
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:6682
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:6683
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4446
-msgid "Gestetner DSm735"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4447
-msgid "Gestetner DSm735G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4448
-msgid "Gestetner DSm745"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4449
-msgid "Gestetner DSm745G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4450
-msgid "Gestetner MP1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4451
-msgid "Gestetner DSm7110"
+#: src/xml/xmli18n-tmp.h:6684
+msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4452
-msgid "Gestetner MP1350"
+#: src/xml/xmli18n-tmp.h:6685
+msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4453
-msgid "Gestetner DSm7135"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4454
-msgid "Gestetner MP1600"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4455
-msgid "Gestetner DSm716"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4456
-msgid "Gestetner MP2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4457
-msgid "Gestetner DSm721d"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4458
-msgid "Gestetner MP2500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4459
-msgid "Gestetner DSm625"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4460
-msgid "Gestetner MP3500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4461
-msgid "Gestetner DSm735e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4462
-msgid "Gestetner MP4500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4463
-msgid "Gestetner DSm745e"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6686
+#, fuzzy
+msgid "Gestetner MP1100/DSm7110"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4464
-msgid "Gestetner MP5500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6687
+#, fuzzy
+msgid "Gestetner MP1350/DSm7135"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4465
-msgid "Gestetner DSm755"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6688
+#, fuzzy
+msgid "Gestetner MP1600/DSm716"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4466
-msgid "Gestetner MP6500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6689
+#, fuzzy
+msgid "Gestetner MP2000/DSm721d"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4467
-msgid "Gestetner DSm765"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6690
+#, fuzzy
+msgid "Gestetner MP2500/DSm625"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4468
-msgid "Gestetner MP7500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6691
+#, fuzzy
+msgid "Gestetner MP3500/DSm735e"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4469
-msgid "Gestetner DSm775"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6692
+#, fuzzy
+msgid "Gestetner MP4500/DSm745e"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4470
-msgid "Gestetner MP9000"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6693
+#, fuzzy
+msgid "Gestetner MP5500/DSm755"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4471
-msgid "Gestetner DSm790"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6694
+#, fuzzy
+msgid "Gestetner MP6500/DSm765"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4472
-msgid "Gestetner MP 161"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6695
+#, fuzzy
+msgid "Gestetner MP7500/DSm775"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4473
-msgid "Gestetner DSm416"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6696
+#, fuzzy
+msgid "Gestetner MP9000/DSm790"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4474
-msgid "Gestetner MP 2510"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6697
+#, fuzzy
+msgid "Gestetner MP 161/DSm416"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4475
-msgid "Gestetner DSm725e"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6698
+#, fuzzy
+msgid "Gestetner MP 2510/DSm725e"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:6699
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:6700
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4478
-msgid "Gestetner MP 3010"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4479
-msgid "Gestetner DSm730e"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6701
+#, fuzzy
+msgid "Gestetner MP 3010/DSm730e"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4480
+#: src/xml/xmli18n-tmp.h:6702
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:6703
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:6704
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:6705
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:6706
 #, fuzzy
 msgid "Gestetner MP 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:6707
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:6708
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:6709
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:6710
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/xml/xmli18n-tmp.h:4489
+#: src/xml/xmli18n-tmp.h:6711
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:6712
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:6713
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/xml/xmli18n-tmp.h:4492
+#: src/xml/xmli18n-tmp.h:6714
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:6715
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:6716
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/xml/xmli18n-tmp.h:4495
+#: src/xml/xmli18n-tmp.h:6717
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/xml/xmli18n-tmp.h:4496
+#: src/xml/xmli18n-tmp.h:6718
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/xml/xmli18n-tmp.h:4497
+#: src/xml/xmli18n-tmp.h:6719
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:6720
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:6721
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:6722
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:6723
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:6724
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:6725
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:6726
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:6727
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:4506
+#: src/xml/xmli18n-tmp.h:6728
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:6729
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:4508
+#: src/xml/xmli18n-tmp.h:6730
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/xml/xmli18n-tmp.h:4509
+#: src/xml/xmli18n-tmp.h:6731
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:4510
+#: src/xml/xmli18n-tmp.h:6732
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:6733
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:6734
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:6735
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:6736
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:6737
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:6738
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:6739
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:4518
+#: src/xml/xmli18n-tmp.h:6740
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:6741
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:6742
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:6743
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:6744
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:4523
+#: src/xml/xmli18n-tmp.h:6745
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5500"
 
-#: src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:6746
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:6747
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:6748
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:6749
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/xml/xmli18n-tmp.h:4528
+#: src/xml/xmli18n-tmp.h:6750
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/xml/xmli18n-tmp.h:4529
+#: src/xml/xmli18n-tmp.h:6751
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/xml/xmli18n-tmp.h:4530
+#: src/xml/xmli18n-tmp.h:6752
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:6753
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/xml/xmli18n-tmp.h:4532
+#: src/xml/xmli18n-tmp.h:6754
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:6755
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:6756
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:6757
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:6758
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:6759
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:6760
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/xml/xmli18n-tmp.h:4539
+#: src/xml/xmli18n-tmp.h:6761
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/xml/xmli18n-tmp.h:4540
+#: src/xml/xmli18n-tmp.h:6762
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/xml/xmli18n-tmp.h:4541
+#: src/xml/xmli18n-tmp.h:6763
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/xml/xmli18n-tmp.h:4542
+#: src/xml/xmli18n-tmp.h:6764
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/xml/xmli18n-tmp.h:4543
+#: src/xml/xmli18n-tmp.h:6765
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:6766
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:6767
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/xml/xmli18n-tmp.h:4546
+#: src/xml/xmli18n-tmp.h:6768
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:6769
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:6770
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:6771
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:6772
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:6773
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/xml/xmli18n-tmp.h:4552
+#: src/xml/xmli18n-tmp.h:6774
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:6775
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:6776
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:6777
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:6778
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:6779
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:6780
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:6781
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:6782
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:6783
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:6784
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:6785
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:6786
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:6787
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:6788
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/xml/xmli18n-tmp.h:4567
+#: src/xml/xmli18n-tmp.h:6789
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/xml/xmli18n-tmp.h:4568
+#: src/xml/xmli18n-tmp.h:6790
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:6791
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/xml/xmli18n-tmp.h:4570
+#: src/xml/xmli18n-tmp.h:6792
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/xml/xmli18n-tmp.h:4571
+#: src/xml/xmli18n-tmp.h:6793
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:6794
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:6795
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:6796
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:6797
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:6798
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:6799
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:6800
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:6801
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:6802
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:6803
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/xml/xmli18n-tmp.h:4582
+#: src/xml/xmli18n-tmp.h:6804
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/xml/xmli18n-tmp.h:4583
+#: src/xml/xmli18n-tmp.h:6805
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/xml/xmli18n-tmp.h:4584
+#: src/xml/xmli18n-tmp.h:6806
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/xml/xmli18n-tmp.h:4585
+#: src/xml/xmli18n-tmp.h:6807
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:6808
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:6809
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:6810
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:6811
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:6812
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:6813
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:6814
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:4593
+#: src/xml/xmli18n-tmp.h:6815
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/xml/xmli18n-tmp.h:4594
+#: src/xml/xmli18n-tmp.h:6816
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:6817
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:6818
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/xml/xmli18n-tmp.h:4597
+#: src/xml/xmli18n-tmp.h:6819
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:6820
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:6821
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:6822
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:6823
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/xml/xmli18n-tmp.h:4602
+#: src/xml/xmli18n-tmp.h:6824
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:6825
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:6826
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:6827
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:6828
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:4607
+#: src/xml/xmli18n-tmp.h:6829
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:6830
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/xml/xmli18n-tmp.h:4609
+#: src/xml/xmli18n-tmp.h:6831
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/xml/xmli18n-tmp.h:4610
+#: src/xml/xmli18n-tmp.h:6832
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:6833
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:6834
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4613
+#: src/xml/xmli18n-tmp.h:6835
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:6836
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:6837
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4O"
 
-#: src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:6838
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:6839
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:6840
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:6841
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:6842
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:6843
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:6844
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:6845
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4624
+#: src/xml/xmli18n-tmp.h:6846
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/xml/xmli18n-tmp.h:4625
+#: src/xml/xmli18n-tmp.h:6847
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:6848
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/xml/xmli18n-tmp.h:4627
+#: src/xml/xmli18n-tmp.h:6849
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/xml/xmli18n-tmp.h:4628
+#: src/xml/xmli18n-tmp.h:6850
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:6851
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:6852
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:6853
 #, fuzzy
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:6854
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:6855
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:6856
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:6857
 #, fuzzy
 msgid "HP LaserJet 1160"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:4636
+#: src/xml/xmli18n-tmp.h:6858
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:4637
+#: src/xml/xmli18n-tmp.h:6859
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1120"
 
-#: src/xml/xmli18n-tmp.h:4638
+#: src/xml/xmli18n-tmp.h:6860
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
 msgid "HP LaserJet 1320"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:4640
+#: src/xml/xmli18n-tmp.h:6862
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:6863
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:6864
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:6865
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:4644
+#: src/xml/xmli18n-tmp.h:6866
 #, fuzzy
 msgid "HP LaserJet 2410"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
 msgid "HP LaserJet 2420"
 msgstr "HP LaserJet 1120"
 
-#: src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
 msgid "HP LaserJet 2430"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:4647
+#: src/xml/xmli18n-tmp.h:6869
 #, fuzzy
 msgid "HP LaserJet 3015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:4648
+#: src/xml/xmli18n-tmp.h:6870
 #, fuzzy
 msgid "HP LaserJet 3020"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:6871
 #, fuzzy
 msgid "HP LaserJet 3030"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4650
+#: src/xml/xmli18n-tmp.h:6872
 #, fuzzy
 msgid "HP LaserJet 3050"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:6873
 #, fuzzy
 msgid "HP LaserJet 3052"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:6874
 #, fuzzy
 msgid "HP LaserJet 3055"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:6875
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:6876
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:6877
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:6878
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:6879
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:6880
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:6881
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/xml/xmli18n-tmp.h:4660
+#: src/xml/xmli18n-tmp.h:6882
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:6883
 #, fuzzy
 msgid "HP LaserJet 3380"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:6884
 #, fuzzy
 msgid "HP LaserJet 3390"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:4663
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "HP LaserJet 3392"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:6886
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:6887
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:6888
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/xml/xmli18n-tmp.h:4667
+#: src/xml/xmli18n-tmp.h:6889
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:6890
 #, fuzzy
 msgid "HP LaserJet 4240"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:6891
 #, fuzzy
 msgid "HP LaserJet 4250"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:6892
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/xml/xmli18n-tmp.h:4671
+#: src/xml/xmli18n-tmp.h:6893
 #, fuzzy
 msgid "HP LaserJet 4345 mfp"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:6894
 #, fuzzy
 msgid "HP LaserJet 4350"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:6895
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:6896
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "HP LaserJet 5200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:6898
 #, fuzzy
 msgid "HP LaserJet 5200L"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:6899
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:6900
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:6901
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/xml/xmli18n-tmp.h:4680
+#: src/xml/xmli18n-tmp.h:6902
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:6903
 #, fuzzy
 msgid "HP LaserJet 9040"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:4682
+#: src/xml/xmli18n-tmp.h:6904
 #, fuzzy
 msgid "HP LaserJet 9040 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:4683
+#: src/xml/xmli18n-tmp.h:6905
 #, fuzzy
 msgid "HP LaserJet 9050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:4684
+#: src/xml/xmli18n-tmp.h:6906
 #, fuzzy
 msgid "HP LaserJet 9050 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "HP LaserJet M3027 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "HP LaserJet M3035 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "HP LaserJet M4345 MFP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "HP LaserJet M5025 MFP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:6911
 #, fuzzy
 msgid "HP LaserJet M5035 MFP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "HP LaserJet P2010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:6913
 #, fuzzy
 msgid "HP LaserJet P2015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:6914
 #, fuzzy
 msgid "HP LaserJet P3004"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:6915
 #, fuzzy
 msgid "HP LaserJet P3005"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:6916
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/xml/xmli18n-tmp.h:4695
+#: src/xml/xmli18n-tmp.h:6917
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:6918
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:6919
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:6920
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:6921
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/xml/xmli18n-tmp.h:4700
+#: src/xml/xmli18n-tmp.h:6922
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:6923
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:6924
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/xml/xmli18n-tmp.h:4703
+#: src/xml/xmli18n-tmp.h:6925
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:6926
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:6927
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/xml/xmli18n-tmp.h:4706
+#: src/xml/xmli18n-tmp.h:6928
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/xml/xmli18n-tmp.h:4707
+#: src/xml/xmli18n-tmp.h:6929
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:6930
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:6931
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/xml/xmli18n-tmp.h:4710
+#: src/xml/xmli18n-tmp.h:6932
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:6933
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:6934
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:6935
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:6936
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:6937
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:6938
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:6939
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/xml/xmli18n-tmp.h:4718
+#: src/xml/xmli18n-tmp.h:6940
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:6941
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:6942
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/xml/xmli18n-tmp.h:4721
+#: src/xml/xmli18n-tmp.h:6943
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:6944
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:6945
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:6946
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/xml/xmli18n-tmp.h:4725
+#: src/xml/xmli18n-tmp.h:6947
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:6948
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:6949
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/xml/xmli18n-tmp.h:4728
+#: src/xml/xmli18n-tmp.h:6950
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/xml/xmli18n-tmp.h:4729
+#: src/xml/xmli18n-tmp.h:6951
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:6952
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:6953
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/xml/xmli18n-tmp.h:4732
+#: src/xml/xmli18n-tmp.h:6954
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:6955
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:6956
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:6957
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:6958
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:6959
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:6960
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/xml/xmli18n-tmp.h:4739
+#: src/xml/xmli18n-tmp.h:6961
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/xml/xmli18n-tmp.h:4740
+#: src/xml/xmli18n-tmp.h:6962
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/xml/xmli18n-tmp.h:4741
+#: src/xml/xmli18n-tmp.h:6963
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/xml/xmli18n-tmp.h:4742
+#: src/xml/xmli18n-tmp.h:6964
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:6965
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:6966
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/xml/xmli18n-tmp.h:4745
+#: src/xml/xmli18n-tmp.h:6967
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:6968
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:6969
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:6970
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/xml/xmli18n-tmp.h:4749
+#: src/xml/xmli18n-tmp.h:6971
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:6972
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:6973
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/xml/xmli18n-tmp.h:4752
+#: src/xml/xmli18n-tmp.h:6974
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:6975
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:6976
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/xml/xmli18n-tmp.h:4755
+#: src/xml/xmli18n-tmp.h:6977
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:6978
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:6979
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:6980
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/xml/xmli18n-tmp.h:4759
+#: src/xml/xmli18n-tmp.h:6981
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/xml/xmli18n-tmp.h:4760
+#: src/xml/xmli18n-tmp.h:6982
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:6983
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/xml/xmli18n-tmp.h:4762
+#: src/xml/xmli18n-tmp.h:6984
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:6985
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:6986
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/xml/xmli18n-tmp.h:4765
+#: src/xml/xmli18n-tmp.h:6987
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:6988
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:6989
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:6990
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:6991
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:6992
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:6993
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/xml/xmli18n-tmp.h:4772
+#: src/xml/xmli18n-tmp.h:6994
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:6995
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/xml/xmli18n-tmp.h:4774
+#: src/xml/xmli18n-tmp.h:6996
 #, fuzzy
 msgid "Infotec 4353 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4775
+#: src/xml/xmli18n-tmp.h:6997
 #, fuzzy
 msgid "Infotec 4452 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4776
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:6999
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:7000
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:7002
 #, fuzzy
 msgid "Infotec IS2035"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:7003
 #, fuzzy
 msgid "Infotec IS2045"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:7004
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:7005
 #, fuzzy
 msgid "Infotec IS2105"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:7006
 #, fuzzy
 msgid "Infotec IS 2015"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:7007
 #, fuzzy
 msgid "Infotec IS 2018"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:7008
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:7009
 #, fuzzy
 msgid "Infotec IS 2060"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:7010
 #, fuzzy
 msgid "Infotec IS 2075"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:7011
 #, fuzzy
 msgid "Infotec IS 2122"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4790
+#: src/xml/xmli18n-tmp.h:7012
 #, fuzzy
 msgid "Infotec IS 2127"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:7013
 #, fuzzy
 msgid "Infotec IS 2132"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:7014
 #, fuzzy
 msgid "Infotec IS 2135"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:7015
 #, fuzzy
 msgid "Infotec IS 2145"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4794
+#: src/xml/xmli18n-tmp.h:7016
 #, fuzzy
 msgid "Infotec IS 2151"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:7017
 #, fuzzy
 msgid "Infotec IS 2160"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:7018
 #, fuzzy
 msgid "Infotec IS 2175"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4797
+#: src/xml/xmli18n-tmp.h:7019
 #, fuzzy
 msgid "Infotec IS 2215"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:7020
 #, fuzzy
 msgid "Infotec IS 2216"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:7021
 #, fuzzy
 msgid "Infotec IS 2220"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:7022
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:7023
 #, fuzzy
 msgid "Infotec IS 2225"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:7024
 #, fuzzy
 msgid "Infotec IS 2230"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:7025
 #, fuzzy
 msgid "Infotec IS 2235"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:7026
 #, fuzzy
 msgid "Infotec IS 2245"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:7027
 #, fuzzy
 msgid "Infotec IS 2255"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:7028
 #, fuzzy
 msgid "Infotec IS 2265"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4807
+#: src/xml/xmli18n-tmp.h:7029
 #, fuzzy
 msgid "Infotec IS 2275"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4808
+#: src/xml/xmli18n-tmp.h:7030
 #, fuzzy
 msgid "Infotec IS 2316"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:7031
 #, fuzzy
 msgid "Infotec IS 2320"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:7032
 #, fuzzy
 msgid "Infotec IS 2325"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:7033
 #, fuzzy
 msgid "Infotec IS 2416"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:7034
 #, fuzzy
 msgid "Infotec IS 2425"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:7035
 #, fuzzy
 msgid "Infotec IS 2430"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:7036
 #, fuzzy
 msgid "Infotec IS 2435"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:7037
 #, fuzzy
 msgid "Infotec IS 2445"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:7038
 #, fuzzy
 msgid "Infotec IS 3090"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:7039
 #, fuzzy
 msgid "Infotec IS 3110"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:7040
 #, fuzzy
 msgid "Infotec IS 3135"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4819
+#: src/xml/xmli18n-tmp.h:7041
 #, fuzzy
 msgid "Infotec MP 2550"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:7042
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:7043
 #, fuzzy
 msgid "Infotec MP 3350"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:7044
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:7045
 #, fuzzy
 msgid "Infotec MP 4000"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:7046
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:7047
 #, fuzzy
 msgid "Infotec MP 5000"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:7048
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:7049
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:7050
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:7051
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:4830
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:7057
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:4837
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:4840
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:4842
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:4852
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/xml/xmli18n-tmp.h:4853
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/xml/xmli18n-tmp.h:4854
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/xml/xmli18n-tmp.h:4855
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:4866
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/xml/xmli18n-tmp.h:4867
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/xml/xmli18n-tmp.h:4873
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4874
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4883
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4886
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4888
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4890
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4894
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4896
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4903
-msgid "Lanier MP 2500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4904
-msgid "Lanier LD125"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4905
+#: src/xml/xmli18n-tmp.h:7125
 #, fuzzy
-msgid "Lanier MP 1100"
-msgstr "HP LaserJet 1100"
+msgid "Lanier MP2500/LD125"
+msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4906
+#: src/xml/xmli18n-tmp.h:7126
 #, fuzzy
-msgid "Lanier LD1100"
+msgid "Lanier MP 1100/LD1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4907
-msgid "Lanier MP 1350"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4908
-msgid "Lanier LD1135"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4909
-msgid "Lanier MP 1600"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4910
-msgid "Lanier LD316"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4911
-msgid "Lanier MP 161"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4912
-msgid "Lanier LD016"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4913
-msgid "Lanier MP 2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4914
-msgid "Lanier LD320d"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4915
-msgid "Lanier MP 2510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4916
-msgid "Lanier LD325"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4917
-msgid "Lanier MP 2550B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4918
-msgid "Lanier LD425B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4919
-msgid "Lanier MP 2550"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4920
-msgid "Lanier LD425"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7127
+#, fuzzy
+msgid "Lanier MP 1350/LD1135"
+msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4921
-msgid "Lanier MP 3010"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7128
+#, fuzzy
+msgid "Lanier MP 1600/LD316"
+msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4922
-msgid "Lanier LD330"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7129
+#, fuzzy
+msgid "Lanier MP 161/LD016"
+msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4923
-msgid "Lanier MP 3350B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7130
+#, fuzzy
+msgid "Lanier MP 2000/LD320d"
+msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:4924
-msgid "Lanier LD433B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7131
+#, fuzzy
+msgid "Lanier MP 2510/LD325"
+msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:7132
 #, fuzzy
-msgid "Lanier MP 3350"
+msgid "Lanier MP 2550B/LD425B"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4926
-msgid "Lanier LD433"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7133
+#, fuzzy
+msgid "Lanier MP 2550/LD425"
+msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4927
-msgid "Lanier MP 3500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7134
+#, fuzzy
+msgid "Lanier MP 3010/LD330"
+msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4928
-msgid "Lanier LD335"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7135
+#, fuzzy
+msgid "Lanier MP 3350B/LD433B"
+msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4929
-msgid "Lanier MP 4000B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7136
+#, fuzzy
+msgid "Lanier MP 3350/LD433"
+msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4930
-msgid "Lanier LD040B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7137
+#, fuzzy
+msgid "Lanier MP 3500/LD335"
+msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:7138
 #, fuzzy
-msgid "Lanier MP 4000"
+msgid "Lanier MP 4000B/LD040B"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:4932
-msgid "Lanier LD040"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4933
-msgid "Lanier MP 4500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4934
-msgid "Lanier LD345"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4935
-msgid "Lanier MP 5000B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7139
+#, fuzzy
+msgid "Lanier MP 4000/LD040"
+msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:4936
-msgid "Lanier LD050B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7140
+#, fuzzy
+msgid "Lanier MP 4500/LD345"
+msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:7141
 #, fuzzy
-msgid "Lanier MP 5000"
+msgid "Lanier MP 5000B/LD050B"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4938
-msgid "Lanier LD050"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4939
-msgid "Lanier MP 5500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4940
-msgid "Lanier LD255"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4941
-msgid "Lanier MP 6500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7142
+#, fuzzy
+msgid "Lanier MP 5000/LD050"
+msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4942
-msgid "Lanier LD265"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7143
+#, fuzzy
+msgid "Lanier MP 5500/LD255"
+msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4943
-msgid "Lanier MP 7500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7144
+#, fuzzy
+msgid "Lanier MP 6500/LD265"
+msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4944
-msgid "Lanier LD275"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7145
+#, fuzzy
+msgid "Lanier MP 7500/LD275"
+msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:7146
 #, fuzzy
-msgid "Lanier MP 9000"
+msgid "Lanier MP 9000/LD190"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:4946
-msgid "Lanier LD190"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:7148
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/xml/xmli18n-tmp.h:4950
+#: src/xml/xmli18n-tmp.h:7150
 #, fuzzy
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:7151
 #, fuzzy
 msgid "Lexmark Optra E321"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:4952
+#: src/xml/xmli18n-tmp.h:7152
 #, fuzzy
 msgid "Lexmark Optra E323"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:4953
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:7155
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/xml/xmli18n-tmp.h:4960
+#: src/xml/xmli18n-tmp.h:7160
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:7161
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:7162
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/xml/xmli18n-tmp.h:4963
+#: src/xml/xmli18n-tmp.h:7163
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:7164
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:7165
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/xml/xmli18n-tmp.h:4966
-msgid "NRG 10515"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4967
-msgid "NRG 10518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4968
-msgid "NRG 10512"
+#: src/xml/xmli18n-tmp.h:7166
+msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4969
-msgid "NRG 2205"
+#: src/xml/xmli18n-tmp.h:7167
+msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4970
-msgid "NRG 2238"
+#: src/xml/xmli18n-tmp.h:7168
+msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4971
-msgid "NRG 2212"
+#: src/xml/xmli18n-tmp.h:7169
+msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4972
-msgid "NRG 2705"
+#: src/xml/xmli18n-tmp.h:7170
+msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4973
-msgid "NRG 2738"
+#: src/xml/xmli18n-tmp.h:7171
+msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4974
-msgid "NRG 2712"
+#: src/xml/xmli18n-tmp.h:7172
+msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4975
-msgid "NRG 3205"
+#: src/xml/xmli18n-tmp.h:7173
+msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4976
-msgid "NRG 3238"
+#: src/xml/xmli18n-tmp.h:7174
+msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4977
-msgid "NRG 3212"
+#: src/xml/xmli18n-tmp.h:7175
+msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4978
-msgid "NRG 3525"
+#: src/xml/xmli18n-tmp.h:7176
+msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4979
-msgid "NRG 3508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4980
-msgid "NRG 3502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4981
-msgid "NRG 3545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4982
-msgid "NRG 3518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4983
-msgid "NRG 3532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4984
-msgid "NRG 4525"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4985
-msgid "NRG 4508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4986
-msgid "NRG 4502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4987
-msgid "NRG 4545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4988
-msgid "NRG 4518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4989
-msgid "NRG 4532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4990
-msgid "NRG 6002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4991
-msgid "NRG 6005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4992
-msgid "NRG 6008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4993
-msgid "NRG 7502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4994
-msgid "NRG 7505"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4995
-msgid "NRG 7508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4996
-msgid "NRG 9005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4997
-msgid "NRG 9008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4998
-msgid "NRG 9002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:7177
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:7178
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5001
+#: src/xml/xmli18n-tmp.h:7179
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:7180
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:7181
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:7182
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:7183
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5006
+#: src/xml/xmli18n-tmp.h:7184
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:7185
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:7186
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5009
+#: src/xml/xmli18n-tmp.h:7187
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:7188
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:7189
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:7190
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:7191
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:7192
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5015
+#: src/xml/xmli18n-tmp.h:7193
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5016
+#: src/xml/xmli18n-tmp.h:7194
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5017
+#: src/xml/xmli18n-tmp.h:7195
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:7196
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:7197
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:7198
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:7199
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:7200
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:7201
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:7202
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5025
+#: src/xml/xmli18n-tmp.h:7203
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:7204
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:7205
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5028
+#: src/xml/xmli18n-tmp.h:7206
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:7207
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:7208
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:7209
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:7210
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5033
+#: src/xml/xmli18n-tmp.h:7211
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:7212
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:7213
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:7214
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:7215
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:7216
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:7217
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5040
+#: src/xml/xmli18n-tmp.h:7218
 #, fuzzy
 msgid "Oki OL400"
 msgstr "Okidata OL400"
 
-#: src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:7219
 #, fuzzy
 msgid "Oki OL400e"
 msgstr "Okidata OL400e"
 
-#: src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:7220
 #, fuzzy
 msgid "Oki OL400ex"
 msgstr "Okidata OL400ex"
 
-#: src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:7221
 #, fuzzy
 msgid "Oki OL410e"
 msgstr "Okidata OL410e"
 
-#: src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:7222
 #, fuzzy
 msgid "Oki OL600e"
 msgstr "Okidata OL600e"
 
-#: src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:7223
 #, fuzzy
 msgid "Oki OL610e/S"
 msgstr "Okidata OL610e/S"
 
-#: src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:7224
 #, fuzzy
 msgid "Oki OL800"
 msgstr "Okidata OL800"
 
-#: src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:7225
 #, fuzzy
 msgid "Oki OL810ex"
 msgstr "Okidata OL810ex"
 
-#: src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:7226
 #, fuzzy
 msgid "Oki Okipage 6e"
 msgstr "Okidata Okipage 6e"
 
-#: src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:7227
 #, fuzzy
 msgid "Oki Okipage 6ex"
 msgstr "Okidata Okipage 6ex"
 
-#: src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:7228
 #, fuzzy
 msgid "Oki Okipage 8p"
 msgstr "Okidata Okipage 8p"
 
-#: src/xml/xmli18n-tmp.h:5051
+#: src/xml/xmli18n-tmp.h:7229
 #, fuzzy
 msgid "Oki Okipage 10e"
 msgstr "Okidata Okipage 10e"
 
-#: src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:7230
 #, fuzzy
 msgid "Oki Okipage 10ex"
 msgstr "Okidata Okipage 10ex"
 
-#: src/xml/xmli18n-tmp.h:5053
+#: src/xml/xmli18n-tmp.h:7231
 #, fuzzy
 msgid "Oki Okipage 14ex"
 msgstr "Okidata Okipage 14ex"
 
-#: src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Okidata Super 6e"
 
-#: src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:7234
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:7235
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/xml/xmli18n-tmp.h:5060
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/xml/xmli18n-tmp.h:5062
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5063
+#: src/xml/xmli18n-tmp.h:7241
 #, fuzzy
 msgid "Ricoh Aficio 1022"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:7242
 #, fuzzy
 msgid "Ricoh Aficio 1027"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:7243
 #, fuzzy
 msgid "Ricoh Aficio 1032"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:7244
 #, fuzzy
 msgid "Ricoh Aficio 1035"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:7245
 #, fuzzy
 msgid "Ricoh Aficio 1045"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:7246
 #, fuzzy
 msgid "Ricoh Aficio 1060"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:7247
 #, fuzzy
 msgid "Ricoh Aficio 1075"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:7248
 #, fuzzy
 msgid "Ricoh Aficio 1515"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:7249
 #, fuzzy
 msgid "Ricoh Aficio 2015"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5072
+#: src/xml/xmli18n-tmp.h:7250
 #, fuzzy
 msgid "Ricoh Aficio 2016"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:7251
 #, fuzzy
 msgid "Ricoh Aficio 2018"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5074
+#: src/xml/xmli18n-tmp.h:7252
 #, fuzzy
 msgid "Ricoh Aficio 2018D"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5075
+#: src/xml/xmli18n-tmp.h:7253
 #, fuzzy
 msgid "Ricoh Aficio 2020"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5076
+#: src/xml/xmli18n-tmp.h:7254
 #, fuzzy
 msgid "Ricoh Aficio 2020D"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:7255
 #, fuzzy
 msgid "Ricoh Aficio 2022"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:7256
 #, fuzzy
 msgid "Ricoh Aficio 2027"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:7257
 #, fuzzy
 msgid "Ricoh Aficio 2032"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:7258
 #, fuzzy
 msgid "Ricoh Aficio 2035"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5081
+#: src/xml/xmli18n-tmp.h:7259
 #, fuzzy
 msgid "Ricoh Aficio 2035e"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:7260
 #, fuzzy
 msgid "Ricoh Aficio 2045"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:7261
 #, fuzzy
 msgid "Ricoh Aficio 2045e"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:7262
 #, fuzzy
 msgid "Ricoh Aficio 2051"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:7263
 #, fuzzy
 msgid "Ricoh Aficio 2060"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5086
+#: src/xml/xmli18n-tmp.h:7264
 #, fuzzy
 msgid "Ricoh Aficio 2075"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:7265
 #, fuzzy
 msgid "Ricoh Aficio 2090"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5088
+#: src/xml/xmli18n-tmp.h:7266
 #, fuzzy
 msgid "Ricoh Aficio 2105"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:7267
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5090
+#: src/xml/xmli18n-tmp.h:7268
 #, fuzzy
 msgid "Ricoh Aficio 3025"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5091
+#: src/xml/xmli18n-tmp.h:7269
 #, fuzzy
 msgid "Ricoh Aficio 3030"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:7270
 #, fuzzy
 msgid "Ricoh Aficio 3035"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5093
+#: src/xml/xmli18n-tmp.h:7271
 #, fuzzy
 msgid "Ricoh Aficio 3045"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:7274
 #, fuzzy
 msgid "Ricoh Aficio MP 1100"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:7275
 #, fuzzy
 msgid "Ricoh Aficio MP 1350"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:7276
 #, fuzzy
 msgid "Ricoh Aficio MP 1600"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5099
+#: src/xml/xmli18n-tmp.h:7277
 #, fuzzy
 msgid "Ricoh Aficio MP 161"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:7278
 #, fuzzy
 msgid "Ricoh Aficio MP 2000"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:7279
 #, fuzzy
 msgid "Ricoh Aficio MP 2500"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:7280
 #, fuzzy
 msgid "Ricoh Aficio MP 2510"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5103
+#: src/xml/xmli18n-tmp.h:7281
 #, fuzzy
 msgid "Ricoh Aficio MP 2550"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5104
+#: src/xml/xmli18n-tmp.h:7282
 #, fuzzy
 msgid "Ricoh Aficio MP 2550B"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:7283
 #, fuzzy
 msgid "Ricoh Aficio MP 3010"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:7284
 #, fuzzy
 msgid "Ricoh Aficio MP 3350"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5107
+#: src/xml/xmli18n-tmp.h:7285
 #, fuzzy
 msgid "Ricoh Aficio MP 3350B"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5108
+#: src/xml/xmli18n-tmp.h:7286
 #, fuzzy
 msgid "Ricoh Aficio MP 3500"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:7287
 #, fuzzy
 msgid "Ricoh Aficio MP 4000"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5110
+#: src/xml/xmli18n-tmp.h:7288
 #, fuzzy
 msgid "Ricoh Aficio MP 4000B"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:7289
 #, fuzzy
 msgid "Ricoh Aficio MP 4500"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:7290
 #, fuzzy
 msgid "Ricoh Aficio MP 5000"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:7291
 #, fuzzy
 msgid "Ricoh Aficio MP 5000B"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:7292
 #, fuzzy
 msgid "Ricoh Aficio MP 5500"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:7293
 #, fuzzy
 msgid "Ricoh Aficio MP 6500"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:7294
 #, fuzzy
 msgid "Ricoh Aficio MP 7500"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:7295
 #, fuzzy
 msgid "Ricoh Aficio MP 9000"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5118
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:7297
 #, fuzzy
 msgid "Samsung ML-1250"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:5120
+#: src/xml/xmli18n-tmp.h:7298
 #, fuzzy
 msgid "Samsung ML-1450"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:7299
 #, fuzzy
 msgid "Samsung ML-1450PS"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:7300
 #, fuzzy
 msgid "Samsung ML-1650"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:7301
 #, fuzzy
 msgid "Samsung ML-1651N"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:7302
 #, fuzzy
 msgid "Samsung ML-1750"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:7303
 #, fuzzy
 msgid "Samsung ML-2150"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:5126
+#: src/xml/xmli18n-tmp.h:7304
 #, fuzzy
 msgid "Samsung ML-2150PS"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:5127
+#: src/xml/xmli18n-tmp.h:7305
 #, fuzzy
 msgid "Samsung ML-2151N"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:7306
 #, fuzzy
 msgid "Samsung ML-2151NPS"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:7307
 #, fuzzy
 msgid "Samsung ML-2152W"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:7308
 #, fuzzy
 msgid "Samsung ML-2152WPS"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5131
+#: src/xml/xmli18n-tmp.h:7309
 #, fuzzy
 msgid "Samsung ML-2250"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:7310
 #, fuzzy
 msgid "Samsung ML-2550"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:5133
+#: src/xml/xmli18n-tmp.h:7311
 #, fuzzy
 msgid "Samsung ML-2551N"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5134
+#: src/xml/xmli18n-tmp.h:7312
 #, fuzzy
 msgid "Samsung ML-2552W"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Samsung ML-6000"
 msgstr "\"Samsung ML-6000"
 
-#: src/xml/xmli18n-tmp.h:5138
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:7321
 #, fuzzy
 msgid "Samsung ML-7300"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:7322
 #, fuzzy
 msgid "Samsung ML-7300N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/xml/xmli18n-tmp.h:5146
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/xml/xmli18n-tmp.h:5147
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5150
-msgid "Savin 2535"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5151
-msgid "Savin 2235"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5152
-msgid "Savin 2545"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7328
+#, fuzzy
+msgid "Savin 2535/2235"
+msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:5153
-msgid "Savin 2245"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7329
+#, fuzzy
+msgid "Savin 2545/2245"
+msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:5154
+#: src/xml/xmli18n-tmp.h:7330
 #, fuzzy
 msgid "Savin 2560"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:5155
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:7333
 #, fuzzy
 msgid "Savin 40105"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5158
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5160
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5163
-msgid "Savin 4035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5164
-msgid "Savin 4135g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5165
-msgid "Savin 4035e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5166
-msgid "Savin 4135eG"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5167
-msgid "Savin 4045"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7339
+#, fuzzy
+msgid "Savin 4035/4135g"
+msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5168
-msgid "Savin 4145g"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7340
+#, fuzzy
+msgid "Savin 4035e/4135eG"
+msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5169
-msgid "Savin 4045e"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7341
+#, fuzzy
+msgid "Savin 4045/4145g"
+msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5170
-msgid "Savin 4145eG"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7342
+#, fuzzy
+msgid "Savin 4045e/4145eG"
+msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5171
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:7344
 #, fuzzy
 msgid "Savin 4060"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:5173
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5174
+#: src/xml/xmli18n-tmp.h:7346
 #, fuzzy
 msgid "Savin 4090"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:7348
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5177
+#: src/xml/xmli18n-tmp.h:7349
 #, fuzzy
 msgid "Savin 8020"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:7353
 #, fuzzy
 msgid "Savin 8030"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5183
-msgid "Savin 8035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5184
-msgid "Savin 8035g"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7355
+#, fuzzy
+msgid "Savin 8035/8035g"
+msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5186
-msgid "Savin 8045"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5187
-msgid "Savin 8045g"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7357
+#, fuzzy
+msgid "Savin 8045/8045g"
+msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5190
+#: src/xml/xmli18n-tmp.h:7360
 #, fuzzy
 msgid "Savin 8065"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5192
+#: src/xml/xmli18n-tmp.h:7362
 #, fuzzy
 msgid "Savin 8090"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5194
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:7370
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5201
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:7373
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:7374
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5205
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5206
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:7378
 #, fuzzy
 msgid "Sharp AR-M257"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:7379
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/xml/xmli18n-tmp.h:5211
+#: src/xml/xmli18n-tmp.h:7381
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/xml/xmli18n-tmp.h:5212
+#: src/xml/xmli18n-tmp.h:7382
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/xml/xmli18n-tmp.h:5213
+#: src/xml/xmli18n-tmp.h:7383
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/xml/xmli18n-tmp.h:5216
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/xml/xmli18n-tmp.h:5221
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:7392
 #, fuzzy
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5224
+#: src/xml/xmli18n-tmp.h:7394
 #, fuzzy
 msgid "Lexmark X73"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:5225
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:5227
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:5230
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:7404
 msgid "Olympus P-300U"
 msgstr "Olympus P-3000"
 
-#: src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/xml/xmli18n-tmp.h:5236
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:7409
 #, fuzzy
 msgid "Olympus P-S100"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:7410
 #, fuzzy
 msgid "Canon CP-10"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/xml/xmli18n-tmp.h:5244
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Canon SELPHY-CP-400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:5247
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Canon SELPHY-CP-500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Canon SELPHY-CP-510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:5249
+#: src/xml/xmli18n-tmp.h:7419
+#, fuzzy
+msgid "Canon SELPHY-CP-520"
+msgstr "Canon SELPHY-CP-500"
+
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Canon SELPHY-CP-600"
 msgstr "Canon SELPHY-CP-600"
 
-#: src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Canon SELPHY-CP-710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:7422
 #, fuzzy
 msgid "Canon SELPHY-CP-720"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:5252
+#: src/xml/xmli18n-tmp.h:7423
 #, fuzzy
 msgid "Canon SELPHY-CP-730"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:7424
 #, fuzzy
 msgid "Canon SELPHY-CP-740"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:7425
 #, fuzzy
 msgid "Canon SELPHY-CP-750"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:7426
 #, fuzzy
 msgid "Canon SELPHY ES1"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:7427
 #, fuzzy
 msgid "Canon SELPHY ES2"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:7428
 #, fuzzy
 msgid "Canon SELPHY ES20"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:5258
+#: src/xml/xmli18n-tmp.h:7429
 #, fuzzy
 msgid "Sony DPP-EX5"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:5259
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:7432
 #, fuzzy
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:7434
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:7436
 #, fuzzy
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:7438
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5268
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Dai Nippon Printing DS40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Dai Nippon Printing DS80"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "RAW DATA 16 bit"
 msgstr "Données brutes (raw) 16 bits"
 
-#: src/xml/xmli18n-tmp.h:5269
+#: src/xml/xmli18n-tmp.h:7442
 msgid "RAW DATA 8 bit"
 msgstr "Données brutes (raw) 8 bits"
 
+#, fuzzy
+#~ msgid "Lower Front Tray"
+#~ msgstr "Bac avant"
+
+#, fuzzy
+#~ msgid "Upper Front Tray"
+#~ msgstr "Bac avant"
+
+#, fuzzy
+#~ msgid "Epson Stylus Offixe TX300F"
+#~ msgstr "Epson Stylus CX3100"
+
+#, fuzzy
+#~ msgid "Lanier LD1100"
+#~ msgstr "HP LaserJet 1100"
+
 #~ msgid "ISOLatin1"
 #~ msgstr "ISOLatin1"
 
diff --git a/po/gutenprint.pot b/po/gutenprint.pot
index 2748b31..ac559c9 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: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-21 22:25-0500\n"
+"POT-Creation-Date: 2009-07-26 19:14-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2109 src/main/print-pcl.c:1779
+#: src/main/print-escp2.c:2314 src/main/print-pcl.c:1779
 msgid "Default"
 msgstr ""
 
@@ -92,15 +92,15 @@ msgstr ""
 
 #: src/main/dither-main.c:91 src/main/print-canon.c:300
 #: src/main/print-canon.c:308 src/main/print-canon.c:316
-#: src/main/print-canon.c:324 src/main/print-escp2.c:439
-#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
-#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-canon.c:324 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: 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-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:1769
-#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
-#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1935
+#: src/main/print-olympus.c:1943 src/main/print-olympus.c:1951
+#: src/main/print-olympus.c:1959 src/main/print-pcl.c:1324
 #: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
 #: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
@@ -150,7 +150,7 @@ msgid "Dither algorithm"
 msgstr ""
 
 #: src/main/print-canon.c:199 src/main/print-escp2.c:165
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1866
 #: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr ""
@@ -167,8 +167,8 @@ msgstr ""
 #: src/main/print-escp2.c:254 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:1704 src/main/print-olympus.c:1710
-#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-olympus.c:1866 src/main/print-olympus.c:1872
+#: src/main/print-olympus.c:1878 src/main/print-olympus.c:1884
 #: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
 #: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
 #: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
@@ -177,31 +177,31 @@ msgid "Basic Printer Setup"
 msgstr ""
 
 #: src/main/print-canon.c:200 src/main/print-escp2.c:166
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1867
 #: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr ""
 
 #: src/main/print-canon.c:205 src/main/print-escp2.c:171
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1259 src/cups/genppd.c:1339 src/cups/genppd.c:2001
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1872
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1372 src/cups/genppd.c:2035
 msgid "Media Type"
 msgstr ""
 
 #: src/main/print-canon.c:206 src/main/print-escp2.c:172
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1873
 #: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
 #: src/main/print-canon.c:211 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
-#: src/main/print-pcl.c:1265 src/cups/genppd.c:1368 src/cups/genppd.c:2020
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1878
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1401 src/cups/genppd.c:2054
 msgid "Media Source"
 msgstr ""
 
 #: src/main/print-canon.c:212 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1879
 #: src/main/print-pcl.c:1266
 msgid "Source (input slot) of the media"
 msgstr ""
@@ -237,8 +237,8 @@ msgstr ""
 #: src/main/print-canon.c:235 src/main/print-canon.c:241
 #: src/main/print-canon.c:253 src/main/print-escp2.c:207
 #: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1906
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
@@ -253,25 +253,25 @@ msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:247 src/main/print-escp2.c:219
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
-#: src/main/print-pcl.c:1277 src/cups/genppd.c:1446 src/cups/genppd.c:2056
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1884
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1479 src/cups/genppd.c:2090
 msgid "Resolution"
 msgstr ""
 
 #: src/main/print-canon.c:248 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1723
+#: src/main/print-olympus.c:1885
 msgid "Resolution and quality of the print"
 msgstr ""
 
 #: src/main/print-canon.c:253 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr ""
 
 #: src/main/print-canon.c:254 src/main/print-escp2.c:231
 #: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
+#: src/main/print-olympus.c:1891 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr ""
@@ -289,32 +289,33 @@ msgstr ""
 #: 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-escp2.c:320 src/main/print-escp2.c:767
-#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
-#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
-#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
-#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:893 src/main/print-escp2.c:901
+#: src/main/print-escp2.c:909 src/main/print-escp2.c:925
+#: src/main/print-escp2.c:933 src/main/print-escp2.c:941
+#: src/main/print-escp2.c:949 src/main/print-escp2.c:957
+#: src/main/print-escp2.c:965 src/main/print-escp2.c:973
 #: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:265 src/main/print-escp2.c:326
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-canon.c:265 src/main/print-escp2.c:332
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1912
 #: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr ""
 
 #: src/main/print-canon.c:265 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:326
-#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-color.c:208 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1912 src/main/print-pcl.c:1295
 #: src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr ""
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:327
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-canon.c:266 src/main/print-escp2.c:333
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1913
 #: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
@@ -342,77 +343,84 @@ msgstr ""
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:300 src/main/print-escp2.c:439
+#: src/main/print-canon.c:300 src/main/print-escp2.c:445
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 msgid "Cyan Density"
 msgstr ""
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:301 src/main/print-escp2.c:446
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 msgid "Adjust the cyan density"
 msgstr ""
 
-#: src/main/print-canon.c:308 src/main/print-escp2.c:447
+#: src/main/print-canon.c:308 src/main/print-escp2.c:453
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 msgid "Magenta Density"
 msgstr ""
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:309 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 msgid "Adjust the magenta density"
 msgstr ""
 
-#: src/main/print-canon.c:316 src/main/print-escp2.c:455
+#: src/main/print-canon.c:316 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 msgid "Yellow Density"
 msgstr ""
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:317 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 msgid "Adjust the yellow density"
 msgstr ""
 
-#: src/main/print-canon.c:324 src/main/print-escp2.c:463
+#: src/main/print-canon.c:324 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 msgid "Black Density"
 msgstr ""
 
-#: src/main/print-canon.c:325 src/main/print-escp2.c:464
+#: src/main/print-canon.c:325 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 msgid "Adjust the black density"
 msgstr ""
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:333
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:541 src/main/print-escp2.c:542
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 msgid "Light Cyan Transition"
 msgstr ""
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:340
-#: src/main/print-canon.c:348 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
-#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
-#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
-#: src/main/print-pcl.c:1364
+#: src/main/print-canon.c:348 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:541
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:557
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:573
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:589
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:605
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:621
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:637
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:653
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:669
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:685
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:701
+#: src/main/print-escp2.c:709 src/main/print-escp2.c:717
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:733
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:749
+#: src/main/print-escp2.c:757 src/main/print-escp2.c:765
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:781
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:797
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:813
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:829
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:845
+#: src/main/print-escp2.c:853 src/main/print-escp2.c:861
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:340 src/main/print-canon.c:341
-#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
+#: src/main/print-escp2.c:573 src/main/print-escp2.c:574
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 msgid "Light Magenta Transition"
@@ -422,14 +430,14 @@ msgstr ""
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:368 src/main/print-escp2.c:2283
-#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3609
-#: src/xml/xmli18n-tmp.h:3614 src/xml/xmli18n-tmp.h:3620
-#: src/xml/xmli18n-tmp.h:3627
+#: src/main/print-canon.c:368 src/main/print-escp2.c:2488
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5851 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5864
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:369 src/main/print-escp2.c:2285
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2490
 #: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
@@ -438,63 +446,64 @@ msgstr ""
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:646 src/main/print-escp2.c:2005
-#: src/xml/xmli18n-tmp.h:3676
+#: src/main/print-canon.c:646 src/main/print-escp2.c:2210
+#: src/xml/xmli18n-tmp.h:5913
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:648 src/main/print-escp2.c:2007
-#: src/xml/xmli18n-tmp.h:3677
+#: src/main/print-canon.c:648 src/main/print-escp2.c:2212
+#: src/xml/xmli18n-tmp.h:5914
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:650 src/main/print-escp2.c:2009
-#: src/xml/xmli18n-tmp.h:3678
+#: src/main/print-canon.c:650 src/main/print-escp2.c:2214
+#: src/xml/xmli18n-tmp.h:5915
 msgid "CD - Custom"
 msgstr ""
 
-#: src/main/print-canon.c:673 src/main/print-escp2.c:2034
-#: src/cups/genppd.c:1323 src/cups/genppd.c:1572 src/cups/genppd.c:1988
-#: src/cups/genppd.c:2079
+#: src/main/print-canon.c:673 src/main/print-escp2.c:2239
+#: src/cups/genppd.c:1356 src/cups/genppd.c:1605 src/cups/genppd.c:2022
+#: src/cups/genppd.c:2113
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:675 src/main/print-escp2.c:2036
+#: src/main/print-canon.c:675 src/main/print-escp2.c:2241
 msgid "Print To Hub"
 msgstr ""
 
-#: src/main/print-canon.c:790 src/main/print-escp2.c:2447
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-canon.c:790 src/main/print-escp2.c:2652
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2167
 #: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
 #: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr ""
 
-#: src/main/print-canon.c:792 src/main/print-escp2.c:2449
+#: src/main/print-canon.c:792 src/main/print-escp2.c:2654
 #: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
 #: src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr ""
 
-#: src/main/print-canon.c:831 src/main/print-escp2.c:2089
+#: src/main/print-canon.c:831 src/main/print-escp2.c:2294
 #: src/main/print-pcl.c:1797 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr ""
 
-#: src/main/print-canon.c:833 src/main/print-escp2.c:2131
-#: src/main/print-escp2.c:2229 src/main/print-escp2.c:2241
+#: src/main/print-canon.c:833 src/main/print-escp2.c:2336
+#: src/main/print-escp2.c:2434 src/main/print-escp2.c:2446
 #: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
 #: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
-#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1215
-#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1219
-#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
-#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3170
-#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3177
-#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3461
-#: src/xml/xmli18n-tmp.h:3464 src/xml/xmli18n-tmp.h:3632
-#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3648
-#: src/xml/xmli18n-tmp.h:3657 src/xml/xmli18n-tmp.h:3665
+#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1627 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3713 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3722 src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5902
 msgid "Standard"
 msgstr ""
 
@@ -531,7 +540,7 @@ msgid "Pre-Dithered"
 msgstr ""
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1268 src/cups/genppd.c:1971
+#: src/cups/genppd.c:1301 src/cups/genppd.c:2005
 msgid "Grayscale"
 msgstr ""
 
@@ -547,11 +556,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1299 src/cups/genppd.c:1978
+#: src/main/print-color.c:129 src/cups/genppd.c:1332 src/cups/genppd.c:2012
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1306 src/cups/genppd.c:1979
+#: src/main/print-color.c:131 src/cups/genppd.c:1339 src/cups/genppd.c:2013
 msgid "KCMY"
 msgstr ""
 
@@ -611,7 +620,7 @@ msgid "Output image type"
 msgstr ""
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338
 msgid "Raw Channels"
 msgstr ""
 
@@ -671,56 +680,208 @@ msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
 #: src/escputil/escputil.c:997 src/escputil/escputil.c:1017
-#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:1812
-#: src/xml/xmli18n-tmp.h:1823 src/xml/xmli18n-tmp.h:1836
-#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1863
-#: src/xml/xmli18n-tmp.h:1876 src/xml/xmli18n-tmp.h:1889
-#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1918
-#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1949
-#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1975
-#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:1999
-#: src/xml/xmli18n-tmp.h:2013 src/xml/xmli18n-tmp.h:2027
-#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2051
-#: src/xml/xmli18n-tmp.h:2064 src/xml/xmli18n-tmp.h:2076
-#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2102
-#: src/xml/xmli18n-tmp.h:2116 src/xml/xmli18n-tmp.h:2130
-#: src/xml/xmli18n-tmp.h:2143 src/xml/xmli18n-tmp.h:2156
-#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2184
-#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2210
-#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2236
-#: src/xml/xmli18n-tmp.h:2249 src/xml/xmli18n-tmp.h:2262
-#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2290
-#: src/xml/xmli18n-tmp.h:2305 src/xml/xmli18n-tmp.h:2320
-#: src/xml/xmli18n-tmp.h:2332 src/xml/xmli18n-tmp.h:2343
-#: src/xml/xmli18n-tmp.h:2356 src/xml/xmli18n-tmp.h:2369
-#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2392
-#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2415
-#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2442
-#: src/xml/xmli18n-tmp.h:2454 src/xml/xmli18n-tmp.h:2466
-#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2496
-#: src/xml/xmli18n-tmp.h:2509 src/xml/xmli18n-tmp.h:2522
-#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
-#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2574
-#: src/xml/xmli18n-tmp.h:2586 src/xml/xmli18n-tmp.h:2598
-#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2623
-#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2653
-#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2683
-#: src/xml/xmli18n-tmp.h:2697 src/xml/xmli18n-tmp.h:2715
-#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2745
-#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
-#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2803
-#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2828
-#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2854
-#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2881
-#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2915
-#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2943
-#: src/xml/xmli18n-tmp.h:2959 src/xml/xmli18n-tmp.h:2976
-#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:3004
-#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3032
-#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3062
-#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3093
-#: src/xml/xmli18n-tmp.h:3107 src/xml/xmli18n-tmp.h:3125
-#: src/xml/xmli18n-tmp.h:3141
+#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2387
+#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2413
+#: src/xml/xmli18n-tmp.h:2426 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2499
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2551
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2575
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2708
+#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2786
+#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2814
+#: src/xml/xmli18n-tmp.h:2829 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2893
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2966
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3005 src/xml/xmli18n-tmp.h:3020
+#: src/xml/xmli18n-tmp.h:3033 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3061 src/xml/xmli18n-tmp.h:3073
+#: src/xml/xmli18n-tmp.h:3085 src/xml/xmli18n-tmp.h:3098
+#: src/xml/xmli18n-tmp.h:3110 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3377
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3616
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3648
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3766 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3775 src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:3794 src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:3805 src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3869 src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:3880 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3902 src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:3913 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:3948 src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:3970 src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:3983 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4023 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4064 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4075 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4088 src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:4103 src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:4118 src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:4143 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:4203 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4275 src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4309 src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4356 src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4421
+#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4449
+#: src/xml/xmli18n-tmp.h:4456 src/xml/xmli18n-tmp.h:4462
+#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4485 src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:4551 src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:4694 src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4717 src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:4818 src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:4829 src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4885 src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4935
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:5041 src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:5052 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:5121 src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5165
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5182 src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:5193 src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:5271 src/xml/xmli18n-tmp.h:5299
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5327 src/xml/xmli18n-tmp.h:5331
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5347
+#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5367 src/xml/xmli18n-tmp.h:5371
+#: src/xml/xmli18n-tmp.h:5383 src/xml/xmli18n-tmp.h:5388
+#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5440
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5461 src/xml/xmli18n-tmp.h:5468
+#: src/xml/xmli18n-tmp.h:5476 src/xml/xmli18n-tmp.h:5486
+#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5514
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5525
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5543
+#: src/xml/xmli18n-tmp.h:5550 src/xml/xmli18n-tmp.h:5556
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5574 src/xml/xmli18n-tmp.h:5582
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5592
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5625
+#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5649
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5662
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5690
+#: src/xml/xmli18n-tmp.h:5694 src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5731
+#: src/xml/xmli18n-tmp.h:5738 src/xml/xmli18n-tmp.h:5742
+#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5759
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5770
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5807
+#: src/xml/xmli18n-tmp.h:5811 src/xml/xmli18n-tmp.h:5817
+#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5828
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5843
 msgid "Cyan"
 msgstr ""
 
@@ -730,56 +891,208 @@ msgstr ""
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
 #: src/escputil/escputil.c:998 src/escputil/escputil.c:1018
-#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:1813
-#: src/xml/xmli18n-tmp.h:1824 src/xml/xmli18n-tmp.h:1837
-#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1864
-#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1890
-#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1919
-#: src/xml/xmli18n-tmp.h:1935 src/xml/xmli18n-tmp.h:1950
-#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1976
-#: src/xml/xmli18n-tmp.h:1988 src/xml/xmli18n-tmp.h:2000
-#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2028
-#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2052
-#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2077
-#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2103
-#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2131
-#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2157
-#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2185
-#: src/xml/xmli18n-tmp.h:2198 src/xml/xmli18n-tmp.h:2211
-#: src/xml/xmli18n-tmp.h:2224 src/xml/xmli18n-tmp.h:2237
-#: src/xml/xmli18n-tmp.h:2250 src/xml/xmli18n-tmp.h:2263
-#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2291
-#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2321
-#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2344
-#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2370
-#: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2393
-#: src/xml/xmli18n-tmp.h:2405 src/xml/xmli18n-tmp.h:2416
-#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2443
-#: src/xml/xmli18n-tmp.h:2455 src/xml/xmli18n-tmp.h:2467
-#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2497
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2523
-#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2575
-#: src/xml/xmli18n-tmp.h:2587 src/xml/xmli18n-tmp.h:2599
-#: src/xml/xmli18n-tmp.h:2611 src/xml/xmli18n-tmp.h:2624
-#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
-#: src/xml/xmli18n-tmp.h:2670 src/xml/xmli18n-tmp.h:2684
-#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2714
-#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2747
-#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2780
-#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
-#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2829
-#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2855
-#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2882
-#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2914
-#: src/xml/xmli18n-tmp.h:2931 src/xml/xmli18n-tmp.h:2944
-#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2975
-#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:3005
-#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3033
-#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3060
-#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3094
-#: src/xml/xmli18n-tmp.h:3108 src/xml/xmli18n-tmp.h:3124
-#: src/xml/xmli18n-tmp.h:3140
+#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2361
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2388
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2414
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2459 src/xml/xmli18n-tmp.h:2474
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2512 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2552
+#: src/xml/xmli18n-tmp.h:2564 src/xml/xmli18n-tmp.h:2576
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2787
+#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2815
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2868
+#: src/xml/xmli18n-tmp.h:2881 src/xml/xmli18n-tmp.h:2894
+#: src/xml/xmli18n-tmp.h:2905 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:2967
+#: src/xml/xmli18n-tmp.h:2979 src/xml/xmli18n-tmp.h:2991
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3062 src/xml/xmli18n-tmp.h:3074
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3099
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3135 src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:3163 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3353
+#: src/xml/xmli18n-tmp.h:3365 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
+#: src/xml/xmli18n-tmp.h:3420 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3542 src/xml/xmli18n-tmp.h:3556
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3600 src/xml/xmli18n-tmp.h:3617
+#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3647
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3751 src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:3784 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3795 src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:3806 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3837 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3903 src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3939 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3960 src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:3972 src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:3984 src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:3999 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:4039 src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:4104 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:4170 src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4194 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:4230 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:4276 src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4311 src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4338 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:4401 src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:4427 src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:4442 src/xml/xmli18n-tmp.h:4451
+#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4464
+#: src/xml/xmli18n-tmp.h:4470 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4486 src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:4511 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:4809 src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4909 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:5007 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5018 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5111 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5123 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5148 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:5240 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5250 src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:5261 src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5301
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5313
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5349
+#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5401
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5441
+#: src/xml/xmli18n-tmp.h:5453 src/xml/xmli18n-tmp.h:5458
+#: src/xml/xmli18n-tmp.h:5463 src/xml/xmli18n-tmp.h:5470
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5496 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5527
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5552 src/xml/xmli18n-tmp.h:5558
+#: src/xml/xmli18n-tmp.h:5564 src/xml/xmli18n-tmp.h:5568
+#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5593
+#: src/xml/xmli18n-tmp.h:5598 src/xml/xmli18n-tmp.h:5616
+#: src/xml/xmli18n-tmp.h:5620 src/xml/xmli18n-tmp.h:5626
+#: src/xml/xmli18n-tmp.h:5631 src/xml/xmli18n-tmp.h:5651
+#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
+#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5674
+#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5720
+#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5733
+#: src/xml/xmli18n-tmp.h:5739 src/xml/xmli18n-tmp.h:5743
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5818
+#: src/xml/xmli18n-tmp.h:5823 src/xml/xmli18n-tmp.h:5829
+#: src/xml/xmli18n-tmp.h:5833 src/xml/xmli18n-tmp.h:5839
+#: src/xml/xmli18n-tmp.h:5844
 msgid "Magenta"
 msgstr ""
 
@@ -789,56 +1102,208 @@ msgstr ""
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
 #: src/escputil/escputil.c:999 src/escputil/escputil.c:1019
-#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:1814
-#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
-#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1865
-#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1891
-#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1920
-#: src/xml/xmli18n-tmp.h:1936 src/xml/xmli18n-tmp.h:1951
-#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1977
-#: src/xml/xmli18n-tmp.h:1989 src/xml/xmli18n-tmp.h:2001
-#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2029
-#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2053
-#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2078
-#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2104
-#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
-#: src/xml/xmli18n-tmp.h:2145 src/xml/xmli18n-tmp.h:2158
-#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2186
-#: src/xml/xmli18n-tmp.h:2199 src/xml/xmli18n-tmp.h:2212
-#: src/xml/xmli18n-tmp.h:2225 src/xml/xmli18n-tmp.h:2238
-#: src/xml/xmli18n-tmp.h:2251 src/xml/xmli18n-tmp.h:2264
-#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2292
-#: src/xml/xmli18n-tmp.h:2307 src/xml/xmli18n-tmp.h:2322
-#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
-#: src/xml/xmli18n-tmp.h:2358 src/xml/xmli18n-tmp.h:2371
-#: src/xml/xmli18n-tmp.h:2382 src/xml/xmli18n-tmp.h:2394
-#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2417
-#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2444
-#: src/xml/xmli18n-tmp.h:2456 src/xml/xmli18n-tmp.h:2468
-#: src/xml/xmli18n-tmp.h:2483 src/xml/xmli18n-tmp.h:2498
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2524
-#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2551
-#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2576
-#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
-#: src/xml/xmli18n-tmp.h:2612 src/xml/xmli18n-tmp.h:2625
-#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2651
-#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2685
-#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2713
-#: src/xml/xmli18n-tmp.h:2734 src/xml/xmli18n-tmp.h:2749
-#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2779
-#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2805
-#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2830
-#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2856
-#: src/xml/xmli18n-tmp.h:2871 src/xml/xmli18n-tmp.h:2883
-#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2910
-#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2945
-#: src/xml/xmli18n-tmp.h:2960 src/xml/xmli18n-tmp.h:2974
-#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3006
-#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3034
-#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3061
-#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3095
-#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3120
-#: src/xml/xmli18n-tmp.h:3136
+#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2389
+#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2444
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2475
+#: src/xml/xmli18n-tmp.h:2488 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2513 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2565 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2602
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2762
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2788
+#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2816
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2846
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2906 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3022
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3048
+#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3075
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3124
+#: src/xml/xmli18n-tmp.h:3136 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3175
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3315 src/xml/xmli18n-tmp.h:3329
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3433
+#: src/xml/xmli18n-tmp.h:3455 src/xml/xmli18n-tmp.h:3468
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3497
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3601 src/xml/xmli18n-tmp.h:3618
+#: src/xml/xmli18n-tmp.h:3632 src/xml/xmli18n-tmp.h:3643
+#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3747 src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3834 src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:3844 src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:3867 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:3900 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3910 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3935 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:3967 src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:3979 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4005 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4062 src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4110 src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:4124 src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4167 src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:4272 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:4321 src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:4334 src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4367 src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4471
+#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4505 src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4549 src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:4562 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4580 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4602 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:4678 src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:4691 src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4770 src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4893 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4904 src/xml/xmli18n-tmp.h:4911
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:4971 src/xml/xmli18n-tmp.h:4978
+#: src/xml/xmli18n-tmp.h:5004 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5050 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5071 src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:5097 src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:5142 src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:5169 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5184
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5257 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5318
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5358
+#: src/xml/xmli18n-tmp.h:5364 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5385
+#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5438
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5454
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5465
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5511
+#: src/xml/xmli18n-tmp.h:5516 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5547 src/xml/xmli18n-tmp.h:5554
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5584 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5617 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5632
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5687
+#: src/xml/xmli18n-tmp.h:5692 src/xml/xmli18n-tmp.h:5698
+#: src/xml/xmli18n-tmp.h:5705 src/xml/xmli18n-tmp.h:5713
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5729
+#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
+#: src/xml/xmli18n-tmp.h:5744 src/xml/xmli18n-tmp.h:5756
+#: src/xml/xmli18n-tmp.h:5761 src/xml/xmli18n-tmp.h:5767
+#: src/xml/xmli18n-tmp.h:5774 src/xml/xmli18n-tmp.h:5782
+#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5792
+#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5803
+#: src/xml/xmli18n-tmp.h:5809 src/xml/xmli18n-tmp.h:5813
+#: src/xml/xmli18n-tmp.h:5819 src/xml/xmli18n-tmp.h:5824
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5845
 msgid "Yellow"
 msgstr ""
 
@@ -848,9 +1313,17 @@ msgstr ""
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
 #: src/escputil/escputil.c:1006 src/escputil/escputil.c:1025
-#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2700
-#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2795
-#: src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:4041 src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:4056 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4091 src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:4155 src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5155
 msgid "Red"
 msgstr ""
 
@@ -868,8 +1341,13 @@ msgstr ""
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
 #: src/escputil/escputil.c:1007 src/escputil/escputil.c:1026
-#: src/xml/xmli18n-tmp.h:2657 src/xml/xmli18n-tmp.h:2701
-#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4051 src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:4084 src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:5156
 msgid "Blue"
 msgstr ""
 
@@ -880,53 +1358,183 @@ msgstr ""
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
 #: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1016 src/escputil/escputil.c:1285
-#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
-#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
-#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1875
-#: src/xml/xmli18n-tmp.h:1888 src/xml/xmli18n-tmp.h:1901
-#: src/xml/xmli18n-tmp.h:1917 src/xml/xmli18n-tmp.h:1933
-#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1961
-#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1986
-#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2012
-#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2038
-#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2063
-#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2090
-#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2115
-#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2142
-#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2169
-#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
-#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
-#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2248
-#: src/xml/xmli18n-tmp.h:2261 src/xml/xmli18n-tmp.h:2274
-#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2304
-#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2331
-#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
-#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
-#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2403
-#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2420
-#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2441
-#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2465
-#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2495
-#: src/xml/xmli18n-tmp.h:2508 src/xml/xmli18n-tmp.h:2521
-#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
-#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2573
-#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2597
-#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2622
-#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2672
-#: src/xml/xmli18n-tmp.h:2682 src/xml/xmli18n-tmp.h:2731
-#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2764
-#: src/xml/xmli18n-tmp.h:2781 src/xml/xmli18n-tmp.h:2794
-#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2815
-#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2839
-#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2868
-#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2894
-#: src/xml/xmli18n-tmp.h:2911 src/xml/xmli18n-tmp.h:2929
-#: src/xml/xmli18n-tmp.h:2942 src/xml/xmli18n-tmp.h:2977
-#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:3003
-#: src/xml/xmli18n-tmp.h:3017 src/xml/xmli18n-tmp.h:3031
-#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3079
-#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3110
-#: src/xml/xmli18n-tmp.h:3121 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2372
+#: src/xml/xmli18n-tmp.h:2386 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2457
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2510
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2536
+#: src/xml/xmli18n-tmp.h:2550 src/xml/xmli18n-tmp.h:2562
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2599 src/xml/xmli18n-tmp.h:2614
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2639
+#: src/xml/xmli18n-tmp.h:2653 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2965
+#: src/xml/xmli18n-tmp.h:2977 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3019
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3060 src/xml/xmli18n-tmp.h:3072
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3133 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3196
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3526
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3680 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3755 src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:3804 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3819 src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:3831 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3846 src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3873 src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:3924 src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:3943 src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:4022 src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4059 src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:4142 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4164 src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:4179 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:4255 src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4289 src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:4308 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4413 src/xml/xmli18n-tmp.h:4420
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4455
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4507 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:4565 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:4604 src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:4702 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:4733 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:4786 src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4920 src/xml/xmli18n-tmp.h:4926
+#: src/xml/xmli18n-tmp.h:4934 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:4973 src/xml/xmli18n-tmp.h:4981
+#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:4993
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:5047 src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5151
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5186
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5223 src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5270
+#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5284
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5320
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5337
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5375
+#: src/xml/xmli18n-tmp.h:5378 src/xml/xmli18n-tmp.h:5380
+#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5435
+#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5447
+#: src/xml/xmli18n-tmp.h:5449 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5474
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5492
+#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5571
+#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5590
+#: src/xml/xmli18n-tmp.h:5596 src/xml/xmli18n-tmp.h:5602
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5614
+#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5629
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5655
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5680 src/xml/xmli18n-tmp.h:5682
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5700
+#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5716
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5749
+#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5769 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5794
+#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5806
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5836
+#: src/xml/xmli18n-tmp.h:5842
 msgid "Black"
 msgstr ""
 
@@ -934,7 +1542,7 @@ msgstr ""
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1769
+#: src/main/print-color.c:322 src/main/print-olympus.c:1935
 msgid "Cyan Balance"
 msgstr ""
 
@@ -947,7 +1555,7 @@ msgstr ""
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1777
+#: src/main/print-color.c:330 src/main/print-olympus.c:1943
 msgid "Magenta Balance"
 msgstr ""
 
@@ -955,7 +1563,7 @@ msgstr ""
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1785
+#: src/main/print-color.c:338 src/main/print-olympus.c:1951
 msgid "Yellow Balance"
 msgstr ""
 
@@ -980,11 +1588,11 @@ msgstr ""
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
-#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
-#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
-#: src/main/print-escp2.c:759
+#: src/main/print-escp2.c:344 src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356 src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368 src/main/print-escp2.c:374
+#: src/main/print-escp2.c:869 src/main/print-escp2.c:877
+#: src/main/print-escp2.c:885
 msgid "Advanced Output Control"
 msgstr ""
 
@@ -992,27 +1600,27 @@ msgstr ""
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:743
+#: src/main/print-color.c:365 src/main/print-escp2.c:869
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:744
+#: src/main/print-color.c:366 src/main/print-escp2.c:870
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:751
+#: src/main/print-color.c:373 src/main/print-escp2.c:877
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:752
+#: src/main/print-color.c:374 src/main/print-escp2.c:878
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:759
+#: src/main/print-color.c:381 src/main/print-escp2.c:885
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:760
+#: src/main/print-color.c:382 src/main/print-escp2.c:886
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -1261,11 +1869,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1906
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1907
 msgid "Print without borders"
 msgstr ""
 
@@ -1278,7 +1886,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:266 src/main/print-escp2.c:267
-#: src/cups/genppd.c:1567 src/cups/genppd.c:2078
+#: src/cups/genppd.c:1600 src/cups/genppd.c:2112
 msgid "Output Order"
 msgstr ""
 
@@ -1319,334 +1927,430 @@ msgid "Has multiple choices of ink cartridges"
 msgstr ""
 
 #: src/main/print-escp2.c:320 src/main/print-escp2.c:321
+msgid "Raw Channel Names"
+msgstr ""
+
+#: src/main/print-escp2.c:326 src/main/print-escp2.c:327
 msgid "Channel Names"
 msgstr ""
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:339
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:344
 msgid "Cyan Map"
 msgstr ""
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:345
 msgid "Adjust the cyan map"
 msgstr ""
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350
 msgid "Magenta Map"
 msgstr ""
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:351
 msgid "Adjust the magenta map"
 msgstr ""
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356
 msgid "Yellow Map"
 msgstr ""
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:357
 msgid "Adjust the yellow map"
 msgstr ""
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362
 msgid "Blue Map"
 msgstr ""
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:363
 msgid "Adjust the blue map"
 msgstr ""
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368
 msgid "Orange Map"
 msgstr ""
 
-#: src/main/print-escp2.c:363
+#: src/main/print-escp2.c:369
 msgid "Adjust the orange map"
 msgstr ""
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:374
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:369
+#: src/main/print-escp2.c:375
 msgid "Adjust the red map"
 msgstr ""
 
-#: src/main/print-escp2.c:471
+#: src/main/print-escp2.c:477
 msgid "Red Density"
 msgstr ""
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:478
 msgid "Adjust the red density"
 msgstr ""
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:485
 msgid "Blue Density"
 msgstr ""
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:486
 msgid "Adjust the blue density"
 msgstr ""
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:493
 msgid "Orange Density"
 msgstr ""
 
-#: src/main/print-escp2.c:488
+#: src/main/print-escp2.c:494
 msgid "Adjust the orange density"
 msgstr ""
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:501
 msgid "Gloss Level"
 msgstr ""
 
-#: src/main/print-escp2.c:496
+#: src/main/print-escp2.c:502
 msgid "Adjust the gloss level"
 msgstr ""
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:509
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:504
+#: src/main/print-escp2.c:510
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:517
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:512
+#: src/main/print-escp2.c:518
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:525
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:520
+#: src/main/print-escp2.c:526
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:534
 msgid "Light Cyan Value"
 msgstr ""
 
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:550
 msgid "Light Cyan Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
+#: src/main/print-escp2.c:557 src/main/print-escp2.c:558
 msgid "Light Magenta Value"
 msgstr ""
 
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:566
 msgid "Light Magenta Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:582
 msgid "Dark Yellow Value"
 msgstr ""
 
-#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
+#: src/main/print-escp2.c:589 src/main/print-escp2.c:590
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:598
 msgid "Dark Yellow Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
+#: src/main/print-escp2.c:605 src/main/print-escp2.c:606
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:630
 msgid "Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
-#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:614
+#: src/main/print-escp2.c:637 src/main/print-escp2.c:638
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
+#: src/main/print-escp2.c:621 src/main/print-escp2.c:622
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:646
 msgid "Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
+#: src/main/print-escp2.c:653 src/main/print-escp2.c:654
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:726
 msgid "Light Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
-#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:662
+#: src/main/print-escp2.c:733 src/main/print-escp2.c:734
 msgid "Light Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
-#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
+#: src/main/print-escp2.c:669 src/main/print-escp2.c:670
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:742
 msgid "Light Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:678
 msgid "Dark Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
+#: src/main/print-escp2.c:685 src/main/print-escp2.c:686
 msgid "Dark Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:694
 msgid "Dark Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:701
 msgid "Mid Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:696
+#: src/main/print-escp2.c:702
 msgid "Medium Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:709
 msgid "Mid Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:704
+#: src/main/print-escp2.c:710
 msgid "Medium Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:717
 msgid "Mid Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:712
+#: src/main/print-escp2.c:718
 msgid "Medium Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:767
+#: src/main/print-escp2.c:749
+msgid "Hextone Gray 5 Value"
+msgstr ""
+
+#: src/main/print-escp2.c:750
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:757
+msgid "Hextone Gray 5 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:758
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:765
+msgid "Hextone Gray 5 Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:766
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:774
+msgid "Hextone Gray 4 Value"
+msgstr ""
+
+#: src/main/print-escp2.c:781 src/main/print-escp2.c:782
+msgid "Hextone Gray 4 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:790
+msgid "Hextone Gray 4 Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:797 src/main/print-escp2.c:798
+msgid "Hextone Gray 3 Value"
+msgstr ""
+
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:806
+msgid "Hextone Gray 3 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:813 src/main/print-escp2.c:814
+msgid "Hextone Gray 3 Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:822
+msgid "Hextone Gray 2 Value"
+msgstr ""
+
+#: src/main/print-escp2.c:829 src/main/print-escp2.c:830
+msgid "Hextone Gray 2 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:838
+msgid "Hextone Gray 2 Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:845
+msgid "Hextone Gray 1 Value"
+msgstr ""
+
+#: src/main/print-escp2.c:846
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:853
+msgid "Hextone Gray 1 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:854
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:861
+msgid "Hextone Gray 1 Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:862
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:893
 msgid "Drying Time Per Page"
 msgstr ""
 
-#: src/main/print-escp2.c:768
+#: src/main/print-escp2.c:894
 msgid "Set drying time per page"
 msgstr ""
 
-#: src/main/print-escp2.c:775
+#: src/main/print-escp2.c:901
 msgid "Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:776
+#: src/main/print-escp2.c:902
 msgid "Set drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:783
+#: src/main/print-escp2.c:909
 msgid "Minimum Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:784
+#: src/main/print-escp2.c:910
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:799
+#: src/main/print-escp2.c:925
+msgid "Quality Enhancement"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Enhance print quality by additional passes"
+msgstr ""
+
+#: src/main/print-escp2.c:933
 msgid "Paper Thickness"
 msgstr ""
 
-#: src/main/print-escp2.c:800
+#: src/main/print-escp2.c:934
 msgid "Set printer paper thickness"
 msgstr ""
 
-#: src/main/print-escp2.c:807
+#: src/main/print-escp2.c:941
 msgid "Vacuum Intensity"
 msgstr ""
 
-#: src/main/print-escp2.c:808
+#: src/main/print-escp2.c:942
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:815
+#: src/main/print-escp2.c:949
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:816
+#: src/main/print-escp2.c:950
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:823
+#: src/main/print-escp2.c:957
 msgid "Print Method"
 msgstr ""
 
-#: src/main/print-escp2.c:824
+#: src/main/print-escp2.c:958
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:831
+#: src/main/print-escp2.c:965
 msgid "Platen Gap"
 msgstr ""
 
-#: src/main/print-escp2.c:832
+#: src/main/print-escp2.c:966
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:839
+#: src/main/print-escp2.c:973
 msgid "Feed Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:840
-#, c-format
+#: src/main/print-escp2.c:975
+#, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:1992
+#: src/main/print-escp2.c:2197
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1994
+#: src/main/print-escp2.c:2199
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2208 src/cups/genppd.c:1484 src/cups/genppd.c:2059
+#: src/main/print-escp2.c:2413 src/cups/genppd.c:1517 src/cups/genppd.c:2093
 msgid "Automatic"
 msgstr ""
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2415
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2417
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:2243
+#: src/main/print-escp2.c:2448
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2450
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2452
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2454
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2456
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2287
+#: src/main/print-escp2.c:2492
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:2858
+#: src/main/print-escp2.c:3100
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:4107 src/main/print-olympus.c:2472
+#: src/main/print-escp2.c:4355 src/main/print-olympus.c:2641
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1700,361 +2404,378 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3205
-#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3217
-#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3233
-#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3255
-#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3276
-#: src/xml/xmli18n-tmp.h:3288 src/xml/xmli18n-tmp.h:3295
-#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3315
-#: src/xml/xmli18n-tmp.h:3327 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3368
-#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3380
-#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
-#: src/xml/xmli18n-tmp.h:3412 src/xml/xmli18n-tmp.h:3424
-#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3444
-#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3472
-#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3496
-#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3521
-#: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3544
-#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3556
-#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3581
-#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3598
-#: src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3754 src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:3809 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3863 src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:4058 src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:4163 src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:4227 src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:4335 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4467 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4594 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:4879 src/xml/xmli18n-tmp.h:4946
+#: src/xml/xmli18n-tmp.h:5000 src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:5243 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5365 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5512 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5667 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5784 src/xml/xmli18n-tmp.h:5805
+#: src/xml/xmli18n-tmp.h:5826
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3206
-#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3218
-#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3234
-#: src/xml/xmli18n-tmp.h:3244 src/xml/xmli18n-tmp.h:3251
-#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3268
-#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3289
-#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3306
-#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
-#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3354
-#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3377
-#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3389
-#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3413
-#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3435
-#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3455
-#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3485
-#: src/xml/xmli18n-tmp.h:3497 src/xml/xmli18n-tmp.h:3508
-#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3537
-#: src/xml/xmli18n-tmp.h:3545 src/xml/xmli18n-tmp.h:3549
-#: src/xml/xmli18n-tmp.h:3557 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3593
-#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3605
+#: src/xml/xmli18n-tmp.h:3759 src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3868 src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:4002 src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:4107 src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4472
+#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4817 src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5181 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5315 src/xml/xmli18n-tmp.h:5370
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5672
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5831
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3241
-#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3265
-#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3286
-#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
-#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3351
-#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3374
-#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3398
-#: src/xml/xmli18n-tmp.h:3410 src/xml/xmli18n-tmp.h:3422
-#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3452
-#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3470
-#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3494
-#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3519
-#: src/xml/xmli18n-tmp.h:3534 src/xml/xmli18n-tmp.h:3542
-#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3741 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4086 src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4933
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5421
+#: src/xml/xmli18n-tmp.h:5499 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5723
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3242
-#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3266
-#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3287
-#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3326
-#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3352
-#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3375
-#: src/xml/xmli18n-tmp.h:3387 src/xml/xmli18n-tmp.h:3399
-#: src/xml/xmli18n-tmp.h:3411 src/xml/xmli18n-tmp.h:3423
-#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3453
-#: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3483
-#: src/xml/xmli18n-tmp.h:3495 src/xml/xmli18n-tmp.h:3506
-#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3535
-#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3566
-#: src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3748 src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:3989 src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:4094 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4267 src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4940
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5661
+#: src/xml/xmli18n-tmp.h:5730
 msgid "Five Color Photo Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
-#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
-#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
-#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
-#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
-#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
-#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
-#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
-#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:849
-#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:963
-#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1077
-#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1170
-#: src/xml/xmli18n-tmp.h:1220 src/xml/xmli18n-tmp.h:1277
-#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1376
-#: src/xml/xmli18n-tmp.h:1439 src/xml/xmli18n-tmp.h:1502
-#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1619
-#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1739
-#: src/xml/xmli18n-tmp.h:1773
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1050
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1240
+#: src/xml/xmli18n-tmp.h:1335 src/xml/xmli18n-tmp.h:1449
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1580
+#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1862
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2200 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2297
 msgid "Plain Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
-#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
-#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
-#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
-#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
-#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
-#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
-#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
-#: src/xml/xmli18n-tmp.h:819 src/xml/xmli18n-tmp.h:858
-#: src/xml/xmli18n-tmp.h:915 src/xml/xmli18n-tmp.h:972
-#: src/xml/xmli18n-tmp.h:1029 src/xml/xmli18n-tmp.h:1086
-#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1176
-#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1286
-#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1385
-#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1508
-#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1628
-#: src/xml/xmli18n-tmp.h:1685 src/xml/xmli18n-tmp.h:1743
-#: src/xml/xmli18n-tmp.h:1779
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:101 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:365 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1160 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1740
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1871
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2136
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2267
+#: src/xml/xmli18n-tmp.h:2303
 msgid "Glossy Film"
 msgstr ""
 
-#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
-#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
-#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
-#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
-#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
-#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
-#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
-#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
-#: src/xml/xmli18n-tmp.h:821 src/xml/xmli18n-tmp.h:861
-#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:975
-#: src/xml/xmli18n-tmp.h:1032 src/xml/xmli18n-tmp.h:1089
-#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1178
-#: src/xml/xmli18n-tmp.h:1232 src/xml/xmli18n-tmp.h:1289
-#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1388
-#: src/xml/xmli18n-tmp.h:1451 src/xml/xmli18n-tmp.h:1511
-#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1631
-#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1745
-#: src/xml/xmli18n-tmp.h:1781
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:845 src/xml/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:965 src/xml/xmli18n-tmp.h:1022
+#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1359
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1550
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1745 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2305
 msgid "Transparencies"
 msgstr ""
 
-#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
-#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
-#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
-#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
-#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
-#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
-#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
-#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
-#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:823
-#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:921
-#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:1035
-#: src/xml/xmli18n-tmp.h:1092 src/xml/xmli18n-tmp.h:1142
-#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1235
-#: src/xml/xmli18n-tmp.h:1292 src/xml/xmli18n-tmp.h:1344
-#: src/xml/xmli18n-tmp.h:1391 src/xml/xmli18n-tmp.h:1454
-#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1577
-#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1691
-#: src/xml/xmli18n-tmp.h:1747 src/xml/xmli18n-tmp.h:1783
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:55 src/xml/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:151 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1024
+#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2215
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2307
 msgid "Envelopes"
 msgstr ""
 
-#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
-#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
-#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
-#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
-#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
-#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
-#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
-#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
-#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:827
-#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:927
-#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:1041
-#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1146
-#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1241
-#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1348
-#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1460
-#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1583
-#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1697
-#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1787
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:1028
+#: src/xml/xmli18n-tmp.h:1085 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1275 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1556
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1665
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1834
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2076
+#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2311
 msgid "Matte Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
-#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
-#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
-#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
-#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
-#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
-#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
-#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
-#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:831
-#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:933
-#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:1047
-#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1150
-#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1247
-#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1352
-#: src/xml/xmli18n-tmp.h:1403 src/xml/xmli18n-tmp.h:1466
-#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1589
-#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1703
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1791
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:167 src/xml/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:569
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1032
+#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1285 src/xml/xmli18n-tmp.h:1389
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1675
+#: src/xml/xmli18n-tmp.h:1770 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1889 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2012 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2227
+#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2315
 msgid "Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
-#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
-#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
-#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
-#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
-#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
-#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
-#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
-#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:833
-#: src/xml/xmli18n-tmp.h:879 src/xml/xmli18n-tmp.h:936
-#: src/xml/xmli18n-tmp.h:993 src/xml/xmli18n-tmp.h:1050
-#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1152
-#: src/xml/xmli18n-tmp.h:1190 src/xml/xmli18n-tmp.h:1250
-#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1354
-#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1469
-#: src/xml/xmli18n-tmp.h:1529 src/xml/xmli18n-tmp.h:1592
-#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1706
-#: src/xml/xmli18n-tmp.h:1757 src/xml/xmli18n-tmp.h:1793
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:425 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:512 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1034
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1499 src/xml/xmli18n-tmp.h:1562
+#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1775 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1955
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2088
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2317
 msgid "Photo Quality Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
-#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
-#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
-#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
-#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
-#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
-#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
-#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
-#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:835
-#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:939
-#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:1053
-#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1154
-#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1253
-#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1356
-#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1472
-#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1595
-#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1709
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1795
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1036
+#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1200
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1504 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1842
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2233
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2319
 msgid "Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
-#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
-#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
-#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
-#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
-#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
-#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
-#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
-#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:837
-#: src/xml/xmli18n-tmp.h:885 src/xml/xmli18n-tmp.h:942
-#: src/xml/xmli18n-tmp.h:999 src/xml/xmli18n-tmp.h:1056
-#: src/xml/xmli18n-tmp.h:1113 src/xml/xmli18n-tmp.h:1156
-#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1212
-#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1256
-#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1358
-#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1475
-#: src/xml/xmli18n-tmp.h:1535 src/xml/xmli18n-tmp.h:1598
-#: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1712
-#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1797
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:179 src/xml/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:518 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:869 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1038
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1407
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1566
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1622
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1844
+#: src/xml/xmli18n-tmp.h:1898 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2321
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
-#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
-#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
-#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
-#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
-#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
-#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
-#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
-#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:841
-#: src/xml/xmli18n-tmp.h:891 src/xml/xmli18n-tmp.h:948
-#: src/xml/xmli18n-tmp.h:1005 src/xml/xmli18n-tmp.h:1062
-#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1160
-#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1262
-#: src/xml/xmli18n-tmp.h:1319 src/xml/xmli18n-tmp.h:1362
-#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1481
-#: src/xml/xmli18n-tmp.h:1541 src/xml/xmli18n-tmp.h:1604
-#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1718
-#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1801
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1042
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1419
+#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1570
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2027 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2242
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2325
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
-#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
-#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
-#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
-#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
-#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
-#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
-#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
-#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:843
-#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:951
-#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1065
-#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1162
-#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1265
-#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1368
-#: src/xml/xmli18n-tmp.h:1427 src/xml/xmli18n-tmp.h:1490
-#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1607
-#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1727
-#: src/xml/xmli18n-tmp.h:1767 src/xml/xmli18n-tmp.h:1803
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:91 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:191 src/xml/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:439 src/xml/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:787 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1044
+#: src/xml/xmli18n-tmp.h:1125 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1315 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1854
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2327
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
-#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
-#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
-#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
-#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
-#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
-#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
-#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:897
-#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:1011
-#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1125
-#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1206
-#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1325
-#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1430
-#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1553
-#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1667
-#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1805
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1130
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1320
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1616
+#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1856 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2329
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
-#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
-#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
-#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
-#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
-#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
-#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
-#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
-#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:847
-#: src/xml/xmli18n-tmp.h:903 src/xml/xmli18n-tmp.h:960
-#: src/xml/xmli18n-tmp.h:1017 src/xml/xmli18n-tmp.h:1074
-#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1168
-#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1214
-#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1274
-#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1374
-#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1499
-#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1616
-#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1736
-#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1809
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:129
+#: src/xml/xmli18n-tmp.h:203 src/xml/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:542 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1048
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1443
+#: src/xml/xmli18n-tmp.h:1539 src/xml/xmli18n-tmp.h:1578
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1720
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1985
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2333
 msgid "Other"
 msgstr ""
 
@@ -2070,52 +2791,56 @@ msgstr ""
 msgid "Manual without Pause"
 msgstr ""
 
-#: src/main/print-olympus.c:279
+#: src/main/print-olympus.c:281
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:280 src/cups/genppd.c:1685 src/cups/genppd.c:1713
-#: src/cups/genppd.c:1745 src/cups/genppd.c:1800 src/cups/genppd.c:1846
-#: src/cups/genppd.c:2147 src/cups/genppd.c:2160 src/cups/genppd.c:2183
-#: src/cups/genppd.c:2204 src/cups/genppd.c:2221
+#: src/main/print-olympus.c:282 src/cups/genppd.c:1718 src/cups/genppd.c:1746
+#: src/cups/genppd.c:1778 src/cups/genppd.c:1833 src/cups/genppd.c:1879
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2194 src/cups/genppd.c:2217
+#: src/cups/genppd.c:2238 src/cups/genppd.c:2255
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
-#: src/main/print-olympus.c:1132
+#: src/main/print-olympus.c:998 src/main/print-olympus.c:1061
+#: src/main/print-olympus.c:1165
 msgid "Glossy"
 msgstr ""
 
-#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
-#: src/main/print-olympus.c:1133
+#: src/main/print-olympus.c:999 src/main/print-olympus.c:1062
+#: src/main/print-olympus.c:1166
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
+#: src/main/print-olympus.c:1063 src/main/print-olympus.c:1167
 msgid "Matte"
 msgstr ""
 
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
+#. TRANSLATORS: 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.
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1901
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1770
+#: src/main/print-olympus.c:1936
 msgid "Adjust the cyan balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1778
+#: src/main/print-olympus.c:1944
 msgid "Adjust the magenta balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1952
 msgid "Adjust the yellow balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1793
+#: src/main/print-olympus.c:1959
 msgid "Black Balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1794
+#: src/main/print-olympus.c:1960
 msgid "Adjust the black balance"
 msgstr ""
 
@@ -2147,7 +2872,7 @@ msgstr ""
 msgid "Quick-dry Transparency"
 msgstr ""
 
-#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3687
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:5925
 msgid "Manual"
 msgstr ""
 
@@ -2232,23 +2957,23 @@ msgid "2400x600 DPI"
 msgstr ""
 
 #: src/main/print-pcl.c:278 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3638
-#: src/xml/xmli18n-tmp.h:3647 src/xml/xmli18n-tmp.h:3656
-#: src/xml/xmli18n-tmp.h:3664
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5875
+#: src/xml/xmli18n-tmp.h:5884 src/xml/xmli18n-tmp.h:5893
+#: src/xml/xmli18n-tmp.h:5901
 msgid "Draft"
 msgstr ""
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:3633 src/xml/xmli18n-tmp.h:3641
-#: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3658
-#: src/xml/xmli18n-tmp.h:3666
+#: src/xml/xmli18n-tmp.h:5870 src/xml/xmli18n-tmp.h:5878
+#: src/xml/xmli18n-tmp.h:5886 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5903
 msgid "High"
 msgstr ""
 
 #: src/main/print-pcl.c:282 src/main/print-pcl.c:283
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3634
-#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3650
-#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3667
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5896 src/xml/xmli18n-tmp.h:5904
 msgid "Photo"
 msgstr ""
 
@@ -2280,15 +3005,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3671
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:5908
 msgid "Letter"
 msgstr ""
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3708
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:5946
 msgid "A4"
 msgstr ""
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3823
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6061
 msgid "Custom"
 msgstr ""
 
@@ -2296,33 +3021,42 @@ msgstr ""
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3629
-#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3654
+#: src/main/print-weave.c:1511
+msgid "Fatal error!"
+msgstr ""
+
+#: src/main/print-weave.c:1547
+msgid ""
+"Please report the above information to gimp-print-devel@lists.sourceforge.net"
+msgstr ""
+
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:5866
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5891
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3630
-#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3655
-#: src/xml/xmli18n-tmp.h:3663
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5900
 msgid "Economy"
 msgstr ""
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3635
-#: src/xml/xmli18n-tmp.h:3642 src/xml/xmli18n-tmp.h:3651
-#: src/xml/xmli18n-tmp.h:3660 src/xml/xmli18n-tmp.h:3668
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:5872
+#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
 msgid "Super Photo"
 msgstr ""
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3636
-#: src/xml/xmli18n-tmp.h:3643 src/xml/xmli18n-tmp.h:3652
-#: src/xml/xmli18n-tmp.h:3661 src/xml/xmli18n-tmp.h:3669
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:5873
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5889
+#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5906
 msgid "Ultra Photo"
 msgstr ""
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1326 src/cups/genppd.c:1989
-#: src/xml/xmli18n-tmp.h:3637 src/xml/xmli18n-tmp.h:3644
-#: src/xml/xmli18n-tmp.h:3653 src/xml/xmli18n-tmp.h:3662
-#: src/xml/xmli18n-tmp.h:3670
+#: src/main/generic-options.c:41 src/cups/genppd.c:1359 src/cups/genppd.c:2023
+#: src/xml/xmli18n-tmp.h:5874 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5899
+#: src/xml/xmli18n-tmp.h:5907
 msgid "Best"
 msgstr ""
 
@@ -3015,77 +3749,77 @@ msgstr ""
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:960
+#: src/cups/genppd.c:993
 msgid "English"
 msgstr ""
 
-#: src/cups/genppd.c:1159 src/cups/genppd.c:1175 src/cups/genppd.c:1934
-#: src/cups/genppd.c:1935
+#: src/cups/genppd.c:1192 src/cups/genppd.c:1208 src/cups/genppd.c:1968
+#: src/cups/genppd.c:1969
 msgid "Media Size"
 msgstr ""
 
-#: src/cups/genppd.c:1248 src/cups/genppd.c:1970
+#: src/cups/genppd.c:1281 src/cups/genppd.c:2004
 msgid "Color Model"
 msgstr ""
 
-#: src/cups/genppd.c:1275 src/cups/genppd.c:1972
+#: src/cups/genppd.c:1308 src/cups/genppd.c:2006
 msgid "Inverted Grayscale"
 msgstr ""
 
-#: src/cups/genppd.c:1285 src/cups/genppd.c:1976
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2010
 msgid "RGB Color"
 msgstr ""
 
-#: src/cups/genppd.c:1292 src/cups/genppd.c:1977
+#: src/cups/genppd.c:1325 src/cups/genppd.c:2011
 msgid "CMY Color"
 msgstr ""
 
-#: src/cups/genppd.c:1317 src/cups/genppd.c:1987
+#: src/cups/genppd.c:1350 src/cups/genppd.c:2021
 msgid "Color Precision"
 msgstr ""
 
-#: src/cups/genppd.c:1573 src/cups/genppd.c:2080
+#: src/cups/genppd.c:1606 src/cups/genppd.c:2114
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:1590 src/cups/genppd.c:2096
+#: src/cups/genppd.c:1623 src/cups/genppd.c:2130
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:1615 src/cups/genppd.c:2113
+#: src/cups/genppd.c:1648 src/cups/genppd.c:2147
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1620 src/cups/genppd.c:2114
+#: src/cups/genppd.c:1653 src/cups/genppd.c:2148
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1621 src/cups/genppd.c:2115
+#: src/cups/genppd.c:1654 src/cups/genppd.c:2149
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1622 src/cups/genppd.c:2116
+#: src/cups/genppd.c:1655 src/cups/genppd.c:2150
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1716 src/cups/genppd.c:2162
+#: src/cups/genppd.c:1749 src/cups/genppd.c:2196
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1718 src/cups/genppd.c:2164
+#: src/cups/genppd.c:1751 src/cups/genppd.c:2198
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1757 src/cups/genppd.c:1820 src/cups/genppd.c:1864
-#: src/cups/genppd.c:2185 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+#: src/cups/genppd.c:1790 src/cups/genppd.c:1853 src/cups/genppd.c:1897
+#: src/cups/genppd.c:2219 src/cups/genppd.c:2249 src/cups/genppd.c:2266
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1762 src/cups/genppd.c:2189
+#: src/cups/genppd.c:1795 src/cups/genppd.c:2223
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/cups/genppd.c:1805 src/cups/genppd.c:2209
+#: src/cups/genppd.c:1838 src/cups/genppd.c:2243
 #, c-format
 msgid "%.1f mm"
 msgstr ""
@@ -3304,51 +4038,61 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:383
-#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
-#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
-#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
-#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
-#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
-#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
-#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
-#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
-#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
-#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
-#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
-#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
-#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
-#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
-#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
-#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
-#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
-#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
-#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
-#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
-#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
-#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
-#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
-#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
-#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
-#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
-#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
-#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
-#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
-#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1503
-#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1509
-#: src/xml/xmli18n-tmp.h:1512 src/xml/xmli18n-tmp.h:1515
-#: src/xml/xmli18n-tmp.h:1518 src/xml/xmli18n-tmp.h:1521
-#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1527
-#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
-#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
-#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
-#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
-#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
-#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:2655
-#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2717
-#: src/xml/xmli18n-tmp.h:3045 src/xml/xmli18n-tmp.h:3252
-#: src/xml/xmli18n-tmp.h:3273 src/xml/xmli18n-tmp.h:3363
-#: src/xml/xmli18n-tmp.h:3531
+#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2001
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2010 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2025
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:4085 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4612 src/xml/xmli18n-tmp.h:5481
 msgid "Photo Black"
 msgstr ""
 
@@ -3359,125 +4103,297 @@ msgid "Unknown"
 msgstr ""
 
 #: src/escputil/escputil.c:1000 src/escputil/escputil.c:1289
-#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1921
-#: src/xml/xmli18n-tmp.h:1937 src/xml/xmli18n-tmp.h:2002
-#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2079
-#: src/xml/xmli18n-tmp.h:2105 src/xml/xmli18n-tmp.h:2119
-#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2173
-#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
-#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
-#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2293
-#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2346
-#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2418
-#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2445
-#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2469
-#: src/xml/xmli18n-tmp.h:2484 src/xml/xmli18n-tmp.h:2512
-#: src/xml/xmli18n-tmp.h:2525 src/xml/xmli18n-tmp.h:2564
-#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2626
-#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2746
-#: src/xml/xmli18n-tmp.h:2762 src/xml/xmli18n-tmp.h:2843
-#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2895
-#: src/xml/xmli18n-tmp.h:2912 src/xml/xmli18n-tmp.h:2946
-#: src/xml/xmli18n-tmp.h:3001 src/xml/xmli18n-tmp.h:3015
-#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3122
-#: src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2461 src/xml/xmli18n-tmp.h:2526
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2683 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2711 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3101 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3661
+#: src/xml/xmli18n-tmp.h:3678 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3750 src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:3782 src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:3932 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3964 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4388 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:4639 src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:4875 src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4936
+#: src/xml/xmli18n-tmp.h:4942 src/xml/xmli18n-tmp.h:4968
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5339 src/xml/xmli18n-tmp.h:5348
+#: src/xml/xmli18n-tmp.h:5355 src/xml/xmli18n-tmp.h:5361
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5417
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5430
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5477 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5502
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5536 src/xml/xmli18n-tmp.h:5544
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5557
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5657 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5719
+#: src/xml/xmli18n-tmp.h:5726 src/xml/xmli18n-tmp.h:5732
+#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5779
 msgid "Light Cyan"
 msgstr ""
 
 #: src/escputil/escputil.c:1001 src/escputil/escputil.c:1290
-#: src/xml/xmli18n-tmp.h:1906 src/xml/xmli18n-tmp.h:1922
-#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:2003
-#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2080
-#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2120
-#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2174
-#: src/xml/xmli18n-tmp.h:2188 src/xml/xmli18n-tmp.h:2201
-#: src/xml/xmli18n-tmp.h:2214 src/xml/xmli18n-tmp.h:2227
-#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2294
-#: src/xml/xmli18n-tmp.h:2309 src/xml/xmli18n-tmp.h:2347
-#: src/xml/xmli18n-tmp.h:2360 src/xml/xmli18n-tmp.h:2419
-#: src/xml/xmli18n-tmp.h:2432 src/xml/xmli18n-tmp.h:2446
-#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2470
-#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2513
-#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2565
-#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2627
-#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2748
-#: src/xml/xmli18n-tmp.h:2761 src/xml/xmli18n-tmp.h:2844
-#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2896
-#: src/xml/xmli18n-tmp.h:2913 src/xml/xmli18n-tmp.h:2947
-#: src/xml/xmli18n-tmp.h:3000 src/xml/xmli18n-tmp.h:3014
-#: src/xml/xmli18n-tmp.h:3028 src/xml/xmli18n-tmp.h:3123
-#: src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2446
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2527
+#: src/xml/xmli18n-tmp.h:2541 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2644
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2698
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2751
+#: src/xml/xmli18n-tmp.h:2803 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2956 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2994
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3381
+#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3662
+#: src/xml/xmli18n-tmp.h:3746 src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:3778 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3934 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3966 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:4265 src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:4390 src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:4428 src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4452
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4465
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4512 src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4586 src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:4641 src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4903
+#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4970
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:5044 src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5168
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5241 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5334
+#: src/xml/xmli18n-tmp.h:5341 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5363
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5419
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5471
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5504
+#: src/xml/xmli18n-tmp.h:5510 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5652
+#: src/xml/xmli18n-tmp.h:5659 src/xml/xmli18n-tmp.h:5665
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5721
+#: src/xml/xmli18n-tmp.h:5728 src/xml/xmli18n-tmp.h:5734
+#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5781
 msgid "Light Magenta"
 msgstr ""
 
-#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2433
-#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:3002
-#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3030
+#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3679 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4409 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:4566 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4605 src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4664 src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5376 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5450
+#: src/xml/xmli18n-tmp.h:5475 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5533 src/xml/xmli18n-tmp.h:5542
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5678 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5717
+#: src/xml/xmli18n-tmp.h:5747 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5777
 msgid "Light Black"
 msgstr ""
 
-#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:384
-#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
-#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
-#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
-#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
-#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
-#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
-#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
-#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
-#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
-#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
-#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
-#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
-#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
-#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
-#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
-#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
-#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
-#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
-#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
-#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
-#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
-#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
-#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
-#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
-#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
-#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
-#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
-#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
-#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
-#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1504
-#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1510
-#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1516
-#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1522
-#: src/xml/xmli18n-tmp.h:1525 src/xml/xmli18n-tmp.h:1528
-#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1534
-#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1540
-#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1546
-#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1552
-#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1558
-#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:2654
-#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2716
-#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3264
-#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3371
-#: src/xml/xmli18n-tmp.h:3539
+#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:508 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:532 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:538 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:562 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:568 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
+#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
+#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
+#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
+#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
+#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
+#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
+#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
+#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
+#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
+#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
+#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2011 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2026
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2032
+#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2038
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:4044 src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:5530
 msgid "Matte Black"
 msgstr ""
 
-#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:2658
-#: src/xml/xmli18n-tmp.h:2702 src/xml/xmli18n-tmp.h:2720
-#: src/xml/xmli18n-tmp.h:3048
+#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3995 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4006 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4020 src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:4106 src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:2760
-#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3013
-#: src/xml/xmli18n-tmp.h:3027
+#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3676
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4616 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5534 src/xml/xmli18n-tmp.h:5573
 msgid "Light Light Black"
 msgstr ""
 
 #: src/escputil/escputil.c:1010 src/escputil/escputil.c:1029
-#: src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:4099 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4189
 msgid "Orange"
 msgstr ""
 
@@ -4027,7808 +4943,7918 @@ msgstr ""
 #: src/xml/xmli18n-tmp.h:68 src/xml/xmli18n-tmp.h:70 src/xml/xmli18n-tmp.h:72
 #: src/xml/xmli18n-tmp.h:74 src/xml/xmli18n-tmp.h:76 src/xml/xmli18n-tmp.h:78
 #: src/xml/xmli18n-tmp.h:80 src/xml/xmli18n-tmp.h:82 src/xml/xmli18n-tmp.h:84
-#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:92
-#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
-#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
-#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
-#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
-#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
-#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
-#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
-#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
-#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
-#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
-#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
-#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
-#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
-#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
-#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
-#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
-#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
-#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
-#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
-#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
-#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
-#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
-#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
-#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
-#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
-#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
-#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
-#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
-#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
-#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
-#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
-#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
-#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
-#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
-#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
-#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
-#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
-#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
-#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
-#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
-#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
-#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
-#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
-#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
-#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
-#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
-#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
-#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
-#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
-#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
-#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
-#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
-#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
-#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
-#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
-#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
-#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
-#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
-#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
-#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
-#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
-#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
-#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
-#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
-#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
-#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
-#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
-#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
-#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
-#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
-#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
-#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
-#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
-#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
-#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
-#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
-#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
-#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
-#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
-#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
-#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
-#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
-#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
-#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
-#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
-#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
-#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
-#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
-#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
-#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
-#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
-#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
-#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
-#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
-#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
-#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:92 src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:102 src/xml/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:106 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:114 src/xml/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:118 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:126 src/xml/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:130 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:136 src/xml/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:144 src/xml/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:168 src/xml/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:192 src/xml/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:216 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:232 src/xml/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:240 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:256 src/xml/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:264 src/xml/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:304 src/xml/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:312 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:320 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:328 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:336 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:344 src/xml/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:352 src/xml/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:384 src/xml/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:408 src/xml/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:412 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:432 src/xml/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:444 src/xml/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:448 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:468 src/xml/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:484 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:642 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:698 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:714 src/xml/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:722 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:738 src/xml/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:746 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:764 src/xml/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:780 src/xml/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:804 src/xml/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:814
 #: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:818
 #: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:822
 #: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:826
 #: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:830
-#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:834
-#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:838
-#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:842
-#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:846
-#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:850
-#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
-#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
-#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
-#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
-#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
-#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
-#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
-#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:898
-#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
-#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
-#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
-#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
-#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
-#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
-#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
-#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
-#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
-#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
-#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
-#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
-#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
-#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
-#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
-#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
-#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
-#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
-#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
-#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1018
-#: src/xml/xmli18n-tmp.h:1021 src/xml/xmli18n-tmp.h:1024
-#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1030
-#: src/xml/xmli18n-tmp.h:1033 src/xml/xmli18n-tmp.h:1036
-#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1042
-#: src/xml/xmli18n-tmp.h:1045 src/xml/xmli18n-tmp.h:1048
-#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1054
-#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1060
-#: src/xml/xmli18n-tmp.h:1063 src/xml/xmli18n-tmp.h:1066
-#: src/xml/xmli18n-tmp.h:1069 src/xml/xmli18n-tmp.h:1072
-#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1078
-#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1084
-#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1090
-#: src/xml/xmli18n-tmp.h:1093 src/xml/xmli18n-tmp.h:1096
-#: src/xml/xmli18n-tmp.h:1099 src/xml/xmli18n-tmp.h:1102
-#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1108
-#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1114
-#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1120
-#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1126
-#: src/xml/xmli18n-tmp.h:1129 src/xml/xmli18n-tmp.h:1132
-#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
-#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
-#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
-#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
-#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
-#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
-#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
-#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
-#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
-#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
-#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
-#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
-#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
-#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1189
-#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1193
-#: src/xml/xmli18n-tmp.h:1195 src/xml/xmli18n-tmp.h:1197
-#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1201
-#: src/xml/xmli18n-tmp.h:1203 src/xml/xmli18n-tmp.h:1205
-#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1209
-#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1221
-#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
-#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
-#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
-#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
-#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
-#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
-#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
-#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
-#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
-#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
-#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
-#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
-#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
-#: src/xml/xmli18n-tmp.h:1302 src/xml/xmli18n-tmp.h:1305
-#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1311
-#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1317
-#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1323
-#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1329
-#: src/xml/xmli18n-tmp.h:1332 src/xml/xmli18n-tmp.h:1335
-#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
-#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1343
-#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1347
-#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1351
-#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1355
-#: src/xml/xmli18n-tmp.h:1357 src/xml/xmli18n-tmp.h:1359
-#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1363
-#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1367
-#: src/xml/xmli18n-tmp.h:1369 src/xml/xmli18n-tmp.h:1371
-#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1375
-#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1566
-#: src/xml/xmli18n-tmp.h:1569 src/xml/xmli18n-tmp.h:1572
-#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1578
-#: src/xml/xmli18n-tmp.h:1581 src/xml/xmli18n-tmp.h:1584
-#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1590
-#: src/xml/xmli18n-tmp.h:1593 src/xml/xmli18n-tmp.h:1596
-#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1602
-#: src/xml/xmli18n-tmp.h:1605 src/xml/xmli18n-tmp.h:1608
-#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1614
-#: src/xml/xmli18n-tmp.h:1617 src/xml/xmli18n-tmp.h:1620
-#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1626
-#: src/xml/xmli18n-tmp.h:1629 src/xml/xmli18n-tmp.h:1632
-#: src/xml/xmli18n-tmp.h:1635 src/xml/xmli18n-tmp.h:1638
-#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1644
-#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
-#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
-#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
-#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
-#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
-#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
-#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
-#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
-#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
-#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
-#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
-#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
-#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
-#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
-#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:1778
-#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1782
-#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1786
-#: src/xml/xmli18n-tmp.h:1788 src/xml/xmli18n-tmp.h:1790
-#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1794
-#: src/xml/xmli18n-tmp.h:1796 src/xml/xmli18n-tmp.h:1798
-#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1802
-#: src/xml/xmli18n-tmp.h:1804 src/xml/xmli18n-tmp.h:1806
-#: src/xml/xmli18n-tmp.h:1808 src/xml/xmli18n-tmp.h:1810
-#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3204
-#: src/xml/xmli18n-tmp.h:3210 src/xml/xmli18n-tmp.h:3216
-#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3232
-#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3250
-#: src/xml/xmli18n-tmp.h:3294 src/xml/xmli18n-tmp.h:3302
-#: src/xml/xmli18n-tmp.h:3304 src/xml/xmli18n-tmp.h:3312
-#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3379
-#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
-#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3421
-#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3441
-#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3469
-#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3555
-#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3597
-#: src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:1017
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1025
+#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1035 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1047 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1056
+#: src/xml/xmli18n-tmp.h:1061 src/xml/xmli18n-tmp.h:1066
+#: src/xml/xmli18n-tmp.h:1071 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1086
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1096
+#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1116
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1126
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1136
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1161 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1181 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1206
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1216
+#: src/xml/xmli18n-tmp.h:1221 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1236
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1246
+#: src/xml/xmli18n-tmp.h:1251 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1261 src/xml/xmli18n-tmp.h:1266
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1281 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1291 src/xml/xmli18n-tmp.h:1296
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1311 src/xml/xmli18n-tmp.h:1316
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1326
+#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1336
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1378 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1414 src/xml/xmli18n-tmp.h:1420
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1432
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1450 src/xml/xmli18n-tmp.h:1455
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1465
+#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1480 src/xml/xmli18n-tmp.h:1485
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1540 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1551 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1583 src/xml/xmli18n-tmp.h:1585
+#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1603 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1607 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1646
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1666
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1676
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1716
+#: src/xml/xmli18n-tmp.h:1721 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1736
+#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1835
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1843
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1851
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:2049
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2057
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2065
+#: src/xml/xmli18n-tmp.h:2069 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2113
+#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2129
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2137
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2153
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2161
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2185
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2264
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2272
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2276
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2282 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2286 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2296
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2300
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2308
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2314 src/xml/xmli18n-tmp.h:2316
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2324
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:3787 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3895 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:4223 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5579
+#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5825
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:405
 msgid "Bright White Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
-#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
-#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
-#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
-#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
-#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
-#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
-#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:817
-#: src/xml/xmli18n-tmp.h:855 src/xml/xmli18n-tmp.h:912
-#: src/xml/xmli18n-tmp.h:969 src/xml/xmli18n-tmp.h:1026
-#: src/xml/xmli18n-tmp.h:1083 src/xml/xmli18n-tmp.h:1136
-#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1226
-#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1338
-#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1445
-#: src/xml/xmli18n-tmp.h:1505 src/xml/xmli18n-tmp.h:1568
-#: src/xml/xmli18n-tmp.h:1625 src/xml/xmli18n-tmp.h:1682
-#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1777
-#: src/xml/xmli18n-tmp.h:3675
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:139 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:959 src/xml/xmli18n-tmp.h:1018
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1155
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1546
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1931
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:5912
 msgid "Postcard"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
-#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
-#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
-#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
-#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
-#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
-#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
-#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:825
-#: src/xml/xmli18n-tmp.h:867 src/xml/xmli18n-tmp.h:924
-#: src/xml/xmli18n-tmp.h:981 src/xml/xmli18n-tmp.h:1038
-#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1144
-#: src/xml/xmli18n-tmp.h:1182 src/xml/xmli18n-tmp.h:1238
-#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1346
-#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1457
-#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1580
-#: src/xml/xmli18n-tmp.h:1637 src/xml/xmli18n-tmp.h:1694
-#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1785
+#: src/xml/xmli18n-tmp.h:13 src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:155 src/xml/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:415 src/xml/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:851 src/xml/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1026
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1175
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1554
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1832
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2309
 msgid "Back Light Film"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
-#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
-#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
-#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
-#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
-#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
-#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
-#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:829
-#: src/xml/xmli18n-tmp.h:873 src/xml/xmli18n-tmp.h:930
-#: src/xml/xmli18n-tmp.h:987 src/xml/xmli18n-tmp.h:1044
-#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1148
-#: src/xml/xmli18n-tmp.h:1186 src/xml/xmli18n-tmp.h:1244
-#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1350
-#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1463
-#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1586
-#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1700
-#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1789
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:419 src/xml/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:857 src/xml/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1030
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1383
+#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1558
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2313
 msgid "Matte Paper Heavyweight"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
-#: src/xml/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:421
 msgid "Premium Presentation Paper Matte"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:27
-msgid "Premium Glossy Photo Paper 170 wt"
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:431
+msgid "Ultra Glossy Photo Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:29
-msgid "Premium Glossy Photo Paper 250 wt"
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1210
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1413
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1568
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1695
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1964
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2176 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2287 src/xml/xmli18n-tmp.h:2323
+msgid "Premium Semigloss Photo Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
-#: src/xml/xmli18n-tmp.h:328
-msgid "Ultra Glossy Photo Paper"
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:437
+msgid "Ultra Premium Photo Paper Luster"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
-#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
-#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
-#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
-#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
-#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
-#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
-#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:839
-#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:945
-#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1059
-#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1158
-#: src/xml/xmli18n-tmp.h:1196 src/xml/xmli18n-tmp.h:1259
-#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1360
-#: src/xml/xmli18n-tmp.h:1415 src/xml/xmli18n-tmp.h:1478
-#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1601
-#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1715
-#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1799
-msgid "Premium Semigloss Photo Paper"
+#: src/xml/xmli18n-tmp.h:37
+msgid "CD or DVD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:93 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1230
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1437
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2331
+msgid "ColorLife Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:35
-msgid "Premium Semigloss Photo Paper 170 wt"
+#: src/xml/xmli18n-tmp.h:73
+msgid "Premium Glossy Photo Paper 170 wt"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:37
-msgid "Premium Semigloss Photo Paper 250 wt"
+#: src/xml/xmli18n-tmp.h:75
+msgid "Premium Glossy Photo Paper 250 wt"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:41
-msgid "Premium Luster Photo Paper 250 wt"
+#: src/xml/xmli18n-tmp.h:81
+msgid "Premium Semigloss Photo Paper 170 wt"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
-#: src/xml/xmli18n-tmp.h:334
-msgid "Ultra Premium Photo Paper Luster"
+#: src/xml/xmli18n-tmp.h:83
+msgid "Premium Semigloss Photo Paper 250 wt"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
-#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
-#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
-#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
-#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
-#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
-#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
-#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:845
-#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:957
-#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1071
-#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1166
-#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1271
-#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1372
-#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1496
-#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1613
-#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1733
-#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1807
-msgid "ColorLife Paper"
+#: src/xml/xmli18n-tmp.h:87
+msgid "Premium Luster Photo Paper 250 wt"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
-#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
-#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
-#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
-#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
-#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
-#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
-#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
-#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
-#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
-#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
-#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
-#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
-#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
-#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
-#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
-#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
-#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
-#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
-#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
-#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
-#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
-#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
-#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
-#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
-#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
-#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
-#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
-#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
-#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
-#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
-#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
-#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
-#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
-#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
-#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
-#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
-#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
-#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
-#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
-#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
-#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
-#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
-#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
-#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
-#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
-#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:851
-#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:857
-#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:863
-#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:869
-#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:875
-#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:881
-#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:887
-#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:893
-#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:899
-#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:905
-#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:911
-#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:917
-#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:923
-#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:929
-#: src/xml/xmli18n-tmp.h:932 src/xml/xmli18n-tmp.h:935
-#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:941
-#: src/xml/xmli18n-tmp.h:944 src/xml/xmli18n-tmp.h:947
-#: src/xml/xmli18n-tmp.h:950 src/xml/xmli18n-tmp.h:953
-#: src/xml/xmli18n-tmp.h:956 src/xml/xmli18n-tmp.h:959
-#: src/xml/xmli18n-tmp.h:962 src/xml/xmli18n-tmp.h:965
-#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:971
-#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:977
-#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:983
-#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:989
-#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:995
-#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1001
-#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1007
-#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1013
-#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1019
-#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1025
-#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1031
-#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1037
-#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1043
-#: src/xml/xmli18n-tmp.h:1046 src/xml/xmli18n-tmp.h:1049
-#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1055
-#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1061
-#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1067
-#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1073
-#: src/xml/xmli18n-tmp.h:1076 src/xml/xmli18n-tmp.h:1079
-#: src/xml/xmli18n-tmp.h:1082 src/xml/xmli18n-tmp.h:1085
-#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1091
-#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1097
-#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1103
-#: src/xml/xmli18n-tmp.h:1106 src/xml/xmli18n-tmp.h:1109
-#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1115
-#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1121
-#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1127
-#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1133
-#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1225
-#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1231
-#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1237
-#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1243
-#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1249
-#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1255
-#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1261
-#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1267
-#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1273
-#: src/xml/xmli18n-tmp.h:1276 src/xml/xmli18n-tmp.h:1279
-#: src/xml/xmli18n-tmp.h:1282 src/xml/xmli18n-tmp.h:1285
-#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1291
-#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1297
-#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1303
-#: src/xml/xmli18n-tmp.h:1306 src/xml/xmli18n-tmp.h:1309
-#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1315
-#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1321
-#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1327
-#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1333
-#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1567
-#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1573
-#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1579
-#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1585
-#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1591
-#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1597
-#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1603
-#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1609
-#: src/xml/xmli18n-tmp.h:1612 src/xml/xmli18n-tmp.h:1615
-#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1621
-#: src/xml/xmli18n-tmp.h:1624 src/xml/xmli18n-tmp.h:1627
-#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1633
-#: src/xml/xmli18n-tmp.h:1636 src/xml/xmli18n-tmp.h:1639
-#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1645
-#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1651
-#: src/xml/xmli18n-tmp.h:1654 src/xml/xmli18n-tmp.h:1657
-#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1663
-#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1669
-#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1675
-#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3223
-#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3231
-#: src/xml/xmli18n-tmp.h:3238 src/xml/xmli18n-tmp.h:3239
-#: src/xml/xmli18n-tmp.h:3300 src/xml/xmli18n-tmp.h:3301
-#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3311
-#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3396
-#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3408
-#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3420
-#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3432
-#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3440
-#: src/xml/xmli18n-tmp.h:3479 src/xml/xmli18n-tmp.h:3480
-#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3492
-#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3554
-#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:133 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:149 src/xml/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:173 src/xml/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:197 src/xml/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:205 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:221 src/xml/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:229 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:245 src/xml/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:253 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:261 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:269 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:277 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:285 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:293 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:301 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:309 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:317 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:325 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:333 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:341 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:349 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:357 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:619 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:643 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:667 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:691 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:707 src/xml/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:715 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:731 src/xml/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:739 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:755 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1062
+#: src/xml/xmli18n-tmp.h:1067 src/xml/xmli18n-tmp.h:1072
+#: src/xml/xmli18n-tmp.h:1077 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1092
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1102
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1112
+#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1122
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1132
+#: src/xml/xmli18n-tmp.h:1137 src/xml/xmli18n-tmp.h:1142
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1157 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1177 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1192
+#: src/xml/xmli18n-tmp.h:1197 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1212
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1222
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1242
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1252
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1272
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1287 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1297 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1327 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1385 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1445 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1461
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1516 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1647
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1657
+#: src/xml/xmli18n-tmp.h:1662 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1677
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1687
+#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1742 src/xml/xmli18n-tmp.h:1747
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1767
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1807
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2090 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2098 src/xml/xmli18n-tmp.h:2102
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2118
+#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2126
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2162 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2190
+#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:3884 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:4779 src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:4845 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4919
+#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4980
+#: src/xml/xmli18n-tmp.h:4986 src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5209 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5276
+#: src/xml/xmli18n-tmp.h:5277 src/xml/xmli18n-tmp.h:5283
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5607 src/xml/xmli18n-tmp.h:5633
+#: src/xml/xmli18n-tmp.h:5634 src/xml/xmli18n-tmp.h:5640
 msgid "Quadtone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
-#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
-#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
-#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
-#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:852
-#: src/xml/xmli18n-tmp.h:909 src/xml/xmli18n-tmp.h:966
-#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1080
-#: src/xml/xmli18n-tmp.h:1172 src/xml/xmli18n-tmp.h:1223
-#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1336
-#: src/xml/xmli18n-tmp.h:1379 src/xml/xmli18n-tmp.h:1442
-#: src/xml/xmli18n-tmp.h:1565 src/xml/xmli18n-tmp.h:1622
-#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1775
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:142 src/xml/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:150 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:174 src/xml/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:198 src/xml/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:214 src/xml/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:222 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:238 src/xml/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:246 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:262 src/xml/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:302 src/xml/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:310 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:318 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:326 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:334 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:342 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:350 src/xml/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:636 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:660 src/xml/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:708 src/xml/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:716 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:732 src/xml/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:756 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1103
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1123
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1158 src/xml/xmli18n-tmp.h:1163
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1183
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1193
+#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1213
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1223
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1238 src/xml/xmli18n-tmp.h:1243
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1253
+#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1283
+#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1313
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1333
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1362 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1374 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1462
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1472
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1487 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1502
+#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:1532
+#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1542
+#: src/xml/xmli18n-tmp.h:1633 src/xml/xmli18n-tmp.h:1638
+#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1648
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1658
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1713 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1728
+#: src/xml/xmli18n-tmp.h:1733 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1768
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2071
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2095
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2115 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2123 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2139 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2183
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2191
+#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2199
+msgid "MISQuadtone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1150 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2299
 msgid "Plain Paper Fast Load"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
-#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
-#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1364
-#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1484
-#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1970 src/xml/xmli18n-tmp.h:2030
+#: src/xml/xmli18n-tmp.h:2245
 msgid "Archival Matte Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
-#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
-#: src/xml/xmli18n-tmp.h:1202 src/xml/xmli18n-tmp.h:1366
-#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1487
-#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:881 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2248
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
-#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
-#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
-#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
-#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
-#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
-#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
-#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
-#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
-#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
-#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1377
-#: src/xml/xmli18n-tmp.h:1380 src/xml/xmli18n-tmp.h:1383
-#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1389
-#: src/xml/xmli18n-tmp.h:1392 src/xml/xmli18n-tmp.h:1395
-#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1401
-#: src/xml/xmli18n-tmp.h:1404 src/xml/xmli18n-tmp.h:1407
-#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1413
-#: src/xml/xmli18n-tmp.h:1416 src/xml/xmli18n-tmp.h:1419
-#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1425
-#: src/xml/xmli18n-tmp.h:1428 src/xml/xmli18n-tmp.h:1431
-#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1437
-#: src/xml/xmli18n-tmp.h:1440 src/xml/xmli18n-tmp.h:1443
-#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1449
-#: src/xml/xmli18n-tmp.h:1452 src/xml/xmli18n-tmp.h:1455
-#: src/xml/xmli18n-tmp.h:1458 src/xml/xmli18n-tmp.h:1461
-#: src/xml/xmli18n-tmp.h:1464 src/xml/xmli18n-tmp.h:1467
-#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1473
-#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1479
-#: src/xml/xmli18n-tmp.h:1482 src/xml/xmli18n-tmp.h:1485
-#: src/xml/xmli18n-tmp.h:1488 src/xml/xmli18n-tmp.h:1491
-#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1497
-#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1677
-#: src/xml/xmli18n-tmp.h:1680 src/xml/xmli18n-tmp.h:1683
-#: src/xml/xmli18n-tmp.h:1686 src/xml/xmli18n-tmp.h:1689
-#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1695
-#: src/xml/xmli18n-tmp.h:1698 src/xml/xmli18n-tmp.h:1701
-#: src/xml/xmli18n-tmp.h:1704 src/xml/xmli18n-tmp.h:1707
-#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1713
-#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1719
-#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1725
-#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1731
-#: src/xml/xmli18n-tmp.h:1734 src/xml/xmli18n-tmp.h:1737
-#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3503
-#: src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:1863
+#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1881
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1893
+#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1905
+#: src/xml/xmli18n-tmp.h:1908 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1923
+#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:1950 src/xml/xmli18n-tmp.h:1953
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1968 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1983
+#: src/xml/xmli18n-tmp.h:1986 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2204 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2255
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5645
 msgid "UltraChrome Photo Black"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
-#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
-#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
-#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
-#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
-#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
-#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
-#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
-#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
-#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
-#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1378
-#: src/xml/xmli18n-tmp.h:1381 src/xml/xmli18n-tmp.h:1384
-#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1390
-#: src/xml/xmli18n-tmp.h:1393 src/xml/xmli18n-tmp.h:1396
-#: src/xml/xmli18n-tmp.h:1399 src/xml/xmli18n-tmp.h:1402
-#: src/xml/xmli18n-tmp.h:1405 src/xml/xmli18n-tmp.h:1408
-#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1414
-#: src/xml/xmli18n-tmp.h:1417 src/xml/xmli18n-tmp.h:1420
-#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1426
-#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1432
-#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1438
-#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1444
-#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1450
-#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1456
-#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1462
-#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1468
-#: src/xml/xmli18n-tmp.h:1471 src/xml/xmli18n-tmp.h:1474
-#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1480
-#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1486
-#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1492
-#: src/xml/xmli18n-tmp.h:1495 src/xml/xmli18n-tmp.h:1498
-#: src/xml/xmli18n-tmp.h:1501 src/xml/xmli18n-tmp.h:1678
-#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1684
-#: src/xml/xmli18n-tmp.h:1687 src/xml/xmli18n-tmp.h:1690
-#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1696
-#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1702
-#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1708
-#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1714
-#: src/xml/xmli18n-tmp.h:1717 src/xml/xmli18n-tmp.h:1720
-#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1726
-#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1732
-#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1738
-#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3517
-#: src/xml/xmli18n-tmp.h:3577
+#: src/xml/xmli18n-tmp.h:835 src/xml/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:841 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1879 src/xml/xmli18n-tmp.h:1882
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1894
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1909 src/xml/xmli18n-tmp.h:1912
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1924
+#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1954
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1969 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1984
+#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2208
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2229 src/xml/xmli18n-tmp.h:2232
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2238
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2244
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2253 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2259 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5714
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1826
-#: src/xml/xmli18n-tmp.h:1839 src/xml/xmli18n-tmp.h:1852
-#: src/xml/xmli18n-tmp.h:1907 src/xml/xmli18n-tmp.h:1923
-#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1952
-#: src/xml/xmli18n-tmp.h:1965 src/xml/xmli18n-tmp.h:2054
-#: src/xml/xmli18n-tmp.h:2081 src/xml/xmli18n-tmp.h:2146
-#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
-#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
-#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2348
-#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2407
-#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2899
-#: src/xml/xmli18n-tmp.h:2916 src/xml/xmli18n-tmp.h:3142
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1139
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1154 src/xml/xmli18n-tmp.h:1159
+#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1179
+#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1199
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1214 src/xml/xmli18n-tmp.h:1219
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1229
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1244 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1259
+#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1274 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1289
+#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1309
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1329
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1423
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1429
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1447
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1634
+#: src/xml/xmli18n-tmp.h:1639 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1664
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1764
+#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1784
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1799 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1819
+msgid "MIS Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1463 src/xml/xmli18n-tmp.h:1468
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1478
+#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1508
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1533 src/xml/xmli18n-tmp.h:1538
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4858 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:5289
+msgid "Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2489 src/xml/xmli18n-tmp.h:2578
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2713 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2752
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2885 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:3051 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3665
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1828
-#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1853
-#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1879
-#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
-#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1940
-#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1966
-#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2055
-#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2133
-#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2175
-#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
-#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
-#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2336
-#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
-#: src/xml/xmli18n-tmp.h:2408 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2699
+#: src/xml/xmli18n-tmp.h:2714 src/xml/xmli18n-tmp.h:2727
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2886
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:3052
 msgid "180 DPI Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1830
-#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1854
-#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1880
-#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
-#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1941
-#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1967
-#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
-#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2134
-#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2176
-#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
-#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
-#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2337
-#: src/xml/xmli18n-tmp.h:2350 src/xml/xmli18n-tmp.h:2363
-#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
-#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2434
-#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2459
-#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2529
-#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2601
-#: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2703
-#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2735
-#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2768
-#: src/xml/xmli18n-tmp.h:2872 src/xml/xmli18n-tmp.h:2884
-#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2917
-#: src/xml/xmli18n-tmp.h:2961 src/xml/xmli18n-tmp.h:3007
-#: src/xml/xmli18n-tmp.h:3021 src/xml/xmli18n-tmp.h:3035
-#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3126
-#: src/xml/xmli18n-tmp.h:3143
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2404
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2658
+#: src/xml/xmli18n-tmp.h:2672 src/xml/xmli18n-tmp.h:2700
+#: src/xml/xmli18n-tmp.h:2715 src/xml/xmli18n-tmp.h:2728
+#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2754
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2919 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3053
+#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3125
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3292
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3530
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3649
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3684
 msgid "360 x 180 DPI Draft"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1818 src/xml/xmli18n-tmp.h:1831
-#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1855
-#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1881
-#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
-#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1942
-#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1968
-#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2135
-#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2392 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2418 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2479 src/xml/xmli18n-tmp.h:2492
+#: src/xml/xmli18n-tmp.h:2581 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2862 src/xml/xmli18n-tmp.h:2934
 msgid "360 DPI High Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1819 src/xml/xmli18n-tmp.h:1832
-#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1856
-#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1882
-#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
-#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1943
-#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1969
-#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1992
-#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2020
-#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
-#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
-#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2096
-#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2123
-#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2149
-#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2177
-#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2205
-#: src/xml/xmli18n-tmp.h:2218 src/xml/xmli18n-tmp.h:2231
-#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2254
-#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
-#: src/xml/xmli18n-tmp.h:2297 src/xml/xmli18n-tmp.h:2312
-#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2339
-#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
-#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2385
-#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2411
-#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2435
-#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2460
-#: src/xml/xmli18n-tmp.h:2473 src/xml/xmli18n-tmp.h:2488
-#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2516
-#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2541
-#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2591
-#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
-#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2645
-#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2675
-#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2704
-#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2736
-#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2769
-#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2808
-#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2833
-#: src/xml/xmli18n-tmp.h:2847 src/xml/xmli18n-tmp.h:2861
-#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2885
-#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2918
-#: src/xml/xmli18n-tmp.h:2935 src/xml/xmli18n-tmp.h:2950
-#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2987
-#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3022
-#: src/xml/xmli18n-tmp.h:3036 src/xml/xmli18n-tmp.h:3050
-#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3081
-#: src/xml/xmli18n-tmp.h:3098 src/xml/xmli18n-tmp.h:3113
-#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2369 src/xml/xmli18n-tmp.h:2380
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2406
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2493
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2544
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
+#: src/xml/xmli18n-tmp.h:2582 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2729
+#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2806
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2836
+#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
+#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3012
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3040
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3184 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3424 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3485 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3573
+#: src/xml/xmli18n-tmp.h:3587 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3650 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3685
 msgid "360 DPI"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1833
-#: src/xml/xmli18n-tmp.h:1846 src/xml/xmli18n-tmp.h:1857
-#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1883
-#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1912
-#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1944
-#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1970
-#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1993
-#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2021
-#: src/xml/xmli18n-tmp.h:2033 src/xml/xmli18n-tmp.h:2045
-#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
-#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2097
-#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2124
-#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2150
-#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2178
-#: src/xml/xmli18n-tmp.h:2193 src/xml/xmli18n-tmp.h:2206
-#: src/xml/xmli18n-tmp.h:2219 src/xml/xmli18n-tmp.h:2232
-#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2255
-#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
-#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2313
-#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2340
-#: src/xml/xmli18n-tmp.h:2352 src/xml/xmli18n-tmp.h:2365
-#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2386
-#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2412
-#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2436
-#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2461
-#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2489
-#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2517
-#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2542
-#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2567
-#: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2592
-#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2616
-#: src/xml/xmli18n-tmp.h:2631 src/xml/xmli18n-tmp.h:2646
-#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2676
-#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2705
-#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2737
-#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2770
-#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2809
-#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2834
-#: src/xml/xmli18n-tmp.h:2848 src/xml/xmli18n-tmp.h:2862
-#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2886
-#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2919
-#: src/xml/xmli18n-tmp.h:2936 src/xml/xmli18n-tmp.h:2951
-#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2988
-#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3023
-#: src/xml/xmli18n-tmp.h:3037 src/xml/xmli18n-tmp.h:3051
-#: src/xml/xmli18n-tmp.h:3066 src/xml/xmli18n-tmp.h:3083
-#: src/xml/xmli18n-tmp.h:3099 src/xml/xmli18n-tmp.h:3114
-#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:2344 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2452 src/xml/xmli18n-tmp.h:2468
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2494
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2557 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:2594
+#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2648
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2674
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2807
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2837
+#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
+#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3013
+#: src/xml/xmli18n-tmp.h:3026 src/xml/xmli18n-tmp.h:3041
+#: src/xml/xmli18n-tmp.h:3055 src/xml/xmli18n-tmp.h:3066
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3140
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3170
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3229
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3333
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3358
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3385
+#: src/xml/xmli18n-tmp.h:3397 src/xml/xmli18n-tmp.h:3409
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3442
+#: src/xml/xmli18n-tmp.h:3459 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3574
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3637
+#: src/xml/xmli18n-tmp.h:3651 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3686
 msgid "720 x 360 DPI"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1834
-#: src/xml/xmli18n-tmp.h:1847 src/xml/xmli18n-tmp.h:1858
-#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1884
-#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1913
-#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1945
-#: src/xml/xmli18n-tmp.h:1958 src/xml/xmli18n-tmp.h:1971
-#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:1994
-#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2022
-#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2046
-#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2071
-#: src/xml/xmli18n-tmp.h:2086 src/xml/xmli18n-tmp.h:2098
-#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2125
-#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2151
-#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2179
-#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2207
-#: src/xml/xmli18n-tmp.h:2220 src/xml/xmli18n-tmp.h:2233
-#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2256
-#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
-#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2314
-#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2341
-#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
-#: src/xml/xmli18n-tmp.h:2376 src/xml/xmli18n-tmp.h:2387
-#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2413
-#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2437
-#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2462
-#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2490
-#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2518
-#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2543
-#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
-#: src/xml/xmli18n-tmp.h:2580 src/xml/xmli18n-tmp.h:2593
-#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2617
-#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
-#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2677
-#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2706
-#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2738
-#: src/xml/xmli18n-tmp.h:2753 src/xml/xmli18n-tmp.h:2771
-#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2810
-#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2835
-#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
-#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2887
-#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2921
-#: src/xml/xmli18n-tmp.h:2937 src/xml/xmli18n-tmp.h:2952
-#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2990
-#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3024
-#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3052
-#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3085
-#: src/xml/xmli18n-tmp.h:3100 src/xml/xmli18n-tmp.h:3115
-#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:2345 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2469
+#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2546
+#: src/xml/xmli18n-tmp.h:2558 src/xml/xmli18n-tmp.h:2570
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2595
+#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2622
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2675
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2731
+#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2808
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2838
+#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2890
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2922 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3014
+#: src/xml/xmli18n-tmp.h:3027 src/xml/xmli18n-tmp.h:3042
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3067
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3186 src/xml/xmli18n-tmp.h:3201
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3334
+#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3359
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3444
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3475
+#: src/xml/xmli18n-tmp.h:3489 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3533 src/xml/xmli18n-tmp.h:3547
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3652 src/xml/xmli18n-tmp.h:3669
+#: src/xml/xmli18n-tmp.h:3687
 msgid "720 DPI"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
-#: src/xml/xmli18n-tmp.h:1978 src/xml/xmli18n-tmp.h:2004
-#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2030
-#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2067
-#: src/xml/xmli18n-tmp.h:2094 src/xml/xmli18n-tmp.h:2107
-#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2161
-#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2252
-#: src/xml/xmli18n-tmp.h:2280 src/xml/xmli18n-tmp.h:2295
-#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2323
-#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
-#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2486
-#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2552
-#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2613
-#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
-#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2686
-#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2806
-#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2831
-#: src/xml/xmli18n-tmp.h:2845 src/xml/xmli18n-tmp.h:2859
-#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2948
-#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3080
-#: src/xml/xmli18n-tmp.h:3097 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2554
+#: src/xml/xmli18n-tmp.h:2566 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2804 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2834 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3076
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3382
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3586 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3634
 msgid "360 x 120 DPI Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1842
-#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2005
-#: src/xml/xmli18n-tmp.h:2019 src/xml/xmli18n-tmp.h:2031
-#: src/xml/xmli18n-tmp.h:2043 src/xml/xmli18n-tmp.h:2068
-#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
-#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2162
-#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2253
-#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2296
-#: src/xml/xmli18n-tmp.h:2311 src/xml/xmli18n-tmp.h:2324
-#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2384
-#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2487
-#: src/xml/xmli18n-tmp.h:2500 src/xml/xmli18n-tmp.h:2553
-#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2614
-#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2644
-#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2687
-#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2807
-#: src/xml/xmli18n-tmp.h:2820 src/xml/xmli18n-tmp.h:2832
-#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
-#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2949
-#: src/xml/xmli18n-tmp.h:3112
+#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2555
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2632
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3077
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3211
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3383
+#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3635
 msgid "360 x 240 DPI Draft"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1872
-#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1898
-#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1930
-#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1959
-#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:1995
-#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2023
-#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2047
-#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2087
-#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2112
-#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2139
-#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2166
-#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2328
-#: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2388
-#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2557
-#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2922
-#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2991
-#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3086
+#: src/xml/xmli18n-tmp.h:2383 src/xml/xmli18n-tmp.h:2396
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2422
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2470 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2507 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2704 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:3057 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3118 src/xml/xmli18n-tmp.h:3445
+#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3514
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3609
 msgid "720 DPI High Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1873
-#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1899
-#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1931
-#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1984
-#: src/xml/xmli18n-tmp.h:1996 src/xml/xmli18n-tmp.h:2010
-#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2036
-#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2061
-#: src/xml/xmli18n-tmp.h:2073 src/xml/xmli18n-tmp.h:2088
-#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2127
-#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2153
-#: src/xml/xmli18n-tmp.h:2167 src/xml/xmli18n-tmp.h:2181
-#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2208
-#: src/xml/xmli18n-tmp.h:2221 src/xml/xmli18n-tmp.h:2234
-#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2257
-#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2285
-#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2315
-#: src/xml/xmli18n-tmp.h:2329 src/xml/xmli18n-tmp.h:2354
-#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2389
-#: src/xml/xmli18n-tmp.h:2399 src/xml/xmli18n-tmp.h:2425
-#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2451
-#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
-#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2504
-#: src/xml/xmli18n-tmp.h:2519 src/xml/xmli18n-tmp.h:2534
-#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2558
-#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2605
-#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2633
-#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2663
-#: src/xml/xmli18n-tmp.h:2678 src/xml/xmli18n-tmp.h:2691
-#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2725
-#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2754
-#: src/xml/xmli18n-tmp.h:2772 src/xml/xmli18n-tmp.h:2787
-#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2811
-#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2836
-#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
-#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2888
-#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2923
-#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2953
-#: src/xml/xmli18n-tmp.h:2968 src/xml/xmli18n-tmp.h:2978
-#: src/xml/xmli18n-tmp.h:2992 src/xml/xmli18n-tmp.h:3011
-#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3039
-#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
-#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3101
-#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3130
-#: src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:2384 src/xml/xmli18n-tmp.h:2397
+#: src/xml/xmli18n-tmp.h:2410 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2548 src/xml/xmli18n-tmp.h:2560
+#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2691 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2794 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2839
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2923 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3105
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3129
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3231 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3311
+#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3335
+#: src/xml/xmli18n-tmp.h:3348 src/xml/xmli18n-tmp.h:3360
+#: src/xml/xmli18n-tmp.h:3372 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3427 src/xml/xmli18n-tmp.h:3446
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3576 src/xml/xmli18n-tmp.h:3593
+#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3688
 msgid "1440 x 720 DPI"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1874
-#: src/xml/xmli18n-tmp.h:1887 src/xml/xmli18n-tmp.h:1900
-#: src/xml/xmli18n-tmp.h:1916 src/xml/xmli18n-tmp.h:1932
-#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1985
-#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2011
-#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2037
-#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2062
-#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2089
-#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2128
-#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2154
-#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2182
-#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2258
-#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
-#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2316
-#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2390
-#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2559
-#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2634
-#: src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2385 src/xml/xmli18n-tmp.h:2398
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2535
+#: src/xml/xmli18n-tmp.h:2549 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2782
+#: src/xml/xmli18n-tmp.h:2795 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3388
 msgid "1440 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1960
-#: src/xml/xmli18n-tmp.h:2100 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2902
 msgid "720 DPI Highest Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2259
-#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
-#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2317
-#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2477
-#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2505
-#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2606
-#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2635
-#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2740
-#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2866
-#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2796 src/xml/xmli18n-tmp.h:2811
+#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3216 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3412
 msgid "2880 x 720 DPI"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2260
-#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
-#: src/xml/xmli18n-tmp.h:2303 src/xml/xmli18n-tmp.h:2318
-#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2771 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2812
+#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:3160 src/xml/xmli18n-tmp.h:3390
 msgid "2880 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2439
-#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2493
-#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2546
-#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2582
-#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2620
-#: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2664
-#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
-#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2726
-#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2755
-#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2789
-#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2812
-#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2878
-#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
-#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2939
-#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2969
-#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2994
-#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
-#: src/xml/xmli18n-tmp.h:3088 src/xml/xmli18n-tmp.h:3102
-#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3131
-#: src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2963
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3070
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3106
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3297 src/xml/xmli18n-tmp.h:3313
+#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
+#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3401
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3492
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3577 src/xml/xmli18n-tmp.h:3594
+#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3671 src/xml/xmli18n-tmp.h:3689
 msgid "1440 x 1440 DPI"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2426
-#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2452
-#: src/xml/xmli18n-tmp.h:2464 src/xml/xmli18n-tmp.h:2479
-#: src/xml/xmli18n-tmp.h:2494 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2547
-#: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2583
-#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2621
-#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2665
-#: src/xml/xmli18n-tmp.h:2680 src/xml/xmli18n-tmp.h:2694
-#: src/xml/xmli18n-tmp.h:2709 src/xml/xmli18n-tmp.h:2727
-#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2756
-#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2790
-#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2813
-#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2837
-#: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2879
-#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
-#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2940
-#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2970
-#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2995
-#: src/xml/xmli18n-tmp.h:3012 src/xml/xmli18n-tmp.h:3026
-#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3055
-#: src/xml/xmli18n-tmp.h:3072 src/xml/xmli18n-tmp.h:3089
-#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3118
-#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3071
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3107
+#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3251
+#: src/xml/xmli18n-tmp.h:3266 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3298 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3324 src/xml/xmli18n-tmp.h:3337
+#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3374 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3463
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3535 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3563 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3612
+#: src/xml/xmli18n-tmp.h:3626 src/xml/xmli18n-tmp.h:3641
+#: src/xml/xmli18n-tmp.h:3655 src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:3690
 msgid "2880 x 1440 DPI"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:4374
 msgid "Dark Yellow"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2584
-#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2711
-#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2743
-#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2776
-#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2908
-#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2972
-#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3057
-#: src/xml/xmli18n-tmp.h:3074 src/xml/xmli18n-tmp.h:3091
-#: src/xml/xmli18n-tmp.h:3105 src/xml/xmli18n-tmp.h:3134
-#: src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3108
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3267
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3495
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3614
+#: src/xml/xmli18n-tmp.h:3628 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3692
 msgid "2880 x 2880 DPI"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2666 src/xml/xmli18n-tmp.h:2681
-#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2728
-#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2775
-#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2814
-#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2838
-#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2926
-#: src/xml/xmli18n-tmp.h:2941 src/xml/xmli18n-tmp.h:2971
-#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
-#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
-#: src/xml/xmli18n-tmp.h:3090 src/xml/xmli18n-tmp.h:3104
-#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3133
-#: src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3190 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3234 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3325 src/xml/xmli18n-tmp.h:3338
+#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3362
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3505
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3613
+#: src/xml/xmli18n-tmp.h:3627 src/xml/xmli18n-tmp.h:3642
+#: src/xml/xmli18n-tmp.h:3656 src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:3691
 msgid "5760 x 1440 DPI"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2712
-#: src/xml/xmli18n-tmp.h:2730 src/xml/xmli18n-tmp.h:2759
-#: src/xml/xmli18n-tmp.h:2777 src/xml/xmli18n-tmp.h:2909
-#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2973
-#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3058
-#: src/xml/xmli18n-tmp.h:3075 src/xml/xmli18n-tmp.h:3092
-#: src/xml/xmli18n-tmp.h:3106 src/xml/xmli18n-tmp.h:3135
-#: src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3301 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3496
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3615
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
 msgid "5760 x 2880 DPI"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2798 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3502
 msgid "1440 x 720 DPI Transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2965
-#: src/xml/xmli18n-tmp.h:2989 src/xml/xmli18n-tmp.h:3067
-#: src/xml/xmli18n-tmp.h:3084
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:3607
 msgid "720 x 360 DPI Enhanced"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:3479
 msgid "Black 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3480
 msgid "Black 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3065
-#: src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3605
 msgid "360 DPI Enhanced"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3516
 msgid "1440 x 720 DPI High Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3153
-msgid "Lower Front Tray"
+#: src/xml/xmli18n-tmp.h:3677
+msgid "Vivid Light Magenta"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3682
+msgid "Vivid Magenta"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3154
-msgid "Upper Front Tray"
+#: src/xml/xmli18n-tmp.h:3694
+msgid "Main Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3160
-#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3176
-#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3186
+#: src/xml/xmli18n-tmp.h:3695
+msgid "Photo Tray"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3725 src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:3732
 msgid "Print to CD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3181
-#: src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:3730
 msgid "Rear Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3157 src/xml/xmli18n-tmp.h:3182
-#: src/xml/xmli18n-tmp.h:3185
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:3731
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3159 src/xml/xmli18n-tmp.h:3164
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3705
 msgid "Manual Feed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3709
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3710
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3171
-#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3180
-#: src/xml/xmli18n-tmp.h:3193
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3716 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3739
 msgid "Roll Feed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3714 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3723
 msgid "Manual Sheet Guide"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3715 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3724
 msgid "Manual Feed (Front)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3733
 msgid "Photo Board"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3734
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3735
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3190
+#: src/xml/xmli18n-tmp.h:3736
 msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3191
+#: src/xml/xmli18n-tmp.h:3737
 msgid "Manual Selection"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3199 src/xml/xmli18n-tmp.h:3207
-#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3219
-#: src/xml/xmli18n-tmp.h:3227 src/xml/xmli18n-tmp.h:3235
-#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3257
-#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3278
-#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3297
-#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3317
-#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3342
-#: src/xml/xmli18n-tmp.h:3356 src/xml/xmli18n-tmp.h:3382
-#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
-#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3426
-#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3446
-#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3474
-#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3498
-#: src/xml/xmli18n-tmp.h:3510 src/xml/xmli18n-tmp.h:3524
-#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3558
-#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:3584
-#: src/xml/xmli18n-tmp.h:3594 src/xml/xmli18n-tmp.h:3600
-#: src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3763 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3872 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:4067 src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4172 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4236 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:4754 src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5102 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5679 src/xml/xmli18n-tmp.h:5748
+#: src/xml/xmli18n-tmp.h:5793 src/xml/xmli18n-tmp.h:5814
+#: src/xml/xmli18n-tmp.h:5835
 msgid "One Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3208
-#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3220
-#: src/xml/xmli18n-tmp.h:3228 src/xml/xmli18n-tmp.h:3236
-#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3259
-#: src/xml/xmli18n-tmp.h:3270 src/xml/xmli18n-tmp.h:3280
-#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3298
-#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3318
-#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3344
-#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3383
-#: src/xml/xmli18n-tmp.h:3391 src/xml/xmli18n-tmp.h:3403
-#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3427
-#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3447
-#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3475
-#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3499
-#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3526
-#: src/xml/xmli18n-tmp.h:3551 src/xml/xmli18n-tmp.h:3559
-#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3586
-#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3601
-#: src/xml/xmli18n-tmp.h:3607
+#: src/xml/xmli18n-tmp.h:3765 src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4484 src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:4756 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5321
+#: src/xml/xmli18n-tmp.h:5382 src/xml/xmli18n-tmp.h:5451
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5795 src/xml/xmli18n-tmp.h:5816
+#: src/xml/xmli18n-tmp.h:5837
 msgid "Three Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
-#: src/xml/xmli18n-tmp.h:3215 src/xml/xmli18n-tmp.h:3221
-#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3237
-#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3271
-#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3299
-#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3319
-#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3345
-#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3384
-#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
-#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3428
-#: src/xml/xmli18n-tmp.h:3438 src/xml/xmli18n-tmp.h:3448
-#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3463
-#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3476
-#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3500
-#: src/xml/xmli18n-tmp.h:3513 src/xml/xmli18n-tmp.h:3527
-#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3560
-#: src/xml/xmli18n-tmp.h:3573 src/xml/xmli18n-tmp.h:3587
-#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3602
-#: src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:3824 src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5325
+#: src/xml/xmli18n-tmp.h:5386 src/xml/xmli18n-tmp.h:5455
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5757
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5841
 msgid "Four Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3248
-#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
-#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3360
-#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
-#: src/xml/xmli18n-tmp.h:3417 src/xml/xmli18n-tmp.h:3429
-#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3459
-#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3501 src/xml/xmli18n-tmp.h:3514
-#: src/xml/xmli18n-tmp.h:3528 src/xml/xmli18n-tmp.h:3574
-#: src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4424 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:5066 src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:5196 src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5391
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5762
 msgid "Five Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3249
-#: src/xml/xmli18n-tmp.h:3272 src/xml/xmli18n-tmp.h:3293
-#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3333
-#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3361
-#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
-#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3430
-#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3460
-#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3478
-#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3502
-#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3529
-#: src/xml/xmli18n-tmp.h:3575 src/xml/xmli18n-tmp.h:3589
+#: src/xml/xmli18n-tmp.h:3780 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:4078 src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:4430 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4972
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5150 src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5336
+#: src/xml/xmli18n-tmp.h:5397 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5768
 msgid "Six Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3919 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:4781 src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:4795 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4921
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:4996
+#: src/xml/xmli18n-tmp.h:5023 src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:5226 src/xml/xmli18n-tmp.h:5279
+#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5603 src/xml/xmli18n-tmp.h:5609
+#: src/xml/xmli18n-tmp.h:5636 src/xml/xmli18n-tmp.h:5642
+msgid "Gray 3"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4782 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4796 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4916 src/xml/xmli18n-tmp.h:4922
+#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4983
+#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5286 src/xml/xmli18n-tmp.h:5294
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5643
+msgid "Gray 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3855 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:4856 src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:4931 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4998
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:5214 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5611
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5644
+msgid "Gray 1"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4985 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5606 src/xml/xmli18n-tmp.h:5639
+msgid "MIS Quadtone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4114
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3260 src/xml/xmli18n-tmp.h:3281
+#: src/xml/xmli18n-tmp.h:4016 src/xml/xmli18n-tmp.h:4121
 msgid "Three Color Raw Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3282
+#: src/xml/xmli18n-tmp.h:4021 src/xml/xmli18n-tmp.h:4126
 msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3262 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4132
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:4035 src/xml/xmli18n-tmp.h:4140
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:4141
+msgid "MatteBlack"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4224
 msgid "Default Black"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
-#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3365
-#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3504
-#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3533
-#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3564
-#: src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4446 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4573 src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:5344
+#: src/xml/xmli18n-tmp.h:5413 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Seven Color Photo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:4315
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3348
-#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3516
-#: src/xml/xmli18n-tmp.h:3530 src/xml/xmli18n-tmp.h:3576
-#: src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:4368 src/xml/xmli18n-tmp.h:4437
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:5404
+#: src/xml/xmli18n-tmp.h:5473 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5775
 msgid "Seven Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3355
-#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3523
-#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5745
 msgid "Two Level Grayscale"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3357
-#: src/xml/xmli18n-tmp.h:3511 src/xml/xmli18n-tmp.h:3525
-#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:4412 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5448
+#: src/xml/xmli18n-tmp.h:5681 src/xml/xmli18n-tmp.h:5750
 msgid "Two Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3372
-#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3540
+#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5531
 msgid "Eight Color Photo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3378
-#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:4652 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5570
 msgid "Eight Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3462 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:5288
+msgid "MIS Six Tone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:4994
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5291
+msgid "Gray 5"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:4928 src/xml/xmli18n-tmp.h:4995
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5292
+msgid "Gray 4"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5145
 msgid "Four Color Photo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3615
-#: src/xml/xmli18n-tmp.h:3621
+#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5852
+#: src/xml/xmli18n-tmp.h:5858
 msgid "Interleave"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3616
-#: src/xml/xmli18n-tmp.h:3622
+#: src/xml/xmli18n-tmp.h:5848 src/xml/xmli18n-tmp.h:5853
+#: src/xml/xmli18n-tmp.h:5859
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3612 src/xml/xmli18n-tmp.h:3617
-#: src/xml/xmli18n-tmp.h:3623
+#: src/xml/xmli18n-tmp.h:5849 src/xml/xmli18n-tmp.h:5854
+#: src/xml/xmli18n-tmp.h:5860
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3613 src/xml/xmli18n-tmp.h:3618
-#: src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5855
+#: src/xml/xmli18n-tmp.h:5861
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:5862
 msgid "Interleave 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3626
+#: src/xml/xmli18n-tmp.h:5863
 msgid "Eight Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3628
+#: src/xml/xmli18n-tmp.h:5865
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:5909
 msgid "Legal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:5910
 msgid "Tabloid"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3674
+#: src/xml/xmli18n-tmp.h:5911
 msgid "Executive"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3679
+#: src/xml/xmli18n-tmp.h:5916
 msgid "3x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3680
+#: src/xml/xmli18n-tmp.h:5917
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:5918
 msgid "4x6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3682
+#: src/xml/xmli18n-tmp.h:5919
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:5920
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5921
 msgid "5x7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3684
+#: src/xml/xmli18n-tmp.h:5922
 msgid "5x8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3685
+#: src/xml/xmli18n-tmp.h:5923
 msgid "6x8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3686
+#: src/xml/xmli18n-tmp.h:5924
 msgid "8x10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3688
+#: src/xml/xmli18n-tmp.h:5926
 msgid "12x18"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3689
+#: src/xml/xmli18n-tmp.h:5927
 msgid "Super B 13x19"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3690
+#: src/xml/xmli18n-tmp.h:5928
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3691
+#: src/xml/xmli18n-tmp.h:5929
 msgid "8x12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3692
+#: src/xml/xmli18n-tmp.h:5930
 msgid "11x14"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3693
+#: src/xml/xmli18n-tmp.h:5931
 msgid "16x20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3694
+#: src/xml/xmli18n-tmp.h:5932
 msgid "16x24"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3695
+#: src/xml/xmli18n-tmp.h:5933
 msgid "20x24"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3696
+#: src/xml/xmli18n-tmp.h:5934
 msgid "20x30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3697
+#: src/xml/xmli18n-tmp.h:5935
 msgid "22x30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3698
+#: src/xml/xmli18n-tmp.h:5936
 msgid "24x30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3699
+#: src/xml/xmli18n-tmp.h:5937
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3700
+#: src/xml/xmli18n-tmp.h:5938
 msgid "30x40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:5939
 msgid "4A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3702
+#: src/xml/xmli18n-tmp.h:5940
 msgid "2A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3703
+#: src/xml/xmli18n-tmp.h:5941
 msgid "Super A0"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:5942
 msgid "A0"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3705
+#: src/xml/xmli18n-tmp.h:5943
 msgid "A1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3706
+#: src/xml/xmli18n-tmp.h:5944
 msgid "A2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3707
+#: src/xml/xmli18n-tmp.h:5945
 msgid "A3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3709
+#: src/xml/xmli18n-tmp.h:5947
 msgid "A5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3710
+#: src/xml/xmli18n-tmp.h:5948
 msgid "A6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:5949
 msgid "A7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:5950
 msgid "A8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3713
+#: src/xml/xmli18n-tmp.h:5951
 msgid "A9"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3714
+#: src/xml/xmli18n-tmp.h:5952
 msgid "A10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3715
+#: src/xml/xmli18n-tmp.h:5953
 msgid "RA0"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3716
+#: src/xml/xmli18n-tmp.h:5954
 msgid "RA1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:5955
 msgid "RA2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:5956
 msgid "RA3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:5957
 msgid "RA4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:5958
 msgid "SRA0"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:5959
 msgid "SRA1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3722
+#: src/xml/xmli18n-tmp.h:5960
 msgid "SRA2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3723
+#: src/xml/xmli18n-tmp.h:5961
 msgid "SRA3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3724
+#: src/xml/xmli18n-tmp.h:5962
 msgid "SRA4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3725
+#: src/xml/xmli18n-tmp.h:5963
 msgid "4B ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3726
+#: src/xml/xmli18n-tmp.h:5964
 msgid "2B ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:5965
 msgid "B0 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:5966
 msgid "B1 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:5967
 msgid "B2 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3730
+#: src/xml/xmli18n-tmp.h:5968
 msgid "B3 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3731
+#: src/xml/xmli18n-tmp.h:5969
 msgid "B4 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3732
+#: src/xml/xmli18n-tmp.h:5970
 msgid "B5 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3733
+#: src/xml/xmli18n-tmp.h:5971
 msgid "B6 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3734
+#: src/xml/xmli18n-tmp.h:5972
 msgid "B7 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3735
+#: src/xml/xmli18n-tmp.h:5973
 msgid "B8 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3736
+#: src/xml/xmli18n-tmp.h:5974
 msgid "B9 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3737
+#: src/xml/xmli18n-tmp.h:5975
 msgid "B10 ISO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5976
 msgid "Super B0 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3739
+#: src/xml/xmli18n-tmp.h:5977
 msgid "B0 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:5978
 msgid "B1 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3741
+#: src/xml/xmli18n-tmp.h:5979
 msgid "B2 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:5980
 msgid "B3 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3743
+#: src/xml/xmli18n-tmp.h:5981
 msgid "B4 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:5982
 msgid "B5 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:5983
 msgid "B6 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3746
+#: src/xml/xmli18n-tmp.h:5984
 msgid "B7 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3747
+#: src/xml/xmli18n-tmp.h:5985
 msgid "B8 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3748
+#: src/xml/xmli18n-tmp.h:5986
 msgid "B9 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:5987
 msgid "B10 JIS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3750
+#: src/xml/xmli18n-tmp.h:5988
 msgid "C0"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3751
+#: src/xml/xmli18n-tmp.h:5989
 msgid "C0 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:5990
 msgid "C1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:5991
 msgid "C1 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3754
+#: src/xml/xmli18n-tmp.h:5992
 msgid "C2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3755
+#: src/xml/xmli18n-tmp.h:5993
 msgid "C2 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3756
+#: src/xml/xmli18n-tmp.h:5994
 msgid "C3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:5995
 msgid "C3 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3758
+#: src/xml/xmli18n-tmp.h:5996
 msgid "C4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3759
+#: src/xml/xmli18n-tmp.h:5997
 msgid "C4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:5998
 msgid "C5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3761
+#: src/xml/xmli18n-tmp.h:5999
 msgid "C5 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:6000
 msgid "B6-C4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3763
+#: src/xml/xmli18n-tmp.h:6001
 msgid "B6-C4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:6002
 msgid "C6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3765
+#: src/xml/xmli18n-tmp.h:6003
 msgid "C6 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3766
+#: src/xml/xmli18n-tmp.h:6004
 msgid "DL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:6005
 msgid "DL landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3768
+#: src/xml/xmli18n-tmp.h:6006
 msgid "C7-6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3769
+#: src/xml/xmli18n-tmp.h:6007
 msgid "C7-6 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3770
+#: src/xml/xmli18n-tmp.h:6008
 msgid "C7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:6009
 msgid "C7 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3772
+#: src/xml/xmli18n-tmp.h:6010
 msgid "C8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:6011
 msgid "C8 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3774
+#: src/xml/xmli18n-tmp.h:6012
 msgid "C9"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3775
+#: src/xml/xmli18n-tmp.h:6013
 msgid "C9 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:6014
 msgid "C10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:6015
 msgid "C10 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3778
+#: src/xml/xmli18n-tmp.h:6016
 msgid "ArchA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3779
+#: src/xml/xmli18n-tmp.h:6017
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3780
+#: src/xml/xmli18n-tmp.h:6018
 msgid "ArchB"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:6019
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3782
+#: src/xml/xmli18n-tmp.h:6020
 msgid "ArchC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:6021
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3784
+#: src/xml/xmli18n-tmp.h:6022
 msgid "ArchD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:6023
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:6024
 msgid "ArchE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3787
+#: src/xml/xmli18n-tmp.h:6025
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:6026
 msgid "American foolscap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3789
+#: src/xml/xmli18n-tmp.h:6027
 msgid "European foolscap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:6028
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:6029
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3792
+#: src/xml/xmli18n-tmp.h:6030
 msgid "Demy Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:6031
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3794
+#: src/xml/xmli18n-tmp.h:6032
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3795
+#: src/xml/xmli18n-tmp.h:6033
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:6034
 msgid "Demy Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:6035
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:6036
 msgid "Small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:6037
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:6038
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:6039
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3802
+#: src/xml/xmli18n-tmp.h:6040
 msgid "Hagaki Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:6041
 msgid "Oufuku Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3804
+#: src/xml/xmli18n-tmp.h:6042
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3805
+#: src/xml/xmli18n-tmp.h:6043
 msgid "Japanese long envelope #3 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3806
+#: src/xml/xmli18n-tmp.h:6044
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:6045
 msgid "Japanese long envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:6046
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3809
+#: src/xml/xmli18n-tmp.h:6047
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:6048
 msgid "Commercial 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:6049
 msgid "Commercial 10 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:6050
 msgid "A2 Invitation"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3813
+#: src/xml/xmli18n-tmp.h:6051
 msgid "Monarch Envelope"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3814
+#: src/xml/xmli18n-tmp.h:6052
 msgid "Monarch Envelope landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3815
+#: src/xml/xmli18n-tmp.h:6053
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3816
+#: src/xml/xmli18n-tmp.h:6054
 msgid "4x7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:6055
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3818
+#: src/xml/xmli18n-tmp.h:6056
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3819
+#: src/xml/xmli18n-tmp.h:6057
 msgid "Wide Postcard"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3820
+#: src/xml/xmli18n-tmp.h:6058
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:6059
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:6060
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3824
+#: src/xml/xmli18n-tmp.h:6062
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:6063
 msgid "4 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3826
+#: src/xml/xmli18n-tmp.h:6064
 msgid "5 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3827
+#: src/xml/xmli18n-tmp.h:6065
 msgid "210 mm Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:6066
 msgid "13 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3829
+#: src/xml/xmli18n-tmp.h:6067
 msgid "17 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:6068
 msgid "22 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3831
+#: src/xml/xmli18n-tmp.h:6069
 msgid "24 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:6070
 msgid "36 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:6071
 msgid "44 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3834
+#: src/xml/xmli18n-tmp.h:6072
 msgid "60 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:6073
 msgid "64 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3836
+#: src/xml/xmli18n-tmp.h:6074
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3837
+#: src/xml/xmli18n-tmp.h:6075
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:6076
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:6077
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:6078
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:6079
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:6080
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:6081
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3844
+#: src/xml/xmli18n-tmp.h:6082
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:6083
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3846
+#: src/xml/xmli18n-tmp.h:6084
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3847
+#: src/xml/xmli18n-tmp.h:6085
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3848
+#: src/xml/xmli18n-tmp.h:6086
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:6087
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3850
+#: src/xml/xmli18n-tmp.h:6088
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:6089
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:6090
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3853
+#: src/xml/xmli18n-tmp.h:6091
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3854
+#: src/xml/xmli18n-tmp.h:6092
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3855
+#: src/xml/xmli18n-tmp.h:6093
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3856
+#: src/xml/xmli18n-tmp.h:6094
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3857
+#: src/xml/xmli18n-tmp.h:6095
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3858
+#: src/xml/xmli18n-tmp.h:6096
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:6097
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:6098
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:6099
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:6100
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3863
+#: src/xml/xmli18n-tmp.h:6101
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:6102
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:6103
 msgid "Canon S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:6104
 msgid "Canon S200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3867
+#: src/xml/xmli18n-tmp.h:6105
 msgid "Canon S300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3868
+#: src/xml/xmli18n-tmp.h:6106
 msgid "Canon S400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3869
+#: src/xml/xmli18n-tmp.h:6107
 msgid "Canon S450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3870
+#: src/xml/xmli18n-tmp.h:6108
 msgid "Canon S500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:6109
 msgid "Canon S600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3872
+#: src/xml/xmli18n-tmp.h:6110
 msgid "Canon S630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3873
+#: src/xml/xmli18n-tmp.h:6111
 msgid "Canon S800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3874
+#: src/xml/xmli18n-tmp.h:6112
 msgid "Canon S4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:6113
 msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:6114
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3877
+#: src/xml/xmli18n-tmp.h:6115
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3878
+#: src/xml/xmli18n-tmp.h:6116
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:6117
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3880
+#: src/xml/xmli18n-tmp.h:6118
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3881
+#: src/xml/xmli18n-tmp.h:6119
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:6120
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:6121
 msgid "Canon PIXMA iP4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3884
+#: src/xml/xmli18n-tmp.h:6122
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3885
+#: src/xml/xmli18n-tmp.h:6123
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3886
+#: src/xml/xmli18n-tmp.h:6124
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3887
+#: src/xml/xmli18n-tmp.h:6125
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3888
+#: src/xml/xmli18n-tmp.h:6126
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:6127
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:6128
+msgid "Canon PIXMA iX4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6129
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:6130
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:6131
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:6132
 msgid "Canon PIXMA MP160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:6133
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3895
+#: src/xml/xmli18n-tmp.h:6134
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:6135
 msgid "Canon PIXMA MP220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3897
+#: src/xml/xmli18n-tmp.h:6136
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:6137
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:6138
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3900
+#: src/xml/xmli18n-tmp.h:6139
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:6140
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3902
+#: src/xml/xmli18n-tmp.h:6141
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3903
+#: src/xml/xmli18n-tmp.h:6142
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:6143
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:6144
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:6145
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:6146
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:6147
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:6148
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3910
+#: src/xml/xmli18n-tmp.h:6149
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:6150
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3912
+#: src/xml/xmli18n-tmp.h:6151
 msgid "Canon i80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3913
+#: src/xml/xmli18n-tmp.h:6152
 msgid "Canon i560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3914
+#: src/xml/xmli18n-tmp.h:6153
 msgid "Canon i850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:6154
 msgid "Canon i860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3916
+#: src/xml/xmli18n-tmp.h:6155
 msgid "Canon i865"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:6156
 msgid "Epson Artisan 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:6157
 msgid "Epson Artisan 800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3919
+#: src/xml/xmli18n-tmp.h:6158
 msgid "Epson B-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3920
+#: src/xml/xmli18n-tmp.h:6159
 msgid "Epson B-308"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3921
+#: src/xml/xmli18n-tmp.h:6160
 msgid "Epson B-500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3922
+#: src/xml/xmli18n-tmp.h:6161
 msgid "Epson B-508DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3923
+#: src/xml/xmli18n-tmp.h:6162
 msgid "Epson Stylus C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3924
+#: src/xml/xmli18n-tmp.h:6163
 msgid "Epson Stylus C20SX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:6164
 msgid "Epson Stylus C20UX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:6165
 msgid "Epson Stylus C40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:6166
 msgid "Epson Stylus C40SX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:6167
 msgid "Epson Stylus C40UX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:6168
 msgid "Epson Stylus C41"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:6169
 msgid "Epson Stylus C41SX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:6170
 msgid "Epson Stylus C41UX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3932
+#: src/xml/xmli18n-tmp.h:6171
 msgid "Epson Stylus C42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:6172
 msgid "Epson Stylus C42SX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3934
+#: src/xml/xmli18n-tmp.h:6173
 msgid "Epson Stylus C42UX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3935
+#: src/xml/xmli18n-tmp.h:6174
 msgid "Epson Stylus C43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:6175
 msgid "Epson Stylus C43SX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3937
+#: src/xml/xmli18n-tmp.h:6176
 msgid "Epson Stylus C43UX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:6177
 msgid "Epson Stylus C44"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3939
+#: src/xml/xmli18n-tmp.h:6178
 msgid "Epson Stylus C44SX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:6179
 msgid "Epson Stylus C44UX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:6180
 msgid "Epson Stylus C45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3942
+#: src/xml/xmli18n-tmp.h:6181
 msgid "Epson Stylus C46"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3943
+#: src/xml/xmli18n-tmp.h:6182
 msgid "Epson Stylus C48"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:6183
 msgid "Epson Stylus C50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:6184
 msgid "Epson Stylus C60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3946
+#: src/xml/xmli18n-tmp.h:6185
 msgid "Epson Stylus C61"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3947
+#: src/xml/xmli18n-tmp.h:6186
 msgid "Epson Stylus C62"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3948
+#: src/xml/xmli18n-tmp.h:6187
 msgid "Epson Stylus C63"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3949
+#: src/xml/xmli18n-tmp.h:6188
 msgid "Epson Stylus C64"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:6189
 msgid "Epson Stylus C65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3951
+#: src/xml/xmli18n-tmp.h:6190
 msgid "Epson Stylus C66"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:6191
 msgid "Epson Stylus C68"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3953
+#: src/xml/xmli18n-tmp.h:6192
 msgid "Epson Stylus C70"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:6193
 msgid "Epson Stylus C79"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:6194
 msgid "Epson Stylus C80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3956
+#: src/xml/xmli18n-tmp.h:6195
 msgid "Epson Stylus C82"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3957
+#: src/xml/xmli18n-tmp.h:6196
 msgid "Epson Stylus C83"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3958
+#: src/xml/xmli18n-tmp.h:6197
 msgid "Epson Stylus C84"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3959
+#: src/xml/xmli18n-tmp.h:6198
 msgid "Epson Stylus C85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3960
+#: src/xml/xmli18n-tmp.h:6199
 msgid "Epson Stylus C86"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:6200
 msgid "Epson Stylus C87"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:6201
 msgid "Epson Stylus C88"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:6202
 msgid "Epson Stylus C110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3964
+#: src/xml/xmli18n-tmp.h:6203
 msgid "Epson Stylus C120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:6204
 msgid "Epson Stylus Color"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3966
+#: src/xml/xmli18n-tmp.h:6205
 msgid "Epson Stylus Color I"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3967
+#: src/xml/xmli18n-tmp.h:6206
 msgid "Epson Stylus Color II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:6207
 msgid "Epson Stylus Color IIs"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:6208
 msgid "Epson Stylus Color PRO"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3970
+#: src/xml/xmli18n-tmp.h:6209
 msgid "Epson Stylus Pro XL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:6210
 msgid "Epson Stylus Color 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3972
+#: src/xml/xmli18n-tmp.h:6211
 msgid "Epson Stylus Color 440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:6212
 msgid "Epson Stylus Color 460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:6213
 msgid "Epson Stylus Color 480"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3975
+#: src/xml/xmli18n-tmp.h:6214
 msgid "Epson Stylus Color 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:6215
 msgid "Epson Stylus Color 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:6216
 msgid "Epson Stylus Color 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:6217
 msgid "Epson Stylus Color 640"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3979
+#: src/xml/xmli18n-tmp.h:6218
 msgid "Epson Stylus Color 660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:6219
 msgid "Epson Stylus Color 670"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3981
+#: src/xml/xmli18n-tmp.h:6220
 msgid "Epson Stylus Color 680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3982
+#: src/xml/xmli18n-tmp.h:6221
 msgid "Epson Stylus Color 740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3983
+#: src/xml/xmli18n-tmp.h:6222
 msgid "Epson Stylus Color 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3984
+#: src/xml/xmli18n-tmp.h:6223
 msgid "Epson Stylus Color 777"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:6224
 msgid "Epson Stylus Color 800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:6225
 msgid "Epson Stylus Color 850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3987
+#: src/xml/xmli18n-tmp.h:6226
 msgid "Epson Stylus Color 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:6227
 msgid "Epson Stylus Color 880"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3989
+#: src/xml/xmli18n-tmp.h:6228
 msgid "Epson Stylus Color 8 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:6229
 msgid "Epson Stylus Color 900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:6230
 msgid "Epson Stylus Color 980"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3992
+#: src/xml/xmli18n-tmp.h:6231
 msgid "Epson Stylus Color 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3993
+#: src/xml/xmli18n-tmp.h:6232
 msgid "Epson Stylus Color 1500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:6233
 msgid "Epson Stylus Color 1520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3995
+#: src/xml/xmli18n-tmp.h:6234
 msgid "Epson Stylus Color 3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:6235
 msgid "Epson Stylus Office B30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:6236
 msgid "Epson Stylus Office B33"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3998
+#: src/xml/xmli18n-tmp.h:6237
 msgid "Epson Stylus Office B40W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3999
+#: src/xml/xmli18n-tmp.h:6238
 msgid "Epson Stylus Office T30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:6239
 msgid "Epson Stylus Office T33"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:6240
 msgid "Epson Stylus Office T40W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4002
+#: src/xml/xmli18n-tmp.h:6241
 msgid "Epson Stylus Office BX300F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:6242
 msgid "Epson Stylus Office BX600FW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:6243
 msgid "Epson Stylus Office SX600FW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4005
-msgid "Epson Stylus Offixe TX300F"
+#: src/xml/xmli18n-tmp.h:6244
+msgid "Epson Stylus Office TX300F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4006
+#: src/xml/xmli18n-tmp.h:6245
 msgid "Epson Stylus Office TX600FW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:6246
 msgid "Epson Stylus Photo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4008
+#: src/xml/xmli18n-tmp.h:6247
 msgid "Epson Stylus Photo 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4009
+#: src/xml/xmli18n-tmp.h:6248
 msgid "Epson Stylus Photo EX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:6249
 msgid "Epson Stylus Photo EX3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:6250
 msgid "Epson Stylus Photo 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:6251
 msgid "Epson Stylus Photo 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4013
+#: src/xml/xmli18n-tmp.h:6252
 msgid "Epson Stylus Photo 780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4014
+#: src/xml/xmli18n-tmp.h:6253
 msgid "Epson Stylus Photo 785"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:6254
 msgid "Epson Stylus Photo 790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4016
+#: src/xml/xmli18n-tmp.h:6255
 msgid "Epson Stylus Photo 810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:6256
 msgid "Epson Stylus Photo 820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:6257
 msgid "Epson Stylus Photo 825"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4019
+#: src/xml/xmli18n-tmp.h:6258
 msgid "Epson Stylus Photo 830"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4020
+#: src/xml/xmli18n-tmp.h:6259
 msgid "Epson Stylus Photo 830U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4021
+#: src/xml/xmli18n-tmp.h:6260
 msgid "Epson Stylus Photo 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4022
+#: src/xml/xmli18n-tmp.h:6261
 msgid "Epson Stylus Photo 875"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4023
+#: src/xml/xmli18n-tmp.h:6262
 msgid "Epson Stylus Photo 890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4024
+#: src/xml/xmli18n-tmp.h:6263
 msgid "Epson Stylus Photo 895"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:6264
 msgid "Epson Stylus Photo 900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:6265
 msgid "Epson Stylus Photo 915"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4027
+#: src/xml/xmli18n-tmp.h:6266
 msgid "Epson Stylus Photo 925"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:6267
 msgid "Epson Stylus Photo 935"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:6268
 msgid "Epson Stylus Photo 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:6269
 msgid "Epson Stylus Photo 960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4031
+#: src/xml/xmli18n-tmp.h:6270
 msgid "Epson Stylus Photo 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:6271
 msgid "Epson Stylus Photo 1270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4033
+#: src/xml/xmli18n-tmp.h:6272
 msgid "Epson Stylus Photo 1280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4034
+#: src/xml/xmli18n-tmp.h:6273
 msgid "Epson Stylus Photo 1290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4035
+#: src/xml/xmli18n-tmp.h:6274
 msgid "Epson Stylus Photo 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:6275
 msgid "Epson Stylus Photo 1410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4037
+#: src/xml/xmli18n-tmp.h:6276
 msgid "Epson Stylus Photo 2000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4038
+#: src/xml/xmli18n-tmp.h:6277
 msgid "Epson Stylus Photo 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4039
+#: src/xml/xmli18n-tmp.h:6278
 msgid "Epson Stylus Photo 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:6279
 msgid "Epson Stylus Photo R200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4041
+#: src/xml/xmli18n-tmp.h:6280
 msgid "Epson Stylus Photo R210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:6281
 msgid "Epson Stylus Photo R220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:6282
 msgid "Epson Stylus Photo R230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4044
+#: src/xml/xmli18n-tmp.h:6283
 msgid "Epson Stylus Photo R240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:6284
 msgid "Epson Stylus Photo R245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:6285
 msgid "Epson Stylus Photo R260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:6286
 msgid "Epson Stylus Photo R265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:6287
 msgid "Epson Stylus Photo R270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4049
+#: src/xml/xmli18n-tmp.h:6288
 msgid "Epson Stylus Photo R280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:6289
 msgid "Epson Stylus Photo R285"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4051
+#: src/xml/xmli18n-tmp.h:6290
 msgid "Epson Stylus Photo R290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:6291
 msgid "Epson Stylus Photo R300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4053
+#: src/xml/xmli18n-tmp.h:6292
 msgid "Epson Stylus Photo R310"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4054
+#: src/xml/xmli18n-tmp.h:6293
 msgid "Epson Stylus Photo R320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:6294
 msgid "Epson Stylus Photo R340"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4056
+#: src/xml/xmli18n-tmp.h:6295
 msgid "Epson Stylus Photo R350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:6296
 msgid "Epson Stylus Photo R360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4058
+#: src/xml/xmli18n-tmp.h:6297
 msgid "Epson Stylus Photo R380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4059
+#: src/xml/xmli18n-tmp.h:6298
 msgid "Epson Stylus Photo R390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:6299
 msgid "Epson Stylus Photo R800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:6300
 msgid "Epson Stylus Photo R1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4062
+#: src/xml/xmli18n-tmp.h:6301
 msgid "Epson Stylus Photo R1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:6302
 msgid "Epson Stylus Photo R2400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4064
+#: src/xml/xmli18n-tmp.h:6303
+msgid "Epson Stylus Photo R2880"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6304
 msgid "Epson Stylus Photo RX400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4065
+#: src/xml/xmli18n-tmp.h:6305
 msgid "Epson Stylus Photo RX420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:6306
 msgid "Epson Stylus Photo RX425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4067
+#: src/xml/xmli18n-tmp.h:6307
 msgid "Epson Stylus Photo RX430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:6308
 msgid "Epson Stylus Photo RX500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4069
+#: src/xml/xmli18n-tmp.h:6309
 msgid "Epson Stylus Photo RX510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:6310
 msgid "Epson Stylus Photo RX560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:6311
 msgid "Epson Stylus Photo RX580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4072
+#: src/xml/xmli18n-tmp.h:6312
 msgid "Epson Stylus Photo RX585"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:6313
 msgid "Epson Stylus Photo RX590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4074
+#: src/xml/xmli18n-tmp.h:6314
 msgid "Epson Stylus Photo RX595"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4075
+#: src/xml/xmli18n-tmp.h:6315
 msgid "Epson Stylus Photo RX600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4076
+#: src/xml/xmli18n-tmp.h:6316
 msgid "Epson Stylus Photo RX610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:6317
 msgid "Epson Stylus Photo RX620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4078
+#: src/xml/xmli18n-tmp.h:6318
 msgid "Epson Stylus Photo RX630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:6319
 msgid "Epson Stylus Photo RX640"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:6320
 msgid "Epson Stylus Photo RX680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:6321
 msgid "Epson Stylus Photo RX685"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4082
+#: src/xml/xmli18n-tmp.h:6322
 msgid "Epson Stylus Photo RX690"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:6323
 msgid "Epson Stylus Photo RX700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4084
+#: src/xml/xmli18n-tmp.h:6324
 msgid "Epson Stylus Photo TX700W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4085
-msgid "Epson Stylus Photo TX800W"
+#: src/xml/xmli18n-tmp.h:6325
+msgid "Epson Stylus Photo TX800FW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4086
+#: src/xml/xmli18n-tmp.h:6326
 msgid "Epson Stylus Pro 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4087
+#: src/xml/xmli18n-tmp.h:6327
 msgid "Epson Stylus Pro 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4088
+#: src/xml/xmli18n-tmp.h:6328
 msgid "Epson Stylus Pro 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4089
+#: src/xml/xmli18n-tmp.h:6329
 msgid "Epson Stylus Pro 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:6330
 msgid "Epson Stylus Pro 7600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4091
+#: src/xml/xmli18n-tmp.h:6331
 msgid "Epson Stylus Pro 7800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:6332
 msgid "Epson Stylus Pro 7880"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4093
+#: src/xml/xmli18n-tmp.h:6333
 msgid "Epson Stylus Pro 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4094
+#: src/xml/xmli18n-tmp.h:6334
 msgid "Epson Stylus Pro 9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:6335
 msgid "Epson Stylus Pro 9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:6336
 msgid "Epson Stylus Pro 9800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4097
+#: src/xml/xmli18n-tmp.h:6337
 msgid "Epson Stylus Pro 9880"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:6338
 msgid "Epson Stylus Pro 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4099
+#: src/xml/xmli18n-tmp.h:6339
 msgid "Epson Stylus Pro 11880"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:6340
 msgid "Epson Stylus Scan 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:6341
 msgid "Epson Stylus Scan 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:6342
 msgid "Epson Stylus CX1500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:6343
 msgid "Epson Stylus CX3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:6344
 msgid "Epson Stylus CX3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:6345
 msgid "Epson Stylus CX3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:6346
 msgid "Epson Stylus CX3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:6347
 msgid "Epson Stylus CX3650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:6348
 msgid "Epson Stylus CX3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:6349
 msgid "Epson Stylus CX3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4110
+#: src/xml/xmli18n-tmp.h:6350
 msgid "Epson Stylus CX3805"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:6351
 msgid "Epson Stylus CX3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:6352
 msgid "Epson Stylus CX4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4113
+#: src/xml/xmli18n-tmp.h:6353
 msgid "Epson Stylus CX4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Epson Stylus CX4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:6355
 msgid "Epson Stylus CX4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4116
+#: src/xml/xmli18n-tmp.h:6356
 msgid "Epson Stylus CX4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:6357
 msgid "Epson Stylus CX4700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4118
+#: src/xml/xmli18n-tmp.h:6358
 msgid "Epson Stylus CX4800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4119
+#: src/xml/xmli18n-tmp.h:6359
 msgid "Epson Stylus CX4900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:6360
 msgid "Epson Stylus CX5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4121
+#: src/xml/xmli18n-tmp.h:6361
 msgid "Epson Stylus CX5000F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:6362
 msgid "Epson Stylus CX5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:6363
 msgid "Epson Stylus CX5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4124
+#: src/xml/xmli18n-tmp.h:6364
 msgid "Epson Stylus CX5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:6365
 msgid "Epson Stylus CX5400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4126
+#: src/xml/xmli18n-tmp.h:6366
 msgid "Epson Stylus CX5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4127
+#: src/xml/xmli18n-tmp.h:6367
 msgid "Epson Stylus CX5600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4128
+#: src/xml/xmli18n-tmp.h:6368
 msgid "Epson Stylus CX5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4129
+#: src/xml/xmli18n-tmp.h:6369
 msgid "Epson Stylus CX5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:6370
 msgid "Epson Stylus CX6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:6371
 msgid "Epson Stylus CX6300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:6372
 msgid "Epson Stylus CX6400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:6373
 msgid "Epson Stylus CX6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:6374
 msgid "Epson Stylus CX6600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:6375
 msgid "Epson Stylus CX7000F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:6376
 msgid "Epson Stylus CX7400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:6377
 msgid "Epson Stylus CX7700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:6378
 msgid "Epson Stylus CX7800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:6379
 msgid "Epson Stylus CX8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:6380
 msgid "Epson Stylus CX8400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:6381
 msgid "Epson Stylus CX9300F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:6382
 msgid "Epson Stylus CX9400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:6383
 msgid "Epson Stylus CX9400F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4144
+#: src/xml/xmli18n-tmp.h:6384
 msgid "Epson Stylus CX9475F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:6385
 msgid "Epson Stylus D68"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:6386
 msgid "Epson Stylus D88"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:6387
 msgid "Epson Stylus D92"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:6388
 msgid "Epson Stylus D120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:6389
 msgid "Epson Stylus DX3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:6390
 msgid "Epson Stylus DX3850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:6391
+msgid "Epson Stylus DX4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6392
 msgid "Epson Stylus DX4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:6393
 msgid "Epson Stylus DX4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:6394
 msgid "Epson Stylus DX4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4154
+#: src/xml/xmli18n-tmp.h:6395
 msgid "Epson Stylus DX4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:6396
 msgid "Epson Stylus DX4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:6397
 msgid "Epson Stylus DX4800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:6398
 msgid "Epson Stylus DX4850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:6399
 msgid "Epson Stylus DX7000F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:6400
 msgid "Epson Stylus DX7400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:6401
 msgid "Epson Stylus DX7450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:6402
 msgid "Epson Stylus DX8400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:6403
 msgid "Epson Stylus DX8450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:6404
 msgid "Epson Stylus DX9400F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:6405
 msgid "Epson Stylus NX100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:6406
 msgid "Epson Stylus NX105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:6407
 msgid "Epson Stylus NX200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:6408
 msgid "Epson Stylus NX300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:6409
 msgid "Epson Stylus NX400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4169
-msgid "Epson Stylus PX700FW"
+#: src/xml/xmli18n-tmp.h:6410
+msgid "Epson Stylus PX700W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:6411
 msgid "Epson Stylus PX800FW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:6412
 msgid "Epson Stylus S20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4172
+#: src/xml/xmli18n-tmp.h:6413
 msgid "Epson Stylus SX100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:6414
 msgid "Epson Stylus SX105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4174
+#: src/xml/xmli18n-tmp.h:6415
 msgid "Epson Stylus SX200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:6416
 msgid "Epson Stylus SX205"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:6417
 msgid "Epson Stylus SX400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4177
+#: src/xml/xmli18n-tmp.h:6418
 msgid "Epson Stylus SX405"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4178
+#: src/xml/xmli18n-tmp.h:6419
 msgid "Epson Stylus T20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4179
+#: src/xml/xmli18n-tmp.h:6420
 msgid "Epson Stylus TX100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4180
+#: src/xml/xmli18n-tmp.h:6421
 msgid "Epson Stylus TX101"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4181
+#: src/xml/xmli18n-tmp.h:6422
 msgid "Epson Stylus TX102"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:6423
 msgid "Epson Stylus TX103"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:6424
 msgid "Epson Stylus TX104"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:6425
 msgid "Epson Stylus TX105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:6426
 msgid "Epson Stylus TX106"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:6427
 msgid "Epson Stylus TX109"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4187
+#: src/xml/xmli18n-tmp.h:6428
 msgid "Epson Stylus TX200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4188
+#: src/xml/xmli18n-tmp.h:6429
 msgid "Epson Stylus TX400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:6430
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:6431
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:6432
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4192
+#: src/xml/xmli18n-tmp.h:6433
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:6434
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:6435
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:6436
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4196
+#: src/xml/xmli18n-tmp.h:6437
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:6438
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:6439
 msgid "Epson PictureMate 215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4199
+#: src/xml/xmli18n-tmp.h:6440
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:6441
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:6442
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:6443
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4204
+#: src/xml/xmli18n-tmp.h:6445
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:6446
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:6447
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4207
+#: src/xml/xmli18n-tmp.h:6448
 msgid "Epson WorkForce 30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:6449
 msgid "Epson WorkForce 40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:6450
 msgid "Epson WorkForce 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:6451
 msgid "Epson WorkForce 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:6452
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4212
+#: src/xml/xmli18n-tmp.h:6453
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:6454
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:6455
 msgid "Epson E 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4215
+#: src/xml/xmli18n-tmp.h:6456
 msgid "Epson E 150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4216
+#: src/xml/xmli18n-tmp.h:6457
 msgid "Epson E 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:6458
 msgid "Epson E 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:6459
 msgid "Epson E 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4219
+#: src/xml/xmli18n-tmp.h:6460
 msgid "Epson E 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:6461
 msgid "Epson E 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:6462
 msgid "Epson E 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:6463
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:6464
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4224
+#: src/xml/xmli18n-tmp.h:6465
 msgid "Epson EP 801A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:6466
 msgid "Epson EP 901A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:6467
 msgid "Epson EP 901F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:6468
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4228
+#: src/xml/xmli18n-tmp.h:6469
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4229
+#: src/xml/xmli18n-tmp.h:6470
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:6471
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:6472
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:6473
 msgid "Epson ME 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:6474
 msgid "Epson ME Office 70"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:6475
 msgid "Epson ME Office 80W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:6476
 msgid "Epson ME Office 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:6477
 msgid "Epson ME Office 700FW"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:6478
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4238
+#: src/xml/xmli18n-tmp.h:6479
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:6480
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:6481
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:6482
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4242
+#: src/xml/xmli18n-tmp.h:6483
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4243
+#: src/xml/xmli18n-tmp.h:6484
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:6485
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:6486
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4246
+#: src/xml/xmli18n-tmp.h:6487
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:6488
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:6490
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4251
+#: src/xml/xmli18n-tmp.h:6492
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4253
+#: src/xml/xmli18n-tmp.h:6494
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4254
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:6496
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:6497
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:6498
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:6499
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4259
+#: src/xml/xmli18n-tmp.h:6500
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4260
+#: src/xml/xmli18n-tmp.h:6501
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:6502
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4262
+#: src/xml/xmli18n-tmp.h:6503
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4263
+#: src/xml/xmli18n-tmp.h:6504
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4264
+#: src/xml/xmli18n-tmp.h:6505
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4265
+#: src/xml/xmli18n-tmp.h:6506
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:6507
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:6508
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:6509
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:6510
 msgid "Epson PM 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:6511
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:6512
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:6513
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:6514
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4274
+#: src/xml/xmli18n-tmp.h:6515
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4275
+#: src/xml/xmli18n-tmp.h:6516
 msgid "Epson PM A940"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4276
+#: src/xml/xmli18n-tmp.h:6517
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:6518
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:6519
 msgid "Epson PM D750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:6520
 msgid "Epson PM D770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:6521
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:6522
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:6523
 msgid "Epson PM D1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:6524
 msgid "Epson PM G700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:6525
 msgid "Epson PM G720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4285
+#: src/xml/xmli18n-tmp.h:6526
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4286
+#: src/xml/xmli18n-tmp.h:6527
 msgid "Epson PM G800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:6528
 msgid "Epson PM G820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:6529
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:6530
 msgid "Epson PM T960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:6531
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:6532
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4292
+#: src/xml/xmli18n-tmp.h:6533
 msgid "Epson Offirio PX B300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:6534
 msgid "Epson Offirio PX B500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:6535
 msgid "Epson PX 101"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4295
+#: src/xml/xmli18n-tmp.h:6536
 msgid "Epson PX 201"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4296
+#: src/xml/xmli18n-tmp.h:6537
 msgid "Epson PX 401A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4297
+#: src/xml/xmli18n-tmp.h:6538
 msgid "Epson PX 601F"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:6539
 msgid "Epson PX G900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4299
+#: src/xml/xmli18n-tmp.h:6540
 msgid "Epson PX G920"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:6541
 msgid "Epson PX G5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:6542
 msgid "Epson PX G5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:6543
 msgid "Epson PX V500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:6544
 msgid "Epson PX V600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4305
+#: src/xml/xmli18n-tmp.h:6546
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:6547
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4307
+#: src/xml/xmli18n-tmp.h:6548
+msgid "Epson PX G5600"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6549
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4308
+#: src/xml/xmli18n-tmp.h:6550
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4309
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4310
+#: src/xml/xmli18n-tmp.h:6552
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:6553
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:6554
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4313
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:6556
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4315
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:6559
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:6560
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:6561
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:6562
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:6563
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:6564
 msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:6565
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4324
+#: src/xml/xmli18n-tmp.h:6566
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:6567
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4326
+#: src/xml/xmli18n-tmp.h:6568
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4327
+#: src/xml/xmli18n-tmp.h:6569
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:6570
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:6571
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Brother HL-1430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:6576
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Brother HL-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4337
+#: src/xml/xmli18n-tmp.h:6579
 msgid "Brother HL-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:6580
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:6581
 msgid "Brother HL-1670N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:6582
 msgid "Brother HL-1850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:6583
 msgid "Brother HL-1870N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:6584
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:6585
 msgid "Brother HL-2460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:6586
 msgid "Brother HL-2460N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:6587
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4346
+#: src/xml/xmli18n-tmp.h:6588
 msgid "Brother HL-5030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:6589
 msgid "Brother HL-5040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:6590
 msgid "Brother HL-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:6591
 msgid "Brother HL-5070N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4350
+#: src/xml/xmli18n-tmp.h:6592
 msgid "Brother HL-5140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4351
+#: src/xml/xmli18n-tmp.h:6593
 msgid "Brother HL-5150D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:6594
 msgid "Brother HL-5170DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:6595
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4354
+#: src/xml/xmli18n-tmp.h:6596
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:6597
 msgid "Brother HL-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:6598
 msgid "Brother HL-7050N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4357
+#: src/xml/xmli18n-tmp.h:6599
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4358
+#: src/xml/xmli18n-tmp.h:6600
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:6601
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:6602
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:6603
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:6604
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:6605
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:6606
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:6607
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:6608
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:6609
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:6610
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:6611
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:6612
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:6613
 msgid "DEC 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:6614
 msgid "DEC LN17"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4373
+#: src/xml/xmli18n-tmp.h:6615
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4374
+#: src/xml/xmli18n-tmp.h:6616
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:6617
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4376
+#: src/xml/xmli18n-tmp.h:6618
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:6619
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:6620
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:6621
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:6622
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:6623
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:6624
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:6625
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4384
+#: src/xml/xmli18n-tmp.h:6626
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4385
+#: src/xml/xmli18n-tmp.h:6627
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4386
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4387
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:6630
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4389
+#: src/xml/xmli18n-tmp.h:6631
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4392
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Epson EPL-N2050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Epson EPL-N2050+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:6636
 msgid "Epson EPL-N2050PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:6637
 msgid "Epson EPL-N2050PS+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:6638
 msgid "Epson EPL-N2120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4397
+#: src/xml/xmli18n-tmp.h:6639
 msgid "Epson EPL-N2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:6640
 msgid "Epson EPL-N2500PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:6641
 msgid "Epson EPL-N2750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4400
+#: src/xml/xmli18n-tmp.h:6642
 msgid "Epson EPL-N2750PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:6643
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4403
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:6646
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:6647
 msgid "Generic PCL 4 Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4406
+#: src/xml/xmli18n-tmp.h:6648
 msgid "Generic PCL 4 LF Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4407
+#: src/xml/xmli18n-tmp.h:6649
 msgid "Generic PCL 5 Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4408
+#: src/xml/xmli18n-tmp.h:6650
 msgid "Generic PCL 5 LF Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:6651
 msgid "Generic PCL 5c Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Generic PCL 5c LF Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:6653
 msgid "Generic PCL 5e Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:6654
 msgid "Generic PCL 5e LF Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:6657
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4416
+#: src/xml/xmli18n-tmp.h:6658
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:6659
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:6660
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:6661
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4420
-msgid "Gestetner 3532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4421
-msgid "Gestetner 4235g"
+#: src/xml/xmli18n-tmp.h:6662
+msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:6663
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4423
-msgid "Gestetner 4532"
+#: src/xml/xmli18n-tmp.h:6664
+msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4424
-msgid "Gestetner 4245g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:6665
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:6666
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:6668
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:6669
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:6670
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4431
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:6672
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:6673
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:6674
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:6675
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4436
+#: src/xml/xmli18n-tmp.h:6676
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4437
-msgid "Gestetner DSm635"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4438
-msgid "Gestetner DSm635G"
+#: src/xml/xmli18n-tmp.h:6677
+msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4439
-msgid "Gestetner DSm645"
+#: src/xml/xmli18n-tmp.h:6678
+msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4440
-msgid "Gestetner DS645G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:6679
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:6680
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4443
+#: src/xml/xmli18n-tmp.h:6681
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:6682
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:6683
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4446
-msgid "Gestetner DSm735"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4447
-msgid "Gestetner DSm735G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4448
-msgid "Gestetner DSm745"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4449
-msgid "Gestetner DSm745G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4450
-msgid "Gestetner MP1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4451
-msgid "Gestetner DSm7110"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4452
-msgid "Gestetner MP1350"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4453
-msgid "Gestetner DSm7135"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4454
-msgid "Gestetner MP1600"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4455
-msgid "Gestetner DSm716"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4456
-msgid "Gestetner MP2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4457
-msgid "Gestetner DSm721d"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4458
-msgid "Gestetner MP2500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4459
-msgid "Gestetner DSm625"
+#: src/xml/xmli18n-tmp.h:6684
+msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4460
-msgid "Gestetner MP3500"
+#: src/xml/xmli18n-tmp.h:6685
+msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4461
-msgid "Gestetner DSm735e"
+#: src/xml/xmli18n-tmp.h:6686
+msgid "Gestetner MP1100/DSm7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4462
-msgid "Gestetner MP4500"
+#: src/xml/xmli18n-tmp.h:6687
+msgid "Gestetner MP1350/DSm7135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4463
-msgid "Gestetner DSm745e"
+#: src/xml/xmli18n-tmp.h:6688
+msgid "Gestetner MP1600/DSm716"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4464
-msgid "Gestetner MP5500"
+#: src/xml/xmli18n-tmp.h:6689
+msgid "Gestetner MP2000/DSm721d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4465
-msgid "Gestetner DSm755"
+#: src/xml/xmli18n-tmp.h:6690
+msgid "Gestetner MP2500/DSm625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4466
-msgid "Gestetner MP6500"
+#: src/xml/xmli18n-tmp.h:6691
+msgid "Gestetner MP3500/DSm735e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4467
-msgid "Gestetner DSm765"
+#: src/xml/xmli18n-tmp.h:6692
+msgid "Gestetner MP4500/DSm745e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4468
-msgid "Gestetner MP7500"
+#: src/xml/xmli18n-tmp.h:6693
+msgid "Gestetner MP5500/DSm755"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4469
-msgid "Gestetner DSm775"
+#: src/xml/xmli18n-tmp.h:6694
+msgid "Gestetner MP6500/DSm765"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4470
-msgid "Gestetner MP9000"
+#: src/xml/xmli18n-tmp.h:6695
+msgid "Gestetner MP7500/DSm775"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4471
-msgid "Gestetner DSm790"
+#: src/xml/xmli18n-tmp.h:6696
+msgid "Gestetner MP9000/DSm790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4472
-msgid "Gestetner MP 161"
+#: src/xml/xmli18n-tmp.h:6697
+msgid "Gestetner MP 161/DSm416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4473
-msgid "Gestetner DSm416"
+#: src/xml/xmli18n-tmp.h:6698
+msgid "Gestetner MP 2510/DSm725e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4474
-msgid "Gestetner MP 2510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4475
-msgid "Gestetner DSm725e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:6699
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:6700
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4478
-msgid "Gestetner MP 3010"
+#: src/xml/xmli18n-tmp.h:6701
+msgid "Gestetner MP 3010/DSm730e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4479
-msgid "Gestetner DSm730e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4480
+#: src/xml/xmli18n-tmp.h:6702
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:6703
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:6704
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:6705
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Gestetner MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:6707
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:6708
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:6709
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:6710
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4489
+#: src/xml/xmli18n-tmp.h:6711
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:6712
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:6713
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4492
+#: src/xml/xmli18n-tmp.h:6714
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:6715
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:6716
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4495
+#: src/xml/xmli18n-tmp.h:6717
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4496
+#: src/xml/xmli18n-tmp.h:6718
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4497
+#: src/xml/xmli18n-tmp.h:6719
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:6720
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:6721
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:6722
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:6723
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:6724
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:6725
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:6726
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:6727
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4506
+#: src/xml/xmli18n-tmp.h:6728
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:6729
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4508
+#: src/xml/xmli18n-tmp.h:6730
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4509
+#: src/xml/xmli18n-tmp.h:6731
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4510
+#: src/xml/xmli18n-tmp.h:6732
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:6733
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:6734
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:6735
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:6736
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:6737
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:6738
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:6739
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4518
+#: src/xml/xmli18n-tmp.h:6740
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:6741
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:6742
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:6743
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:6744
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4523
+#: src/xml/xmli18n-tmp.h:6745
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:6746
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:6747
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:6748
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:6749
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4528
+#: src/xml/xmli18n-tmp.h:6750
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4529
+#: src/xml/xmli18n-tmp.h:6751
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4530
+#: src/xml/xmli18n-tmp.h:6752
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:6753
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4532
+#: src/xml/xmli18n-tmp.h:6754
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:6755
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:6756
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:6757
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:6758
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:6759
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:6760
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4539
+#: src/xml/xmli18n-tmp.h:6761
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4540
+#: src/xml/xmli18n-tmp.h:6762
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4541
+#: src/xml/xmli18n-tmp.h:6763
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4542
+#: src/xml/xmli18n-tmp.h:6764
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4543
+#: src/xml/xmli18n-tmp.h:6765
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:6766
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:6767
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4546
+#: src/xml/xmli18n-tmp.h:6768
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:6769
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:6770
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:6771
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:6772
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:6773
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4552
+#: src/xml/xmli18n-tmp.h:6774
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:6775
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:6776
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:6777
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:6778
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:6779
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:6780
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:6781
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:6782
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:6783
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:6784
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:6785
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:6786
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:6787
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:6788
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4567
+#: src/xml/xmli18n-tmp.h:6789
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4568
+#: src/xml/xmli18n-tmp.h:6790
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:6791
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4570
+#: src/xml/xmli18n-tmp.h:6792
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4571
+#: src/xml/xmli18n-tmp.h:6793
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:6794
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:6795
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:6796
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:6797
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:6798
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:6799
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:6800
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:6801
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:6802
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:6803
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4582
+#: src/xml/xmli18n-tmp.h:6804
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4583
+#: src/xml/xmli18n-tmp.h:6805
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4584
+#: src/xml/xmli18n-tmp.h:6806
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4585
+#: src/xml/xmli18n-tmp.h:6807
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:6808
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:6809
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:6810
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:6811
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:6812
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:6813
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:6814
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4593
+#: src/xml/xmli18n-tmp.h:6815
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4594
+#: src/xml/xmli18n-tmp.h:6816
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:6817
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:6818
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4597
+#: src/xml/xmli18n-tmp.h:6819
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:6820
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:6821
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:6822
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:6823
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4602
+#: src/xml/xmli18n-tmp.h:6824
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:6825
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:6826
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:6827
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:6828
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4607
+#: src/xml/xmli18n-tmp.h:6829
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:6830
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4609
+#: src/xml/xmli18n-tmp.h:6831
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4610
+#: src/xml/xmli18n-tmp.h:6832
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:6833
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:6834
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4613
+#: src/xml/xmli18n-tmp.h:6835
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:6836
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:6837
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:6838
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:6839
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:6840
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:6841
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:6842
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:6843
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:6844
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:6845
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4624
+#: src/xml/xmli18n-tmp.h:6846
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4625
+#: src/xml/xmli18n-tmp.h:6847
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:6848
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4627
+#: src/xml/xmli18n-tmp.h:6849
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4628
+#: src/xml/xmli18n-tmp.h:6850
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:6851
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:6852
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:6853
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:6854
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:6855
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:6856
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:6857
 msgid "HP LaserJet 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4636
+#: src/xml/xmli18n-tmp.h:6858
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4637
+#: src/xml/xmli18n-tmp.h:6859
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4638
+#: src/xml/xmli18n-tmp.h:6860
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:6861
 msgid "HP LaserJet 1320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4640
+#: src/xml/xmli18n-tmp.h:6862
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:6863
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:6864
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:6865
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4644
+#: src/xml/xmli18n-tmp.h:6866
 msgid "HP LaserJet 2410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:6867
 msgid "HP LaserJet 2420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:6868
 msgid "HP LaserJet 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4647
+#: src/xml/xmli18n-tmp.h:6869
 msgid "HP LaserJet 3015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4648
+#: src/xml/xmli18n-tmp.h:6870
 msgid "HP LaserJet 3020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:6871
 msgid "HP LaserJet 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4650
+#: src/xml/xmli18n-tmp.h:6872
 msgid "HP LaserJet 3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:6873
 msgid "HP LaserJet 3052"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:6874
 msgid "HP LaserJet 3055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:6875
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:6876
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:6877
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:6878
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:6879
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:6880
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:6881
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4660
+#: src/xml/xmli18n-tmp.h:6882
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:6883
 msgid "HP LaserJet 3380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:6884
 msgid "HP LaserJet 3390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4663
+#: src/xml/xmli18n-tmp.h:6885
 msgid "HP LaserJet 3392"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:6886
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:6887
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:6888
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4667
+#: src/xml/xmli18n-tmp.h:6889
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:6890
 msgid "HP LaserJet 4240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:6891
 msgid "HP LaserJet 4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:6892
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4671
+#: src/xml/xmli18n-tmp.h:6893
 msgid "HP LaserJet 4345 mfp"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:6894
 msgid "HP LaserJet 4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:6895
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:6896
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:6897
 msgid "HP LaserJet 5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:6898
 msgid "HP LaserJet 5200L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:6899
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:6900
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:6901
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4680
+#: src/xml/xmli18n-tmp.h:6902
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:6903
 msgid "HP LaserJet 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4682
+#: src/xml/xmli18n-tmp.h:6904
 msgid "HP LaserJet 9040 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4683
+#: src/xml/xmli18n-tmp.h:6905
 msgid "HP LaserJet 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4684
+#: src/xml/xmli18n-tmp.h:6906
 msgid "HP LaserJet 9050 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:6907
 msgid "HP LaserJet M3027 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:6908
 msgid "HP LaserJet M3035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:6909
 msgid "HP LaserJet M4345 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:6910
 msgid "HP LaserJet M5025 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:6911
 msgid "HP LaserJet M5035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:6912
 msgid "HP LaserJet P2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:6913
 msgid "HP LaserJet P2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:6914
 msgid "HP LaserJet P3004"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:6915
 msgid "HP LaserJet P3005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:6916
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4695
+#: src/xml/xmli18n-tmp.h:6917
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:6918
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:6919
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:6920
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:6921
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4700
+#: src/xml/xmli18n-tmp.h:6922
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:6923
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:6924
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4703
+#: src/xml/xmli18n-tmp.h:6925
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:6926
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:6927
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4706
+#: src/xml/xmli18n-tmp.h:6928
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4707
+#: src/xml/xmli18n-tmp.h:6929
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:6930
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:6931
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4710
+#: src/xml/xmli18n-tmp.h:6932
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:6933
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:6934
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:6935
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:6936
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:6937
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:6938
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:6939
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4718
+#: src/xml/xmli18n-tmp.h:6940
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:6941
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:6942
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4721
+#: src/xml/xmli18n-tmp.h:6943
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:6944
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:6945
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:6946
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4725
+#: src/xml/xmli18n-tmp.h:6947
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:6948
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:6949
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4728
+#: src/xml/xmli18n-tmp.h:6950
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4729
+#: src/xml/xmli18n-tmp.h:6951
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:6952
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:6953
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4732
+#: src/xml/xmli18n-tmp.h:6954
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:6955
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:6956
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:6957
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:6958
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:6959
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:6960
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4739
+#: src/xml/xmli18n-tmp.h:6961
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4740
+#: src/xml/xmli18n-tmp.h:6962
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4741
+#: src/xml/xmli18n-tmp.h:6963
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4742
+#: src/xml/xmli18n-tmp.h:6964
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:6965
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:6966
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4745
+#: src/xml/xmli18n-tmp.h:6967
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:6968
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:6969
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:6970
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4749
+#: src/xml/xmli18n-tmp.h:6971
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:6972
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:6973
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4752
+#: src/xml/xmli18n-tmp.h:6974
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:6975
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:6976
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4755
+#: src/xml/xmli18n-tmp.h:6977
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:6978
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:6979
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:6980
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4759
+#: src/xml/xmli18n-tmp.h:6981
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4760
+#: src/xml/xmli18n-tmp.h:6982
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:6983
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4762
+#: src/xml/xmli18n-tmp.h:6984
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:6985
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:6986
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4765
+#: src/xml/xmli18n-tmp.h:6987
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:6988
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:6989
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:6990
 msgid "HP e-printer e20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:6991
 msgid "IBM 4019"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:6992
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:6993
 msgid "IBM 4312"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4772
+#: src/xml/xmli18n-tmp.h:6994
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:6995
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4774
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4775
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4776
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:6999
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:7000
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:7002
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:7003
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:7004
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:7005
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:7006
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:7007
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:7008
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:7009
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:7010
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:7011
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4790
+#: src/xml/xmli18n-tmp.h:7012
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:7013
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:7014
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:7015
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4794
+#: src/xml/xmli18n-tmp.h:7016
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:7017
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:7018
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4797
+#: src/xml/xmli18n-tmp.h:7019
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:7020
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:7021
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:7022
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:7023
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:7025
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:7026
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:7027
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:7028
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4807
+#: src/xml/xmli18n-tmp.h:7029
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4808
+#: src/xml/xmli18n-tmp.h:7030
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:7031
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:7032
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:7034
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:7035
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:7037
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:7039
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:7040
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4819
+#: src/xml/xmli18n-tmp.h:7041
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:7042
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:7043
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:7044
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:7045
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:7046
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:7047
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:7048
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:7049
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:7050
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:7051
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4830
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:7057
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4837
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4840
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4842
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4852
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4853
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4854
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4855
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4866
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4867
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4873
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4874
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4883
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4886
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4888
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4890
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4894
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4896
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4903
-msgid "Lanier MP 2500"
+#: src/xml/xmli18n-tmp.h:7125
+msgid "Lanier MP2500/LD125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4904
-msgid "Lanier LD125"
+#: src/xml/xmli18n-tmp.h:7126
+msgid "Lanier MP 1100/LD1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4905
-msgid "Lanier MP 1100"
+#: src/xml/xmli18n-tmp.h:7127
+msgid "Lanier MP 1350/LD1135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4906
-msgid "Lanier LD1100"
+#: src/xml/xmli18n-tmp.h:7128
+msgid "Lanier MP 1600/LD316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4907
-msgid "Lanier MP 1350"
+#: src/xml/xmli18n-tmp.h:7129
+msgid "Lanier MP 161/LD016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4908
-msgid "Lanier LD1135"
+#: src/xml/xmli18n-tmp.h:7130
+msgid "Lanier MP 2000/LD320d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4909
-msgid "Lanier MP 1600"
+#: src/xml/xmli18n-tmp.h:7131
+msgid "Lanier MP 2510/LD325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4910
-msgid "Lanier LD316"
+#: src/xml/xmli18n-tmp.h:7132
+msgid "Lanier MP 2550B/LD425B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4911
-msgid "Lanier MP 161"
+#: src/xml/xmli18n-tmp.h:7133
+msgid "Lanier MP 2550/LD425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4912
-msgid "Lanier LD016"
+#: src/xml/xmli18n-tmp.h:7134
+msgid "Lanier MP 3010/LD330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4913
-msgid "Lanier MP 2000"
+#: src/xml/xmli18n-tmp.h:7135
+msgid "Lanier MP 3350B/LD433B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4914
-msgid "Lanier LD320d"
+#: src/xml/xmli18n-tmp.h:7136
+msgid "Lanier MP 3350/LD433"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4915
-msgid "Lanier MP 2510"
+#: src/xml/xmli18n-tmp.h:7137
+msgid "Lanier MP 3500/LD335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4916
-msgid "Lanier LD325"
+#: src/xml/xmli18n-tmp.h:7138
+msgid "Lanier MP 4000B/LD040B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4917
-msgid "Lanier MP 2550B"
+#: src/xml/xmli18n-tmp.h:7139
+msgid "Lanier MP 4000/LD040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4918
-msgid "Lanier LD425B"
+#: src/xml/xmli18n-tmp.h:7140
+msgid "Lanier MP 4500/LD345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4919
-msgid "Lanier MP 2550"
+#: src/xml/xmli18n-tmp.h:7141
+msgid "Lanier MP 5000B/LD050B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4920
-msgid "Lanier LD425"
+#: src/xml/xmli18n-tmp.h:7142
+msgid "Lanier MP 5000/LD050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4921
-msgid "Lanier MP 3010"
+#: src/xml/xmli18n-tmp.h:7143
+msgid "Lanier MP 5500/LD255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4922
-msgid "Lanier LD330"
+#: src/xml/xmli18n-tmp.h:7144
+msgid "Lanier MP 6500/LD265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4923
-msgid "Lanier MP 3350B"
+#: src/xml/xmli18n-tmp.h:7145
+msgid "Lanier MP 7500/LD275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4924
-msgid "Lanier LD433B"
+#: src/xml/xmli18n-tmp.h:7146
+msgid "Lanier MP 9000/LD190"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4925
-msgid "Lanier MP 3350"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4926
-msgid "Lanier LD433"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4927
-msgid "Lanier MP 3500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4928
-msgid "Lanier LD335"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4929
-msgid "Lanier MP 4000B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4930
-msgid "Lanier LD040B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4931
-msgid "Lanier MP 4000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4932
-msgid "Lanier LD040"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4933
-msgid "Lanier MP 4500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4934
-msgid "Lanier LD345"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4935
-msgid "Lanier MP 5000B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4936
-msgid "Lanier LD050B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4937
-msgid "Lanier MP 5000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4938
-msgid "Lanier LD050"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4939
-msgid "Lanier MP 5500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4940
-msgid "Lanier LD255"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4941
-msgid "Lanier MP 6500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4942
-msgid "Lanier LD265"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4943
-msgid "Lanier MP 7500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4944
-msgid "Lanier LD275"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4945
-msgid "Lanier MP 9000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4946
-msgid "Lanier LD190"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:7148
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4950
+#: src/xml/xmli18n-tmp.h:7150
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:7151
 msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4952
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4953
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:7155
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4960
+#: src/xml/xmli18n-tmp.h:7160
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:7161
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:7162
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4963
+#: src/xml/xmli18n-tmp.h:7163
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:7164
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:7165
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4966
-msgid "NRG 10515"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4967
-msgid "NRG 10518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4968
-msgid "NRG 10512"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4969
-msgid "NRG 2205"
+#: src/xml/xmli18n-tmp.h:7166
+msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4970
-msgid "NRG 2238"
+#: src/xml/xmli18n-tmp.h:7167
+msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4971
-msgid "NRG 2212"
+#: src/xml/xmli18n-tmp.h:7168
+msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4972
-msgid "NRG 2705"
+#: src/xml/xmli18n-tmp.h:7169
+msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4973
-msgid "NRG 2738"
+#: src/xml/xmli18n-tmp.h:7170
+msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4974
-msgid "NRG 2712"
+#: src/xml/xmli18n-tmp.h:7171
+msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4975
-msgid "NRG 3205"
+#: src/xml/xmli18n-tmp.h:7172
+msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4976
-msgid "NRG 3238"
+#: src/xml/xmli18n-tmp.h:7173
+msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4977
-msgid "NRG 3212"
+#: src/xml/xmli18n-tmp.h:7174
+msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4978
-msgid "NRG 3525"
+#: src/xml/xmli18n-tmp.h:7175
+msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4979
-msgid "NRG 3508"
+#: src/xml/xmli18n-tmp.h:7176
+msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4980
-msgid "NRG 3502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4981
-msgid "NRG 3545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4982
-msgid "NRG 3518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4983
-msgid "NRG 3532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4984
-msgid "NRG 4525"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4985
-msgid "NRG 4508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4986
-msgid "NRG 4502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4987
-msgid "NRG 4545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4988
-msgid "NRG 4518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4989
-msgid "NRG 4532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4990
-msgid "NRG 6002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4991
-msgid "NRG 6005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4992
-msgid "NRG 6008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4993
-msgid "NRG 7502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4994
-msgid "NRG 7505"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4995
-msgid "NRG 7508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4996
-msgid "NRG 9005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4997
-msgid "NRG 9008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4998
-msgid "NRG 9002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:7177
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:7178
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5001
+#: src/xml/xmli18n-tmp.h:7179
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:7180
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:7181
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:7182
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:7183
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5006
+#: src/xml/xmli18n-tmp.h:7184
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:7185
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:7186
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5009
+#: src/xml/xmli18n-tmp.h:7187
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:7188
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:7189
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:7190
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:7191
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:7192
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5015
+#: src/xml/xmli18n-tmp.h:7193
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5016
+#: src/xml/xmli18n-tmp.h:7194
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5017
+#: src/xml/xmli18n-tmp.h:7195
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:7196
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:7197
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:7198
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:7199
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:7200
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:7201
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:7202
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5025
+#: src/xml/xmli18n-tmp.h:7203
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:7204
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:7205
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5028
+#: src/xml/xmli18n-tmp.h:7206
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:7207
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:7208
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:7209
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:7210
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5033
+#: src/xml/xmli18n-tmp.h:7211
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:7212
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:7213
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:7214
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:7215
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:7216
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:7217
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5040
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5051
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5053
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:7232
 msgid "Oki Super 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:7234
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:7235
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5060
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5062
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5063
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:7242
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:7243
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:7244
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:7245
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:7246
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:7247
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:7248
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:7249
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5072
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5074
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5075
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5076
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:7255
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:7258
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5081
+#: src/xml/xmli18n-tmp.h:7259
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:7263
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5086
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5088
+#: src/xml/xmli18n-tmp.h:7266
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:7267
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5090
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5091
+#: src/xml/xmli18n-tmp.h:7269
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:7270
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5093
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5099
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5103
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5104
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:7284
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5107
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5108
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5110
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5118
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5120
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5126
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5127
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5131
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5133
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5134
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5138
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5146
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5147
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5150
-msgid "Savin 2535"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5151
-msgid "Savin 2235"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5152
-msgid "Savin 2545"
+#: src/xml/xmli18n-tmp.h:7328
+msgid "Savin 2535/2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5153
-msgid "Savin 2245"
+#: src/xml/xmli18n-tmp.h:7329
+msgid "Savin 2545/2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5154
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Savin 2560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5155
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5158
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5160
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5163
-msgid "Savin 4035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5164
-msgid "Savin 4135g"
+#: src/xml/xmli18n-tmp.h:7339
+msgid "Savin 4035/4135g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5165
-msgid "Savin 4035e"
+#: src/xml/xmli18n-tmp.h:7340
+msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5166
-msgid "Savin 4135eG"
+#: src/xml/xmli18n-tmp.h:7341
+msgid "Savin 4045/4145g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5167
-msgid "Savin 4045"
+#: src/xml/xmli18n-tmp.h:7342
+msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5168
-msgid "Savin 4145g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5169
-msgid "Savin 4045e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5170
-msgid "Savin 4145eG"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5171
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Savin 4060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5173
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5174
+#: src/xml/xmli18n-tmp.h:7346
 msgid "Savin 4090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:7348
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5177
+#: src/xml/xmli18n-tmp.h:7349
 msgid "Savin 8020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:7353
 msgid "Savin 8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5183
-msgid "Savin 8035"
+#: src/xml/xmli18n-tmp.h:7355
+msgid "Savin 8035/8035g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5184
-msgid "Savin 8035g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5186
-msgid "Savin 8045"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5187
-msgid "Savin 8045g"
+#: src/xml/xmli18n-tmp.h:7357
+msgid "Savin 8045/8045g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5190
+#: src/xml/xmli18n-tmp.h:7360
 msgid "Savin 8065"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5192
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Savin 8090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5194
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:7370
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5201
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:7373
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:7374
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5205
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5206
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:7379
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5211
+#: src/xml/xmli18n-tmp.h:7381
 msgid "Star LaserPrinter 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5212
+#: src/xml/xmli18n-tmp.h:7382
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5213
+#: src/xml/xmli18n-tmp.h:7383
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5216
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5221
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5224
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5225
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5227
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5230
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:7404
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5236
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:7409
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:7410
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5244
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5247
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5249
+#: src/xml/xmli18n-tmp.h:7419
+msgid "Canon SELPHY-CP-520"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Canon SELPHY-CP-720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5252
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Canon SELPHY-CP-730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Canon SELPHY-CP-740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Canon SELPHY-CP-750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Canon SELPHY ES1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Canon SELPHY ES2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Canon SELPHY ES20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5258
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5259
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:7434
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:7438
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5268
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Dai Nippon Printing DS40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Dai Nippon Printing DS80"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5269
+#: src/xml/xmli18n-tmp.h:7442
 msgid "RAW DATA 8 bit"
 msgstr ""
diff --git a/po/hu.gmo b/po/hu.gmo
index c816902..3fb4e49 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
diff --git a/po/hu.po b/po/hu.po
index dcd0df1..d8fa6c7 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gutenprint 5.1.98.1\n"
 "Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-21 22:25-0500\n"
+"POT-Creation-Date: 2009-07-26 19:14-0400\n"
 "PO-Revision-Date: 2008-05-11 15:51+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -21,7 +21,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2109 src/main/print-pcl.c:1779
+#: src/main/print-escp2.c:2314 src/main/print-pcl.c:1779
 msgid "Default"
 msgstr "Alapértelmezett"
 
@@ -94,15 +94,15 @@ msgstr "Sűrűség"
 
 #: src/main/dither-main.c:91 src/main/print-canon.c:300
 #: src/main/print-canon.c:308 src/main/print-canon.c:316
-#: src/main/print-canon.c:324 src/main/print-escp2.c:439
-#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
-#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-canon.c:324 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: 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-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:1769
-#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
-#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1935
+#: src/main/print-olympus.c:1943 src/main/print-olympus.c:1951
+#: src/main/print-olympus.c:1959 src/main/print-pcl.c:1324
 #: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
 #: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
@@ -166,7 +166,7 @@ msgid "Dither algorithm"
 msgstr "Szórási algoritmus"
 
 #: src/main/print-canon.c:199 src/main/print-escp2.c:165
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1866
 #: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Oldalméret"
@@ -183,8 +183,8 @@ msgstr "Oldalméret"
 #: src/main/print-escp2.c:254 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:1704 src/main/print-olympus.c:1710
-#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-olympus.c:1866 src/main/print-olympus.c:1872
+#: src/main/print-olympus.c:1878 src/main/print-olympus.c:1884
 #: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
 #: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
 #: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
@@ -193,31 +193,31 @@ msgid "Basic Printer Setup"
 msgstr "Nyomtató alapbeállításai"
 
 #: src/main/print-canon.c:200 src/main/print-escp2.c:166
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1867
 #: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr "A nyomtatáshoz használt papír mérete"
 
 #: src/main/print-canon.c:205 src/main/print-escp2.c:171
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1259 src/cups/genppd.c:1339 src/cups/genppd.c:2001
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1872
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1372 src/cups/genppd.c:2035
 msgid "Media Type"
 msgstr "Papír típusa"
 
 #: src/main/print-canon.c:206 src/main/print-escp2.c:172
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1873
 #: src/main/print-pcl.c:1260
 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:211 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
-#: src/main/print-pcl.c:1265 src/cups/genppd.c:1368 src/cups/genppd.c:2020
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1878
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1401 src/cups/genppd.c:2054
 msgid "Media Source"
 msgstr "Papír forrása"
 
 #: src/main/print-canon.c:212 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1879
 #: src/main/print-pcl.c:1266
 msgid "Source (input slot) of the media"
 msgstr "A nyomtatáshoz használt hordozó forrása"
@@ -253,8 +253,8 @@ msgstr "CD vízszintes finomhangolása"
 #: src/main/print-canon.c:235 src/main/print-canon.c:241
 #: src/main/print-canon.c:253 src/main/print-escp2.c:207
 #: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1906
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr "Haladó nyomtatóbeállítások"
@@ -269,25 +269,25 @@ msgid "CD Vertical Fine Adjustment"
 msgstr "CD függőleges finomhangolása"
 
 #: src/main/print-canon.c:247 src/main/print-escp2.c:219
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
-#: src/main/print-pcl.c:1277 src/cups/genppd.c:1446 src/cups/genppd.c:2056
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1884
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1479 src/cups/genppd.c:2090
 msgid "Resolution"
 msgstr "Felbontás"
 
 #: src/main/print-canon.c:248 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1723
+#: src/main/print-olympus.c:1885
 msgid "Resolution and quality of the print"
 msgstr "A nyomtatás felbontása és minősége"
 
 #: src/main/print-canon.c:253 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tinta típusa"
 
 #: src/main/print-canon.c:254 src/main/print-escp2.c:231
 #: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
+#: src/main/print-olympus.c:1891 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "A nyomtatóban levő tinta típusa"
@@ -305,32 +305,33 @@ msgstr "Tintacsatornák"
 #: 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-escp2.c:320 src/main/print-escp2.c:767
-#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
-#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
-#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
-#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:893 src/main/print-escp2.c:901
+#: src/main/print-escp2.c:909 src/main/print-escp2.c:925
+#: src/main/print-escp2.c:933 src/main/print-escp2.c:941
+#: src/main/print-escp2.c:949 src/main/print-escp2.c:957
+#: src/main/print-escp2.c:965 src/main/print-escp2.c:973
 #: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr "Haladó nyomtatófunkciók"
 
-#: src/main/print-canon.c:265 src/main/print-escp2.c:326
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-canon.c:265 src/main/print-escp2.c:332
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1912
 #: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Nyomtatási mód"
 
 #: src/main/print-canon.c:265 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:326
-#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-color.c:208 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1912 src/main/print-pcl.c:1295
 #: src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr "Alap paraméter"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:327
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-canon.c:266 src/main/print-escp2.c:333
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1913
 #: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Nyomtatás kimeneti módja"
@@ -358,77 +359,84 @@ msgstr "Nyomtatási minőség"
 msgid "Basic Output Adjustment"
 msgstr "Alap kimenetvezérlés"
 
-#: src/main/print-canon.c:300 src/main/print-escp2.c:439
+#: src/main/print-canon.c:300 src/main/print-escp2.c:445
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 msgid "Cyan Density"
 msgstr "Ciánkék sűrűsége"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:301 src/main/print-escp2.c:446
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 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:308 src/main/print-escp2.c:447
+#: src/main/print-canon.c:308 src/main/print-escp2.c:453
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 msgid "Magenta Density"
 msgstr "Bíborvörös sűrűsége"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:309 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 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:316 src/main/print-escp2.c:455
+#: src/main/print-canon.c:316 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 msgid "Yellow Density"
 msgstr "Sárga sűrűsége"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:317 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 msgid "Adjust the yellow density"
 msgstr "A nyomat sárga-sűrűségének beállítása"
 
-#: src/main/print-canon.c:324 src/main/print-escp2.c:463
+#: src/main/print-canon.c:324 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 msgid "Black Density"
 msgstr "Fekete sűrűsége"
 
-#: src/main/print-canon.c:325 src/main/print-escp2.c:464
+#: src/main/print-canon.c:325 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 msgid "Adjust the black density"
 msgstr "A nyomat fekete-sűrűségének beállítása"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:333
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:541 src/main/print-escp2.c:542
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 msgid "Light Cyan Transition"
 msgstr "Világos ciánkék átmenet"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:340
-#: src/main/print-canon.c:348 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
-#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
-#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
-#: src/main/print-pcl.c:1364
+#: src/main/print-canon.c:348 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:541
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:557
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:573
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:589
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:605
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:621
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:637
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:653
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:669
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:685
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:701
+#: src/main/print-escp2.c:709 src/main/print-escp2.c:717
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:733
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:749
+#: src/main/print-escp2.c:757 src/main/print-escp2.c:765
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:781
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:797
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:813
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:829
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:845
+#: src/main/print-escp2.c:853 src/main/print-escp2.c:861
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr "Haladó tintabeállítás"
 
 #: src/main/print-canon.c:340 src/main/print-canon.c:341
-#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
+#: src/main/print-escp2.c:573 src/main/print-escp2.c:574
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 msgid "Light Magenta Transition"
@@ -438,14 +446,14 @@ msgstr "Világos bíborvörös átmenet"
 msgid "Light Yellow Transition"
 msgstr "Világossárga átmenet"
 
-#: src/main/print-canon.c:368 src/main/print-escp2.c:2283
-#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3609
-#: src/xml/xmli18n-tmp.h:3614 src/xml/xmli18n-tmp.h:3620
-#: src/xml/xmli18n-tmp.h:3627
+#: src/main/print-canon.c:368 src/main/print-escp2.c:2488
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5851 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5864
 msgid "Off"
 msgstr "Kikapcsolva"
 
-#: src/main/print-canon.c:369 src/main/print-escp2.c:2285
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2490
 #: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr "hosszabbik él (szabvány)"
@@ -454,63 +462,64 @@ msgstr "hosszabbik él (szabvány)"
 msgid "Short Edge (Flip)"
 msgstr "Rövidebbik él (tükrözve)"
 
-#: src/main/print-canon.c:646 src/main/print-escp2.c:2005
-#: src/xml/xmli18n-tmp.h:3676
+#: src/main/print-canon.c:646 src/main/print-escp2.c:2210
+#: src/xml/xmli18n-tmp.h:5913
 msgid "CD - 5 inch"
 msgstr "5 hüvelykes CD"
 
-#: src/main/print-canon.c:648 src/main/print-escp2.c:2007
-#: src/xml/xmli18n-tmp.h:3677
+#: src/main/print-canon.c:648 src/main/print-escp2.c:2212
+#: src/xml/xmli18n-tmp.h:5914
 msgid "CD - 3 inch"
 msgstr "3 hüvelykes CD"
 
-#: src/main/print-canon.c:650 src/main/print-escp2.c:2009
-#: src/xml/xmli18n-tmp.h:3678
+#: src/main/print-canon.c:650 src/main/print-escp2.c:2214
+#: src/xml/xmli18n-tmp.h:5915
 msgid "CD - Custom"
 msgstr "CD - Egyéni"
 
-#: src/main/print-canon.c:673 src/main/print-escp2.c:2034
-#: src/cups/genppd.c:1323 src/cups/genppd.c:1572 src/cups/genppd.c:1988
-#: src/cups/genppd.c:2079
+#: src/main/print-canon.c:673 src/main/print-escp2.c:2239
+#: src/cups/genppd.c:1356 src/cups/genppd.c:1605 src/cups/genppd.c:2022
+#: src/cups/genppd.c:2113
 msgid "Normal"
 msgstr "Normál"
 
-#: src/main/print-canon.c:675 src/main/print-escp2.c:2036
+#: src/main/print-canon.c:675 src/main/print-escp2.c:2241
 msgid "Print To Hub"
 msgstr "Nyomtatás a középpontig"
 
-#: src/main/print-canon.c:790 src/main/print-escp2.c:2447
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-canon.c:790 src/main/print-escp2.c:2652
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2167
 #: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
 #: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Színes"
 
-#: src/main/print-canon.c:792 src/main/print-escp2.c:2449
+#: src/main/print-canon.c:792 src/main/print-escp2.c:2654
 #: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
 #: src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "Fekete-fehér"
 
-#: src/main/print-canon.c:831 src/main/print-escp2.c:2089
+#: src/main/print-canon.c:831 src/main/print-escp2.c:2294
 #: src/main/print-pcl.c:1797 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr "Kézi vezérlés"
 
-#: src/main/print-canon.c:833 src/main/print-escp2.c:2131
-#: src/main/print-escp2.c:2229 src/main/print-escp2.c:2241
+#: src/main/print-canon.c:833 src/main/print-escp2.c:2336
+#: src/main/print-escp2.c:2434 src/main/print-escp2.c:2446
 #: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
 #: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
-#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1215
-#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1219
-#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
-#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3170
-#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3177
-#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3461
-#: src/xml/xmli18n-tmp.h:3464 src/xml/xmli18n-tmp.h:3632
-#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3648
-#: src/xml/xmli18n-tmp.h:3657 src/xml/xmli18n-tmp.h:3665
+#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1627 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3713 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3722 src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5902
 msgid "Standard"
 msgstr "Szabványos"
 
@@ -547,7 +556,7 @@ msgid "Pre-Dithered"
 msgstr "Előszórt"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1268 src/cups/genppd.c:1971
+#: src/cups/genppd.c:1301 src/cups/genppd.c:2005
 msgid "Grayscale"
 msgstr "Szürkeárnyalatos"
 
@@ -563,11 +572,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1299 src/cups/genppd.c:1978
+#: src/main/print-color.c:129 src/cups/genppd.c:1332 src/cups/genppd.c:2012
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1306 src/cups/genppd.c:1979
+#: src/main/print-color.c:131 src/cups/genppd.c:1339 src/cups/genppd.c:2013
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -627,7 +636,7 @@ msgid "Output image type"
 msgstr "Kimeneti kép típusa"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338
 msgid "Raw Channels"
 msgstr "Nyers csatornák"
 
@@ -689,56 +698,208 @@ msgstr "Az alkalmazás által feltételezett gamma érték"
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
 #: src/escputil/escputil.c:997 src/escputil/escputil.c:1017
-#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:1812
-#: src/xml/xmli18n-tmp.h:1823 src/xml/xmli18n-tmp.h:1836
-#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1863
-#: src/xml/xmli18n-tmp.h:1876 src/xml/xmli18n-tmp.h:1889
-#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1918
-#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1949
-#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1975
-#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:1999
-#: src/xml/xmli18n-tmp.h:2013 src/xml/xmli18n-tmp.h:2027
-#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2051
-#: src/xml/xmli18n-tmp.h:2064 src/xml/xmli18n-tmp.h:2076
-#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2102
-#: src/xml/xmli18n-tmp.h:2116 src/xml/xmli18n-tmp.h:2130
-#: src/xml/xmli18n-tmp.h:2143 src/xml/xmli18n-tmp.h:2156
-#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2184
-#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2210
-#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2236
-#: src/xml/xmli18n-tmp.h:2249 src/xml/xmli18n-tmp.h:2262
-#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2290
-#: src/xml/xmli18n-tmp.h:2305 src/xml/xmli18n-tmp.h:2320
-#: src/xml/xmli18n-tmp.h:2332 src/xml/xmli18n-tmp.h:2343
-#: src/xml/xmli18n-tmp.h:2356 src/xml/xmli18n-tmp.h:2369
-#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2392
-#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2415
-#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2442
-#: src/xml/xmli18n-tmp.h:2454 src/xml/xmli18n-tmp.h:2466
-#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2496
-#: src/xml/xmli18n-tmp.h:2509 src/xml/xmli18n-tmp.h:2522
-#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
-#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2574
-#: src/xml/xmli18n-tmp.h:2586 src/xml/xmli18n-tmp.h:2598
-#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2623
-#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2653
-#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2683
-#: src/xml/xmli18n-tmp.h:2697 src/xml/xmli18n-tmp.h:2715
-#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2745
-#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
-#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2803
-#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2828
-#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2854
-#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2881
-#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2915
-#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2943
-#: src/xml/xmli18n-tmp.h:2959 src/xml/xmli18n-tmp.h:2976
-#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:3004
-#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3032
-#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3062
-#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3093
-#: src/xml/xmli18n-tmp.h:3107 src/xml/xmli18n-tmp.h:3125
-#: src/xml/xmli18n-tmp.h:3141
+#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2387
+#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2413
+#: src/xml/xmli18n-tmp.h:2426 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2499
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2551
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2575
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2708
+#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2786
+#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2814
+#: src/xml/xmli18n-tmp.h:2829 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2893
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2966
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3005 src/xml/xmli18n-tmp.h:3020
+#: src/xml/xmli18n-tmp.h:3033 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3061 src/xml/xmli18n-tmp.h:3073
+#: src/xml/xmli18n-tmp.h:3085 src/xml/xmli18n-tmp.h:3098
+#: src/xml/xmli18n-tmp.h:3110 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3377
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3616
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3648
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3766 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3775 src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:3794 src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:3805 src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3869 src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:3880 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3902 src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:3913 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:3948 src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:3970 src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:3983 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4023 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4064 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4075 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4088 src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:4103 src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:4118 src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:4143 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:4203 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4275 src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4309 src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4356 src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4421
+#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4449
+#: src/xml/xmli18n-tmp.h:4456 src/xml/xmli18n-tmp.h:4462
+#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4485 src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:4551 src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:4694 src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4717 src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:4818 src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:4829 src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4885 src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4935
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:5041 src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:5052 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:5121 src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5165
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5182 src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:5193 src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:5271 src/xml/xmli18n-tmp.h:5299
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5327 src/xml/xmli18n-tmp.h:5331
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5347
+#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5367 src/xml/xmli18n-tmp.h:5371
+#: src/xml/xmli18n-tmp.h:5383 src/xml/xmli18n-tmp.h:5388
+#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5440
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5461 src/xml/xmli18n-tmp.h:5468
+#: src/xml/xmli18n-tmp.h:5476 src/xml/xmli18n-tmp.h:5486
+#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5514
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5525
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5543
+#: src/xml/xmli18n-tmp.h:5550 src/xml/xmli18n-tmp.h:5556
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5574 src/xml/xmli18n-tmp.h:5582
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5592
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5625
+#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5649
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5662
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5690
+#: src/xml/xmli18n-tmp.h:5694 src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5731
+#: src/xml/xmli18n-tmp.h:5738 src/xml/xmli18n-tmp.h:5742
+#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5759
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5770
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5807
+#: src/xml/xmli18n-tmp.h:5811 src/xml/xmli18n-tmp.h:5817
+#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5828
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5843
 msgid "Cyan"
 msgstr "Ciánkék"
 
@@ -748,56 +909,208 @@ msgstr "A ciánkék gamma értékének beállítása"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
 #: src/escputil/escputil.c:998 src/escputil/escputil.c:1018
-#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:1813
-#: src/xml/xmli18n-tmp.h:1824 src/xml/xmli18n-tmp.h:1837
-#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1864
-#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1890
-#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1919
-#: src/xml/xmli18n-tmp.h:1935 src/xml/xmli18n-tmp.h:1950
-#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1976
-#: src/xml/xmli18n-tmp.h:1988 src/xml/xmli18n-tmp.h:2000
-#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2028
-#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2052
-#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2077
-#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2103
-#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2131
-#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2157
-#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2185
-#: src/xml/xmli18n-tmp.h:2198 src/xml/xmli18n-tmp.h:2211
-#: src/xml/xmli18n-tmp.h:2224 src/xml/xmli18n-tmp.h:2237
-#: src/xml/xmli18n-tmp.h:2250 src/xml/xmli18n-tmp.h:2263
-#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2291
-#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2321
-#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2344
-#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2370
-#: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2393
-#: src/xml/xmli18n-tmp.h:2405 src/xml/xmli18n-tmp.h:2416
-#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2443
-#: src/xml/xmli18n-tmp.h:2455 src/xml/xmli18n-tmp.h:2467
-#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2497
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2523
-#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2575
-#: src/xml/xmli18n-tmp.h:2587 src/xml/xmli18n-tmp.h:2599
-#: src/xml/xmli18n-tmp.h:2611 src/xml/xmli18n-tmp.h:2624
-#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
-#: src/xml/xmli18n-tmp.h:2670 src/xml/xmli18n-tmp.h:2684
-#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2714
-#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2747
-#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2780
-#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
-#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2829
-#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2855
-#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2882
-#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2914
-#: src/xml/xmli18n-tmp.h:2931 src/xml/xmli18n-tmp.h:2944
-#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2975
-#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:3005
-#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3033
-#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3060
-#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3094
-#: src/xml/xmli18n-tmp.h:3108 src/xml/xmli18n-tmp.h:3124
-#: src/xml/xmli18n-tmp.h:3140
+#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2361
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2388
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2414
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2459 src/xml/xmli18n-tmp.h:2474
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2512 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2552
+#: src/xml/xmli18n-tmp.h:2564 src/xml/xmli18n-tmp.h:2576
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2787
+#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2815
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2868
+#: src/xml/xmli18n-tmp.h:2881 src/xml/xmli18n-tmp.h:2894
+#: src/xml/xmli18n-tmp.h:2905 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:2967
+#: src/xml/xmli18n-tmp.h:2979 src/xml/xmli18n-tmp.h:2991
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3062 src/xml/xmli18n-tmp.h:3074
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3099
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3135 src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:3163 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3353
+#: src/xml/xmli18n-tmp.h:3365 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
+#: src/xml/xmli18n-tmp.h:3420 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3542 src/xml/xmli18n-tmp.h:3556
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3600 src/xml/xmli18n-tmp.h:3617
+#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3647
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3751 src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:3784 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3795 src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:3806 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3837 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3903 src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3939 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3960 src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:3972 src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:3984 src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:3999 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:4039 src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:4104 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:4170 src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4194 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:4230 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:4276 src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4311 src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4338 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:4401 src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:4427 src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:4442 src/xml/xmli18n-tmp.h:4451
+#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4464
+#: src/xml/xmli18n-tmp.h:4470 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4486 src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:4511 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:4809 src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4909 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:5007 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5018 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5111 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5123 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5148 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:5240 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5250 src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:5261 src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5301
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5313
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5349
+#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5401
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5441
+#: src/xml/xmli18n-tmp.h:5453 src/xml/xmli18n-tmp.h:5458
+#: src/xml/xmli18n-tmp.h:5463 src/xml/xmli18n-tmp.h:5470
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5496 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5527
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5552 src/xml/xmli18n-tmp.h:5558
+#: src/xml/xmli18n-tmp.h:5564 src/xml/xmli18n-tmp.h:5568
+#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5593
+#: src/xml/xmli18n-tmp.h:5598 src/xml/xmli18n-tmp.h:5616
+#: src/xml/xmli18n-tmp.h:5620 src/xml/xmli18n-tmp.h:5626
+#: src/xml/xmli18n-tmp.h:5631 src/xml/xmli18n-tmp.h:5651
+#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
+#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5674
+#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5720
+#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5733
+#: src/xml/xmli18n-tmp.h:5739 src/xml/xmli18n-tmp.h:5743
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5818
+#: src/xml/xmli18n-tmp.h:5823 src/xml/xmli18n-tmp.h:5829
+#: src/xml/xmli18n-tmp.h:5833 src/xml/xmli18n-tmp.h:5839
+#: src/xml/xmli18n-tmp.h:5844
 msgid "Magenta"
 msgstr "Bíborvörös"
 
@@ -807,56 +1120,208 @@ msgstr "A bíborvörös gamma értékének beállítása"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
 #: src/escputil/escputil.c:999 src/escputil/escputil.c:1019
-#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:1814
-#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
-#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1865
-#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1891
-#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1920
-#: src/xml/xmli18n-tmp.h:1936 src/xml/xmli18n-tmp.h:1951
-#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1977
-#: src/xml/xmli18n-tmp.h:1989 src/xml/xmli18n-tmp.h:2001
-#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2029
-#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2053
-#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2078
-#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2104
-#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
-#: src/xml/xmli18n-tmp.h:2145 src/xml/xmli18n-tmp.h:2158
-#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2186
-#: src/xml/xmli18n-tmp.h:2199 src/xml/xmli18n-tmp.h:2212
-#: src/xml/xmli18n-tmp.h:2225 src/xml/xmli18n-tmp.h:2238
-#: src/xml/xmli18n-tmp.h:2251 src/xml/xmli18n-tmp.h:2264
-#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2292
-#: src/xml/xmli18n-tmp.h:2307 src/xml/xmli18n-tmp.h:2322
-#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
-#: src/xml/xmli18n-tmp.h:2358 src/xml/xmli18n-tmp.h:2371
-#: src/xml/xmli18n-tmp.h:2382 src/xml/xmli18n-tmp.h:2394
-#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2417
-#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2444
-#: src/xml/xmli18n-tmp.h:2456 src/xml/xmli18n-tmp.h:2468
-#: src/xml/xmli18n-tmp.h:2483 src/xml/xmli18n-tmp.h:2498
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2524
-#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2551
-#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2576
-#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
-#: src/xml/xmli18n-tmp.h:2612 src/xml/xmli18n-tmp.h:2625
-#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2651
-#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2685
-#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2713
-#: src/xml/xmli18n-tmp.h:2734 src/xml/xmli18n-tmp.h:2749
-#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2779
-#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2805
-#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2830
-#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2856
-#: src/xml/xmli18n-tmp.h:2871 src/xml/xmli18n-tmp.h:2883
-#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2910
-#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2945
-#: src/xml/xmli18n-tmp.h:2960 src/xml/xmli18n-tmp.h:2974
-#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3006
-#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3034
-#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3061
-#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3095
-#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3120
-#: src/xml/xmli18n-tmp.h:3136
+#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2389
+#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2444
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2475
+#: src/xml/xmli18n-tmp.h:2488 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2513 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2565 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2602
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2762
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2788
+#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2816
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2846
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2906 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3022
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3048
+#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3075
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3124
+#: src/xml/xmli18n-tmp.h:3136 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3175
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3315 src/xml/xmli18n-tmp.h:3329
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3433
+#: src/xml/xmli18n-tmp.h:3455 src/xml/xmli18n-tmp.h:3468
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3497
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3601 src/xml/xmli18n-tmp.h:3618
+#: src/xml/xmli18n-tmp.h:3632 src/xml/xmli18n-tmp.h:3643
+#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3747 src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3834 src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:3844 src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:3867 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:3900 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3910 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3935 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:3967 src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:3979 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4005 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4062 src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4110 src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:4124 src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4167 src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:4272 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:4321 src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:4334 src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4367 src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4471
+#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4505 src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4549 src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:4562 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4580 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4602 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:4678 src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:4691 src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4770 src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4893 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4904 src/xml/xmli18n-tmp.h:4911
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:4971 src/xml/xmli18n-tmp.h:4978
+#: src/xml/xmli18n-tmp.h:5004 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5050 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5071 src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:5097 src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:5142 src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:5169 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5184
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5257 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5318
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5358
+#: src/xml/xmli18n-tmp.h:5364 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5385
+#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5438
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5454
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5465
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5511
+#: src/xml/xmli18n-tmp.h:5516 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5547 src/xml/xmli18n-tmp.h:5554
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5584 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5617 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5632
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5687
+#: src/xml/xmli18n-tmp.h:5692 src/xml/xmli18n-tmp.h:5698
+#: src/xml/xmli18n-tmp.h:5705 src/xml/xmli18n-tmp.h:5713
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5729
+#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
+#: src/xml/xmli18n-tmp.h:5744 src/xml/xmli18n-tmp.h:5756
+#: src/xml/xmli18n-tmp.h:5761 src/xml/xmli18n-tmp.h:5767
+#: src/xml/xmli18n-tmp.h:5774 src/xml/xmli18n-tmp.h:5782
+#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5792
+#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5803
+#: src/xml/xmli18n-tmp.h:5809 src/xml/xmli18n-tmp.h:5813
+#: src/xml/xmli18n-tmp.h:5819 src/xml/xmli18n-tmp.h:5824
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5845
 msgid "Yellow"
 msgstr "Sárga"
 
@@ -866,9 +1331,17 @@ msgstr "A sárga gamma értékének beállítása"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
 #: src/escputil/escputil.c:1006 src/escputil/escputil.c:1025
-#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2700
-#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2795
-#: src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:4041 src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:4056 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4091 src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:4155 src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5155
 msgid "Red"
 msgstr "Vörös"
 
@@ -886,8 +1359,13 @@ msgstr "A zöld gamma értékének beállítása"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
 #: src/escputil/escputil.c:1007 src/escputil/escputil.c:1026
-#: src/xml/xmli18n-tmp.h:2657 src/xml/xmli18n-tmp.h:2701
-#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4051 src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:4084 src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:5156
 msgid "Blue"
 msgstr "Kék"
 
@@ -898,53 +1376,183 @@ msgstr "A kék gamma értékének beállítása"
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
 #: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1016 src/escputil/escputil.c:1285
-#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
-#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
-#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1875
-#: src/xml/xmli18n-tmp.h:1888 src/xml/xmli18n-tmp.h:1901
-#: src/xml/xmli18n-tmp.h:1917 src/xml/xmli18n-tmp.h:1933
-#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1961
-#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1986
-#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2012
-#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2038
-#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2063
-#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2090
-#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2115
-#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2142
-#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2169
-#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
-#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
-#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2248
-#: src/xml/xmli18n-tmp.h:2261 src/xml/xmli18n-tmp.h:2274
-#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2304
-#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2331
-#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
-#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
-#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2403
-#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2420
-#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2441
-#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2465
-#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2495
-#: src/xml/xmli18n-tmp.h:2508 src/xml/xmli18n-tmp.h:2521
-#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
-#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2573
-#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2597
-#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2622
-#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2672
-#: src/xml/xmli18n-tmp.h:2682 src/xml/xmli18n-tmp.h:2731
-#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2764
-#: src/xml/xmli18n-tmp.h:2781 src/xml/xmli18n-tmp.h:2794
-#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2815
-#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2839
-#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2868
-#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2894
-#: src/xml/xmli18n-tmp.h:2911 src/xml/xmli18n-tmp.h:2929
-#: src/xml/xmli18n-tmp.h:2942 src/xml/xmli18n-tmp.h:2977
-#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:3003
-#: src/xml/xmli18n-tmp.h:3017 src/xml/xmli18n-tmp.h:3031
-#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3079
-#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3110
-#: src/xml/xmli18n-tmp.h:3121 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2372
+#: src/xml/xmli18n-tmp.h:2386 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2457
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2510
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2536
+#: src/xml/xmli18n-tmp.h:2550 src/xml/xmli18n-tmp.h:2562
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2599 src/xml/xmli18n-tmp.h:2614
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2639
+#: src/xml/xmli18n-tmp.h:2653 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2965
+#: src/xml/xmli18n-tmp.h:2977 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3019
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3060 src/xml/xmli18n-tmp.h:3072
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3133 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3196
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3526
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3680 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3755 src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:3804 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3819 src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:3831 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3846 src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3873 src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:3924 src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:3943 src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:4022 src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4059 src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:4142 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4164 src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:4179 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:4255 src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4289 src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:4308 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4413 src/xml/xmli18n-tmp.h:4420
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4455
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4507 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:4565 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:4604 src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:4702 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:4733 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:4786 src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4920 src/xml/xmli18n-tmp.h:4926
+#: src/xml/xmli18n-tmp.h:4934 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:4973 src/xml/xmli18n-tmp.h:4981
+#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:4993
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:5047 src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5151
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5186
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5223 src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5270
+#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5284
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5320
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5337
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5375
+#: src/xml/xmli18n-tmp.h:5378 src/xml/xmli18n-tmp.h:5380
+#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5435
+#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5447
+#: src/xml/xmli18n-tmp.h:5449 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5474
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5492
+#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5571
+#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5590
+#: src/xml/xmli18n-tmp.h:5596 src/xml/xmli18n-tmp.h:5602
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5614
+#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5629
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5655
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5680 src/xml/xmli18n-tmp.h:5682
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5700
+#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5716
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5749
+#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5769 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5794
+#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5806
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5836
+#: src/xml/xmli18n-tmp.h:5842
 msgid "Black"
 msgstr "Fekete"
 
@@ -952,7 +1560,7 @@ msgstr "Fekete"
 msgid "Adjust the black gamma"
 msgstr "A fekete gamma értékének beállítása"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1769
+#: src/main/print-color.c:322 src/main/print-olympus.c:1935
 msgid "Cyan Balance"
 msgstr "Ciánkékegyensúly"
 
@@ -965,7 +1573,7 @@ msgstr "Szürkeegyensúly"
 msgid "Adjust the cyan gray balance"
 msgstr "A ciánkék szürkeegyensúlyának beállítása"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1777
+#: src/main/print-color.c:330 src/main/print-olympus.c:1943
 msgid "Magenta Balance"
 msgstr "Bíborvörös-egyensúly"
 
@@ -973,7 +1581,7 @@ msgstr "Bíborvörös-egyensúly"
 msgid "Adjust the magenta gray balance"
 msgstr "A bíborvörös szürkeegyensúlyának beállítása"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1785
+#: src/main/print-color.c:338 src/main/print-olympus.c:1951
 msgid "Yellow Balance"
 msgstr "Sárgaegyensúly"
 
@@ -1001,11 +1609,11 @@ 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:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
-#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
-#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
-#: src/main/print-escp2.c:759
+#: src/main/print-escp2.c:344 src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356 src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368 src/main/print-escp2.c:374
+#: src/main/print-escp2.c:869 src/main/print-escp2.c:877
+#: src/main/print-escp2.c:885
 msgid "Advanced Output Control"
 msgstr "Haladó kimenetvezérlés"
 
@@ -1013,27 +1621,27 @@ msgstr "Haladó kimenetvezérlés"
 msgid "Limit the total ink printed to the page"
 msgstr "Az oldalra összesen kinyomtatott tinta korlátozása"
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:743
+#: src/main/print-color.c:365 src/main/print-escp2.c:869
 msgid "GCR Transition"
 msgstr "GCR áttérés"
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:744
+#: src/main/print-color.c:366 src/main/print-escp2.c:870
 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 src/main/print-escp2.c:751
+#: src/main/print-color.c:373 src/main/print-escp2.c:877
 msgid "GCR Lower Bound"
 msgstr "GCR alsó korlát"
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:752
+#: src/main/print-color.c:374 src/main/print-escp2.c:878
 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 src/main/print-escp2.c:759
+#: src/main/print-color.c:381 src/main/print-escp2.c:885
 msgid "GCR Upper Bound"
 msgstr "GCR felső korlát"
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:760
+#: src/main/print-color.c:382 src/main/print-escp2.c:886
 msgid "Upper bound of gray component reduction"
 msgstr "A szürkeösszetevő csökkentésének felső korlátja"
 
@@ -1286,11 +1894,11 @@ msgstr "Haladó kimenetvezérlés"
 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:254 src/main/print-olympus.c:1740
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1906
 msgid "Borderless"
 msgstr "Szegély nélküli"
 
-#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1907
 msgid "Print without borders"
 msgstr "Nyomtatás szegélyek nélkül"
 
@@ -1303,7 +1911,7 @@ msgid "Interleave pattern to use"
 msgstr "A használandó kihagyásminta"
 
 #: src/main/print-escp2.c:266 src/main/print-escp2.c:267
-#: src/cups/genppd.c:1567 src/cups/genppd.c:2078
+#: src/cups/genppd.c:1600 src/cups/genppd.c:2112
 msgid "Output Order"
 msgstr "Kimeneti sorrend"
 
@@ -1344,345 +1952,462 @@ msgid "Has multiple choices of ink cartridges"
 msgstr "Többféle tintapatron választható"
 
 #: src/main/print-escp2.c:320 src/main/print-escp2.c:321
+#, fuzzy
+msgid "Raw Channel Names"
+msgstr "Csatornanevek"
+
+#: src/main/print-escp2.c:326 src/main/print-escp2.c:327
 msgid "Channel Names"
 msgstr "Csatornanevek"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:339
 msgid "Raw Channel Count"
 msgstr "Nyers csatornaszám"
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:344
 msgid "Cyan Map"
 msgstr "Ciánkék-leképezés"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:345
 msgid "Adjust the cyan map"
 msgstr "A ciánkék-leképezés beállítása"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350
 msgid "Magenta Map"
 msgstr "Bíborvörös-leképezés"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:351
 msgid "Adjust the magenta map"
 msgstr "A bíborvörös-leképezés beállítása"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356
 msgid "Yellow Map"
 msgstr "Sárga-leképezés"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:357
 msgid "Adjust the yellow map"
 msgstr "A sárga-leképezés beállítása"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362
 msgid "Blue Map"
 msgstr "Kék-leképezés"
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:363
 msgid "Adjust the blue map"
 msgstr "A kék-leképezés beállítása"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368
 #, fuzzy
 msgid "Orange Map"
 msgstr "Ciánkék-leképezés"
 
-#: src/main/print-escp2.c:363
+#: src/main/print-escp2.c:369
 #, fuzzy
 msgid "Adjust the orange map"
 msgstr "A vörös-leképezés beállítása"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:374
 msgid "Red Map"
 msgstr "Vörös-leképezés"
 
-#: src/main/print-escp2.c:369
+#: src/main/print-escp2.c:375
 msgid "Adjust the red map"
 msgstr "A vörös-leképezés beállítása"
 
-#: src/main/print-escp2.c:471
+#: src/main/print-escp2.c:477
 msgid "Red Density"
 msgstr "Vörös sűrűsége"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:478
 msgid "Adjust the red density"
 msgstr "A vörös sűrűségének beállítása"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:485
 msgid "Blue Density"
 msgstr "Kék sűrűsége"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:486
 msgid "Adjust the blue density"
 msgstr "A kék sűrűségének beállítása"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:493
 #, fuzzy
 msgid "Orange Density"
 msgstr "Ciánkék sűrűsége"
 
-#: src/main/print-escp2.c:488
+#: src/main/print-escp2.c:494
 #, fuzzy
 msgid "Adjust the orange density"
 msgstr "A vörös sűrűségének beállítása"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:501
 msgid "Gloss Level"
 msgstr "Fényesség szintje"
 
-#: src/main/print-escp2.c:496
+#: src/main/print-escp2.c:502
 msgid "Adjust the gloss level"
 msgstr "A fényesség szintjének beállítása"
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:509
 msgid "Drop Size Small"
 msgstr "Kicsi cseppméret"
 
-#: src/main/print-escp2.c:504
+#: src/main/print-escp2.c:510
 msgid "Drop Size 1 (small)"
 msgstr "1-es cseppméret (kicsi)"
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:517
 msgid "Drop Size Medium"
 msgstr "Közepes cseppméret"
 
-#: src/main/print-escp2.c:512
+#: src/main/print-escp2.c:518
 msgid "Drop Size 2 (medium)"
 msgstr "2-es cseppméret (közepes)"
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:525
 msgid "Drop Size Large"
 msgstr "Nagy cseppméret"
 
-#: src/main/print-escp2.c:520
+#: src/main/print-escp2.c:526
 msgid "Drop Size 3 (large)"
 msgstr "3-as cseppméret (nagy)"
 
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:534
 msgid "Light Cyan Value"
 msgstr "Világos ciánkék értéke"
 
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:550
 msgid "Light Cyan Density Scale"
 msgstr "Világos ciánkék sűrűségaránya"
 
-#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
+#: src/main/print-escp2.c:557 src/main/print-escp2.c:558
 msgid "Light Magenta Value"
 msgstr "Világos bíborvörös értéke"
 
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:566
 msgid "Light Magenta Density Scale"
 msgstr "Világos bíborvörös sűrűségaránya"
 
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:582
 msgid "Dark Yellow Value"
 msgstr "Sötétsárga értéke"
 
-#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
+#: src/main/print-escp2.c:589 src/main/print-escp2.c:590
 msgid "Dark Yellow Transition"
 msgstr "Sötétsárga átmenet"
 
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:598
 msgid "Dark Yellow Density Scale"
 msgstr "Sötétsárga sűrűségaránya"
 
-#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
+#: src/main/print-escp2.c:605 src/main/print-escp2.c:606
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:630
 msgid "Gray Value"
 msgstr "Szürke értéke"
 
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
-#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:614
+#: src/main/print-escp2.c:637 src/main/print-escp2.c:638
 msgid "Gray Transition"
 msgstr "Szürkeátmenet"
 
-#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
+#: src/main/print-escp2.c:621 src/main/print-escp2.c:622
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:646
 msgid "Gray Density Scale"
 msgstr "Szürke sűrűségaránya"
 
-#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
+#: src/main/print-escp2.c:653 src/main/print-escp2.c:654
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:726
 msgid "Light Gray Value"
 msgstr "Világosszürke értéke"
 
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
-#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:662
+#: src/main/print-escp2.c:733 src/main/print-escp2.c:734
 msgid "Light Gray Transition"
 msgstr "Világosszürke-átmenet"
 
-#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
-#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
+#: src/main/print-escp2.c:669 src/main/print-escp2.c:670
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:742
 msgid "Light Gray Density Scale"
 msgstr "Világosszürke sűrűségaránya"
 
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:678
 msgid "Dark Gray Value"
 msgstr "Sötétszürke értéke"
 
-#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
+#: src/main/print-escp2.c:685 src/main/print-escp2.c:686
 msgid "Dark Gray Transition"
 msgstr "Sötétszürke-átmenet"
 
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:694
 msgid "Dark Gray Density Scale"
 msgstr "Sötétszürke sűrűségaránya"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:701
 msgid "Mid Gray Value"
 msgstr "Középsőszürke értéke"
 
-#: src/main/print-escp2.c:696
+#: src/main/print-escp2.c:702
 msgid "Medium Gray Value"
 msgstr "Közepesszürke értéke"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:709
 msgid "Mid Gray Transition"
 msgstr "Középsőszürke-átmenet"
 
-#: src/main/print-escp2.c:704
+#: src/main/print-escp2.c:710
 msgid "Medium Gray Transition"
 msgstr "Közepesszürke-átmenet"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:717
 msgid "Mid Gray Density Scale"
 msgstr "Középsőszürke sűrűségaránya"
 
-#: src/main/print-escp2.c:712
+#: src/main/print-escp2.c:718
 msgid "Medium Gray Density Scale"
 msgstr "Közepesszürke sűrűségaránya"
 
-#: src/main/print-escp2.c:767
+#: src/main/print-escp2.c:749
+#, fuzzy
+msgid "Hextone Gray 5 Value"
+msgstr "Szürke értéke"
+
+#: src/main/print-escp2.c:750
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:757
+#, fuzzy
+msgid "Hextone Gray 5 Transition"
+msgstr "Szürkeátmenet"
+
+#: src/main/print-escp2.c:758
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr "Világosszürke-átmenet"
+
+#: src/main/print-escp2.c:765
+#, fuzzy
+msgid "Hextone Gray 5 Density Scale"
+msgstr "Szürke sűrűségaránya"
+
+#: src/main/print-escp2.c:766
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr "Világosszürke sűrűségaránya"
+
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:774
+#, fuzzy
+msgid "Hextone Gray 4 Value"
+msgstr "Szürke értéke"
+
+#: src/main/print-escp2.c:781 src/main/print-escp2.c:782
+#, fuzzy
+msgid "Hextone Gray 4 Transition"
+msgstr "Szürkeátmenet"
+
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:790
+#, fuzzy
+msgid "Hextone Gray 4 Density Scale"
+msgstr "Szürke sűrűségaránya"
+
+#: src/main/print-escp2.c:797 src/main/print-escp2.c:798
+#, fuzzy
+msgid "Hextone Gray 3 Value"
+msgstr "Szürke értéke"
+
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:806
+#, fuzzy
+msgid "Hextone Gray 3 Transition"
+msgstr "Szürkeátmenet"
+
+#: src/main/print-escp2.c:813 src/main/print-escp2.c:814
+#, fuzzy
+msgid "Hextone Gray 3 Density Scale"
+msgstr "Szürke sűrűségaránya"
+
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:822
+#, fuzzy
+msgid "Hextone Gray 2 Value"
+msgstr "Szürke értéke"
+
+#: src/main/print-escp2.c:829 src/main/print-escp2.c:830
+#, fuzzy
+msgid "Hextone Gray 2 Transition"
+msgstr "Szürkeátmenet"
+
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:838
+#, fuzzy
+msgid "Hextone Gray 2 Density Scale"
+msgstr "Szürke sűrűségaránya"
+
+#: src/main/print-escp2.c:845
+#, fuzzy
+msgid "Hextone Gray 1 Value"
+msgstr "Szürke értéke"
+
+#: src/main/print-escp2.c:846
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:853
+#, fuzzy
+msgid "Hextone Gray 1 Transition"
+msgstr "Szürkeátmenet"
+
+#: src/main/print-escp2.c:854
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr "Világos bíborvörös átmenet"
+
+#: src/main/print-escp2.c:861
+#, fuzzy
+msgid "Hextone Gray 1 Density Scale"
+msgstr "Szürke sűrűségaránya"
+
+#: src/main/print-escp2.c:862
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr "Világos bíborvörös sűrűségaránya"
+
+#: src/main/print-escp2.c:893
 msgid "Drying Time Per Page"
 msgstr ""
 
-#: src/main/print-escp2.c:768
+#: src/main/print-escp2.c:894
 msgid "Set drying time per page"
 msgstr ""
 
-#: src/main/print-escp2.c:775
+#: src/main/print-escp2.c:901
 msgid "Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:776
+#: src/main/print-escp2.c:902
 msgid "Set drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:783
+#: src/main/print-escp2.c:909
 msgid "Minimum Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:784
+#: src/main/print-escp2.c:910
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:799
+#: src/main/print-escp2.c:925
+#, fuzzy
+msgid "Quality Enhancement"
+msgstr "Fényességkiterjesztés hozzáadása"
+
+#: src/main/print-escp2.c:926
+msgid "Enhance print quality by additional passes"
+msgstr ""
+
+#: src/main/print-escp2.c:933
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "Papírméret"
 
-#: src/main/print-escp2.c:800
+#: src/main/print-escp2.c:934
 #, fuzzy
 msgid "Set printer paper thickness"
 msgstr "Nyomtató alapértelmezéseinek beállítása"
 
-#: src/main/print-escp2.c:807
+#: src/main/print-escp2.c:941
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Fekete sűrűsége"
 
-#: src/main/print-escp2.c:808
+#: src/main/print-escp2.c:942
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:815
+#: src/main/print-escp2.c:949
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:816
+#: src/main/print-escp2.c:950
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:823
+#: src/main/print-escp2.c:957
 #, fuzzy
 msgid "Print Method"
 msgstr "Nyomtatási mód"
 
-#: src/main/print-escp2.c:824
+#: src/main/print-escp2.c:958
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:831
+#: src/main/print-escp2.c:965
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Egyszerű lap"
 
-#: src/main/print-escp2.c:832
+#: src/main/print-escp2.c:966
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:839
+#: src/main/print-escp2.c:973
 #, fuzzy
 msgid "Feed Adjustment"
 msgstr "Finomhangolás"
 
-#: src/main/print-escp2.c:840
-#, c-format
+#: src/main/print-escp2.c:975
+#, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:1992
+#: src/main/print-escp2.c:2197
 msgid "Full Manual Control"
 msgstr "Teljesen kézi vezérlés"
 
-#: src/main/print-escp2.c:1994
+#: src/main/print-escp2.c:2199
 msgid "Automatic Setting Control"
 msgstr "Automatikus beállításvezérlés"
 
-#: src/main/print-escp2.c:2208 src/cups/genppd.c:1484 src/cups/genppd.c:2059
+#: src/main/print-escp2.c:2413 src/cups/genppd.c:1517 src/cups/genppd.c:2093
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2415
 msgid "Bidirectional"
 msgstr "Kétirányú"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2417
 msgid "Unidirectional"
 msgstr "Egyirányú"
 
-#: src/main/print-escp2.c:2243
+#: src/main/print-escp2.c:2448
 msgid "Alternate Fill"
 msgstr "Alternatív kitöltés"
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2450
 msgid "Ascending Fill"
 msgstr "Növekvő kitöltés"
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2452
 msgid "Descending Fill"
 msgstr "Csökkenő kitöltés"
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2454
 msgid "Ascending Double"
 msgstr "Növekvő dupla"
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2456
 msgid "Nearest Neighbor Avoidance"
 msgstr "Legközelebbi szomszéd elkerülése"
 
-#: src/main/print-escp2.c:2287
+#: src/main/print-escp2.c:2492
 #, fuzzy
 msgid "Short Edge(Flip)"
 msgstr "Rövidebbik él (tükrözve)"
 
-#: src/main/print-escp2.c:2858
+#: src/main/print-escp2.c:3100
 #, 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:4107 src/main/print-olympus.c:2472
+#: src/main/print-escp2.c:4355 src/main/print-olympus.c:2641
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr "A nyomtatási beállítások nincsenek ellenőrizve, nem lehet nyomtatni.\n"
@@ -1736,361 +2461,378 @@ msgid "test print"
 msgstr "próbanyomtatás"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3205
-#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3217
-#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3233
-#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3255
-#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3276
-#: src/xml/xmli18n-tmp.h:3288 src/xml/xmli18n-tmp.h:3295
-#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3315
-#: src/xml/xmli18n-tmp.h:3327 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3368
-#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3380
-#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
-#: src/xml/xmli18n-tmp.h:3412 src/xml/xmli18n-tmp.h:3424
-#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3444
-#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3472
-#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3496
-#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3521
-#: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3544
-#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3556
-#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3581
-#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3598
-#: src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3754 src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:3809 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3863 src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:4058 src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:4163 src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:4227 src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:4335 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4467 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4594 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:4879 src/xml/xmli18n-tmp.h:4946
+#: src/xml/xmli18n-tmp.h:5000 src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:5243 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5365 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5512 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5667 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5784 src/xml/xmli18n-tmp.h:5805
+#: src/xml/xmli18n-tmp.h:5826
 msgid "Four Color Standard"
 msgstr "Négyszínű szabvány"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3206
-#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3218
-#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3234
-#: src/xml/xmli18n-tmp.h:3244 src/xml/xmli18n-tmp.h:3251
-#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3268
-#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3289
-#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3306
-#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
-#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3354
-#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3377
-#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3389
-#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3413
-#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3435
-#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3455
-#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3485
-#: src/xml/xmli18n-tmp.h:3497 src/xml/xmli18n-tmp.h:3508
-#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3537
-#: src/xml/xmli18n-tmp.h:3545 src/xml/xmli18n-tmp.h:3549
-#: src/xml/xmli18n-tmp.h:3557 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3593
-#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3605
+#: src/xml/xmli18n-tmp.h:3759 src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3868 src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:4002 src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:4107 src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4472
+#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4817 src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5181 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5315 src/xml/xmli18n-tmp.h:5370
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5672
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5831
 msgid "Three Color Composite"
 msgstr "Háromszínű kompozit"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3241
-#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3265
-#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3286
-#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
-#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3351
-#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3374
-#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3398
-#: src/xml/xmli18n-tmp.h:3410 src/xml/xmli18n-tmp.h:3422
-#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3452
-#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3470
-#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3494
-#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3519
-#: src/xml/xmli18n-tmp.h:3534 src/xml/xmli18n-tmp.h:3542
-#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3741 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4086 src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4933
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5421
+#: src/xml/xmli18n-tmp.h:5499 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5723
 msgid "Six Color Photo"
 msgstr "Hatszínes fénykép"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3242
-#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3266
-#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3287
-#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3326
-#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3352
-#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3375
-#: src/xml/xmli18n-tmp.h:3387 src/xml/xmli18n-tmp.h:3399
-#: src/xml/xmli18n-tmp.h:3411 src/xml/xmli18n-tmp.h:3423
-#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3453
-#: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3483
-#: src/xml/xmli18n-tmp.h:3495 src/xml/xmli18n-tmp.h:3506
-#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3535
-#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3566
-#: src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3748 src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:3989 src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:4094 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4267 src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4940
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5661
+#: src/xml/xmli18n-tmp.h:5730
 msgid "Five Color Photo Composite"
 msgstr "Ötszínes fénykép (kompozit)"
 
 #: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
-#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
-#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
-#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
-#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
-#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
-#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
-#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
-#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:849
-#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:963
-#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1077
-#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1170
-#: src/xml/xmli18n-tmp.h:1220 src/xml/xmli18n-tmp.h:1277
-#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1376
-#: src/xml/xmli18n-tmp.h:1439 src/xml/xmli18n-tmp.h:1502
-#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1619
-#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1739
-#: src/xml/xmli18n-tmp.h:1773
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1050
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1240
+#: src/xml/xmli18n-tmp.h:1335 src/xml/xmli18n-tmp.h:1449
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1580
+#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1862
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2200 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2297
 msgid "Plain Paper"
 msgstr "Egyszerű lap"
 
-#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
-#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
-#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
-#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
-#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
-#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
-#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
-#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
-#: src/xml/xmli18n-tmp.h:819 src/xml/xmli18n-tmp.h:858
-#: src/xml/xmli18n-tmp.h:915 src/xml/xmli18n-tmp.h:972
-#: src/xml/xmli18n-tmp.h:1029 src/xml/xmli18n-tmp.h:1086
-#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1176
-#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1286
-#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1385
-#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1508
-#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1628
-#: src/xml/xmli18n-tmp.h:1685 src/xml/xmli18n-tmp.h:1743
-#: src/xml/xmli18n-tmp.h:1779
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:101 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:365 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1160 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1740
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1871
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2136
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2267
+#: src/xml/xmli18n-tmp.h:2303
 msgid "Glossy Film"
 msgstr "Fényes film"
 
-#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
-#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
-#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
-#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
-#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
-#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
-#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
-#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
-#: src/xml/xmli18n-tmp.h:821 src/xml/xmli18n-tmp.h:861
-#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:975
-#: src/xml/xmli18n-tmp.h:1032 src/xml/xmli18n-tmp.h:1089
-#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1178
-#: src/xml/xmli18n-tmp.h:1232 src/xml/xmli18n-tmp.h:1289
-#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1388
-#: src/xml/xmli18n-tmp.h:1451 src/xml/xmli18n-tmp.h:1511
-#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1631
-#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1745
-#: src/xml/xmli18n-tmp.h:1781
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:845 src/xml/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:965 src/xml/xmli18n-tmp.h:1022
+#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1359
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1550
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1745 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2305
 msgid "Transparencies"
 msgstr "�tlátszóságok"
 
-#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
-#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
-#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
-#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
-#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
-#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
-#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
-#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
-#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:823
-#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:921
-#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:1035
-#: src/xml/xmli18n-tmp.h:1092 src/xml/xmli18n-tmp.h:1142
-#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1235
-#: src/xml/xmli18n-tmp.h:1292 src/xml/xmli18n-tmp.h:1344
-#: src/xml/xmli18n-tmp.h:1391 src/xml/xmli18n-tmp.h:1454
-#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1577
-#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1691
-#: src/xml/xmli18n-tmp.h:1747 src/xml/xmli18n-tmp.h:1783
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:55 src/xml/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:151 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1024
+#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2215
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2307
 msgid "Envelopes"
 msgstr "Borítékok"
 
-#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
-#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
-#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
-#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
-#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
-#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
-#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
-#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
-#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:827
-#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:927
-#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:1041
-#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1146
-#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1241
-#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1348
-#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1460
-#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1583
-#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1697
-#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1787
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:1028
+#: src/xml/xmli18n-tmp.h:1085 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1275 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1556
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1665
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1834
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2076
+#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2311
 msgid "Matte Paper"
 msgstr "Matt papír"
 
-#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
-#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
-#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
-#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
-#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
-#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
-#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
-#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
-#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:831
-#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:933
-#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:1047
-#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1150
-#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1247
-#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1352
-#: src/xml/xmli18n-tmp.h:1403 src/xml/xmli18n-tmp.h:1466
-#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1589
-#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1703
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1791
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:167 src/xml/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:569
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1032
+#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1285 src/xml/xmli18n-tmp.h:1389
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1675
+#: src/xml/xmli18n-tmp.h:1770 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1889 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2012 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2227
+#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2315
 msgid "Inkjet Paper"
 msgstr "Inkjet papír"
 
-#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
-#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
-#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
-#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
-#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
-#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
-#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
-#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
-#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:833
-#: src/xml/xmli18n-tmp.h:879 src/xml/xmli18n-tmp.h:936
-#: src/xml/xmli18n-tmp.h:993 src/xml/xmli18n-tmp.h:1050
-#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1152
-#: src/xml/xmli18n-tmp.h:1190 src/xml/xmli18n-tmp.h:1250
-#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1354
-#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1469
-#: src/xml/xmli18n-tmp.h:1529 src/xml/xmli18n-tmp.h:1592
-#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1706
-#: src/xml/xmli18n-tmp.h:1757 src/xml/xmli18n-tmp.h:1793
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:425 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:512 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1034
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1499 src/xml/xmli18n-tmp.h:1562
+#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1775 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1955
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2088
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2317
 msgid "Photo Quality Inkjet Paper"
 msgstr "Fotó minőségű Inkjet papír"
 
-#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
-#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
-#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
-#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
-#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
-#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
-#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
-#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
-#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:835
-#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:939
-#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:1053
-#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1154
-#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1253
-#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1356
-#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1472
-#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1595
-#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1709
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1795
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1036
+#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1200
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1504 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1842
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2233
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2319
 msgid "Photo Paper"
 msgstr "Fotópapír"
 
-#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
-#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
-#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
-#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
-#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
-#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
-#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
-#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
-#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:837
-#: src/xml/xmli18n-tmp.h:885 src/xml/xmli18n-tmp.h:942
-#: src/xml/xmli18n-tmp.h:999 src/xml/xmli18n-tmp.h:1056
-#: src/xml/xmli18n-tmp.h:1113 src/xml/xmli18n-tmp.h:1156
-#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1212
-#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1256
-#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1358
-#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1475
-#: src/xml/xmli18n-tmp.h:1535 src/xml/xmli18n-tmp.h:1598
-#: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1712
-#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1797
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:179 src/xml/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:518 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:869 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1038
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1407
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1566
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1622
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1844
+#: src/xml/xmli18n-tmp.h:1898 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2321
 msgid "Premium Glossy Photo Paper"
 msgstr "Kiváló minőségű fényes fotópapír"
 
-#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
-#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
-#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
-#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
-#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
-#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
-#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
-#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
-#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:841
-#: src/xml/xmli18n-tmp.h:891 src/xml/xmli18n-tmp.h:948
-#: src/xml/xmli18n-tmp.h:1005 src/xml/xmli18n-tmp.h:1062
-#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1160
-#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1262
-#: src/xml/xmli18n-tmp.h:1319 src/xml/xmli18n-tmp.h:1362
-#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1481
-#: src/xml/xmli18n-tmp.h:1541 src/xml/xmli18n-tmp.h:1604
-#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1718
-#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1801
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1042
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1419
+#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1570
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2027 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2242
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2325
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Luster fotópapír"
 
-#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
-#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
-#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
-#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
-#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
-#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
-#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
-#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
-#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:843
-#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:951
-#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1065
-#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1162
-#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1265
-#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1368
-#: src/xml/xmli18n-tmp.h:1427 src/xml/xmli18n-tmp.h:1490
-#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1607
-#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1727
-#: src/xml/xmli18n-tmp.h:1767 src/xml/xmli18n-tmp.h:1803
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:91 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:191 src/xml/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:439 src/xml/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:787 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1044
+#: src/xml/xmli18n-tmp.h:1125 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1315 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1854
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2327
 msgid "Photo Quality Glossy Paper"
 msgstr "Fotó minőségű fényes papír"
 
-#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
-#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
-#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
-#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
-#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
-#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
-#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
-#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:897
-#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:1011
-#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1125
-#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1206
-#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1325
-#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1430
-#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1553
-#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1667
-#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1805
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1130
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1320
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1616
+#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1856 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2329
 msgid "Ilford Heavy Paper"
 msgstr "Ilford-féle nehéz papír"
 
-#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
-#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
-#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
-#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
-#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
-#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
-#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
-#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
-#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:847
-#: src/xml/xmli18n-tmp.h:903 src/xml/xmli18n-tmp.h:960
-#: src/xml/xmli18n-tmp.h:1017 src/xml/xmli18n-tmp.h:1074
-#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1168
-#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1214
-#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1274
-#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1374
-#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1499
-#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1616
-#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1736
-#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1809
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:129
+#: src/xml/xmli18n-tmp.h:203 src/xml/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:542 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1048
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1443
+#: src/xml/xmli18n-tmp.h:1539 src/xml/xmli18n-tmp.h:1578
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1720
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1985
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2333
 msgid "Other"
 msgstr "Egyéb"
 
@@ -2106,52 +2848,56 @@ msgstr "Kézzel szünetekkel"
 msgid "Manual without Pause"
 msgstr "Kézzel szünetek nélkül"
 
-#: src/main/print-olympus.c:279
+#: src/main/print-olympus.c:281
 msgid "Coated"
 msgstr "Bevont"
 
-#: src/main/print-olympus.c:280 src/cups/genppd.c:1685 src/cups/genppd.c:1713
-#: src/cups/genppd.c:1745 src/cups/genppd.c:1800 src/cups/genppd.c:1846
-#: src/cups/genppd.c:2147 src/cups/genppd.c:2160 src/cups/genppd.c:2183
-#: src/cups/genppd.c:2204 src/cups/genppd.c:2221
+#: src/main/print-olympus.c:282 src/cups/genppd.c:1718 src/cups/genppd.c:1746
+#: src/cups/genppd.c:1778 src/cups/genppd.c:1833 src/cups/genppd.c:1879
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2194 src/cups/genppd.c:2217
+#: src/cups/genppd.c:2238 src/cups/genppd.c:2255
 msgid "None"
 msgstr "Nincs"
 
-#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
-#: src/main/print-olympus.c:1132
+#: src/main/print-olympus.c:998 src/main/print-olympus.c:1061
+#: src/main/print-olympus.c:1165
 msgid "Glossy"
 msgstr "Fényes"
 
-#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
-#: src/main/print-olympus.c:1133
+#: src/main/print-olympus.c:999 src/main/print-olympus.c:1062
+#: src/main/print-olympus.c:1166
 msgid "Texture"
 msgstr "Textúra"
 
-#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
+#: src/main/print-olympus.c:1063 src/main/print-olympus.c:1167
 msgid "Matte"
 msgstr "Matt"
 
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
+#. TRANSLATORS: 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.
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1901
 msgid "Laminate Pattern"
 msgstr "Laminált minta"
 
-#: src/main/print-olympus.c:1770
+#: src/main/print-olympus.c:1936
 msgid "Adjust the cyan balance"
 msgstr "A ciánkék-egyensúly beállítása"
 
-#: src/main/print-olympus.c:1778
+#: src/main/print-olympus.c:1944
 msgid "Adjust the magenta balance"
 msgstr "A bíborvörös-egyensúly beállítása"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1952
 msgid "Adjust the yellow balance"
 msgstr "A sárgaegyensúly beállítása"
 
-#: src/main/print-olympus.c:1793
+#: src/main/print-olympus.c:1959
 msgid "Black Balance"
 msgstr "Feketeegyensúly"
 
-#: src/main/print-olympus.c:1794
+#: src/main/print-olympus.c:1960
 msgid "Adjust the black balance"
 msgstr "A feketeegyensúly beállítása"
 
@@ -2183,7 +2929,7 @@ msgstr "Gyorsan száradó fénykép"
 msgid "Quick-dry Transparency"
 msgstr "Gyorsan száradó fólia"
 
-#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3687
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:5925
 msgid "Manual"
 msgstr "Kézi"
 
@@ -2268,23 +3014,23 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:278 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3638
-#: src/xml/xmli18n-tmp.h:3647 src/xml/xmli18n-tmp.h:3656
-#: src/xml/xmli18n-tmp.h:3664
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5875
+#: src/xml/xmli18n-tmp.h:5884 src/xml/xmli18n-tmp.h:5893
+#: src/xml/xmli18n-tmp.h:5901
 msgid "Draft"
 msgstr "Piszkozat"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:3633 src/xml/xmli18n-tmp.h:3641
-#: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3658
-#: src/xml/xmli18n-tmp.h:3666
+#: src/xml/xmli18n-tmp.h:5870 src/xml/xmli18n-tmp.h:5878
+#: src/xml/xmli18n-tmp.h:5886 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5903
 msgid "High"
 msgstr "Magas"
 
 #: src/main/print-pcl.c:282 src/main/print-pcl.c:283
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3634
-#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3650
-#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3667
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5896 src/xml/xmli18n-tmp.h:5904
 msgid "Photo"
 msgstr "Fotó"
 
@@ -2316,15 +3062,15 @@ msgstr "PPD fájl típusneve"
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3671
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:5908
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3708
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:5946
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3823
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6061
 msgid "Custom"
 msgstr "Egyéni"
 
@@ -2332,33 +3078,43 @@ msgstr "Egyéni"
 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/generic-options.c:33 src/xml/xmli18n-tmp.h:3629
-#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3654
+#: src/main/print-weave.c:1511
+#, fuzzy
+msgid "Fatal error!"
+msgstr "Hiba: Végzetes hiba\n"
+
+#: src/main/print-weave.c:1547
+msgid ""
+"Please report the above information to gimp-print-devel@lists.sourceforge.net"
+msgstr ""
+
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:5866
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5891
 msgid "Fast Economy"
 msgstr "Gyors, gazdaságos"
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3630
-#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3655
-#: src/xml/xmli18n-tmp.h:3663
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5900
 msgid "Economy"
 msgstr "Gazdaságos"
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3635
-#: src/xml/xmli18n-tmp.h:3642 src/xml/xmli18n-tmp.h:3651
-#: src/xml/xmli18n-tmp.h:3660 src/xml/xmli18n-tmp.h:3668
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:5872
+#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
 msgid "Super Photo"
 msgstr "Szuper fotó"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3636
-#: src/xml/xmli18n-tmp.h:3643 src/xml/xmli18n-tmp.h:3652
-#: src/xml/xmli18n-tmp.h:3661 src/xml/xmli18n-tmp.h:3669
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:5873
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5889
+#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5906
 msgid "Ultra Photo"
 msgstr "Ultra fotó"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1326 src/cups/genppd.c:1989
-#: src/xml/xmli18n-tmp.h:3637 src/xml/xmli18n-tmp.h:3644
-#: src/xml/xmli18n-tmp.h:3653 src/xml/xmli18n-tmp.h:3662
-#: src/xml/xmli18n-tmp.h:3670
+#: src/main/generic-options.c:41 src/cups/genppd.c:1359 src/cups/genppd.c:2023
+#: src/xml/xmli18n-tmp.h:5874 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5899
+#: src/xml/xmli18n-tmp.h:5907
 msgid "Best"
 msgstr "Legjobb"
 
@@ -3080,84 +3836,84 @@ msgstr "5. extra"
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:960
+#: src/cups/genppd.c:993
 msgid "English"
 msgstr "Hungarian"
 
-#: src/cups/genppd.c:1159 src/cups/genppd.c:1175 src/cups/genppd.c:1934
-#: src/cups/genppd.c:1935
+#: src/cups/genppd.c:1192 src/cups/genppd.c:1208 src/cups/genppd.c:1968
+#: src/cups/genppd.c:1969
 #, fuzzy
 msgid "Media Size"
 msgstr "Papír forrása"
 
-#: src/cups/genppd.c:1248 src/cups/genppd.c:1970
+#: src/cups/genppd.c:1281 src/cups/genppd.c:2004
 #, fuzzy
 msgid "Color Model"
 msgstr "Feladat módja"
 
-#: src/cups/genppd.c:1275 src/cups/genppd.c:1972
+#: src/cups/genppd.c:1308 src/cups/genppd.c:2006
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "Szürkeárnyalatos"
 
-#: src/cups/genppd.c:1285 src/cups/genppd.c:1976
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2010
 #, fuzzy
 msgid "RGB Color"
 msgstr "Színes"
 
-#: src/cups/genppd.c:1292 src/cups/genppd.c:1977
+#: src/cups/genppd.c:1325 src/cups/genppd.c:2011
 #, fuzzy
 msgid "CMY Color"
 msgstr "Színes"
 
-#: src/cups/genppd.c:1317 src/cups/genppd.c:1987
+#: src/cups/genppd.c:1350 src/cups/genppd.c:2021
 #, fuzzy
 msgid "Color Precision"
 msgstr "Színkorrekció"
 
-#: src/cups/genppd.c:1573 src/cups/genppd.c:2080
+#: src/cups/genppd.c:1606 src/cups/genppd.c:2114
 #, fuzzy
 msgid "Reverse"
 msgstr "Visszaállítás"
 
-#: src/cups/genppd.c:1590 src/cups/genppd.c:2096
+#: src/cups/genppd.c:1623 src/cups/genppd.c:2130
 msgid "2-Sided Printing"
 msgstr "Kétoldalas nyomtatás"
 
-#: src/cups/genppd.c:1615 src/cups/genppd.c:2113
+#: src/cups/genppd.c:1648 src/cups/genppd.c:2147
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr "Oldal zsugorítása szükség esetén a szegélyekig"
 
-#: src/cups/genppd.c:1620 src/cups/genppd.c:2114
+#: src/cups/genppd.c:1653 src/cups/genppd.c:2148
 msgid "Shrink (print the whole page)"
 msgstr "Zsugorítás (teljes oldal nyomtatása)"
 
-#: src/cups/genppd.c:1621 src/cups/genppd.c:2115
+#: src/cups/genppd.c:1654 src/cups/genppd.c:2149
 msgid "Crop (preserve dimensions)"
 msgstr "Levágás (méretek megőrzése)"
 
-#: src/cups/genppd.c:1622 src/cups/genppd.c:2116
+#: src/cups/genppd.c:1655 src/cups/genppd.c:2150
 msgid "Expand (use maximum page area)"
 msgstr "Nagyítás (teljes oldalterület használata)"
 
-#: src/cups/genppd.c:1716 src/cups/genppd.c:2162
+#: src/cups/genppd.c:1749 src/cups/genppd.c:2196
 msgid "No"
 msgstr "Nem"
 
-#: src/cups/genppd.c:1718 src/cups/genppd.c:2164
+#: src/cups/genppd.c:1751 src/cups/genppd.c:2198
 msgid "Yes"
 msgstr "Igen"
 
-#: src/cups/genppd.c:1757 src/cups/genppd.c:1820 src/cups/genppd.c:1864
-#: src/cups/genppd.c:2185 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+#: src/cups/genppd.c:1790 src/cups/genppd.c:1853 src/cups/genppd.c:1897
+#: src/cups/genppd.c:2219 src/cups/genppd.c:2249 src/cups/genppd.c:2266
 msgid "Value"
 msgstr "Érték"
 
-#: src/cups/genppd.c:1762 src/cups/genppd.c:2189
+#: src/cups/genppd.c:1795 src/cups/genppd.c:2223
 msgid "Fine Adjustment"
 msgstr "Finomhangolás"
 
-#: src/cups/genppd.c:1805 src/cups/genppd.c:2209
+#: src/cups/genppd.c:1838 src/cups/genppd.c:2243
 #, c-format
 msgid "%.1f mm"
 msgstr ""
@@ -3396,51 +4152,61 @@ msgstr ""
 "Nem lehet felismerni a nyomtató típusát.\n"
 "Használja az -m kapcsolót a nyomtató típusának megadásához.\n"
 
-#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:383
-#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
-#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
-#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
-#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
-#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
-#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
-#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
-#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
-#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
-#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
-#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
-#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
-#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
-#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
-#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
-#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
-#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
-#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
-#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
-#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
-#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
-#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
-#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
-#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
-#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
-#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
-#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
-#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
-#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
-#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1503
-#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1509
-#: src/xml/xmli18n-tmp.h:1512 src/xml/xmli18n-tmp.h:1515
-#: src/xml/xmli18n-tmp.h:1518 src/xml/xmli18n-tmp.h:1521
-#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1527
-#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
-#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
-#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
-#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
-#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
-#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:2655
-#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2717
-#: src/xml/xmli18n-tmp.h:3045 src/xml/xmli18n-tmp.h:3252
-#: src/xml/xmli18n-tmp.h:3273 src/xml/xmli18n-tmp.h:3363
-#: src/xml/xmli18n-tmp.h:3531
+#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2001
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2010 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2025
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:4085 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4612 src/xml/xmli18n-tmp.h:5481
 msgid "Photo Black"
 msgstr "Fotófekete"
 
@@ -3451,125 +4217,297 @@ msgid "Unknown"
 msgstr "Ismeretlen"
 
 #: src/escputil/escputil.c:1000 src/escputil/escputil.c:1289
-#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1921
-#: src/xml/xmli18n-tmp.h:1937 src/xml/xmli18n-tmp.h:2002
-#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2079
-#: src/xml/xmli18n-tmp.h:2105 src/xml/xmli18n-tmp.h:2119
-#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2173
-#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
-#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
-#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2293
-#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2346
-#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2418
-#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2445
-#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2469
-#: src/xml/xmli18n-tmp.h:2484 src/xml/xmli18n-tmp.h:2512
-#: src/xml/xmli18n-tmp.h:2525 src/xml/xmli18n-tmp.h:2564
-#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2626
-#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2746
-#: src/xml/xmli18n-tmp.h:2762 src/xml/xmli18n-tmp.h:2843
-#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2895
-#: src/xml/xmli18n-tmp.h:2912 src/xml/xmli18n-tmp.h:2946
-#: src/xml/xmli18n-tmp.h:3001 src/xml/xmli18n-tmp.h:3015
-#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3122
-#: src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2461 src/xml/xmli18n-tmp.h:2526
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2683 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2711 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3101 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3661
+#: src/xml/xmli18n-tmp.h:3678 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3750 src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:3782 src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:3932 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3964 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4388 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:4639 src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:4875 src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4936
+#: src/xml/xmli18n-tmp.h:4942 src/xml/xmli18n-tmp.h:4968
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5339 src/xml/xmli18n-tmp.h:5348
+#: src/xml/xmli18n-tmp.h:5355 src/xml/xmli18n-tmp.h:5361
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5417
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5430
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5477 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5502
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5536 src/xml/xmli18n-tmp.h:5544
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5557
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5657 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5719
+#: src/xml/xmli18n-tmp.h:5726 src/xml/xmli18n-tmp.h:5732
+#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5779
 msgid "Light Cyan"
 msgstr "Világos ciánkék"
 
 #: src/escputil/escputil.c:1001 src/escputil/escputil.c:1290
-#: src/xml/xmli18n-tmp.h:1906 src/xml/xmli18n-tmp.h:1922
-#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:2003
-#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2080
-#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2120
-#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2174
-#: src/xml/xmli18n-tmp.h:2188 src/xml/xmli18n-tmp.h:2201
-#: src/xml/xmli18n-tmp.h:2214 src/xml/xmli18n-tmp.h:2227
-#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2294
-#: src/xml/xmli18n-tmp.h:2309 src/xml/xmli18n-tmp.h:2347
-#: src/xml/xmli18n-tmp.h:2360 src/xml/xmli18n-tmp.h:2419
-#: src/xml/xmli18n-tmp.h:2432 src/xml/xmli18n-tmp.h:2446
-#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2470
-#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2513
-#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2565
-#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2627
-#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2748
-#: src/xml/xmli18n-tmp.h:2761 src/xml/xmli18n-tmp.h:2844
-#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2896
-#: src/xml/xmli18n-tmp.h:2913 src/xml/xmli18n-tmp.h:2947
-#: src/xml/xmli18n-tmp.h:3000 src/xml/xmli18n-tmp.h:3014
-#: src/xml/xmli18n-tmp.h:3028 src/xml/xmli18n-tmp.h:3123
-#: src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2446
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2527
+#: src/xml/xmli18n-tmp.h:2541 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2644
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2698
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2751
+#: src/xml/xmli18n-tmp.h:2803 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2956 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2994
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3381
+#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3662
+#: src/xml/xmli18n-tmp.h:3746 src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:3778 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3934 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3966 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:4265 src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:4390 src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:4428 src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4452
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4465
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4512 src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4586 src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:4641 src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4903
+#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4970
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:5044 src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5168
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5241 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5334
+#: src/xml/xmli18n-tmp.h:5341 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5363
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5419
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5471
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5504
+#: src/xml/xmli18n-tmp.h:5510 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5652
+#: src/xml/xmli18n-tmp.h:5659 src/xml/xmli18n-tmp.h:5665
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5721
+#: src/xml/xmli18n-tmp.h:5728 src/xml/xmli18n-tmp.h:5734
+#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5781
 msgid "Light Magenta"
 msgstr "Világos bíborvörös"
 
-#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2433
-#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:3002
-#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3030
+#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3679 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4409 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:4566 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4605 src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4664 src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5376 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5450
+#: src/xml/xmli18n-tmp.h:5475 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5533 src/xml/xmli18n-tmp.h:5542
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5678 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5717
+#: src/xml/xmli18n-tmp.h:5747 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5777
 msgid "Light Black"
 msgstr "Világos fekete"
 
-#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:384
-#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
-#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
-#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
-#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
-#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
-#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
-#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
-#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
-#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
-#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
-#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
-#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
-#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
-#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
-#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
-#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
-#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
-#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
-#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
-#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
-#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
-#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
-#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
-#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
-#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
-#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
-#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
-#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
-#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
-#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1504
-#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1510
-#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1516
-#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1522
-#: src/xml/xmli18n-tmp.h:1525 src/xml/xmli18n-tmp.h:1528
-#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1534
-#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1540
-#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1546
-#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1552
-#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1558
-#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:2654
-#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2716
-#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3264
-#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3371
-#: src/xml/xmli18n-tmp.h:3539
+#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:508 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:532 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:538 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:562 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:568 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
+#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
+#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
+#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
+#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
+#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
+#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
+#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
+#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
+#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
+#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
+#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2011 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2026
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2032
+#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2038
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:4044 src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:5530
 msgid "Matte Black"
 msgstr "Matt fekete"
 
-#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:2658
-#: src/xml/xmli18n-tmp.h:2702 src/xml/xmli18n-tmp.h:2720
-#: src/xml/xmli18n-tmp.h:3048
+#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3995 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4006 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4020 src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:4106 src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Gloss Optimizer"
 msgstr "Fényességoptimalizáló"
 
-#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:2760
-#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3013
-#: src/xml/xmli18n-tmp.h:3027
+#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3676
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4616 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5534 src/xml/xmli18n-tmp.h:5573
 msgid "Light Light Black"
 msgstr "Világosszürke"
 
 #: src/escputil/escputil.c:1010 src/escputil/escputil.c:1029
-#: src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:4099 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4189
 #, fuzzy
 msgid "Orange"
 msgstr "Oldal"
@@ -4139,8125 +5077,8305 @@ msgstr "Nyomtatás..."
 #: src/xml/xmli18n-tmp.h:68 src/xml/xmli18n-tmp.h:70 src/xml/xmli18n-tmp.h:72
 #: src/xml/xmli18n-tmp.h:74 src/xml/xmli18n-tmp.h:76 src/xml/xmli18n-tmp.h:78
 #: src/xml/xmli18n-tmp.h:80 src/xml/xmli18n-tmp.h:82 src/xml/xmli18n-tmp.h:84
-#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:92
-#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
-#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
-#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
-#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
-#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
-#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
-#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
-#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
-#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
-#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
-#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
-#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
-#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
-#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
-#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
-#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
-#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
-#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
-#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
-#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
-#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
-#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
-#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
-#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
-#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
-#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
-#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
-#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
-#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
-#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
-#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
-#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
-#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
-#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
-#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
-#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
-#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
-#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
-#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
-#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
-#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
-#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
-#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
-#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
-#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
-#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
-#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
-#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
-#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
-#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
-#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
-#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
-#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
-#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
-#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
-#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
-#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
-#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
-#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
-#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
-#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
-#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
-#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
-#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
-#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
-#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
-#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
-#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
-#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
-#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
-#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
-#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
-#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
-#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
-#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
-#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
-#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
-#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
-#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
-#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
-#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
-#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
-#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
-#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
-#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
-#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
-#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
-#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
-#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
-#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
-#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
-#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
-#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
-#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
-#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
-#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:92 src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:102 src/xml/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:106 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:114 src/xml/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:118 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:126 src/xml/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:130 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:136 src/xml/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:144 src/xml/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:168 src/xml/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:192 src/xml/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:216 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:232 src/xml/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:240 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:256 src/xml/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:264 src/xml/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:304 src/xml/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:312 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:320 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:328 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:336 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:344 src/xml/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:352 src/xml/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:384 src/xml/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:408 src/xml/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:412 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:432 src/xml/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:444 src/xml/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:448 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:468 src/xml/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:484 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:642 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:698 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:714 src/xml/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:722 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:738 src/xml/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:746 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:764 src/xml/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:780 src/xml/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:804 src/xml/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:814
 #: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:818
 #: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:822
 #: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:826
 #: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:830
-#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:834
-#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:838
-#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:842
-#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:846
-#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:850
-#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
-#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
-#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
-#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
-#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
-#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
-#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
-#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:898
-#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
-#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
-#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
-#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
-#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
-#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
-#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
-#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
-#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
-#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
-#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
-#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
-#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
-#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
-#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
-#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
-#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
-#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
-#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
-#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1018
-#: src/xml/xmli18n-tmp.h:1021 src/xml/xmli18n-tmp.h:1024
-#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1030
-#: src/xml/xmli18n-tmp.h:1033 src/xml/xmli18n-tmp.h:1036
-#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1042
-#: src/xml/xmli18n-tmp.h:1045 src/xml/xmli18n-tmp.h:1048
-#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1054
-#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1060
-#: src/xml/xmli18n-tmp.h:1063 src/xml/xmli18n-tmp.h:1066
-#: src/xml/xmli18n-tmp.h:1069 src/xml/xmli18n-tmp.h:1072
-#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1078
-#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1084
-#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1090
-#: src/xml/xmli18n-tmp.h:1093 src/xml/xmli18n-tmp.h:1096
-#: src/xml/xmli18n-tmp.h:1099 src/xml/xmli18n-tmp.h:1102
-#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1108
-#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1114
-#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1120
-#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1126
-#: src/xml/xmli18n-tmp.h:1129 src/xml/xmli18n-tmp.h:1132
-#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
-#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
-#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
-#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
-#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
-#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
-#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
-#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
-#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
-#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
-#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
-#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
-#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
-#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1189
-#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1193
-#: src/xml/xmli18n-tmp.h:1195 src/xml/xmli18n-tmp.h:1197
-#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1201
-#: src/xml/xmli18n-tmp.h:1203 src/xml/xmli18n-tmp.h:1205
-#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1209
-#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1221
-#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
-#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
-#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
-#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
-#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
-#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
-#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
-#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
-#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
-#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
-#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
-#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
-#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
-#: src/xml/xmli18n-tmp.h:1302 src/xml/xmli18n-tmp.h:1305
-#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1311
-#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1317
-#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1323
-#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1329
-#: src/xml/xmli18n-tmp.h:1332 src/xml/xmli18n-tmp.h:1335
-#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
-#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1343
-#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1347
-#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1351
-#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1355
-#: src/xml/xmli18n-tmp.h:1357 src/xml/xmli18n-tmp.h:1359
-#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1363
-#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1367
-#: src/xml/xmli18n-tmp.h:1369 src/xml/xmli18n-tmp.h:1371
-#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1375
-#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1566
-#: src/xml/xmli18n-tmp.h:1569 src/xml/xmli18n-tmp.h:1572
-#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1578
-#: src/xml/xmli18n-tmp.h:1581 src/xml/xmli18n-tmp.h:1584
-#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1590
-#: src/xml/xmli18n-tmp.h:1593 src/xml/xmli18n-tmp.h:1596
-#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1602
-#: src/xml/xmli18n-tmp.h:1605 src/xml/xmli18n-tmp.h:1608
-#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1614
-#: src/xml/xmli18n-tmp.h:1617 src/xml/xmli18n-tmp.h:1620
-#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1626
-#: src/xml/xmli18n-tmp.h:1629 src/xml/xmli18n-tmp.h:1632
-#: src/xml/xmli18n-tmp.h:1635 src/xml/xmli18n-tmp.h:1638
-#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1644
-#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
-#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
-#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
-#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
-#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
-#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
-#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
-#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
-#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
-#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
-#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
-#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
-#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
-#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
-#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:1778
-#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1782
-#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1786
-#: src/xml/xmli18n-tmp.h:1788 src/xml/xmli18n-tmp.h:1790
-#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1794
-#: src/xml/xmli18n-tmp.h:1796 src/xml/xmli18n-tmp.h:1798
-#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1802
-#: src/xml/xmli18n-tmp.h:1804 src/xml/xmli18n-tmp.h:1806
-#: src/xml/xmli18n-tmp.h:1808 src/xml/xmli18n-tmp.h:1810
-#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3204
-#: src/xml/xmli18n-tmp.h:3210 src/xml/xmli18n-tmp.h:3216
-#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3232
-#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3250
-#: src/xml/xmli18n-tmp.h:3294 src/xml/xmli18n-tmp.h:3302
-#: src/xml/xmli18n-tmp.h:3304 src/xml/xmli18n-tmp.h:3312
-#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3379
-#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
-#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3421
-#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3441
-#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3469
-#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3555
-#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3597
-#: src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:1017
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1025
+#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1035 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1047 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1056
+#: src/xml/xmli18n-tmp.h:1061 src/xml/xmli18n-tmp.h:1066
+#: src/xml/xmli18n-tmp.h:1071 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1086
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1096
+#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1116
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1126
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1136
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1161 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1181 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1206
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1216
+#: src/xml/xmli18n-tmp.h:1221 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1236
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1246
+#: src/xml/xmli18n-tmp.h:1251 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1261 src/xml/xmli18n-tmp.h:1266
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1281 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1291 src/xml/xmli18n-tmp.h:1296
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1311 src/xml/xmli18n-tmp.h:1316
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1326
+#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1336
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1378 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1414 src/xml/xmli18n-tmp.h:1420
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1432
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1450 src/xml/xmli18n-tmp.h:1455
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1465
+#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1480 src/xml/xmli18n-tmp.h:1485
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1540 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1551 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1583 src/xml/xmli18n-tmp.h:1585
+#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1603 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1607 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1646
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1666
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1676
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1716
+#: src/xml/xmli18n-tmp.h:1721 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1736
+#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1835
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1843
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1851
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:2049
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2057
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2065
+#: src/xml/xmli18n-tmp.h:2069 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2113
+#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2129
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2137
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2153
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2161
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2185
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2264
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2272
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2276
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2282 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2286 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2296
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2300
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2308
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2314 src/xml/xmli18n-tmp.h:2316
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2324
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:3787 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3895 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:4223 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5579
+#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5825
 msgid "EPSON Standard Inks"
 msgstr "Epson szabvány tinták"
 
-#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Bright White Paper"
 msgstr "Matt papír"
 
-#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
-#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
-#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
-#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
-#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
-#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
-#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
-#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:817
-#: src/xml/xmli18n-tmp.h:855 src/xml/xmli18n-tmp.h:912
-#: src/xml/xmli18n-tmp.h:969 src/xml/xmli18n-tmp.h:1026
-#: src/xml/xmli18n-tmp.h:1083 src/xml/xmli18n-tmp.h:1136
-#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1226
-#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1338
-#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1445
-#: src/xml/xmli18n-tmp.h:1505 src/xml/xmli18n-tmp.h:1568
-#: src/xml/xmli18n-tmp.h:1625 src/xml/xmli18n-tmp.h:1682
-#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1777
-#: src/xml/xmli18n-tmp.h:3675
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:139 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:959 src/xml/xmli18n-tmp.h:1018
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1155
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1546
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1931
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:5912
 msgid "Postcard"
 msgstr "Levelezőlap"
 
-#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
-#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
-#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
-#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
-#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
-#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
-#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
-#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:825
-#: src/xml/xmli18n-tmp.h:867 src/xml/xmli18n-tmp.h:924
-#: src/xml/xmli18n-tmp.h:981 src/xml/xmli18n-tmp.h:1038
-#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1144
-#: src/xml/xmli18n-tmp.h:1182 src/xml/xmli18n-tmp.h:1238
-#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1346
-#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1457
-#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1580
-#: src/xml/xmli18n-tmp.h:1637 src/xml/xmli18n-tmp.h:1694
-#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1785
+#: src/xml/xmli18n-tmp.h:13 src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:155 src/xml/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:415 src/xml/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:851 src/xml/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1026
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1175
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1554
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1832
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2309
 msgid "Back Light Film"
 msgstr "Hátulról megvilágított film"
 
-#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
-#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
-#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
-#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
-#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
-#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
-#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
-#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:829
-#: src/xml/xmli18n-tmp.h:873 src/xml/xmli18n-tmp.h:930
-#: src/xml/xmli18n-tmp.h:987 src/xml/xmli18n-tmp.h:1044
-#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1148
-#: src/xml/xmli18n-tmp.h:1186 src/xml/xmli18n-tmp.h:1244
-#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1350
-#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1463
-#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1586
-#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1700
-#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1789
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:419 src/xml/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:857 src/xml/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1030
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1383
+#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1558
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2313
 msgid "Matte Paper Heavyweight"
 msgstr "Matt papír, nehéz"
 
-#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
-#: src/xml/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:421
 #, fuzzy
 msgid "Premium Presentation Paper Matte"
 msgstr "Premium Luster fotópapír"
 
-#: src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:431
 #, fuzzy
-msgid "Premium Glossy Photo Paper 170 wt"
+msgid "Ultra Glossy Photo Paper"
 msgstr "Kiváló minőségű fényes fotópapír"
 
-#: src/xml/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1210
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1413
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1568
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1695
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1964
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2176 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2287 src/xml/xmli18n-tmp.h:2323
+msgid "Premium Semigloss Photo Paper"
+msgstr "Kiváló minőségű félig fényes fotópapír"
+
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:437
 #, fuzzy
-msgid "Premium Glossy Photo Paper 250 wt"
+msgid "Ultra Premium Photo Paper Luster"
 msgstr "Kiváló minőségű fényes fotópapír"
 
-#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
-#: src/xml/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:37
+msgid "CD or DVD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:93 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1230
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1437
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2331
+msgid "ColorLife Paper"
+msgstr "ColorLife papír"
+
+#: src/xml/xmli18n-tmp.h:73
 #, fuzzy
-msgid "Ultra Glossy Photo Paper"
+msgid "Premium Glossy Photo Paper 170 wt"
 msgstr "Kiváló minőségű fényes fotópapír"
 
-#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
-#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
-#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
-#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
-#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
-#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
-#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
-#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:839
-#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:945
-#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1059
-#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1158
-#: src/xml/xmli18n-tmp.h:1196 src/xml/xmli18n-tmp.h:1259
-#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1360
-#: src/xml/xmli18n-tmp.h:1415 src/xml/xmli18n-tmp.h:1478
-#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1601
-#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1715
-#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1799
-msgid "Premium Semigloss Photo Paper"
-msgstr "Kiváló minőségű félig fényes fotópapír"
+#: src/xml/xmli18n-tmp.h:75
+#, fuzzy
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "Kiváló minőségű fényes fotópapír"
 
-#: src/xml/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:81
 #, fuzzy
 msgid "Premium Semigloss Photo Paper 170 wt"
 msgstr "Kiváló minőségű félig fényes fotópapír"
 
-#: src/xml/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:83
 #, fuzzy
 msgid "Premium Semigloss Photo Paper 250 wt"
 msgstr "Kiváló minőségű félig fényes fotópapír"
 
-#: src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:87
 #, fuzzy
 msgid "Premium Luster Photo Paper 250 wt"
 msgstr "Premium Luster fotópapír"
 
-#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
-#: src/xml/xmli18n-tmp.h:334
-#, fuzzy
-msgid "Ultra Premium Photo Paper Luster"
-msgstr "Kiváló minőségű fényes fotópapír"
-
-#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
-#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
-#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
-#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
-#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
-#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
-#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
-#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:845
-#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:957
-#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1071
-#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1166
-#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1271
-#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1372
-#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1496
-#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1613
-#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1733
-#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1807
-msgid "ColorLife Paper"
-msgstr "ColorLife papír"
-
-#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
-#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
-#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
-#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
-#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
-#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
-#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
-#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
-#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
-#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
-#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
-#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
-#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
-#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
-#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
-#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
-#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
-#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
-#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
-#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
-#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
-#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
-#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
-#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
-#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
-#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
-#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
-#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
-#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
-#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
-#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
-#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
-#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
-#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
-#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
-#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
-#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
-#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
-#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
-#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
-#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
-#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
-#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
-#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
-#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
-#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
-#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:851
-#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:857
-#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:863
-#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:869
-#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:875
-#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:881
-#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:887
-#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:893
-#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:899
-#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:905
-#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:911
-#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:917
-#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:923
-#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:929
-#: src/xml/xmli18n-tmp.h:932 src/xml/xmli18n-tmp.h:935
-#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:941
-#: src/xml/xmli18n-tmp.h:944 src/xml/xmli18n-tmp.h:947
-#: src/xml/xmli18n-tmp.h:950 src/xml/xmli18n-tmp.h:953
-#: src/xml/xmli18n-tmp.h:956 src/xml/xmli18n-tmp.h:959
-#: src/xml/xmli18n-tmp.h:962 src/xml/xmli18n-tmp.h:965
-#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:971
-#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:977
-#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:983
-#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:989
-#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:995
-#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1001
-#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1007
-#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1013
-#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1019
-#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1025
-#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1031
-#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1037
-#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1043
-#: src/xml/xmli18n-tmp.h:1046 src/xml/xmli18n-tmp.h:1049
-#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1055
-#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1061
-#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1067
-#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1073
-#: src/xml/xmli18n-tmp.h:1076 src/xml/xmli18n-tmp.h:1079
-#: src/xml/xmli18n-tmp.h:1082 src/xml/xmli18n-tmp.h:1085
-#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1091
-#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1097
-#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1103
-#: src/xml/xmli18n-tmp.h:1106 src/xml/xmli18n-tmp.h:1109
-#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1115
-#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1121
-#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1127
-#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1133
-#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1225
-#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1231
-#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1237
-#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1243
-#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1249
-#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1255
-#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1261
-#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1267
-#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1273
-#: src/xml/xmli18n-tmp.h:1276 src/xml/xmli18n-tmp.h:1279
-#: src/xml/xmli18n-tmp.h:1282 src/xml/xmli18n-tmp.h:1285
-#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1291
-#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1297
-#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1303
-#: src/xml/xmli18n-tmp.h:1306 src/xml/xmli18n-tmp.h:1309
-#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1315
-#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1321
-#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1327
-#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1333
-#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1567
-#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1573
-#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1579
-#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1585
-#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1591
-#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1597
-#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1603
-#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1609
-#: src/xml/xmli18n-tmp.h:1612 src/xml/xmli18n-tmp.h:1615
-#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1621
-#: src/xml/xmli18n-tmp.h:1624 src/xml/xmli18n-tmp.h:1627
-#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1633
-#: src/xml/xmli18n-tmp.h:1636 src/xml/xmli18n-tmp.h:1639
-#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1645
-#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1651
-#: src/xml/xmli18n-tmp.h:1654 src/xml/xmli18n-tmp.h:1657
-#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1663
-#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1669
-#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1675
-#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3223
-#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3231
-#: src/xml/xmli18n-tmp.h:3238 src/xml/xmli18n-tmp.h:3239
-#: src/xml/xmli18n-tmp.h:3300 src/xml/xmli18n-tmp.h:3301
-#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3311
-#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3396
-#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3408
-#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3420
-#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3432
-#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3440
-#: src/xml/xmli18n-tmp.h:3479 src/xml/xmli18n-tmp.h:3480
-#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3492
-#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3554
-#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:133 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:149 src/xml/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:173 src/xml/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:197 src/xml/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:205 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:221 src/xml/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:229 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:245 src/xml/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:253 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:261 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:269 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:277 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:285 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:293 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:301 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:309 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:317 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:325 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:333 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:341 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:349 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:357 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:619 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:643 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:667 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:691 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:707 src/xml/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:715 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:731 src/xml/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:739 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:755 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1062
+#: src/xml/xmli18n-tmp.h:1067 src/xml/xmli18n-tmp.h:1072
+#: src/xml/xmli18n-tmp.h:1077 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1092
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1102
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1112
+#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1122
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1132
+#: src/xml/xmli18n-tmp.h:1137 src/xml/xmli18n-tmp.h:1142
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1157 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1177 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1192
+#: src/xml/xmli18n-tmp.h:1197 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1212
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1222
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1242
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1252
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1272
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1287 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1297 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1327 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1385 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1445 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1461
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1516 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1647
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1657
+#: src/xml/xmli18n-tmp.h:1662 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1677
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1687
+#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1742 src/xml/xmli18n-tmp.h:1747
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1767
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1807
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2090 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2098 src/xml/xmli18n-tmp.h:2102
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2118
+#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2126
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2162 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2190
+#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:3884 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:4779 src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:4845 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4919
+#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4980
+#: src/xml/xmli18n-tmp.h:4986 src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5209 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5276
+#: src/xml/xmli18n-tmp.h:5277 src/xml/xmli18n-tmp.h:5283
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5607 src/xml/xmli18n-tmp.h:5633
+#: src/xml/xmli18n-tmp.h:5634 src/xml/xmli18n-tmp.h:5640
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
-#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
-#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
-#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
-#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:852
-#: src/xml/xmli18n-tmp.h:909 src/xml/xmli18n-tmp.h:966
-#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1080
-#: src/xml/xmli18n-tmp.h:1172 src/xml/xmli18n-tmp.h:1223
-#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1336
-#: src/xml/xmli18n-tmp.h:1379 src/xml/xmli18n-tmp.h:1442
-#: src/xml/xmli18n-tmp.h:1565 src/xml/xmli18n-tmp.h:1622
-#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1775
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:142 src/xml/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:150 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:174 src/xml/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:198 src/xml/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:214 src/xml/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:222 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:238 src/xml/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:246 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:262 src/xml/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:302 src/xml/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:310 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:318 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:326 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:334 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:342 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:350 src/xml/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:636 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:660 src/xml/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:708 src/xml/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:716 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:732 src/xml/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:756 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1103
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1123
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1158 src/xml/xmli18n-tmp.h:1163
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1183
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1193
+#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1213
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1223
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1238 src/xml/xmli18n-tmp.h:1243
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1253
+#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1283
+#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1313
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1333
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1362 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1374 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1462
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1472
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1487 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1502
+#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:1532
+#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1542
+#: src/xml/xmli18n-tmp.h:1633 src/xml/xmli18n-tmp.h:1638
+#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1648
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1658
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1713 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1728
+#: src/xml/xmli18n-tmp.h:1733 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1768
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2071
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2095
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2115 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2123 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2139 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2183
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2191
+#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2199
+#, fuzzy
+msgid "MISQuadtone"
+msgstr "Quadtone"
+
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1150 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2299
 msgid "Plain Paper Fast Load"
 msgstr "Egyszerű papír, gyors betöltéssel"
 
-#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
-#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
-#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1364
-#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1484
-#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1970 src/xml/xmli18n-tmp.h:2030
+#: src/xml/xmli18n-tmp.h:2245
 msgid "Archival Matte Paper"
 msgstr "Archiválási matt papír"
 
-#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
-#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
-#: src/xml/xmli18n-tmp.h:1202 src/xml/xmli18n-tmp.h:1366
-#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1487
-#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:881 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2248
 msgid "Watercolor Paper - Radiant White"
 msgstr "Vízfesték papír - Ragyogó fehér"
 
-#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
-#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
-#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
-#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
-#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
-#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
-#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
-#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
-#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
-#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
-#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1377
-#: src/xml/xmli18n-tmp.h:1380 src/xml/xmli18n-tmp.h:1383
-#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1389
-#: src/xml/xmli18n-tmp.h:1392 src/xml/xmli18n-tmp.h:1395
-#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1401
-#: src/xml/xmli18n-tmp.h:1404 src/xml/xmli18n-tmp.h:1407
-#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1413
-#: src/xml/xmli18n-tmp.h:1416 src/xml/xmli18n-tmp.h:1419
-#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1425
-#: src/xml/xmli18n-tmp.h:1428 src/xml/xmli18n-tmp.h:1431
-#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1437
-#: src/xml/xmli18n-tmp.h:1440 src/xml/xmli18n-tmp.h:1443
-#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1449
-#: src/xml/xmli18n-tmp.h:1452 src/xml/xmli18n-tmp.h:1455
-#: src/xml/xmli18n-tmp.h:1458 src/xml/xmli18n-tmp.h:1461
-#: src/xml/xmli18n-tmp.h:1464 src/xml/xmli18n-tmp.h:1467
-#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1473
-#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1479
-#: src/xml/xmli18n-tmp.h:1482 src/xml/xmli18n-tmp.h:1485
-#: src/xml/xmli18n-tmp.h:1488 src/xml/xmli18n-tmp.h:1491
-#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1497
-#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1677
-#: src/xml/xmli18n-tmp.h:1680 src/xml/xmli18n-tmp.h:1683
-#: src/xml/xmli18n-tmp.h:1686 src/xml/xmli18n-tmp.h:1689
-#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1695
-#: src/xml/xmli18n-tmp.h:1698 src/xml/xmli18n-tmp.h:1701
-#: src/xml/xmli18n-tmp.h:1704 src/xml/xmli18n-tmp.h:1707
-#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1713
-#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1719
-#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1725
-#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1731
-#: src/xml/xmli18n-tmp.h:1734 src/xml/xmli18n-tmp.h:1737
-#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3503
-#: src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:1863
+#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1881
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1893
+#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1905
+#: src/xml/xmli18n-tmp.h:1908 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1923
+#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:1950 src/xml/xmli18n-tmp.h:1953
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1968 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1983
+#: src/xml/xmli18n-tmp.h:1986 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2204 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2255
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5645
 msgid "UltraChrome Photo Black"
 msgstr "UltraChrome fotó fekete"
 
-#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
-#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
-#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
-#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
-#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
-#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
-#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
-#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
-#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
-#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
-#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1378
-#: src/xml/xmli18n-tmp.h:1381 src/xml/xmli18n-tmp.h:1384
-#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1390
-#: src/xml/xmli18n-tmp.h:1393 src/xml/xmli18n-tmp.h:1396
-#: src/xml/xmli18n-tmp.h:1399 src/xml/xmli18n-tmp.h:1402
-#: src/xml/xmli18n-tmp.h:1405 src/xml/xmli18n-tmp.h:1408
-#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1414
-#: src/xml/xmli18n-tmp.h:1417 src/xml/xmli18n-tmp.h:1420
-#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1426
-#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1432
-#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1438
-#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1444
-#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1450
-#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1456
-#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1462
-#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1468
-#: src/xml/xmli18n-tmp.h:1471 src/xml/xmli18n-tmp.h:1474
-#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1480
-#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1486
-#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1492
-#: src/xml/xmli18n-tmp.h:1495 src/xml/xmli18n-tmp.h:1498
-#: src/xml/xmli18n-tmp.h:1501 src/xml/xmli18n-tmp.h:1678
-#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1684
-#: src/xml/xmli18n-tmp.h:1687 src/xml/xmli18n-tmp.h:1690
-#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1696
-#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1702
-#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1708
-#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1714
-#: src/xml/xmli18n-tmp.h:1717 src/xml/xmli18n-tmp.h:1720
-#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1726
-#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1732
-#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1738
-#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3517
-#: src/xml/xmli18n-tmp.h:3577
+#: src/xml/xmli18n-tmp.h:835 src/xml/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:841 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1879 src/xml/xmli18n-tmp.h:1882
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1894
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1909 src/xml/xmli18n-tmp.h:1912
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1924
+#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1954
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1969 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1984
+#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2208
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2229 src/xml/xmli18n-tmp.h:2232
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2238
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2244
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2253 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2259 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5714
 msgid "UltraChrome Matte Black"
 msgstr "UltraChrome matt fekete"
 
-#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1826
-#: src/xml/xmli18n-tmp.h:1839 src/xml/xmli18n-tmp.h:1852
-#: src/xml/xmli18n-tmp.h:1907 src/xml/xmli18n-tmp.h:1923
-#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1952
-#: src/xml/xmli18n-tmp.h:1965 src/xml/xmli18n-tmp.h:2054
-#: src/xml/xmli18n-tmp.h:2081 src/xml/xmli18n-tmp.h:2146
-#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
-#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
-#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2348
-#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2407
-#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2899
-#: src/xml/xmli18n-tmp.h:2916 src/xml/xmli18n-tmp.h:3142
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1139
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1154 src/xml/xmli18n-tmp.h:1159
+#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1179
+#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1199
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1214 src/xml/xmli18n-tmp.h:1219
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1229
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1244 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1259
+#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1274 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1289
+#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1309
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1329
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1423
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1429
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1447
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1634
+#: src/xml/xmli18n-tmp.h:1639 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1664
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1764
+#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1784
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1799 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1819
+msgid "MIS Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1463 src/xml/xmli18n-tmp.h:1468
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1478
+#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1508
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1533 src/xml/xmli18n-tmp.h:1538
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4858 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:5289
+msgid "Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2489 src/xml/xmli18n-tmp.h:2578
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2713 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2752
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2885 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:3051 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3665
 msgid "360 x 90 DPI Fast Economy"
 msgstr "360 x 90 DPI Gyors, gazdaságos"
 
-#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1828
-#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1853
-#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1879
-#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
-#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1940
-#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1966
-#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2055
-#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2133
-#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2175
-#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
-#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
-#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2336
-#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
-#: src/xml/xmli18n-tmp.h:2408 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2699
+#: src/xml/xmli18n-tmp.h:2714 src/xml/xmli18n-tmp.h:2727
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2886
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:3052
 msgid "180 DPI Economy"
 msgstr "180 DPI Gazdaságos"
 
-#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1830
-#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1854
-#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1880
-#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
-#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1941
-#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1967
-#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
-#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2134
-#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2176
-#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
-#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
-#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2337
-#: src/xml/xmli18n-tmp.h:2350 src/xml/xmli18n-tmp.h:2363
-#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
-#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2434
-#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2459
-#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2529
-#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2601
-#: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2703
-#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2735
-#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2768
-#: src/xml/xmli18n-tmp.h:2872 src/xml/xmli18n-tmp.h:2884
-#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2917
-#: src/xml/xmli18n-tmp.h:2961 src/xml/xmli18n-tmp.h:3007
-#: src/xml/xmli18n-tmp.h:3021 src/xml/xmli18n-tmp.h:3035
-#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3126
-#: src/xml/xmli18n-tmp.h:3143
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2404
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2658
+#: src/xml/xmli18n-tmp.h:2672 src/xml/xmli18n-tmp.h:2700
+#: src/xml/xmli18n-tmp.h:2715 src/xml/xmli18n-tmp.h:2728
+#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2754
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2919 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3053
+#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3125
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3292
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3530
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3649
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3684
 msgid "360 x 180 DPI Draft"
 msgstr "360 x 180 DPI Piszkozat"
 
-#: src/xml/xmli18n-tmp.h:1818 src/xml/xmli18n-tmp.h:1831
-#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1855
-#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1881
-#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
-#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1942
-#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1968
-#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2135
-#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2392 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2418 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2479 src/xml/xmli18n-tmp.h:2492
+#: src/xml/xmli18n-tmp.h:2581 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2862 src/xml/xmli18n-tmp.h:2934
 msgid "360 DPI High Quality"
 msgstr "360 dpi Jó minőségű"
 
-#: src/xml/xmli18n-tmp.h:1819 src/xml/xmli18n-tmp.h:1832
-#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1856
-#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1882
-#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
-#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1943
-#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1969
-#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1992
-#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2020
-#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
-#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
-#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2096
-#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2123
-#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2149
-#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2177
-#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2205
-#: src/xml/xmli18n-tmp.h:2218 src/xml/xmli18n-tmp.h:2231
-#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2254
-#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
-#: src/xml/xmli18n-tmp.h:2297 src/xml/xmli18n-tmp.h:2312
-#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2339
-#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
-#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2385
-#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2411
-#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2435
-#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2460
-#: src/xml/xmli18n-tmp.h:2473 src/xml/xmli18n-tmp.h:2488
-#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2516
-#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2541
-#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2591
-#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
-#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2645
-#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2675
-#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2704
-#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2736
-#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2769
-#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2808
-#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2833
-#: src/xml/xmli18n-tmp.h:2847 src/xml/xmli18n-tmp.h:2861
-#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2885
-#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2918
-#: src/xml/xmli18n-tmp.h:2935 src/xml/xmli18n-tmp.h:2950
-#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2987
-#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3022
-#: src/xml/xmli18n-tmp.h:3036 src/xml/xmli18n-tmp.h:3050
-#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3081
-#: src/xml/xmli18n-tmp.h:3098 src/xml/xmli18n-tmp.h:3113
-#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2369 src/xml/xmli18n-tmp.h:2380
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2406
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2493
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2544
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
+#: src/xml/xmli18n-tmp.h:2582 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2729
+#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2806
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2836
+#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
+#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3012
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3040
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3184 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3424 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3485 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3573
+#: src/xml/xmli18n-tmp.h:3587 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3650 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3685
 msgid "360 DPI"
 msgstr "360 DPI"
 
-#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1833
-#: src/xml/xmli18n-tmp.h:1846 src/xml/xmli18n-tmp.h:1857
-#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1883
-#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1912
-#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1944
-#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1970
-#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1993
-#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2021
-#: src/xml/xmli18n-tmp.h:2033 src/xml/xmli18n-tmp.h:2045
-#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
-#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2097
-#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2124
-#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2150
-#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2178
-#: src/xml/xmli18n-tmp.h:2193 src/xml/xmli18n-tmp.h:2206
-#: src/xml/xmli18n-tmp.h:2219 src/xml/xmli18n-tmp.h:2232
-#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2255
-#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
-#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2313
-#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2340
-#: src/xml/xmli18n-tmp.h:2352 src/xml/xmli18n-tmp.h:2365
-#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2386
-#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2412
-#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2436
-#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2461
-#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2489
-#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2517
-#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2542
-#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2567
-#: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2592
-#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2616
-#: src/xml/xmli18n-tmp.h:2631 src/xml/xmli18n-tmp.h:2646
-#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2676
-#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2705
-#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2737
-#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2770
-#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2809
-#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2834
-#: src/xml/xmli18n-tmp.h:2848 src/xml/xmli18n-tmp.h:2862
-#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2886
-#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2919
-#: src/xml/xmli18n-tmp.h:2936 src/xml/xmli18n-tmp.h:2951
-#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2988
-#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3023
-#: src/xml/xmli18n-tmp.h:3037 src/xml/xmli18n-tmp.h:3051
-#: src/xml/xmli18n-tmp.h:3066 src/xml/xmli18n-tmp.h:3083
-#: src/xml/xmli18n-tmp.h:3099 src/xml/xmli18n-tmp.h:3114
-#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:2344 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2452 src/xml/xmli18n-tmp.h:2468
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2494
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2557 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:2594
+#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2648
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2674
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2807
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2837
+#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
+#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3013
+#: src/xml/xmli18n-tmp.h:3026 src/xml/xmli18n-tmp.h:3041
+#: src/xml/xmli18n-tmp.h:3055 src/xml/xmli18n-tmp.h:3066
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3140
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3170
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3229
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3333
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3358
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3385
+#: src/xml/xmli18n-tmp.h:3397 src/xml/xmli18n-tmp.h:3409
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3442
+#: src/xml/xmli18n-tmp.h:3459 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3574
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3637
+#: src/xml/xmli18n-tmp.h:3651 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3686
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1834
-#: src/xml/xmli18n-tmp.h:1847 src/xml/xmli18n-tmp.h:1858
-#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1884
-#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1913
-#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1945
-#: src/xml/xmli18n-tmp.h:1958 src/xml/xmli18n-tmp.h:1971
-#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:1994
-#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2022
-#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2046
-#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2071
-#: src/xml/xmli18n-tmp.h:2086 src/xml/xmli18n-tmp.h:2098
-#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2125
-#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2151
-#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2179
-#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2207
-#: src/xml/xmli18n-tmp.h:2220 src/xml/xmli18n-tmp.h:2233
-#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2256
-#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
-#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2314
-#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2341
-#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
-#: src/xml/xmli18n-tmp.h:2376 src/xml/xmli18n-tmp.h:2387
-#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2413
-#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2437
-#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2462
-#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2490
-#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2518
-#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2543
-#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
-#: src/xml/xmli18n-tmp.h:2580 src/xml/xmli18n-tmp.h:2593
-#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2617
-#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
-#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2677
-#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2706
-#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2738
-#: src/xml/xmli18n-tmp.h:2753 src/xml/xmli18n-tmp.h:2771
-#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2810
-#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2835
-#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
-#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2887
-#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2921
-#: src/xml/xmli18n-tmp.h:2937 src/xml/xmli18n-tmp.h:2952
-#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2990
-#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3024
-#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3052
-#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3085
-#: src/xml/xmli18n-tmp.h:3100 src/xml/xmli18n-tmp.h:3115
-#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:2345 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2469
+#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2546
+#: src/xml/xmli18n-tmp.h:2558 src/xml/xmli18n-tmp.h:2570
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2595
+#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2622
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2675
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2731
+#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2808
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2838
+#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2890
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2922 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3014
+#: src/xml/xmli18n-tmp.h:3027 src/xml/xmli18n-tmp.h:3042
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3067
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3186 src/xml/xmli18n-tmp.h:3201
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3334
+#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3359
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3444
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3475
+#: src/xml/xmli18n-tmp.h:3489 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3533 src/xml/xmli18n-tmp.h:3547
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3652 src/xml/xmli18n-tmp.h:3669
+#: src/xml/xmli18n-tmp.h:3687
 msgid "720 DPI"
 msgstr "720 DPI"
 
-#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
-#: src/xml/xmli18n-tmp.h:1978 src/xml/xmli18n-tmp.h:2004
-#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2030
-#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2067
-#: src/xml/xmli18n-tmp.h:2094 src/xml/xmli18n-tmp.h:2107
-#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2161
-#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2252
-#: src/xml/xmli18n-tmp.h:2280 src/xml/xmli18n-tmp.h:2295
-#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2323
-#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
-#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2486
-#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2552
-#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2613
-#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
-#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2686
-#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2806
-#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2831
-#: src/xml/xmli18n-tmp.h:2845 src/xml/xmli18n-tmp.h:2859
-#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2948
-#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3080
-#: src/xml/xmli18n-tmp.h:3097 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2554
+#: src/xml/xmli18n-tmp.h:2566 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2804 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2834 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3076
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3382
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3586 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3634
 msgid "360 x 120 DPI Economy"
 msgstr "360 x 120 DPI Gazdaságos"
 
-#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1842
-#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2005
-#: src/xml/xmli18n-tmp.h:2019 src/xml/xmli18n-tmp.h:2031
-#: src/xml/xmli18n-tmp.h:2043 src/xml/xmli18n-tmp.h:2068
-#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
-#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2162
-#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2253
-#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2296
-#: src/xml/xmli18n-tmp.h:2311 src/xml/xmli18n-tmp.h:2324
-#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2384
-#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2487
-#: src/xml/xmli18n-tmp.h:2500 src/xml/xmli18n-tmp.h:2553
-#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2614
-#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2644
-#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2687
-#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2807
-#: src/xml/xmli18n-tmp.h:2820 src/xml/xmli18n-tmp.h:2832
-#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
-#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2949
-#: src/xml/xmli18n-tmp.h:3112
+#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2555
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2632
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3077
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3211
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3383
+#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3635
 msgid "360 x 240 DPI Draft"
 msgstr "360 x 240 DPI Piszkozat"
 
-#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1872
-#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1898
-#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1930
-#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1959
-#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:1995
-#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2023
-#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2047
-#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2087
-#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2112
-#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2139
-#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2166
-#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2328
-#: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2388
-#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2557
-#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2922
-#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2991
-#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3086
+#: src/xml/xmli18n-tmp.h:2383 src/xml/xmli18n-tmp.h:2396
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2422
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2470 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2507 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2704 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:3057 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3118 src/xml/xmli18n-tmp.h:3445
+#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3514
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3609
 msgid "720 DPI High Quality"
 msgstr "720 DPI Jó minőségű"
 
-#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1873
-#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1899
-#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1931
-#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1984
-#: src/xml/xmli18n-tmp.h:1996 src/xml/xmli18n-tmp.h:2010
-#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2036
-#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2061
-#: src/xml/xmli18n-tmp.h:2073 src/xml/xmli18n-tmp.h:2088
-#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2127
-#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2153
-#: src/xml/xmli18n-tmp.h:2167 src/xml/xmli18n-tmp.h:2181
-#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2208
-#: src/xml/xmli18n-tmp.h:2221 src/xml/xmli18n-tmp.h:2234
-#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2257
-#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2285
-#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2315
-#: src/xml/xmli18n-tmp.h:2329 src/xml/xmli18n-tmp.h:2354
-#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2389
-#: src/xml/xmli18n-tmp.h:2399 src/xml/xmli18n-tmp.h:2425
-#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2451
-#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
-#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2504
-#: src/xml/xmli18n-tmp.h:2519 src/xml/xmli18n-tmp.h:2534
-#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2558
-#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2605
-#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2633
-#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2663
-#: src/xml/xmli18n-tmp.h:2678 src/xml/xmli18n-tmp.h:2691
-#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2725
-#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2754
-#: src/xml/xmli18n-tmp.h:2772 src/xml/xmli18n-tmp.h:2787
-#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2811
-#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2836
-#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
-#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2888
-#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2923
-#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2953
-#: src/xml/xmli18n-tmp.h:2968 src/xml/xmli18n-tmp.h:2978
-#: src/xml/xmli18n-tmp.h:2992 src/xml/xmli18n-tmp.h:3011
-#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3039
-#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
-#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3101
-#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3130
-#: src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:2384 src/xml/xmli18n-tmp.h:2397
+#: src/xml/xmli18n-tmp.h:2410 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2548 src/xml/xmli18n-tmp.h:2560
+#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2691 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2794 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2839
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2923 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3105
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3129
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3231 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3311
+#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3335
+#: src/xml/xmli18n-tmp.h:3348 src/xml/xmli18n-tmp.h:3360
+#: src/xml/xmli18n-tmp.h:3372 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3427 src/xml/xmli18n-tmp.h:3446
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3576 src/xml/xmli18n-tmp.h:3593
+#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3688
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1874
-#: src/xml/xmli18n-tmp.h:1887 src/xml/xmli18n-tmp.h:1900
-#: src/xml/xmli18n-tmp.h:1916 src/xml/xmli18n-tmp.h:1932
-#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1985
-#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2011
-#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2037
-#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2062
-#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2089
-#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2128
-#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2154
-#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2182
-#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2258
-#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
-#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2316
-#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2390
-#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2559
-#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2634
-#: src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2385 src/xml/xmli18n-tmp.h:2398
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2535
+#: src/xml/xmli18n-tmp.h:2549 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2782
+#: src/xml/xmli18n-tmp.h:2795 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3388
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 720 DPI Legjobb minőségű"
 
-#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1960
-#: src/xml/xmli18n-tmp.h:2100 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2902
 msgid "720 DPI Highest Quality"
 msgstr "720 DPI Legjobb minőségű"
 
-#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2259
-#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
-#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2317
-#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2477
-#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2505
-#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2606
-#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2635
-#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2740
-#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2866
-#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2796 src/xml/xmli18n-tmp.h:2811
+#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3216 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3412
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2260
-#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
-#: src/xml/xmli18n-tmp.h:2303 src/xml/xmli18n-tmp.h:2318
-#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2771 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2812
+#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:3160 src/xml/xmli18n-tmp.h:3390
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 x 720 DPI Legjobb minőségű"
 
-#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2439
-#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2493
-#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2546
-#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2582
-#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2620
-#: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2664
-#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
-#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2726
-#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2755
-#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2789
-#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2812
-#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2878
-#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
-#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2939
-#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2969
-#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2994
-#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
-#: src/xml/xmli18n-tmp.h:3088 src/xml/xmli18n-tmp.h:3102
-#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3131
-#: src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2963
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3070
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3106
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3297 src/xml/xmli18n-tmp.h:3313
+#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
+#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3401
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3492
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3577 src/xml/xmli18n-tmp.h:3594
+#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3671 src/xml/xmli18n-tmp.h:3689
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2426
-#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2452
-#: src/xml/xmli18n-tmp.h:2464 src/xml/xmli18n-tmp.h:2479
-#: src/xml/xmli18n-tmp.h:2494 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2547
-#: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2583
-#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2621
-#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2665
-#: src/xml/xmli18n-tmp.h:2680 src/xml/xmli18n-tmp.h:2694
-#: src/xml/xmli18n-tmp.h:2709 src/xml/xmli18n-tmp.h:2727
-#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2756
-#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2790
-#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2813
-#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2837
-#: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2879
-#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
-#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2940
-#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2970
-#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2995
-#: src/xml/xmli18n-tmp.h:3012 src/xml/xmli18n-tmp.h:3026
-#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3055
-#: src/xml/xmli18n-tmp.h:3072 src/xml/xmli18n-tmp.h:3089
-#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3118
-#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3071
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3107
+#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3251
+#: src/xml/xmli18n-tmp.h:3266 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3298 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3324 src/xml/xmli18n-tmp.h:3337
+#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3374 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3463
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3535 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3563 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3612
+#: src/xml/xmli18n-tmp.h:3626 src/xml/xmli18n-tmp.h:3641
+#: src/xml/xmli18n-tmp.h:3655 src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:3690
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:4374
 msgid "Dark Yellow"
 msgstr "Sötétsárga"
 
-#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2584
-#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2711
-#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2743
-#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2776
-#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2908
-#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2972
-#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3057
-#: src/xml/xmli18n-tmp.h:3074 src/xml/xmli18n-tmp.h:3091
-#: src/xml/xmli18n-tmp.h:3105 src/xml/xmli18n-tmp.h:3134
-#: src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3108
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3267
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3495
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3614
+#: src/xml/xmli18n-tmp.h:3628 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3692
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/xml/xmli18n-tmp.h:2666 src/xml/xmli18n-tmp.h:2681
-#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2728
-#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2775
-#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2814
-#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2838
-#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2926
-#: src/xml/xmli18n-tmp.h:2941 src/xml/xmli18n-tmp.h:2971
-#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
-#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
-#: src/xml/xmli18n-tmp.h:3090 src/xml/xmli18n-tmp.h:3104
-#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3133
-#: src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3190 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3234 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3325 src/xml/xmli18n-tmp.h:3338
+#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3362
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3505
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3613
+#: src/xml/xmli18n-tmp.h:3627 src/xml/xmli18n-tmp.h:3642
+#: src/xml/xmli18n-tmp.h:3656 src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:3691
 msgid "5760 x 1440 DPI"
 msgstr "5760 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2712
-#: src/xml/xmli18n-tmp.h:2730 src/xml/xmli18n-tmp.h:2759
-#: src/xml/xmli18n-tmp.h:2777 src/xml/xmli18n-tmp.h:2909
-#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2973
-#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3058
-#: src/xml/xmli18n-tmp.h:3075 src/xml/xmli18n-tmp.h:3092
-#: src/xml/xmli18n-tmp.h:3106 src/xml/xmli18n-tmp.h:3135
-#: src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3301 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3496
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3615
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
 msgid "5760 x 2880 DPI"
 msgstr "5760 x 2880 DPI"
 
-#: src/xml/xmli18n-tmp.h:2798 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3502
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI felcserélt"
 
-#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2965
-#: src/xml/xmli18n-tmp.h:2989 src/xml/xmli18n-tmp.h:3067
-#: src/xml/xmli18n-tmp.h:3084
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:3607
 msgid "720 x 360 DPI Enhanced"
 msgstr "720 x 360 DPI továbbfejlesztett"
 
-#: src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:3479
 #, fuzzy
 msgid "Black 1"
 msgstr "Fekete"
 
-#: src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3480
 #, fuzzy
 msgid "Black 2"
 msgstr "Fekete"
 
-#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3065
-#: src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3605
 #, fuzzy
 msgid "360 DPI Enhanced"
 msgstr "720 x 360 DPI továbbfejlesztett"
 
-#: src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3516
 #, fuzzy
 msgid "1440 x 720 DPI High Quality"
 msgstr "1440 x 720 DPI Legjobb minőségű"
 
-#: src/xml/xmli18n-tmp.h:3153
+#: src/xml/xmli18n-tmp.h:3677
 #, fuzzy
-msgid "Lower Front Tray"
-msgstr "Első tálca"
+msgid "Vivid Light Magenta"
+msgstr "Világos bíborvörös"
 
-#: src/xml/xmli18n-tmp.h:3154
+#: src/xml/xmli18n-tmp.h:3682
 #, fuzzy
-msgid "Upper Front Tray"
-msgstr "Első tálca"
+msgid "Vivid Magenta"
+msgstr "Bíborvörös"
 
-#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3160
-#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3176
-#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3186
+#: src/xml/xmli18n-tmp.h:3694
+#, fuzzy
+msgid "Main Tray"
+msgstr "Hátsó tálca"
+
+#: src/xml/xmli18n-tmp.h:3695
+#, fuzzy
+msgid "Photo Tray"
+msgstr "Fénykép"
+
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3725 src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:3732
 msgid "Print to CD"
 msgstr "Nyomtatás CD-re"
 
-#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3181
-#: src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:3730
 msgid "Rear Tray"
 msgstr "Hátsó tálca"
 
-#: src/xml/xmli18n-tmp.h:3157 src/xml/xmli18n-tmp.h:3182
-#: src/xml/xmli18n-tmp.h:3185
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:3731
 msgid "Front Tray"
 msgstr "Első tálca"
 
-#: src/xml/xmli18n-tmp.h:3159 src/xml/xmli18n-tmp.h:3164
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3705
 msgid "Manual Feed"
 msgstr "Kézi adagolás"
 
-#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3709
 msgid "Roll Feed (cut each page)"
 msgstr "Tekercses adagoló (levágás minden lap után)"
 
-#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3710
 msgid "Roll Feed (do not cut)"
 msgstr "Tekercses adagoló (levágás nélkül)"
 
-#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3171
-#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3180
-#: src/xml/xmli18n-tmp.h:3193
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3716 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3739
 msgid "Roll Feed"
 msgstr "Tekercses adagoló"
 
-#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3714 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3723
 msgid "Manual Sheet Guide"
 msgstr "Kézi lapvezérlő"
 
-#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3715 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3724
 msgid "Manual Feed (Front)"
 msgstr "Kézi adagolás (elöl)"
 
-#: src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3733
 msgid "Photo Board"
 msgstr "Fotókarton"
 
-#: src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3734
 msgid "Cut Sheet Bin 1"
 msgstr "Vágólap, 1. tálca"
 
-#: src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3735
 msgid "Cut Sheet Bin 2"
 msgstr "Vágólap, 2. tálca"
 
-#: src/xml/xmli18n-tmp.h:3190
+#: src/xml/xmli18n-tmp.h:3736
 msgid "Cut Sheet Autoselect"
 msgstr "Vágólap, automatikus tálcaválasztás"
 
-#: src/xml/xmli18n-tmp.h:3191
+#: src/xml/xmli18n-tmp.h:3737
 msgid "Manual Selection"
 msgstr "Kézi kijelölés"
 
-#: src/xml/xmli18n-tmp.h:3199 src/xml/xmli18n-tmp.h:3207
-#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3219
-#: src/xml/xmli18n-tmp.h:3227 src/xml/xmli18n-tmp.h:3235
-#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3257
-#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3278
-#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3297
-#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3317
-#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3342
-#: src/xml/xmli18n-tmp.h:3356 src/xml/xmli18n-tmp.h:3382
-#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
-#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3426
-#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3446
-#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3474
-#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3498
-#: src/xml/xmli18n-tmp.h:3510 src/xml/xmli18n-tmp.h:3524
-#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3558
-#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:3584
-#: src/xml/xmli18n-tmp.h:3594 src/xml/xmli18n-tmp.h:3600
-#: src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3763 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3872 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:4067 src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4172 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4236 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:4754 src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5102 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5679 src/xml/xmli18n-tmp.h:5748
+#: src/xml/xmli18n-tmp.h:5793 src/xml/xmli18n-tmp.h:5814
+#: src/xml/xmli18n-tmp.h:5835
 msgid "One Color Raw"
 msgstr "Egyszínű nyers"
 
-#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3208
-#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3220
-#: src/xml/xmli18n-tmp.h:3228 src/xml/xmli18n-tmp.h:3236
-#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3259
-#: src/xml/xmli18n-tmp.h:3270 src/xml/xmli18n-tmp.h:3280
-#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3298
-#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3318
-#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3344
-#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3383
-#: src/xml/xmli18n-tmp.h:3391 src/xml/xmli18n-tmp.h:3403
-#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3427
-#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3447
-#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3475
-#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3499
-#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3526
-#: src/xml/xmli18n-tmp.h:3551 src/xml/xmli18n-tmp.h:3559
-#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3586
-#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3601
-#: src/xml/xmli18n-tmp.h:3607
+#: src/xml/xmli18n-tmp.h:3765 src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4484 src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:4756 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5321
+#: src/xml/xmli18n-tmp.h:5382 src/xml/xmli18n-tmp.h:5451
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5795 src/xml/xmli18n-tmp.h:5816
+#: src/xml/xmli18n-tmp.h:5837
 msgid "Three Color Raw"
 msgstr "Háromszínű nyers"
 
-#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
-#: src/xml/xmli18n-tmp.h:3215 src/xml/xmli18n-tmp.h:3221
-#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3237
-#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3271
-#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3299
-#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3319
-#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3345
-#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3384
-#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
-#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3428
-#: src/xml/xmli18n-tmp.h:3438 src/xml/xmli18n-tmp.h:3448
-#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3463
-#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3476
-#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3500
-#: src/xml/xmli18n-tmp.h:3513 src/xml/xmli18n-tmp.h:3527
-#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3560
-#: src/xml/xmli18n-tmp.h:3573 src/xml/xmli18n-tmp.h:3587
-#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3602
-#: src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:3824 src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5325
+#: src/xml/xmli18n-tmp.h:5386 src/xml/xmli18n-tmp.h:5455
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5757
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5841
 msgid "Four Color Raw"
 msgstr "Négyszínű nyers"
 
-#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3248
-#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
-#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3360
-#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
-#: src/xml/xmli18n-tmp.h:3417 src/xml/xmli18n-tmp.h:3429
-#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3459
-#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3501 src/xml/xmli18n-tmp.h:3514
-#: src/xml/xmli18n-tmp.h:3528 src/xml/xmli18n-tmp.h:3574
-#: src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4424 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:5066 src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:5196 src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5391
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5762
 msgid "Five Color Raw"
 msgstr "Ötszínes nyers"
 
-#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3249
-#: src/xml/xmli18n-tmp.h:3272 src/xml/xmli18n-tmp.h:3293
-#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3333
-#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3361
-#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
-#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3430
-#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3460
-#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3478
-#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3502
-#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3529
-#: src/xml/xmli18n-tmp.h:3575 src/xml/xmli18n-tmp.h:3589
+#: src/xml/xmli18n-tmp.h:3780 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:4078 src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:4430 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4972
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5150 src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5336
+#: src/xml/xmli18n-tmp.h:5397 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5768
 msgid "Six Color Raw"
 msgstr "Hatszínes nyers"
 
-#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3919 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:4781 src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:4795 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4921
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:4996
+#: src/xml/xmli18n-tmp.h:5023 src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:5226 src/xml/xmli18n-tmp.h:5279
+#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5603 src/xml/xmli18n-tmp.h:5609
+#: src/xml/xmli18n-tmp.h:5636 src/xml/xmli18n-tmp.h:5642
+#, fuzzy
+msgid "Gray 3"
+msgstr "3. tálca"
+
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4782 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4796 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4916 src/xml/xmli18n-tmp.h:4922
+#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4983
+#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5286 src/xml/xmli18n-tmp.h:5294
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5643
+#, fuzzy
+msgid "Gray 2"
+msgstr "2. tálca"
+
+#: src/xml/xmli18n-tmp.h:3855 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:4856 src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:4931 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4998
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:5214 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5611
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5644
+#, fuzzy
+msgid "Gray 1"
+msgstr "1. tálca"
+
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4985 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5606 src/xml/xmli18n-tmp.h:5639
+#, fuzzy
+msgid "MIS Quadtone"
+msgstr "Quadtone"
+
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4114
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Egyszínű nyers (továbbfejlesztett fényesség)"
 
-#: src/xml/xmli18n-tmp.h:3260 src/xml/xmli18n-tmp.h:3281
+#: src/xml/xmli18n-tmp.h:4016 src/xml/xmli18n-tmp.h:4121
 msgid "Three Color Raw Gloss"
 msgstr "Háromszínű nyers fényes"
 
-#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3282
+#: src/xml/xmli18n-tmp.h:4021 src/xml/xmli18n-tmp.h:4126
 msgid "Four Color Raw Gloss"
 msgstr "Négyszínű nyers fényes"
 
-#: src/xml/xmli18n-tmp.h:3262 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4132
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Hatszínes továbbfejlesztett, fényes nyers"
 
-#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:4035 src/xml/xmli18n-tmp.h:4140
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Hétszínes továbbfejlesztett, fényes nyers"
 
-#: src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:4141
+#, fuzzy
+msgid "MatteBlack"
+msgstr "Matt fekete"
+
+#: src/xml/xmli18n-tmp.h:4224
 #, fuzzy
 msgid "Default Black"
 msgstr "Alapértelmezett"
 
-#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
-#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3365
-#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3504
-#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3533
-#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3564
-#: src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4446 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4573 src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:5344
+#: src/xml/xmli18n-tmp.h:5413 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Seven Color Photo"
 msgstr "Hétszínes fénykép"
 
-#: src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:4315
 msgid "Six Color Enhanced Composite"
 msgstr "Hatszínes (továbbfejlesztett, kompozit)"
 
-#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3348
-#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3516
-#: src/xml/xmli18n-tmp.h:3530 src/xml/xmli18n-tmp.h:3576
-#: src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:4368 src/xml/xmli18n-tmp.h:4437
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:5404
+#: src/xml/xmli18n-tmp.h:5473 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5775
 msgid "Seven Color Raw"
 msgstr "Hétszínes nyers"
 
-#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3355
-#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3523
-#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5745
 msgid "Two Level Grayscale"
 msgstr "Kétszintű szürkeárnyalatos"
 
-#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3357
-#: src/xml/xmli18n-tmp.h:3511 src/xml/xmli18n-tmp.h:3525
-#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:4412 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5448
+#: src/xml/xmli18n-tmp.h:5681 src/xml/xmli18n-tmp.h:5750
 msgid "Two Color Raw"
 msgstr "Kétszínű nyers"
 
-#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3372
-#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3540
+#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5531
 msgid "Eight Color Photo"
 msgstr "Nyolcszínes fénykép"
 
-#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3378
-#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:4652 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5570
 msgid "Eight Color Raw"
 msgstr "Nyolcszínes nyers"
 
-#: src/xml/xmli18n-tmp.h:3462 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:5288
+msgid "MIS Six Tone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:4994
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5291
+#, fuzzy
+msgid "Gray 5"
+msgstr "1. tálca"
+
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:4928 src/xml/xmli18n-tmp.h:4995
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5292
+#, fuzzy
+msgid "Gray 4"
+msgstr "4. tálca"
+
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5145
 msgid "Four Color Photo"
 msgstr "Négyszínes fénykép"
 
-#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3615
-#: src/xml/xmli18n-tmp.h:3621
+#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5852
+#: src/xml/xmli18n-tmp.h:5858
 msgid "Interleave"
 msgstr "Kihagyás"
 
-#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3616
-#: src/xml/xmli18n-tmp.h:3622
+#: src/xml/xmli18n-tmp.h:5848 src/xml/xmli18n-tmp.h:5853
+#: src/xml/xmli18n-tmp.h:5859
 msgid "Full Overlap"
 msgstr "Teljes átfedés"
 
-#: src/xml/xmli18n-tmp.h:3612 src/xml/xmli18n-tmp.h:3617
-#: src/xml/xmli18n-tmp.h:3623
+#: src/xml/xmli18n-tmp.h:5849 src/xml/xmli18n-tmp.h:5854
+#: src/xml/xmli18n-tmp.h:5860
 msgid "Four Pass"
 msgstr "Négymenetes"
 
-#: src/xml/xmli18n-tmp.h:3613 src/xml/xmli18n-tmp.h:3618
-#: src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5855
+#: src/xml/xmli18n-tmp.h:5861
 msgid "Full Overlap 2"
 msgstr "Teljes átfedés 2"
 
-#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:5862
 msgid "Interleave 2"
 msgstr "Kihagyás 2"
 
-#: src/xml/xmli18n-tmp.h:3626
+#: src/xml/xmli18n-tmp.h:5863
 msgid "Eight Pass"
 msgstr "Nyolclépéses"
 
-#: src/xml/xmli18n-tmp.h:3628
+#: src/xml/xmli18n-tmp.h:5865
 msgid "On"
 msgstr "Be"
 
-#: src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:5909
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:5910
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:3674
+#: src/xml/xmli18n-tmp.h:5911
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:3679
+#: src/xml/xmli18n-tmp.h:5916
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:3680
+#: src/xml/xmli18n-tmp.h:5917
 msgid "3 1/2 x5"
 msgstr "3 1/2 x5"
 
-#: src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:5918
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:3682
+#: src/xml/xmli18n-tmp.h:5919
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6-os fotópapír (letéphető szegélyek)"
 
-#: src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:5920
+#, fuzzy
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr "Epson 4x6-os fotópapír (letéphető szegélyek)"
+
+#: src/xml/xmli18n-tmp.h:5921
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:3684
+#: src/xml/xmli18n-tmp.h:5922
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:3685
+#: src/xml/xmli18n-tmp.h:5923
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:3686
+#: src/xml/xmli18n-tmp.h:5924
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:3688
+#: src/xml/xmli18n-tmp.h:5926
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:3689
+#: src/xml/xmli18n-tmp.h:5927
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/xml/xmli18n-tmp.h:3690
+#: src/xml/xmli18n-tmp.h:5928
 msgid "Engineering C 17x22"
 msgstr "Mérnöki C 17x22"
 
-#: src/xml/xmli18n-tmp.h:3691
+#: src/xml/xmli18n-tmp.h:5929
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:3692
+#: src/xml/xmli18n-tmp.h:5930
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:3693
+#: src/xml/xmli18n-tmp.h:5931
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:3694
+#: src/xml/xmli18n-tmp.h:5932
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:3695
+#: src/xml/xmli18n-tmp.h:5933
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:3696
+#: src/xml/xmli18n-tmp.h:5934
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:3697
+#: src/xml/xmli18n-tmp.h:5935
 msgid "22x30"
 msgstr "22x30"
 
-#: src/xml/xmli18n-tmp.h:3698
+#: src/xml/xmli18n-tmp.h:5936
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:3699
+#: src/xml/xmli18n-tmp.h:5937
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/xml/xmli18n-tmp.h:3700
+#: src/xml/xmli18n-tmp.h:5938
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:5939
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:3702
+#: src/xml/xmli18n-tmp.h:5940
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:3703
+#: src/xml/xmli18n-tmp.h:5941
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:5942
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:3705
+#: src/xml/xmli18n-tmp.h:5943
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:3706
+#: src/xml/xmli18n-tmp.h:5944
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:3707
+#: src/xml/xmli18n-tmp.h:5945
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:3709
+#: src/xml/xmli18n-tmp.h:5947
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:3710
+#: src/xml/xmli18n-tmp.h:5948
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:5949
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:5950
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:3713
+#: src/xml/xmli18n-tmp.h:5951
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:3714
+#: src/xml/xmli18n-tmp.h:5952
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:3715
+#: src/xml/xmli18n-tmp.h:5953
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:3716
+#: src/xml/xmli18n-tmp.h:5954
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:5955
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:5956
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:5957
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:5958
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:5959
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:3722
+#: src/xml/xmli18n-tmp.h:5960
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:3723
+#: src/xml/xmli18n-tmp.h:5961
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:3724
+#: src/xml/xmli18n-tmp.h:5962
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:3725
+#: src/xml/xmli18n-tmp.h:5963
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:3726
+#: src/xml/xmli18n-tmp.h:5964
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:5965
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:5966
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:5967
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:3730
+#: src/xml/xmli18n-tmp.h:5968
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:3731
+#: src/xml/xmli18n-tmp.h:5969
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:3732
+#: src/xml/xmli18n-tmp.h:5970
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:3733
+#: src/xml/xmli18n-tmp.h:5971
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:3734
+#: src/xml/xmli18n-tmp.h:5972
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:3735
+#: src/xml/xmli18n-tmp.h:5973
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:3736
+#: src/xml/xmli18n-tmp.h:5974
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:3737
+#: src/xml/xmli18n-tmp.h:5975
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5976
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3739
+#: src/xml/xmli18n-tmp.h:5977
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:5978
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:3741
+#: src/xml/xmli18n-tmp.h:5979
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:5980
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:3743
+#: src/xml/xmli18n-tmp.h:5981
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:5982
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:5983
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:3746
+#: src/xml/xmli18n-tmp.h:5984
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:3747
+#: src/xml/xmli18n-tmp.h:5985
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:3748
+#: src/xml/xmli18n-tmp.h:5986
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:5987
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:3750
+#: src/xml/xmli18n-tmp.h:5988
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:3751
+#: src/xml/xmli18n-tmp.h:5989
 msgid "C0 landscape"
 msgstr "C0 fekvő"
 
-#: src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:5990
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:5991
 msgid "C1 landscape"
 msgstr "C1 fekvő"
 
-#: src/xml/xmli18n-tmp.h:3754
+#: src/xml/xmli18n-tmp.h:5992
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:3755
+#: src/xml/xmli18n-tmp.h:5993
 msgid "C2 landscape"
 msgstr "C2 fekvő"
 
-#: src/xml/xmli18n-tmp.h:3756
+#: src/xml/xmli18n-tmp.h:5994
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:5995
 msgid "C3 landscape"
 msgstr "C3 fekvő"
 
-#: src/xml/xmli18n-tmp.h:3758
+#: src/xml/xmli18n-tmp.h:5996
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:3759
+#: src/xml/xmli18n-tmp.h:5997
 msgid "C4 landscape"
 msgstr "C4 fekvő"
 
-#: src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:5998
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:3761
+#: src/xml/xmli18n-tmp.h:5999
 msgid "C5 landscape"
 msgstr "C5 fekvő"
 
-#: src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:6000
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:3763
+#: src/xml/xmli18n-tmp.h:6001
 msgid "B6-C4 landscape"
 msgstr "B6-C4 fekvő"
 
-#: src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:6002
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:3765
+#: src/xml/xmli18n-tmp.h:6003
 msgid "C6 landscape"
 msgstr "C6 fekvő"
 
-#: src/xml/xmli18n-tmp.h:3766
+#: src/xml/xmli18n-tmp.h:6004
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:6005
 msgid "DL landscape"
 msgstr "DL fekvő"
 
-#: src/xml/xmli18n-tmp.h:3768
+#: src/xml/xmli18n-tmp.h:6006
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:3769
+#: src/xml/xmli18n-tmp.h:6007
 msgid "C7-6 landscape"
 msgstr "C7-6 fekvő"
 
-#: src/xml/xmli18n-tmp.h:3770
+#: src/xml/xmli18n-tmp.h:6008
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:6009
 msgid "C7 landscape"
 msgstr "C7 fekvő"
 
-#: src/xml/xmli18n-tmp.h:3772
+#: src/xml/xmli18n-tmp.h:6010
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:6011
 msgid "C8 landscape"
 msgstr "C8 fekvő"
 
-#: src/xml/xmli18n-tmp.h:3774
+#: src/xml/xmli18n-tmp.h:6012
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:3775
+#: src/xml/xmli18n-tmp.h:6013
 msgid "C9 landscape"
 msgstr "C9 fekvő"
 
-#: src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:6014
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:6015
 msgid "C10 landscape"
 msgstr "C10 fekvő"
 
-#: src/xml/xmli18n-tmp.h:3778
+#: src/xml/xmli18n-tmp.h:6016
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:3779
+#: src/xml/xmli18n-tmp.h:6017
 msgid "ArchA transposed"
 msgstr "ArchA felcserélt"
 
-#: src/xml/xmli18n-tmp.h:3780
+#: src/xml/xmli18n-tmp.h:6018
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:6019
 msgid "ArchB transposed"
 msgstr "ArchB felcserélt"
 
-#: src/xml/xmli18n-tmp.h:3782
+#: src/xml/xmli18n-tmp.h:6020
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:6021
 msgid "ArchC transposed"
 msgstr "ArchC felcserélt"
 
-#: src/xml/xmli18n-tmp.h:3784
+#: src/xml/xmli18n-tmp.h:6022
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:6023
 msgid "ArchD transposed"
 msgstr "ArchD felcserélt"
 
-#: src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:6024
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:3787
+#: src/xml/xmli18n-tmp.h:6025
 msgid "ArchE transposed"
 msgstr "ArchE felcserélt"
 
-#: src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:6026
 msgid "American foolscap"
 msgstr "Amerikai írólap"
 
-#: src/xml/xmli18n-tmp.h:3789
+#: src/xml/xmli18n-tmp.h:6027
 msgid "European foolscap"
 msgstr "Európai írólap"
 
-#: src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:6028
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:6029
 msgid "Large Crown Quarto"
 msgstr "Nagy Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:3792
+#: src/xml/xmli18n-tmp.h:6030
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:6031
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/xml/xmli18n-tmp.h:3794
+#: src/xml/xmli18n-tmp.h:6032
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:3795
+#: src/xml/xmli18n-tmp.h:6033
 msgid "Large Crown Octavo"
 msgstr "Nagy Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:6034
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:6035
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:6036
 msgid "Small paperback"
 msgstr "Kis paperback"
 
-#: src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:6037
 msgid "Penguin small paperback"
 msgstr "Penguin, kis paperback"
 
-#: src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:6038
 msgid "Penguin large paperback"
 msgstr "Penguin, nagy paperback"
 
-#: src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:6039
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/xml/xmli18n-tmp.h:3802
+#: src/xml/xmli18n-tmp.h:6040
 msgid "Hagaki Card"
 msgstr "Hagaki kártya"
 
-#: src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:6041
 msgid "Oufuku Card"
 msgstr "Oufuku kártya"
 
-#: src/xml/xmli18n-tmp.h:3804
+#: src/xml/xmli18n-tmp.h:6042
 msgid "Japanese long envelope #3"
 msgstr "Japán hosszú boríték #3"
 
-#: src/xml/xmli18n-tmp.h:3805
+#: src/xml/xmli18n-tmp.h:6043
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japán fekvő hosszú boríték #3"
 
-#: src/xml/xmli18n-tmp.h:3806
+#: src/xml/xmli18n-tmp.h:6044
 msgid "Japanese long envelope #4"
 msgstr "Japán hosszú boríték #4"
 
-#: src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:6045
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japán fekvő hosszú boríték #4"
 
-#: src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:6046
 msgid "Japanese Kaku envelope #4"
 msgstr "Japán Kaku boríték #4"
 
-#: src/xml/xmli18n-tmp.h:3809
+#: src/xml/xmli18n-tmp.h:6047
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japán fekvő Kaku boríték #4"
 
-#: src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:6048
 msgid "Commercial 10"
 msgstr "Kereskedelmi 10"
 
-#: src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:6049
 msgid "Commercial 10 landscape"
 msgstr "Fekvő kereskedelmi 10"
 
-#: src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:6050
 msgid "A2 Invitation"
 msgstr "A2 meghívó"
 
-#: src/xml/xmli18n-tmp.h:3813
+#: src/xml/xmli18n-tmp.h:6051
 msgid "Monarch Envelope"
 msgstr "Monarch boríték"
 
-#: src/xml/xmli18n-tmp.h:3814
+#: src/xml/xmli18n-tmp.h:6052
 msgid "Monarch Envelope landscape"
 msgstr "Fekvő Monarch boríték"
 
-#: src/xml/xmli18n-tmp.h:3815
+#: src/xml/xmli18n-tmp.h:6053
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/xml/xmli18n-tmp.h:3816
+#: src/xml/xmli18n-tmp.h:6054
 msgid "4x7"
 msgstr "4x7"
 
-#: src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:6055
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/xml/xmli18n-tmp.h:3818
+#: src/xml/xmli18n-tmp.h:6056
 msgid "Card"
 msgstr "Kártya"
 
-#: src/xml/xmli18n-tmp.h:3819
+#: src/xml/xmli18n-tmp.h:6057
 msgid "Wide Postcard"
 msgstr "Széles levelezőlap"
 
-#: src/xml/xmli18n-tmp.h:3820
+#: src/xml/xmli18n-tmp.h:6058
 msgid "Chilean Office"
 msgstr "Chilei Office"
 
-#: src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:6059
 msgid "Chilean Double Letter"
 msgstr "Chilei dupla levél"
 
-#: src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:6060
 msgid "Chilean Double Office"
 msgstr "Chilei dupla Office"
 
-#: src/xml/xmli18n-tmp.h:3824
+#: src/xml/xmli18n-tmp.h:6062
 msgid "89 mm Roll Paper"
 msgstr "89mm-es papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:6063
 msgid "4 Inch Roll Paper"
 msgstr "4 hüvelykes papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:3826
+#: src/xml/xmli18n-tmp.h:6064
 msgid "5 Inch Roll Paper"
 msgstr "5 hüvelykes papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:3827
+#: src/xml/xmli18n-tmp.h:6065
 msgid "210 mm Roll Paper"
 msgstr "210 mm-es papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:6066
 msgid "13 Inch Roll Paper"
 msgstr "13 hüvelykes papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:3829
+#: src/xml/xmli18n-tmp.h:6067
 #, fuzzy
 msgid "17 Inch Roll Paper"
 msgstr "13 hüvelykes papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:6068
 msgid "22 Inch Roll Paper"
 msgstr "22 hüvelykes papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:3831
+#: src/xml/xmli18n-tmp.h:6069
 msgid "24 Inch Roll Paper"
 msgstr "24 hüvelykes papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:6070
 msgid "36 Inch Roll Paper"
 msgstr "36 hüvelykes papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:6071
 msgid "44 Inch Roll Paper"
 msgstr "44 hüvelykes papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:3834
+#: src/xml/xmli18n-tmp.h:6072
 #, fuzzy
 msgid "60 Inch Roll Paper"
 msgstr "36 hüvelykes papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:6073
 #, fuzzy
 msgid "64 Inch Roll Paper"
 msgstr "4 hüvelykes papírtekercs"
 
-#: src/xml/xmli18n-tmp.h:3836
+#: src/xml/xmli18n-tmp.h:6074
 msgid "PostScript Level 1"
 msgstr "1. szintű PostScript"
 
-#: src/xml/xmli18n-tmp.h:3837
+#: src/xml/xmli18n-tmp.h:6075
 msgid "PostScript Level 2"
 msgstr "2. szintű PostScript"
 
-#: src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:6076
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:6077
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:6078
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:6079
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:6080
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:6081
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/xml/xmli18n-tmp.h:3844
+#: src/xml/xmli18n-tmp.h:6082
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:6083
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/xml/xmli18n-tmp.h:3846
+#: src/xml/xmli18n-tmp.h:6084
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:3847
+#: src/xml/xmli18n-tmp.h:6085
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/xml/xmli18n-tmp.h:3848
+#: src/xml/xmli18n-tmp.h:6086
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:6087
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/xml/xmli18n-tmp.h:3850
+#: src/xml/xmli18n-tmp.h:6088
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:6089
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:6090
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/xml/xmli18n-tmp.h:3853
+#: src/xml/xmli18n-tmp.h:6091
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/xml/xmli18n-tmp.h:3854
+#: src/xml/xmli18n-tmp.h:6092
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/xml/xmli18n-tmp.h:3855
+#: src/xml/xmli18n-tmp.h:6093
 msgid "Canon BJC-5100"
 msgstr "Canon BJC-5100"
 
-#: src/xml/xmli18n-tmp.h:3856
+#: src/xml/xmli18n-tmp.h:6094
 msgid "Canon BJC-5500"
 msgstr "Canon BJC-5500"
 
-#: src/xml/xmli18n-tmp.h:3857
+#: src/xml/xmli18n-tmp.h:6095
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/xml/xmli18n-tmp.h:3858
+#: src/xml/xmli18n-tmp.h:6096
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:6097
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:6098
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:6099
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:6100
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/xml/xmli18n-tmp.h:3863
+#: src/xml/xmli18n-tmp.h:6101
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:6102
 msgid "Canon BJC-8500"
 msgstr "Canon BJC-8500"
 
-#: src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:6103
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:6104
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/xml/xmli18n-tmp.h:3867
+#: src/xml/xmli18n-tmp.h:6105
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/xml/xmli18n-tmp.h:3868
+#: src/xml/xmli18n-tmp.h:6106
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:3869
+#: src/xml/xmli18n-tmp.h:6107
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:3870
+#: src/xml/xmli18n-tmp.h:6108
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:6109
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:3872
+#: src/xml/xmli18n-tmp.h:6110
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/xml/xmli18n-tmp.h:3873
+#: src/xml/xmli18n-tmp.h:6111
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:3874
+#: src/xml/xmli18n-tmp.h:6112
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:6113
 msgid "Canon PIXMA iP2000"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:6114
 msgid "Canon PIXMA iP3000"
 msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:3877
+#: src/xml/xmli18n-tmp.h:6115
 msgid "Canon PIXMA iP3100"
 msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:3878
+#: src/xml/xmli18n-tmp.h:6116
 msgid "Canon PIXMA iP4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:6117
 msgid "Canon PIXMA iP4100"
 msgstr "Canon PIXMA iP4100"
 
-#: src/xml/xmli18n-tmp.h:3880
+#: src/xml/xmli18n-tmp.h:6118
 msgid "Canon PIXMA iP4200"
 msgstr "Canon PIXMA iP4200"
 
-#: src/xml/xmli18n-tmp.h:3881
+#: src/xml/xmli18n-tmp.h:6119
 msgid "Canon PIXMA iP4300"
 msgstr "Canon PIXMA iP4300"
 
-#: src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:6120
 msgid "Canon PIXMA iP4500"
 msgstr "Canon PIXMA iP4500"
 
-#: src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:6121
 #, fuzzy
 msgid "Canon PIXMA iP4600"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:3884
+#: src/xml/xmli18n-tmp.h:6122
 msgid "Canon PIXMA iP5000"
 msgstr "Canon PIXMA iP5000"
 
-#: src/xml/xmli18n-tmp.h:3885
+#: src/xml/xmli18n-tmp.h:6123
 msgid "Canon PIXMA iP5200"
 msgstr "Canon PIXMA iP5200"
 
-#: src/xml/xmli18n-tmp.h:3886
+#: src/xml/xmli18n-tmp.h:6124
 msgid "Canon PIXMA iP5300"
 msgstr "Canon PIXMA iP5300"
 
-#: src/xml/xmli18n-tmp.h:3887
+#: src/xml/xmli18n-tmp.h:6125
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:3888
+#: src/xml/xmli18n-tmp.h:6126
 msgid "Canon PIXMA iP6700"
 msgstr "Canon PIXMA iP6700"
 
-#: src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:6127
 msgid "Canon PIXMA iP8500"
 msgstr "Canon PIXMA iP8500"
 
-#: src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:6128
+#, fuzzy
+msgid "Canon PIXMA iX4000"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6129
 msgid "Canon PIXMA iX5000"
 msgstr "Canon PIXMA iX5000"
 
-#: src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:6130
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:6131
 msgid "Canon PIXMA MP150"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:6132
 #, fuzzy
 msgid "Canon PIXMA MP160"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:6133
 msgid "Canon PIXMA MP170"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:3895
+#: src/xml/xmli18n-tmp.h:6134
 msgid "Canon PIXMA MP180"
 msgstr "Canon PIXMA MP180"
 
-#: src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:6135
 #, fuzzy
 msgid "Canon PIXMA MP220"
 msgstr "Canon PIXMA MP520"
 
-#: src/xml/xmli18n-tmp.h:3897
+#: src/xml/xmli18n-tmp.h:6136
 msgid "Canon PIXMA MP500"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:6137
 msgid "Canon PIXMA MP520"
 msgstr "Canon PIXMA MP520"
 
-#: src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:6138
 msgid "Canon PIXMA MP610"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:3900
+#: src/xml/xmli18n-tmp.h:6139
 msgid "Canon PIXMA MP700"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:6140
 msgid "Canon PIXMA MP710"
 msgstr "Canon PIXMA MP710"
 
-#: src/xml/xmli18n-tmp.h:3902
+#: src/xml/xmli18n-tmp.h:6141
 msgid "Canon PIXMA MP730"
 msgstr "Canon PIXMA MP730"
 
-#: src/xml/xmli18n-tmp.h:3903
+#: src/xml/xmli18n-tmp.h:6142
 msgid "Canon PIXMA MP740"
 msgstr "Canon PIXMA MP740"
 
-#: src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:6143
 msgid "Canon PIXMA MP750"
 msgstr "Canon PIXMA MP750"
 
-#: src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:6144
 msgid "Canon PIXMA MP760"
 msgstr "Canon PIXMA MP760"
 
-#: src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:6145
 msgid "Canon PIXMA MP770"
 msgstr "Canon PIXMA MP770"
 
-#: src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:6146
 msgid "Canon PIXMA MP780"
 msgstr "Canon PIXMA MP780"
 
-#: src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:6147
 msgid "Canon PIXMA MP790"
 msgstr "Canon PIXMA MP790"
 
-#: src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:6148
 msgid "Canon PIXMA MP830"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:3910
+#: src/xml/xmli18n-tmp.h:6149
 msgid "Canon PIXUS iP3100"
 msgstr "Canon PIXUS iP3100"
 
-#: src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:6150
 msgid "Canon PIXUS iP4100"
 msgstr "Canon PIXUS iP4100"
 
-#: src/xml/xmli18n-tmp.h:3912
+#: src/xml/xmli18n-tmp.h:6151
 msgid "Canon i80"
 msgstr "Canon i80"
 
-#: src/xml/xmli18n-tmp.h:3913
+#: src/xml/xmli18n-tmp.h:6152
 msgid "Canon i560"
 msgstr "Canon i560"
 
-#: src/xml/xmli18n-tmp.h:3914
+#: src/xml/xmli18n-tmp.h:6153
 msgid "Canon i850"
 msgstr "Canon i850"
 
-#: src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:6154
 msgid "Canon i860"
 msgstr "Canon i860"
 
-#: src/xml/xmli18n-tmp.h:3916
+#: src/xml/xmli18n-tmp.h:6155
 msgid "Canon i865"
 msgstr "Canon i865"
 
-#: src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:6156
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:6157
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3919
+#: src/xml/xmli18n-tmp.h:6158
 #, fuzzy
 msgid "Epson B-300"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:3920
+#: src/xml/xmli18n-tmp.h:6159
 #, fuzzy
 msgid "Epson B-308"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:3921
+#: src/xml/xmli18n-tmp.h:6160
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "Epson E 500"
 
-#: src/xml/xmli18n-tmp.h:3922
+#: src/xml/xmli18n-tmp.h:6161
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:3923
+#: src/xml/xmli18n-tmp.h:6162
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:3924
+#: src/xml/xmli18n-tmp.h:6163
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:6164
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:6165
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:6166
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:6167
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:6168
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:6169
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:6170
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/xml/xmli18n-tmp.h:3932
+#: src/xml/xmli18n-tmp.h:6171
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:6172
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:3934
+#: src/xml/xmli18n-tmp.h:6173
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/xml/xmli18n-tmp.h:3935
+#: src/xml/xmli18n-tmp.h:6174
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:6175
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:3937
+#: src/xml/xmli18n-tmp.h:6176
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:6177
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/xml/xmli18n-tmp.h:3939
+#: src/xml/xmli18n-tmp.h:6178
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:6179
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:6180
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:3942
+#: src/xml/xmli18n-tmp.h:6181
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:3943
+#: src/xml/xmli18n-tmp.h:6182
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:6183
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:6184
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3946
+#: src/xml/xmli18n-tmp.h:6185
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:3947
+#: src/xml/xmli18n-tmp.h:6186
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:3948
+#: src/xml/xmli18n-tmp.h:6187
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/xml/xmli18n-tmp.h:3949
+#: src/xml/xmli18n-tmp.h:6188
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:6189
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/xml/xmli18n-tmp.h:3951
+#: src/xml/xmli18n-tmp.h:6190
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:6191
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/xml/xmli18n-tmp.h:3953
+#: src/xml/xmli18n-tmp.h:6192
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:6193
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C79"
 
-#: src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:6194
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3956
+#: src/xml/xmli18n-tmp.h:6195
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:3957
+#: src/xml/xmli18n-tmp.h:6196
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/xml/xmli18n-tmp.h:3958
+#: src/xml/xmli18n-tmp.h:6197
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/xml/xmli18n-tmp.h:3959
+#: src/xml/xmli18n-tmp.h:6198
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/xml/xmli18n-tmp.h:3960
+#: src/xml/xmli18n-tmp.h:6199
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:6200
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C87"
 
-#: src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:6201
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:6202
 msgid "Epson Stylus C110"
 msgstr "Epson Stylus C110"
 
-#: src/xml/xmli18n-tmp.h:3964
+#: src/xml/xmli18n-tmp.h:6203
 msgid "Epson Stylus C120"
 msgstr "Epson Stylus C120"
 
-#: src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:6204
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3966
+#: src/xml/xmli18n-tmp.h:6205
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/xml/xmli18n-tmp.h:3967
+#: src/xml/xmli18n-tmp.h:6206
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:6207
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:6208
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/xml/xmli18n-tmp.h:3970
+#: src/xml/xmli18n-tmp.h:6209
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:6210
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:3972
+#: src/xml/xmli18n-tmp.h:6211
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:6212
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:6213
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:3975
+#: src/xml/xmli18n-tmp.h:6214
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:6215
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:6216
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:6217
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:3979
+#: src/xml/xmli18n-tmp.h:6218
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:6219
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:3981
+#: src/xml/xmli18n-tmp.h:6220
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:3982
+#: src/xml/xmli18n-tmp.h:6221
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:3983
+#: src/xml/xmli18n-tmp.h:6222
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:3984
+#: src/xml/xmli18n-tmp.h:6223
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:6224
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:6225
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:3987
+#: src/xml/xmli18n-tmp.h:6226
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:6227
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:3989
+#: src/xml/xmli18n-tmp.h:6228
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:6229
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:6230
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:3992
+#: src/xml/xmli18n-tmp.h:6231
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:3993
+#: src/xml/xmli18n-tmp.h:6232
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:6233
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:3995
+#: src/xml/xmli18n-tmp.h:6234
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:6235
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:6236
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:3998
+#: src/xml/xmli18n-tmp.h:6237
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:3999
+#: src/xml/xmli18n-tmp.h:6238
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:6239
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:6240
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:4002
+#: src/xml/xmli18n-tmp.h:6241
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:6242
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:6243
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4005
+#: src/xml/xmli18n-tmp.h:6244
 #, fuzzy
-msgid "Epson Stylus Offixe TX300F"
+msgid "Epson Stylus Office TX300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4006
+#: src/xml/xmli18n-tmp.h:6245
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:6246
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:4008
+#: src/xml/xmli18n-tmp.h:6247
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4009
+#: src/xml/xmli18n-tmp.h:6248
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:6249
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:6250
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:6251
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4013
+#: src/xml/xmli18n-tmp.h:6252
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4014
+#: src/xml/xmli18n-tmp.h:6253
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:6254
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:4016
+#: src/xml/xmli18n-tmp.h:6255
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:6256
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:6257
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/xml/xmli18n-tmp.h:4019
+#: src/xml/xmli18n-tmp.h:6258
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:4020
+#: src/xml/xmli18n-tmp.h:6259
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/xml/xmli18n-tmp.h:4021
+#: src/xml/xmli18n-tmp.h:6260
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:4022
+#: src/xml/xmli18n-tmp.h:6261
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:4023
+#: src/xml/xmli18n-tmp.h:6262
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:4024
+#: src/xml/xmli18n-tmp.h:6263
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:6264
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:6265
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:4027
+#: src/xml/xmli18n-tmp.h:6266
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:6267
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:6268
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:6269
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:4031
+#: src/xml/xmli18n-tmp.h:6270
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:6271
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4033
+#: src/xml/xmli18n-tmp.h:6272
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4034
+#: src/xml/xmli18n-tmp.h:6273
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4035
+#: src/xml/xmli18n-tmp.h:6274
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1400"
 
-#: src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:6275
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 1410"
 
-#: src/xml/xmli18n-tmp.h:4037
+#: src/xml/xmli18n-tmp.h:6276
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:4038
+#: src/xml/xmli18n-tmp.h:6277
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:4039
+#: src/xml/xmli18n-tmp.h:6278
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:6279
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:4041
+#: src/xml/xmli18n-tmp.h:6280
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:6281
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:6282
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R230"
 
-#: src/xml/xmli18n-tmp.h:4044
+#: src/xml/xmli18n-tmp.h:6283
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R240"
 
-#: src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:6284
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo R245"
 
-#: src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:6285
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R260"
 
-#: src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:6286
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo R265"
 
-#: src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:6287
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo R270"
 
-#: src/xml/xmli18n-tmp.h:4049
+#: src/xml/xmli18n-tmp.h:6288
 msgid "Epson Stylus Photo R280"
 msgstr "Epson Stylus Photo R280"
 
-#: src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:6289
 msgid "Epson Stylus Photo R285"
 msgstr "Epson Stylus Photo R285"
 
-#: src/xml/xmli18n-tmp.h:4051
+#: src/xml/xmli18n-tmp.h:6290
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:6291
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:4053
+#: src/xml/xmli18n-tmp.h:6292
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/xml/xmli18n-tmp.h:4054
+#: src/xml/xmli18n-tmp.h:6293
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:6294
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/xml/xmli18n-tmp.h:4056
+#: src/xml/xmli18n-tmp.h:6295
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R350"
 
-#: src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:6296
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R360"
 
-#: src/xml/xmli18n-tmp.h:4058
+#: src/xml/xmli18n-tmp.h:6297
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R380"
 
-#: src/xml/xmli18n-tmp.h:4059
+#: src/xml/xmli18n-tmp.h:6298
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R390"
 
-#: src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:6299
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:6300
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:4062
+#: src/xml/xmli18n-tmp.h:6301
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:6302
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:4064
+#: src/xml/xmli18n-tmp.h:6303
+#, fuzzy
+msgid "Epson Stylus Photo R2880"
+msgstr "Epson Stylus Photo R280"
+
+#: src/xml/xmli18n-tmp.h:6304
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:4065
+#: src/xml/xmli18n-tmp.h:6305
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:6306
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4067
+#: src/xml/xmli18n-tmp.h:6307
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:6308
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4069
+#: src/xml/xmli18n-tmp.h:6309
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:6310
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX560"
 
-#: src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:6311
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX580"
 
-#: src/xml/xmli18n-tmp.h:4072
+#: src/xml/xmli18n-tmp.h:6312
 msgid "Epson Stylus Photo RX585"
 msgstr "Epson Stylus Photo RX585"
 
-#: src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:6313
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX590"
 
-#: src/xml/xmli18n-tmp.h:4074
+#: src/xml/xmli18n-tmp.h:6314
 msgid "Epson Stylus Photo RX595"
 msgstr "Epson Stylus Photo RX595"
 
-#: src/xml/xmli18n-tmp.h:4075
+#: src/xml/xmli18n-tmp.h:6315
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:4076
+#: src/xml/xmli18n-tmp.h:6316
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:6317
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/xml/xmli18n-tmp.h:4078
+#: src/xml/xmli18n-tmp.h:6318
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:6319
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX640"
 
-#: src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:6320
 msgid "Epson Stylus Photo RX680"
 msgstr "Epson Stylus Photo RX680"
 
-#: src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:6321
 msgid "Epson Stylus Photo RX685"
 msgstr "Epson Stylus Photo RX685"
 
-#: src/xml/xmli18n-tmp.h:4082
+#: src/xml/xmli18n-tmp.h:6322
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Epson Stylus Photo RX560"
 
-#: src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:6323
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:4084
+#: src/xml/xmli18n-tmp.h:6324
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:4085
+#: src/xml/xmli18n-tmp.h:6325
 #, fuzzy
-msgid "Epson Stylus Photo TX800W"
+msgid "Epson Stylus Photo TX800FW"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:4086
+#: src/xml/xmli18n-tmp.h:6326
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:4087
+#: src/xml/xmli18n-tmp.h:6327
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:4088
+#: src/xml/xmli18n-tmp.h:6328
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4089
+#: src/xml/xmli18n-tmp.h:6329
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:6330
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:4091
+#: src/xml/xmli18n-tmp.h:6331
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:6332
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4093
+#: src/xml/xmli18n-tmp.h:6333
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4094
+#: src/xml/xmli18n-tmp.h:6334
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:6335
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:6336
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4097
+#: src/xml/xmli18n-tmp.h:6337
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:6338
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4099
+#: src/xml/xmli18n-tmp.h:6339
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:6340
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:6341
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:6342
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:6343
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:6344
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:6345
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:6346
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:6347
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:6348
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:6349
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:4110
+#: src/xml/xmli18n-tmp.h:6350
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:6351
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:6352
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4113
+#: src/xml/xmli18n-tmp.h:6353
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Epson Stylus CX4400"
 msgstr "Epson Stylus CX4400"
 
-#: src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:6355
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/xml/xmli18n-tmp.h:4116
+#: src/xml/xmli18n-tmp.h:6356
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:6357
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/xml/xmli18n-tmp.h:4118
+#: src/xml/xmli18n-tmp.h:6358
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/xml/xmli18n-tmp.h:4119
+#: src/xml/xmli18n-tmp.h:6359
 msgid "Epson Stylus CX4900"
 msgstr "Epson Stylus CX4900"
 
-#: src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:6360
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX5000"
 
-#: src/xml/xmli18n-tmp.h:4121
+#: src/xml/xmli18n-tmp.h:6361
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX5000F"
 
-#: src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:6362
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:6363
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/xml/xmli18n-tmp.h:4124
+#: src/xml/xmli18n-tmp.h:6364
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:6365
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/xml/xmli18n-tmp.h:4126
+#: src/xml/xmli18n-tmp.h:6366
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4127
+#: src/xml/xmli18n-tmp.h:6367
 msgid "Epson Stylus CX5600"
 msgstr "Epson Stylus CX5600"
 
-#: src/xml/xmli18n-tmp.h:4128
+#: src/xml/xmli18n-tmp.h:6368
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/xml/xmli18n-tmp.h:4129
+#: src/xml/xmli18n-tmp.h:6369
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:6370
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX6000"
 
-#: src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:6371
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:6372
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:6373
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:6374
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:6375
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX7000F"
 
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:6376
 msgid "Epson Stylus CX7400"
 msgstr "Epson Stylus CX7400"
 
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:6377
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:6378
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:6379
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:6380
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:6381
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:6382
 msgid "Epson Stylus CX9400"
 msgstr "Epson Stylus CX9400"
 
-#: src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:6383
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Epson Stylus CX9400"
 
-#: src/xml/xmli18n-tmp.h:4144
+#: src/xml/xmli18n-tmp.h:6384
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:6385
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:6386
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:6387
 msgid "Epson Stylus D92"
 msgstr "Epson Stylus D92"
 
-#: src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:6388
 msgid "Epson Stylus D120"
 msgstr "Epson Stylus D120"
 
-#: src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:6389
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:6390
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:6391
+#, fuzzy
+msgid "Epson Stylus DX4000"
+msgstr "Epson Stylus DX4050"
+
+#: src/xml/xmli18n-tmp.h:6392
 msgid "Epson Stylus DX4050"
 msgstr "Epson Stylus DX4050"
 
-#: src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:6393
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:6394
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:4154
+#: src/xml/xmli18n-tmp.h:6395
 msgid "Epson Stylus DX4400"
 msgstr "Epson Stylus DX4400"
 
-#: src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:6396
 msgid "Epson Stylus DX4450"
 msgstr "Epson Stylus DX4450"
 
-#: src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:6397
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:6398
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:6399
 msgid "Epson Stylus DX7000F"
 msgstr "Epson Stylus DX7000F"
 
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:6400
 msgid "Epson Stylus DX7400"
 msgstr "Epson Stylus DX7400"
 
-#: src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:6401
 msgid "Epson Stylus DX7450"
 msgstr "Epson Stylus DX7450"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:6402
 msgid "Epson Stylus DX8400"
 msgstr "Epson Stylus DX8400"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:6403
 msgid "Epson Stylus DX8450"
 msgstr "Epson Stylus DX8450"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:6404
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Epson Stylus CX9400"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:6405
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:6406
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:6407
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:6408
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:6409
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:6410
 #, fuzzy
-msgid "Epson Stylus PX700FW"
+msgid "Epson Stylus PX700W"
 msgstr "Epson Stylus CX7000F"
 
-#: src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:6411
 #, fuzzy
 msgid "Epson Stylus PX800FW"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:6412
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:4172
+#: src/xml/xmli18n-tmp.h:6413
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:6414
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4174
+#: src/xml/xmli18n-tmp.h:6415
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:6416
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:6417
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4177
+#: src/xml/xmli18n-tmp.h:6418
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Epson Stylus DX4050"
 
-#: src/xml/xmli18n-tmp.h:4178
+#: src/xml/xmli18n-tmp.h:6419
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:4179
+#: src/xml/xmli18n-tmp.h:6420
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4180
+#: src/xml/xmli18n-tmp.h:6421
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4181
+#: src/xml/xmli18n-tmp.h:6422
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:6423
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:6424
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:6425
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:6426
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:6427
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4187
+#: src/xml/xmli18n-tmp.h:6428
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4188
+#: src/xml/xmli18n-tmp.h:6429
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:6430
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:6431
 msgid "Epson PictureMate Dash"
 msgstr "Epson PictureMate Dash"
 
-#: src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:6432
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/xml/xmli18n-tmp.h:4192
+#: src/xml/xmli18n-tmp.h:6433
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate Flash"
 
-#: src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:6434
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate Pal"
 
-#: src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:6435
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate Snap"
 
-#: src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:6436
 msgid "Epson PictureMate 100"
 msgstr "Epson PictureMate 100"
 
-#: src/xml/xmli18n-tmp.h:4196
+#: src/xml/xmli18n-tmp.h:6437
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate 200"
 
-#: src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:6438
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate 210"
 
-#: src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:6439
 #, fuzzy
 msgid "Epson PictureMate 215"
 msgstr "Epson PictureMate 210"
 
-#: src/xml/xmli18n-tmp.h:4199
+#: src/xml/xmli18n-tmp.h:6440
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate 240"
 
-#: src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:6441
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate 250"
 
-#: src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:6442
 msgid "Epson PictureMate 260"
 msgstr "Epson PictureMate 260"
 
-#: src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:6443
 msgid "Epson PictureMate 270"
 msgstr "Epson PictureMate 270"
 
-#: src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate 280"
 
-#: src/xml/xmli18n-tmp.h:4204
+#: src/xml/xmli18n-tmp.h:6445
 msgid "Epson PictureMate 290"
 msgstr "Epson PictureMate 290"
 
-#: src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:6446
 msgid "Epson PictureMate 500"
 msgstr "Epson PictureMate 500"
 
-#: src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:6447
 msgid "Epson PictureMate 2005"
 msgstr "Epson PictureMate 2005"
 
-#: src/xml/xmli18n-tmp.h:4207
+#: src/xml/xmli18n-tmp.h:6448
 #, fuzzy
 msgid "Epson WorkForce 30"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:6449
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:6450
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Epson E 500"
 
-#: src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:6451
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:6452
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/xml/xmli18n-tmp.h:4212
+#: src/xml/xmli18n-tmp.h:6453
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:6454
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:6455
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4215
+#: src/xml/xmli18n-tmp.h:6456
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:4216
+#: src/xml/xmli18n-tmp.h:6457
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:6458
 msgid "Epson E 300"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:6459
 msgid "Epson E 500"
 msgstr "Epson E 500"
 
-#: src/xml/xmli18n-tmp.h:4219
+#: src/xml/xmli18n-tmp.h:6460
 msgid "Epson E 520"
 msgstr "Epson E 520"
 
-#: src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:6461
 msgid "Epson E 700"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:6462
 msgid "Epson E 720"
 msgstr "Epson E 720"
 
-#: src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:6463
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:6464
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/xml/xmli18n-tmp.h:4224
+#: src/xml/xmli18n-tmp.h:6465
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:6466
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:6467
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:6468
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:4228
+#: src/xml/xmli18n-tmp.h:6469
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4229
+#: src/xml/xmli18n-tmp.h:6470
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:6471
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:6472
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:6473
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:6474
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:6475
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:6476
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:6477
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:6478
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/xml/xmli18n-tmp.h:4238
+#: src/xml/xmli18n-tmp.h:6479
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:6480
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:6481
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:6482
 msgid "Epson PM 670C"
 msgstr "Epson PM 670C"
 
-#: src/xml/xmli18n-tmp.h:4242
+#: src/xml/xmli18n-tmp.h:6483
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:4243
+#: src/xml/xmli18n-tmp.h:6484
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:6485
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:6486
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/xml/xmli18n-tmp.h:4246
+#: src/xml/xmli18n-tmp.h:6487
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:6488
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:6490
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/xml/xmli18n-tmp.h:4251
+#: src/xml/xmli18n-tmp.h:6492
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:4253
+#: src/xml/xmli18n-tmp.h:6494
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/xml/xmli18n-tmp.h:4254
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:6496
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:6497
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:6498
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:6499
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/xml/xmli18n-tmp.h:4259
+#: src/xml/xmli18n-tmp.h:6500
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/xml/xmli18n-tmp.h:4260
+#: src/xml/xmli18n-tmp.h:6501
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:6502
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/xml/xmli18n-tmp.h:4262
+#: src/xml/xmli18n-tmp.h:6503
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/xml/xmli18n-tmp.h:4263
+#: src/xml/xmli18n-tmp.h:6504
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/xml/xmli18n-tmp.h:4264
+#: src/xml/xmli18n-tmp.h:6505
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/xml/xmli18n-tmp.h:4265
+#: src/xml/xmli18n-tmp.h:6506
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:6507
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:6508
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:6509
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:6510
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:6511
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:6512
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:6513
 msgid "Epson PM A820"
 msgstr "Epson PM A820"
 
-#: src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:6514
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:4274
+#: src/xml/xmli18n-tmp.h:6515
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/xml/xmli18n-tmp.h:4275
+#: src/xml/xmli18n-tmp.h:6516
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:4276
+#: src/xml/xmli18n-tmp.h:6517
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:6518
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:6519
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:6520
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:6521
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:6522
 msgid "Epson PM D870"
 msgstr "Epson PM D870"
 
-#: src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:6523
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:6524
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:6525
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/xml/xmli18n-tmp.h:4285
+#: src/xml/xmli18n-tmp.h:6526
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/xml/xmli18n-tmp.h:4286
+#: src/xml/xmli18n-tmp.h:6527
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:6528
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:6529
 msgid "Epson PM G850"
 msgstr "Epson PM G850"
 
-#: src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:6530
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Epson PM 670C"
 
-#: src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:6531
 msgid "Epson PM G4500"
 msgstr "Epson PM G4500"
 
-#: src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:6532
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4292
+#: src/xml/xmli18n-tmp.h:6533
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:6534
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:6535
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4295
+#: src/xml/xmli18n-tmp.h:6536
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:4296
+#: src/xml/xmli18n-tmp.h:6537
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4297
+#: src/xml/xmli18n-tmp.h:6538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:6539
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:4299
+#: src/xml/xmli18n-tmp.h:6540
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:6541
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:6542
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:6543
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:6544
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/xml/xmli18n-tmp.h:4305
+#: src/xml/xmli18n-tmp.h:6546
 msgid "Epson PX V780"
 msgstr "Epson PX V780"
 
-#: src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:6547
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/xml/xmli18n-tmp.h:4307
+#: src/xml/xmli18n-tmp.h:6548
+#, fuzzy
+msgid "Epson PX G5600"
+msgstr "Epson PX G5000"
+
+#: src/xml/xmli18n-tmp.h:6549
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/xml/xmli18n-tmp.h:4308
+#: src/xml/xmli18n-tmp.h:6550
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/xml/xmli18n-tmp.h:4309
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/xml/xmli18n-tmp.h:4310
+#: src/xml/xmli18n-tmp.h:6552
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:6553
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:6554
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/xml/xmli18n-tmp.h:4313
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:6556
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/xml/xmli18n-tmp.h:4315
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:6559
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:6560
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:6561
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:6562
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:6563
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:6564
 #, fuzzy
 msgid "Brother DCP-8045D"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:6565
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:4324
+#: src/xml/xmli18n-tmp.h:6566
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:6567
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/xml/xmli18n-tmp.h:4326
+#: src/xml/xmli18n-tmp.h:6568
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:4327
+#: src/xml/xmli18n-tmp.h:6569
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:6570
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:6571
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:6575
 #, fuzzy
 msgid "Brother HL-1430"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:6576
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:6577
 #, fuzzy
 msgid "Brother HL-1450"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:6578
 #, fuzzy
 msgid "Brother HL-1470N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:4337
+#: src/xml/xmli18n-tmp.h:6579
 #, fuzzy
 msgid "Brother HL-1650"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:6580
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:6581
 #, fuzzy
 msgid "Brother HL-1670N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:6582
 #, fuzzy
 msgid "Brother HL-1850"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:6583
 #, fuzzy
 msgid "Brother HL-1870N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:6584
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:6585
 #, fuzzy
 msgid "Brother HL-2460"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:6586
 #, fuzzy
 msgid "Brother HL-2460N"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:6587
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/xml/xmli18n-tmp.h:4346
+#: src/xml/xmli18n-tmp.h:6588
 #, fuzzy
 msgid "Brother HL-5030"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:6589
 #, fuzzy
 msgid "Brother HL-5040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:6590
 #, fuzzy
 msgid "Brother HL-5050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:6591
 #, fuzzy
 msgid "Brother HL-5070N"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:4350
+#: src/xml/xmli18n-tmp.h:6592
 #, fuzzy
 msgid "Brother HL-5140"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:4351
+#: src/xml/xmli18n-tmp.h:6593
 #, fuzzy
 msgid "Brother HL-5150D"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:6594
 #, fuzzy
 msgid "Brother HL-5170DN"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:6595
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:4354
+#: src/xml/xmli18n-tmp.h:6596
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:6597
 #, fuzzy
 msgid "Brother HL-7050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:6598
 #, fuzzy
 msgid "Brother HL-7050N"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4357
+#: src/xml/xmli18n-tmp.h:6599
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/xml/xmli18n-tmp.h:4358
+#: src/xml/xmli18n-tmp.h:6600
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:6601
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:6602
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:6603
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:6604
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:6605
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:6606
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:6607
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:6608
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:6609
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:6610
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:6611
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:6612
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:6613
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:6614
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/xml/xmli18n-tmp.h:4373
+#: src/xml/xmli18n-tmp.h:6615
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/xml/xmli18n-tmp.h:4374
+#: src/xml/xmli18n-tmp.h:6616
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:6617
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/xml/xmli18n-tmp.h:4376
+#: src/xml/xmli18n-tmp.h:6618
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:6619
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:6620
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:6621
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:6622
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:6623
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:6624
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:6625
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/xml/xmli18n-tmp.h:4384
+#: src/xml/xmli18n-tmp.h:6626
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:4385
+#: src/xml/xmli18n-tmp.h:6627
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:4386
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:4387
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:6630
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/xml/xmli18n-tmp.h:4389
+#: src/xml/xmli18n-tmp.h:6631
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/xml/xmli18n-tmp.h:4392
+#: src/xml/xmli18n-tmp.h:6634
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:6635
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:6636
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:6637
 #, fuzzy
 msgid "Epson EPL-N2050PS+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:4397
+#: src/xml/xmli18n-tmp.h:6639
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:6640
 #, fuzzy
 msgid "Epson EPL-N2500PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:4400
+#: src/xml/xmli18n-tmp.h:6642
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:6643
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/xml/xmli18n-tmp.h:4403
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:6646
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:6647
 msgid "Generic PCL 4 Printer"
 msgstr "�ltalános PCL 4 nyomtató"
 
-#: src/xml/xmli18n-tmp.h:4406
+#: src/xml/xmli18n-tmp.h:6648
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "�ltalános PCL 4 nyomtató"
 
-#: src/xml/xmli18n-tmp.h:4407
+#: src/xml/xmli18n-tmp.h:6649
 msgid "Generic PCL 5 Printer"
 msgstr "�ltalános PCL 5 nyomtató"
 
-#: src/xml/xmli18n-tmp.h:4408
+#: src/xml/xmli18n-tmp.h:6650
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "�ltalános PCL 5 nyomtató"
 
-#: src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:6651
 msgid "Generic PCL 5c Printer"
 msgstr "�ltalános PCL 5c nyomtató"
 
-#: src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:6652
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "�ltalános PCL 5c nyomtató"
 
-#: src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:6653
 msgid "Generic PCL 5e Printer"
 msgstr "�ltalános PCL 5e nyomtató"
 
-#: src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:6654
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "�ltalános PCL 5e nyomtató"
 
-#: src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "�ltalános PCL 6/PCL XL nyomtató"
 
-#: src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:6656
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "�ltalános PCL 6/PCL XL nyomtató"
 
-#: src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:6657
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4416
+#: src/xml/xmli18n-tmp.h:6658
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:6659
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:6660
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:6661
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4420
-msgid "Gestetner 3532"
+#: src/xml/xmli18n-tmp.h:6662
+msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4421
-msgid "Gestetner 4235g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:6663
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4423
-msgid "Gestetner 4532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4424
-msgid "Gestetner 4245g"
+#: src/xml/xmli18n-tmp.h:6664
+msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:6665
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:6666
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:6668
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:6669
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:6670
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4431
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:6672
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:6673
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:6674
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:6675
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4436
+#: src/xml/xmli18n-tmp.h:6676
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4437
-msgid "Gestetner DSm635"
+#: src/xml/xmli18n-tmp.h:6677
+msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4438
-msgid "Gestetner DSm635G"
+#: src/xml/xmli18n-tmp.h:6678
+msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4439
-msgid "Gestetner DSm645"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4440
-msgid "Gestetner DS645G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:6679
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:6680
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4443
+#: src/xml/xmli18n-tmp.h:6681
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:6682
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:6683
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4446
-msgid "Gestetner DSm735"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4447
-msgid "Gestetner DSm735G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4448
-msgid "Gestetner DSm745"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4449
-msgid "Gestetner DSm745G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4450
-msgid "Gestetner MP1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4451
-msgid "Gestetner DSm7110"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4452
-msgid "Gestetner MP1350"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4453
-msgid "Gestetner DSm7135"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4454
-msgid "Gestetner MP1600"
+#: src/xml/xmli18n-tmp.h:6684
+msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4455
-msgid "Gestetner DSm716"
+#: src/xml/xmli18n-tmp.h:6685
+msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4456
-msgid "Gestetner MP2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4457
-msgid "Gestetner DSm721d"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4458
-msgid "Gestetner MP2500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4459
-msgid "Gestetner DSm625"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4460
-msgid "Gestetner MP3500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4461
-msgid "Gestetner DSm735e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4462
-msgid "Gestetner MP4500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4463
-msgid "Gestetner DSm745e"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6686
+#, fuzzy
+msgid "Gestetner MP1100/DSm7110"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4464
-msgid "Gestetner MP5500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6687
+#, fuzzy
+msgid "Gestetner MP1350/DSm7135"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4465
-msgid "Gestetner DSm755"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6688
+#, fuzzy
+msgid "Gestetner MP1600/DSm716"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4466
-msgid "Gestetner MP6500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6689
+#, fuzzy
+msgid "Gestetner MP2000/DSm721d"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4467
-msgid "Gestetner DSm765"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6690
+#, fuzzy
+msgid "Gestetner MP2500/DSm625"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4468
-msgid "Gestetner MP7500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6691
+#, fuzzy
+msgid "Gestetner MP3500/DSm735e"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4469
-msgid "Gestetner DSm775"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6692
+#, fuzzy
+msgid "Gestetner MP4500/DSm745e"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4470
-msgid "Gestetner MP9000"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6693
+#, fuzzy
+msgid "Gestetner MP5500/DSm755"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4471
-msgid "Gestetner DSm790"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6694
+#, fuzzy
+msgid "Gestetner MP6500/DSm765"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4472
-msgid "Gestetner MP 161"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6695
+#, fuzzy
+msgid "Gestetner MP7500/DSm775"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4473
-msgid "Gestetner DSm416"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6696
+#, fuzzy
+msgid "Gestetner MP9000/DSm790"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4474
-msgid "Gestetner MP 2510"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6697
+#, fuzzy
+msgid "Gestetner MP 161/DSm416"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4475
-msgid "Gestetner DSm725e"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6698
+#, fuzzy
+msgid "Gestetner MP 2510/DSm725e"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:6699
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:6700
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4478
-msgid "Gestetner MP 3010"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4479
-msgid "Gestetner DSm730e"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6701
+#, fuzzy
+msgid "Gestetner MP 3010/DSm730e"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4480
+#: src/xml/xmli18n-tmp.h:6702
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:6703
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:6704
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:6705
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:6706
 #, fuzzy
 msgid "Gestetner MP 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:6707
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:6708
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:6709
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:6710
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/xml/xmli18n-tmp.h:4489
+#: src/xml/xmli18n-tmp.h:6711
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:6712
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:6713
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/xml/xmli18n-tmp.h:4492
+#: src/xml/xmli18n-tmp.h:6714
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:6715
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:6716
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/xml/xmli18n-tmp.h:4495
+#: src/xml/xmli18n-tmp.h:6717
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/xml/xmli18n-tmp.h:4496
+#: src/xml/xmli18n-tmp.h:6718
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/xml/xmli18n-tmp.h:4497
+#: src/xml/xmli18n-tmp.h:6719
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:6720
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:6721
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:6722
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:6723
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:6724
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:6725
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:6726
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:6727
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:4506
+#: src/xml/xmli18n-tmp.h:6728
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:6729
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:4508
+#: src/xml/xmli18n-tmp.h:6730
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/xml/xmli18n-tmp.h:4509
+#: src/xml/xmli18n-tmp.h:6731
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:4510
+#: src/xml/xmli18n-tmp.h:6732
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:6733
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:6734
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:6735
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:6736
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:6737
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:6738
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:6739
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:4518
+#: src/xml/xmli18n-tmp.h:6740
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:6741
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:6742
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:6743
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:6744
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:4523
+#: src/xml/xmli18n-tmp.h:6745
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:6746
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:6747
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:6748
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:6749
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/xml/xmli18n-tmp.h:4528
+#: src/xml/xmli18n-tmp.h:6750
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/xml/xmli18n-tmp.h:4529
+#: src/xml/xmli18n-tmp.h:6751
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/xml/xmli18n-tmp.h:4530
+#: src/xml/xmli18n-tmp.h:6752
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:6753
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/xml/xmli18n-tmp.h:4532
+#: src/xml/xmli18n-tmp.h:6754
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:6755
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:6756
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:6757
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:6758
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:6759
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:6760
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/xml/xmli18n-tmp.h:4539
+#: src/xml/xmli18n-tmp.h:6761
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/xml/xmli18n-tmp.h:4540
+#: src/xml/xmli18n-tmp.h:6762
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/xml/xmli18n-tmp.h:4541
+#: src/xml/xmli18n-tmp.h:6763
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/xml/xmli18n-tmp.h:4542
+#: src/xml/xmli18n-tmp.h:6764
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/xml/xmli18n-tmp.h:4543
+#: src/xml/xmli18n-tmp.h:6765
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:6766
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:6767
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/xml/xmli18n-tmp.h:4546
+#: src/xml/xmli18n-tmp.h:6768
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:6769
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:6770
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:6771
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:6772
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:6773
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/xml/xmli18n-tmp.h:4552
+#: src/xml/xmli18n-tmp.h:6774
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:6775
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:6776
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:6777
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:6778
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:6779
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:6780
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:6781
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:6782
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:6783
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:6784
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:6785
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:6786
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:6787
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:6788
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/xml/xmli18n-tmp.h:4567
+#: src/xml/xmli18n-tmp.h:6789
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/xml/xmli18n-tmp.h:4568
+#: src/xml/xmli18n-tmp.h:6790
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:6791
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/xml/xmli18n-tmp.h:4570
+#: src/xml/xmli18n-tmp.h:6792
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/xml/xmli18n-tmp.h:4571
+#: src/xml/xmli18n-tmp.h:6793
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:6794
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:6795
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:6796
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:6797
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:6798
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:6799
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:6800
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:6801
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:6802
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:6803
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/xml/xmli18n-tmp.h:4582
+#: src/xml/xmli18n-tmp.h:6804
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/xml/xmli18n-tmp.h:4583
+#: src/xml/xmli18n-tmp.h:6805
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/xml/xmli18n-tmp.h:4584
+#: src/xml/xmli18n-tmp.h:6806
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/xml/xmli18n-tmp.h:4585
+#: src/xml/xmli18n-tmp.h:6807
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:6808
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:6809
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:6810
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:6811
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:6812
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:6813
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:6814
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:4593
+#: src/xml/xmli18n-tmp.h:6815
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/xml/xmli18n-tmp.h:4594
+#: src/xml/xmli18n-tmp.h:6816
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:6817
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:6818
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/xml/xmli18n-tmp.h:4597
+#: src/xml/xmli18n-tmp.h:6819
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:6820
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:6821
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:6822
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:6823
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/xml/xmli18n-tmp.h:4602
+#: src/xml/xmli18n-tmp.h:6824
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:6825
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:6826
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:6827
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:6828
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:4607
+#: src/xml/xmli18n-tmp.h:6829
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:6830
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P PCL5 támogatással"
 
-#: src/xml/xmli18n-tmp.h:4609
+#: src/xml/xmli18n-tmp.h:6831
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P PS támogatással"
 
-#: src/xml/xmli18n-tmp.h:4610
+#: src/xml/xmli18n-tmp.h:6832
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:6833
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:6834
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4613
+#: src/xml/xmli18n-tmp.h:6835
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:6836
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:6837
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:6838
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:6839
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:6840
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:6841
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:6842
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:6843
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:6844
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:6845
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4624
+#: src/xml/xmli18n-tmp.h:6846
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/xml/xmli18n-tmp.h:4625
+#: src/xml/xmli18n-tmp.h:6847
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:6848
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/xml/xmli18n-tmp.h:4627
+#: src/xml/xmli18n-tmp.h:6849
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/xml/xmli18n-tmp.h:4628
+#: src/xml/xmli18n-tmp.h:6850
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:6851
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:6852
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:6853
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 1022"
 
-#: src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:6854
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:6855
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:6856
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:6857
 #, fuzzy
 msgid "HP LaserJet 1160"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:4636
+#: src/xml/xmli18n-tmp.h:6858
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:4637
+#: src/xml/xmli18n-tmp.h:6859
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/xml/xmli18n-tmp.h:4638
+#: src/xml/xmli18n-tmp.h:6860
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
 msgid "HP LaserJet 1320"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:4640
+#: src/xml/xmli18n-tmp.h:6862
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:6863
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:6864
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:6865
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:4644
+#: src/xml/xmli18n-tmp.h:6866
 #, fuzzy
 msgid "HP LaserJet 2410"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
 msgid "HP LaserJet 2420"
 msgstr "HP LaserJet 1220"
 
-#: src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
 msgid "HP LaserJet 2430"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:4647
+#: src/xml/xmli18n-tmp.h:6869
 #, fuzzy
 msgid "HP LaserJet 3015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:4648
+#: src/xml/xmli18n-tmp.h:6870
 #, fuzzy
 msgid "HP LaserJet 3020"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:6871
 #, fuzzy
 msgid "HP LaserJet 3030"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4650
+#: src/xml/xmli18n-tmp.h:6872
 #, fuzzy
 msgid "HP LaserJet 3050"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:6873
 #, fuzzy
 msgid "HP LaserJet 3052"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:6874
 #, fuzzy
 msgid "HP LaserJet 3055"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:6875
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:6876
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:6877
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:6878
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:6879
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:6880
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:6881
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/xml/xmli18n-tmp.h:4660
+#: src/xml/xmli18n-tmp.h:6882
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:6883
 #, fuzzy
 msgid "HP LaserJet 3380"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:6884
 #, fuzzy
 msgid "HP LaserJet 3390"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:4663
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "HP LaserJet 3392"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:6886
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:6887
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:6888
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/xml/xmli18n-tmp.h:4667
+#: src/xml/xmli18n-tmp.h:6889
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:6890
 #, fuzzy
 msgid "HP LaserJet 4240"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:6891
 #, fuzzy
 msgid "HP LaserJet 4250"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:6892
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/xml/xmli18n-tmp.h:4671
+#: src/xml/xmli18n-tmp.h:6893
 #, fuzzy
 msgid "HP LaserJet 4345 mfp"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:6894
 #, fuzzy
 msgid "HP LaserJet 4350"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:6895
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:6896
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "HP LaserJet 5200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:6898
 #, fuzzy
 msgid "HP LaserJet 5200L"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:6899
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:6900
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:6901
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/xml/xmli18n-tmp.h:4680
+#: src/xml/xmli18n-tmp.h:6902
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:6903
 #, fuzzy
 msgid "HP LaserJet 9040"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:4682
+#: src/xml/xmli18n-tmp.h:6904
 #, fuzzy
 msgid "HP LaserJet 9040 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:4683
+#: src/xml/xmli18n-tmp.h:6905
 #, fuzzy
 msgid "HP LaserJet 9050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:4684
+#: src/xml/xmli18n-tmp.h:6906
 #, fuzzy
 msgid "HP LaserJet 9050 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "HP LaserJet M3027 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "HP LaserJet M3035 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "HP LaserJet M4345 MFP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "HP LaserJet M5025 MFP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:6911
 #, fuzzy
 msgid "HP LaserJet M5035 MFP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "HP LaserJet P2010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:6913
 #, fuzzy
 msgid "HP LaserJet P2015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:6914
 #, fuzzy
 msgid "HP LaserJet P3004"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:6915
 #, fuzzy
 msgid "HP LaserJet P3005"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:6916
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/xml/xmli18n-tmp.h:4695
+#: src/xml/xmli18n-tmp.h:6917
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:6918
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:6919
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:6920
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:6921
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/xml/xmli18n-tmp.h:4700
+#: src/xml/xmli18n-tmp.h:6922
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:6923
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:6924
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/xml/xmli18n-tmp.h:4703
+#: src/xml/xmli18n-tmp.h:6925
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:6926
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:6927
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/xml/xmli18n-tmp.h:4706
+#: src/xml/xmli18n-tmp.h:6928
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/xml/xmli18n-tmp.h:4707
+#: src/xml/xmli18n-tmp.h:6929
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:6930
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:6931
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/xml/xmli18n-tmp.h:4710
+#: src/xml/xmli18n-tmp.h:6932
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:6933
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:6934
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:6935
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:6936
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:6937
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:6938
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:6939
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/xml/xmli18n-tmp.h:4718
+#: src/xml/xmli18n-tmp.h:6940
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:6941
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:6942
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/xml/xmli18n-tmp.h:4721
+#: src/xml/xmli18n-tmp.h:6943
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:6944
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:6945
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:6946
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/xml/xmli18n-tmp.h:4725
+#: src/xml/xmli18n-tmp.h:6947
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:6948
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:6949
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/xml/xmli18n-tmp.h:4728
+#: src/xml/xmli18n-tmp.h:6950
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/xml/xmli18n-tmp.h:4729
+#: src/xml/xmli18n-tmp.h:6951
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:6952
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:6953
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/xml/xmli18n-tmp.h:4732
+#: src/xml/xmli18n-tmp.h:6954
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:6955
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:6956
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:6957
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:6958
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:6959
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:6960
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/xml/xmli18n-tmp.h:4739
+#: src/xml/xmli18n-tmp.h:6961
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/xml/xmli18n-tmp.h:4740
+#: src/xml/xmli18n-tmp.h:6962
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/xml/xmli18n-tmp.h:4741
+#: src/xml/xmli18n-tmp.h:6963
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/xml/xmli18n-tmp.h:4742
+#: src/xml/xmli18n-tmp.h:6964
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:6965
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:6966
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/xml/xmli18n-tmp.h:4745
+#: src/xml/xmli18n-tmp.h:6967
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:6968
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:6969
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:6970
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/xml/xmli18n-tmp.h:4749
+#: src/xml/xmli18n-tmp.h:6971
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:6972
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:6973
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/xml/xmli18n-tmp.h:4752
+#: src/xml/xmli18n-tmp.h:6974
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:6975
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:6976
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/xml/xmli18n-tmp.h:4755
+#: src/xml/xmli18n-tmp.h:6977
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:6978
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:6979
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:6980
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/xml/xmli18n-tmp.h:4759
+#: src/xml/xmli18n-tmp.h:6981
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/xml/xmli18n-tmp.h:4760
+#: src/xml/xmli18n-tmp.h:6982
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:6983
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/xml/xmli18n-tmp.h:4762
+#: src/xml/xmli18n-tmp.h:6984
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:6985
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:6986
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/xml/xmli18n-tmp.h:4765
+#: src/xml/xmli18n-tmp.h:6987
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:6988
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:6989
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:6990
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:6991
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:6992
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:6993
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/xml/xmli18n-tmp.h:4772
+#: src/xml/xmli18n-tmp.h:6994
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:6995
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/xml/xmli18n-tmp.h:4774
+#: src/xml/xmli18n-tmp.h:6996
 #, fuzzy
 msgid "Infotec 4353 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4775
+#: src/xml/xmli18n-tmp.h:6997
 #, fuzzy
 msgid "Infotec 4452 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4776
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:6999
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:7000
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:7002
 #, fuzzy
 msgid "Infotec IS2035"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:7003
 #, fuzzy
 msgid "Infotec IS2045"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:7004
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:7005
 #, fuzzy
 msgid "Infotec IS2105"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:7006
 #, fuzzy
 msgid "Infotec IS 2015"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:7007
 #, fuzzy
 msgid "Infotec IS 2018"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:7008
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:7009
 #, fuzzy
 msgid "Infotec IS 2060"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:7010
 #, fuzzy
 msgid "Infotec IS 2075"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:7011
 #, fuzzy
 msgid "Infotec IS 2122"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4790
+#: src/xml/xmli18n-tmp.h:7012
 #, fuzzy
 msgid "Infotec IS 2127"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:7013
 #, fuzzy
 msgid "Infotec IS 2132"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:7014
 #, fuzzy
 msgid "Infotec IS 2135"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:7015
 #, fuzzy
 msgid "Infotec IS 2145"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4794
+#: src/xml/xmli18n-tmp.h:7016
 #, fuzzy
 msgid "Infotec IS 2151"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:7017
 #, fuzzy
 msgid "Infotec IS 2160"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:7018
 #, fuzzy
 msgid "Infotec IS 2175"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4797
+#: src/xml/xmli18n-tmp.h:7019
 #, fuzzy
 msgid "Infotec IS 2215"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:7020
 #, fuzzy
 msgid "Infotec IS 2216"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:7021
 #, fuzzy
 msgid "Infotec IS 2220"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:7022
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:7023
 #, fuzzy
 msgid "Infotec IS 2225"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:7024
 #, fuzzy
 msgid "Infotec IS 2230"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:7025
 #, fuzzy
 msgid "Infotec IS 2235"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:7026
 #, fuzzy
 msgid "Infotec IS 2245"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:7027
 #, fuzzy
 msgid "Infotec IS 2255"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:7028
 #, fuzzy
 msgid "Infotec IS 2265"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4807
+#: src/xml/xmli18n-tmp.h:7029
 #, fuzzy
 msgid "Infotec IS 2275"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4808
+#: src/xml/xmli18n-tmp.h:7030
 #, fuzzy
 msgid "Infotec IS 2316"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:7031
 #, fuzzy
 msgid "Infotec IS 2320"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:7032
 #, fuzzy
 msgid "Infotec IS 2325"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:7033
 #, fuzzy
 msgid "Infotec IS 2416"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:7034
 #, fuzzy
 msgid "Infotec IS 2425"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:7035
 #, fuzzy
 msgid "Infotec IS 2430"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:7036
 #, fuzzy
 msgid "Infotec IS 2435"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:7037
 #, fuzzy
 msgid "Infotec IS 2445"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:7038
 #, fuzzy
 msgid "Infotec IS 3090"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:7039
 #, fuzzy
 msgid "Infotec IS 3110"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:7040
 #, fuzzy
 msgid "Infotec IS 3135"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4819
+#: src/xml/xmli18n-tmp.h:7041
 #, fuzzy
 msgid "Infotec MP 2550"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:7042
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:7043
 #, fuzzy
 msgid "Infotec MP 3350"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:7044
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:7045
 #, fuzzy
 msgid "Infotec MP 4000"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:7046
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:7047
 #, fuzzy
 msgid "Infotec MP 5000"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:7048
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:7049
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:7050
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:7051
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:4830
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:7057
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:4837
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:4840
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:4842
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:4852
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/xml/xmli18n-tmp.h:4853
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/xml/xmli18n-tmp.h:4854
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/xml/xmli18n-tmp.h:4855
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:4866
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/xml/xmli18n-tmp.h:4867
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/xml/xmli18n-tmp.h:4873
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4874
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4883
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4886
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4888
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4890
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4894
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4896
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4903
-msgid "Lanier MP 2500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4904
-msgid "Lanier LD125"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4905
+#: src/xml/xmli18n-tmp.h:7125
 #, fuzzy
-msgid "Lanier MP 1100"
-msgstr "HP LaserJet 1100"
+msgid "Lanier MP2500/LD125"
+msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4906
+#: src/xml/xmli18n-tmp.h:7126
 #, fuzzy
-msgid "Lanier LD1100"
+msgid "Lanier MP 1100/LD1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4907
-msgid "Lanier MP 1350"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4908
-msgid "Lanier LD1135"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4909
-msgid "Lanier MP 1600"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4910
-msgid "Lanier LD316"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4911
-msgid "Lanier MP 161"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4912
-msgid "Lanier LD016"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4913
-msgid "Lanier MP 2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4914
-msgid "Lanier LD320d"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4915
-msgid "Lanier MP 2510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4916
-msgid "Lanier LD325"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4917
-msgid "Lanier MP 2550B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4918
-msgid "Lanier LD425B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4919
-msgid "Lanier MP 2550"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4920
-msgid "Lanier LD425"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7127
+#, fuzzy
+msgid "Lanier MP 1350/LD1135"
+msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4921
-msgid "Lanier MP 3010"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7128
+#, fuzzy
+msgid "Lanier MP 1600/LD316"
+msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4922
-msgid "Lanier LD330"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7129
+#, fuzzy
+msgid "Lanier MP 161/LD016"
+msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4923
-msgid "Lanier MP 3350B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7130
+#, fuzzy
+msgid "Lanier MP 2000/LD320d"
+msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:4924
-msgid "Lanier LD433B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7131
+#, fuzzy
+msgid "Lanier MP 2510/LD325"
+msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:7132
 #, fuzzy
-msgid "Lanier MP 3350"
+msgid "Lanier MP 2550B/LD425B"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4926
-msgid "Lanier LD433"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7133
+#, fuzzy
+msgid "Lanier MP 2550/LD425"
+msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4927
-msgid "Lanier MP 3500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7134
+#, fuzzy
+msgid "Lanier MP 3010/LD330"
+msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4928
-msgid "Lanier LD335"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7135
+#, fuzzy
+msgid "Lanier MP 3350B/LD433B"
+msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4929
-msgid "Lanier MP 4000B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7136
+#, fuzzy
+msgid "Lanier MP 3350/LD433"
+msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4930
-msgid "Lanier LD040B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7137
+#, fuzzy
+msgid "Lanier MP 3500/LD335"
+msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:7138
 #, fuzzy
-msgid "Lanier MP 4000"
+msgid "Lanier MP 4000B/LD040B"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:4932
-msgid "Lanier LD040"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4933
-msgid "Lanier MP 4500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4934
-msgid "Lanier LD345"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4935
-msgid "Lanier MP 5000B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7139
+#, fuzzy
+msgid "Lanier MP 4000/LD040"
+msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:4936
-msgid "Lanier LD050B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7140
+#, fuzzy
+msgid "Lanier MP 4500/LD345"
+msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:7141
 #, fuzzy
-msgid "Lanier MP 5000"
+msgid "Lanier MP 5000B/LD050B"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4938
-msgid "Lanier LD050"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4939
-msgid "Lanier MP 5500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4940
-msgid "Lanier LD255"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4941
-msgid "Lanier MP 6500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7142
+#, fuzzy
+msgid "Lanier MP 5000/LD050"
+msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4942
-msgid "Lanier LD265"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7143
+#, fuzzy
+msgid "Lanier MP 5500/LD255"
+msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4943
-msgid "Lanier MP 7500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7144
+#, fuzzy
+msgid "Lanier MP 6500/LD265"
+msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4944
-msgid "Lanier LD275"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7145
+#, fuzzy
+msgid "Lanier MP 7500/LD275"
+msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:7146
 #, fuzzy
-msgid "Lanier MP 9000"
+msgid "Lanier MP 9000/LD190"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:4946
-msgid "Lanier LD190"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:7148
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/xml/xmli18n-tmp.h:4950
+#: src/xml/xmli18n-tmp.h:7150
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E220"
 
-#: src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:7151
 #, fuzzy
 msgid "Lexmark Optra E321"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:4952
+#: src/xml/xmli18n-tmp.h:7152
 #, fuzzy
 msgid "Lexmark Optra E323"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:4953
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:7155
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/xml/xmli18n-tmp.h:4960
+#: src/xml/xmli18n-tmp.h:7160
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:7161
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:7162
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/xml/xmli18n-tmp.h:4963
+#: src/xml/xmli18n-tmp.h:7163
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:7164
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:7165
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/xml/xmli18n-tmp.h:4966
-msgid "NRG 10515"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4967
-msgid "NRG 10518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4968
-msgid "NRG 10512"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4969
-msgid "NRG 2205"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4970
-msgid "NRG 2238"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4971
-msgid "NRG 2212"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4972
-msgid "NRG 2705"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4973
-msgid "NRG 2738"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4974
-msgid "NRG 2712"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4975
-msgid "NRG 3205"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4976
-msgid "NRG 3238"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4977
-msgid "NRG 3212"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4978
-msgid "NRG 3525"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4979
-msgid "NRG 3508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4980
-msgid "NRG 3502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4981
-msgid "NRG 3545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4982
-msgid "NRG 3518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4983
-msgid "NRG 3532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4984
-msgid "NRG 4525"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4985
-msgid "NRG 4508"
+#: src/xml/xmli18n-tmp.h:7166
+msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4986
-msgid "NRG 4502"
+#: src/xml/xmli18n-tmp.h:7167
+msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4987
-msgid "NRG 4545"
+#: src/xml/xmli18n-tmp.h:7168
+msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4988
-msgid "NRG 4518"
+#: src/xml/xmli18n-tmp.h:7169
+msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4989
-msgid "NRG 4532"
+#: src/xml/xmli18n-tmp.h:7170
+msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4990
-msgid "NRG 6002"
+#: src/xml/xmli18n-tmp.h:7171
+msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4991
-msgid "NRG 6005"
+#: src/xml/xmli18n-tmp.h:7172
+msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4992
-msgid "NRG 6008"
+#: src/xml/xmli18n-tmp.h:7173
+msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4993
-msgid "NRG 7502"
+#: src/xml/xmli18n-tmp.h:7174
+msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4994
-msgid "NRG 7505"
+#: src/xml/xmli18n-tmp.h:7175
+msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4995
-msgid "NRG 7508"
+#: src/xml/xmli18n-tmp.h:7176
+msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4996
-msgid "NRG 9005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4997
-msgid "NRG 9008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4998
-msgid "NRG 9002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:7177
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:7178
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5001
+#: src/xml/xmli18n-tmp.h:7179
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:7180
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:7181
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:7182
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:7183
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5006
+#: src/xml/xmli18n-tmp.h:7184
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:7185
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:7186
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5009
+#: src/xml/xmli18n-tmp.h:7187
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:7188
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:7189
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:7190
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:7191
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:7192
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5015
+#: src/xml/xmli18n-tmp.h:7193
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5016
+#: src/xml/xmli18n-tmp.h:7194
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5017
+#: src/xml/xmli18n-tmp.h:7195
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:7196
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:7197
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:7198
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:7199
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:7200
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:7201
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:7202
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5025
+#: src/xml/xmli18n-tmp.h:7203
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:7204
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:7205
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5028
+#: src/xml/xmli18n-tmp.h:7206
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:7207
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:7208
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:7209
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:7210
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5033
+#: src/xml/xmli18n-tmp.h:7211
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:7212
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:7213
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:7214
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:7215
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:7216
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:7217
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5040
+#: src/xml/xmli18n-tmp.h:7218
 #, fuzzy
 msgid "Oki OL400"
 msgstr "Okidata OL400"
 
-#: src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:7219
 #, fuzzy
 msgid "Oki OL400e"
 msgstr "Okidata OL400e"
 
-#: src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:7220
 #, fuzzy
 msgid "Oki OL400ex"
 msgstr "Okidata OL400ex"
 
-#: src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:7221
 #, fuzzy
 msgid "Oki OL410e"
 msgstr "Okidata OL410e"
 
-#: src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:7222
 #, fuzzy
 msgid "Oki OL600e"
 msgstr "Okidata OL600e"
 
-#: src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:7223
 #, fuzzy
 msgid "Oki OL610e/S"
 msgstr "Okidata OL610e/S"
 
-#: src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:7224
 #, fuzzy
 msgid "Oki OL800"
 msgstr "Okidata OL800"
 
-#: src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:7225
 #, fuzzy
 msgid "Oki OL810ex"
 msgstr "Okidata OL810ex"
 
-#: src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:7226
 #, fuzzy
 msgid "Oki Okipage 6e"
 msgstr "Okidata Okipage 6e"
 
-#: src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:7227
 #, fuzzy
 msgid "Oki Okipage 6ex"
 msgstr "Okidata Okipage 6ex"
 
-#: src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:7228
 #, fuzzy
 msgid "Oki Okipage 8p"
 msgstr "Okidata Okipage 8p"
 
-#: src/xml/xmli18n-tmp.h:5051
+#: src/xml/xmli18n-tmp.h:7229
 #, fuzzy
 msgid "Oki Okipage 10e"
 msgstr "Okidata Okipage 10e"
 
-#: src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:7230
 #, fuzzy
 msgid "Oki Okipage 10ex"
 msgstr "Okidata Okipage 10ex"
 
-#: src/xml/xmli18n-tmp.h:5053
+#: src/xml/xmli18n-tmp.h:7231
 #, fuzzy
 msgid "Oki Okipage 14ex"
 msgstr "Okidata Okipage 14ex"
 
-#: src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Okidata Super 6e"
 
-#: src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:7234
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:7235
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/xml/xmli18n-tmp.h:5060
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/xml/xmli18n-tmp.h:5062
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5063
+#: src/xml/xmli18n-tmp.h:7241
 #, fuzzy
 msgid "Ricoh Aficio 1022"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:7242
 #, fuzzy
 msgid "Ricoh Aficio 1027"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:7243
 #, fuzzy
 msgid "Ricoh Aficio 1032"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:7244
 #, fuzzy
 msgid "Ricoh Aficio 1035"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:7245
 #, fuzzy
 msgid "Ricoh Aficio 1045"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:7246
 #, fuzzy
 msgid "Ricoh Aficio 1060"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:7247
 #, fuzzy
 msgid "Ricoh Aficio 1075"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:7248
 #, fuzzy
 msgid "Ricoh Aficio 1515"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:7249
 #, fuzzy
 msgid "Ricoh Aficio 2015"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5072
+#: src/xml/xmli18n-tmp.h:7250
 #, fuzzy
 msgid "Ricoh Aficio 2016"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:7251
 #, fuzzy
 msgid "Ricoh Aficio 2018"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5074
+#: src/xml/xmli18n-tmp.h:7252
 #, fuzzy
 msgid "Ricoh Aficio 2018D"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5075
+#: src/xml/xmli18n-tmp.h:7253
 #, fuzzy
 msgid "Ricoh Aficio 2020"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5076
+#: src/xml/xmli18n-tmp.h:7254
 #, fuzzy
 msgid "Ricoh Aficio 2020D"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:7255
 #, fuzzy
 msgid "Ricoh Aficio 2022"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:7256
 #, fuzzy
 msgid "Ricoh Aficio 2027"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:7257
 #, fuzzy
 msgid "Ricoh Aficio 2032"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:7258
 #, fuzzy
 msgid "Ricoh Aficio 2035"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5081
+#: src/xml/xmli18n-tmp.h:7259
 #, fuzzy
 msgid "Ricoh Aficio 2035e"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:7260
 #, fuzzy
 msgid "Ricoh Aficio 2045"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:7261
 #, fuzzy
 msgid "Ricoh Aficio 2045e"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:7262
 #, fuzzy
 msgid "Ricoh Aficio 2051"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:7263
 #, fuzzy
 msgid "Ricoh Aficio 2060"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5086
+#: src/xml/xmli18n-tmp.h:7264
 #, fuzzy
 msgid "Ricoh Aficio 2075"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:7265
 #, fuzzy
 msgid "Ricoh Aficio 2090"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5088
+#: src/xml/xmli18n-tmp.h:7266
 #, fuzzy
 msgid "Ricoh Aficio 2105"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:7267
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5090
+#: src/xml/xmli18n-tmp.h:7268
 #, fuzzy
 msgid "Ricoh Aficio 3025"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5091
+#: src/xml/xmli18n-tmp.h:7269
 #, fuzzy
 msgid "Ricoh Aficio 3030"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:7270
 #, fuzzy
 msgid "Ricoh Aficio 3035"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5093
+#: src/xml/xmli18n-tmp.h:7271
 #, fuzzy
 msgid "Ricoh Aficio 3045"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:7274
 #, fuzzy
 msgid "Ricoh Aficio MP 1100"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:7275
 #, fuzzy
 msgid "Ricoh Aficio MP 1350"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:7276
 #, fuzzy
 msgid "Ricoh Aficio MP 1600"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5099
+#: src/xml/xmli18n-tmp.h:7277
 #, fuzzy
 msgid "Ricoh Aficio MP 161"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:7278
 #, fuzzy
 msgid "Ricoh Aficio MP 2000"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:7279
 #, fuzzy
 msgid "Ricoh Aficio MP 2500"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:7280
 #, fuzzy
 msgid "Ricoh Aficio MP 2510"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5103
+#: src/xml/xmli18n-tmp.h:7281
 #, fuzzy
 msgid "Ricoh Aficio MP 2550"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5104
+#: src/xml/xmli18n-tmp.h:7282
 #, fuzzy
 msgid "Ricoh Aficio MP 2550B"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:7283
 #, fuzzy
 msgid "Ricoh Aficio MP 3010"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:7284
 #, fuzzy
 msgid "Ricoh Aficio MP 3350"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5107
+#: src/xml/xmli18n-tmp.h:7285
 #, fuzzy
 msgid "Ricoh Aficio MP 3350B"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5108
+#: src/xml/xmli18n-tmp.h:7286
 #, fuzzy
 msgid "Ricoh Aficio MP 3500"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:7287
 #, fuzzy
 msgid "Ricoh Aficio MP 4000"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5110
+#: src/xml/xmli18n-tmp.h:7288
 #, fuzzy
 msgid "Ricoh Aficio MP 4000B"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:7289
 #, fuzzy
 msgid "Ricoh Aficio MP 4500"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:7290
 #, fuzzy
 msgid "Ricoh Aficio MP 5000"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:7291
 #, fuzzy
 msgid "Ricoh Aficio MP 5000B"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:7292
 #, fuzzy
 msgid "Ricoh Aficio MP 5500"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:7293
 #, fuzzy
 msgid "Ricoh Aficio MP 6500"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:7294
 #, fuzzy
 msgid "Ricoh Aficio MP 7500"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:7295
 #, fuzzy
 msgid "Ricoh Aficio MP 9000"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5118
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:7297
 #, fuzzy
 msgid "Samsung ML-1250"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:5120
+#: src/xml/xmli18n-tmp.h:7298
 #, fuzzy
 msgid "Samsung ML-1450"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:7299
 #, fuzzy
 msgid "Samsung ML-1450PS"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:7300
 #, fuzzy
 msgid "Samsung ML-1650"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:7301
 #, fuzzy
 msgid "Samsung ML-1651N"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:7302
 #, fuzzy
 msgid "Samsung ML-1750"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:7303
 #, fuzzy
 msgid "Samsung ML-2150"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:5126
+#: src/xml/xmli18n-tmp.h:7304
 #, fuzzy
 msgid "Samsung ML-2150PS"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:5127
+#: src/xml/xmli18n-tmp.h:7305
 #, fuzzy
 msgid "Samsung ML-2151N"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:7306
 #, fuzzy
 msgid "Samsung ML-2151NPS"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:7307
 #, fuzzy
 msgid "Samsung ML-2152W"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:7308
 #, fuzzy
 msgid "Samsung ML-2152WPS"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5131
+#: src/xml/xmli18n-tmp.h:7309
 #, fuzzy
 msgid "Samsung ML-2250"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:7310
 #, fuzzy
 msgid "Samsung ML-2550"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:5133
+#: src/xml/xmli18n-tmp.h:7311
 #, fuzzy
 msgid "Samsung ML-2551N"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5134
+#: src/xml/xmli18n-tmp.h:7312
 #, fuzzy
 msgid "Samsung ML-2552W"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/xml/xmli18n-tmp.h:5138
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:7321
 #, fuzzy
 msgid "Samsung ML-7300"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:7322
 #, fuzzy
 msgid "Samsung ML-7300N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/xml/xmli18n-tmp.h:5146
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/xml/xmli18n-tmp.h:5147
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5150
-msgid "Savin 2535"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5151
-msgid "Savin 2235"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5152
-msgid "Savin 2545"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7328
+#, fuzzy
+msgid "Savin 2535/2235"
+msgstr "Canon i560"
 
-#: src/xml/xmli18n-tmp.h:5153
-msgid "Savin 2245"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7329
+#, fuzzy
+msgid "Savin 2545/2245"
+msgstr "Canon i560"
 
-#: src/xml/xmli18n-tmp.h:5154
+#: src/xml/xmli18n-tmp.h:7330
 #, fuzzy
 msgid "Savin 2560"
 msgstr "Canon i560"
 
-#: src/xml/xmli18n-tmp.h:5155
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:7333
 #, fuzzy
 msgid "Savin 40105"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5158
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5160
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5163
-msgid "Savin 4035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5164
-msgid "Savin 4135g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5165
-msgid "Savin 4035e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5166
-msgid "Savin 4135eG"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5167
-msgid "Savin 4045"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7339
+#, fuzzy
+msgid "Savin 4035/4135g"
+msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5168
-msgid "Savin 4145g"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7340
+#, fuzzy
+msgid "Savin 4035e/4135eG"
+msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5169
-msgid "Savin 4045e"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7341
+#, fuzzy
+msgid "Savin 4045/4145g"
+msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5170
-msgid "Savin 4145eG"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7342
+#, fuzzy
+msgid "Savin 4045e/4145eG"
+msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5171
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:7344
 #, fuzzy
 msgid "Savin 4060"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:5173
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5174
+#: src/xml/xmli18n-tmp.h:7346
 #, fuzzy
 msgid "Savin 4090"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:7348
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5177
+#: src/xml/xmli18n-tmp.h:7349
 #, fuzzy
 msgid "Savin 8020"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:7353
 #, fuzzy
 msgid "Savin 8030"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5183
-msgid "Savin 8035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5184
-msgid "Savin 8035g"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7355
+#, fuzzy
+msgid "Savin 8035/8035g"
+msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5186
-msgid "Savin 8045"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5187
-msgid "Savin 8045g"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7357
+#, fuzzy
+msgid "Savin 8045/8045g"
+msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5190
+#: src/xml/xmli18n-tmp.h:7360
 #, fuzzy
 msgid "Savin 8065"
 msgstr "Canon i865"
 
-#: src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5192
+#: src/xml/xmli18n-tmp.h:7362
 #, fuzzy
 msgid "Savin 8090"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5194
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:7370
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5201
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:7373
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:7374
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5205
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5206
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Sharp AR-M257"
 msgstr "Sharp AR-M257"
 
-#: src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:7379
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/xml/xmli18n-tmp.h:5211
+#: src/xml/xmli18n-tmp.h:7381
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/xml/xmli18n-tmp.h:5212
+#: src/xml/xmli18n-tmp.h:7382
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/xml/xmli18n-tmp.h:5213
+#: src/xml/xmli18n-tmp.h:7383
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/xml/xmli18n-tmp.h:5216
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/xml/xmli18n-tmp.h:5221
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox WorkCentre M118"
 
-#: src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Compaq IJ1200"
 msgstr "Compaq IJ1200"
 
-#: src/xml/xmli18n-tmp.h:5224
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Lexmark X73"
 msgstr "Lexmark X73"
 
-#: src/xml/xmli18n-tmp.h:5225
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:5227
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:5230
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:7404
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/xml/xmli18n-tmp.h:5236
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:7409
 msgid "Olympus P-S100"
 msgstr "Olympus P-S100"
 
-#: src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:7410
 msgid "Canon CP-10"
 msgstr "Canon CP-10"
 
-#: src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/xml/xmli18n-tmp.h:5244
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Canon SELPHY-CP-400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:5247
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Canon SELPHY-CP-500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Canon SELPHY-CP-510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:5249
+#: src/xml/xmli18n-tmp.h:7419
+#, fuzzy
+msgid "Canon SELPHY-CP-520"
+msgstr "Canon SELPHY-CP-500"
+
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Canon SELPHY-CP-600"
 msgstr "Canon SELPHY-CP-600"
 
-#: src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Canon SELPHY-CP-710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Canon SELPHY-CP-720"
 msgstr "Canon SELPHY-CP-720"
 
-#: src/xml/xmli18n-tmp.h:5252
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Canon SELPHY-CP-730"
 msgstr "Canon SELPHY-CP-730"
 
-#: src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Canon SELPHY-CP-740"
 msgstr "Canon SELPHY-CP-740"
 
-#: src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Canon SELPHY-CP-750"
 msgstr "Canon SELPHY-CP-750"
 
-#: src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Canon SELPHY ES1"
 msgstr "Canon SELPHY ES1"
 
-#: src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Canon SELPHY ES2"
 msgstr "Canon SELPHY ES2"
 
-#: src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Canon SELPHY ES20"
 msgstr "Canon SELPHY ES20"
 
-#: src/xml/xmli18n-tmp.h:5258
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Sony DPP-EX5"
 msgstr "Sony DPP-EX5"
 
-#: src/xml/xmli18n-tmp.h:5259
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Sony DPP-EX7"
 msgstr "Sony DPP-EX7"
 
-#: src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR100"
 
-#: src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:7434
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm FinePix-NX-500"
 
-#: src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr "Kodak Easyshare nyomtatódokk"
 
-#: src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:7438
 msgid "Shinko CHC-S9045"
 msgstr "Shinko CHC-S9045"
 
-#: src/xml/xmli18n-tmp.h:5268
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Dai Nippon Printing DS40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Dai Nippon Printing DS80"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "RAW DATA 16 bit"
 msgstr "NYERS ADAT 16 bit"
 
-#: src/xml/xmli18n-tmp.h:5269
+#: src/xml/xmli18n-tmp.h:7442
 msgid "RAW DATA 8 bit"
 msgstr "NYERS ADAT 8 bit"
 
+#, fuzzy
+#~ msgid "Lower Front Tray"
+#~ msgstr "Első tálca"
+
+#, fuzzy
+#~ msgid "Upper Front Tray"
+#~ msgstr "Első tálca"
+
+#, fuzzy
+#~ msgid "Epson Stylus Offixe TX300F"
+#~ msgstr "Epson Stylus CX3100"
+
+#, fuzzy
+#~ msgid "Lanier LD1100"
+#~ msgstr "HP LaserJet 1100"
+
 #~ msgid "ISOLatin1"
 #~ msgstr "ISOLatin2"
 
diff --git a/po/it.gmo b/po/it.gmo
index 4993a1e..132e602 100644
--- a/po/it.gmo
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index 4b56a15..d1736d9 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,27 +4,33 @@
 # Copyright (C) 2006, 2008 Free Software Foundation, Inc.
 #
 # This file is distributed under the same license as the gutenprint package.
+#
+# Convenzioni:
+#
+# Dove «output» si riferisce a «stampa»,
+# è stato tradotto con «stampa» e non con «uscita»
+#
 # Luca Ferretti <elle.uca@libero.it>, 2006.
 # Gruppo traduzione Italiano di Ubuntu <gruppo-traduzione@ubuntu-it.org>, 2008.
-# Marco Poletti <poletti.marco@gmail.com>, 2008.
+# Marco Poletti <poletti.marco@gmail.com>, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gutenprint-5.2.0-rc1\n"
+"Project-Id-Version: gutenprint-5.2.3.99.1\n"
 "Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-21 22:25-0500\n"
-"PO-Revision-Date: 2008-11-14 09:10+0100\n"
+"POT-Creation-Date: 2009-07-26 19:14-0400\n"
+"PO-Revision-Date: 2009-06-22 10:48+0200\n"
 "Last-Translator: Marco Poletti <poletti.marco@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 0.3\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2109 src/main/print-pcl.c:1779
+#: src/main/print-escp2.c:2314 src/main/print-pcl.c:1779
 msgid "Default"
 msgstr "Predefinito"
 
@@ -81,15 +87,15 @@ msgstr "Floyd-Steinberg ibrido"
 
 #: src/main/dither-main.c:69
 msgid "Predithered Input"
-msgstr "Ingresso preretinato"
+msgstr "Ingresso pre-retinato"
 
 #: src/main/dither-main.c:70
 msgid "Drop Size Segmented"
-msgstr ""
+msgstr "Algoritmo drop size segmented"
 
 #: src/main/dither-main.c:71
 msgid "Drop Size Segmented New"
-msgstr ""
+msgstr "Nuovo algoritmo drop size segmented"
 
 #: src/main/dither-main.c:91 src/main/print-color.c:56
 msgid "Density"
@@ -97,15 +103,15 @@ msgstr "Densità"
 
 #: src/main/dither-main.c:91 src/main/print-canon.c:300
 #: src/main/print-canon.c:308 src/main/print-canon.c:316
-#: src/main/print-canon.c:324 src/main/print-escp2.c:439
-#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
-#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-canon.c:324 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: 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-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:1769
-#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
-#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1935
+#: src/main/print-olympus.c:1943 src/main/print-olympus.c:1951
+#: src/main/print-olympus.c:1959 src/main/print-pcl.c:1324
 #: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
 #: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
@@ -117,9 +123,9 @@ msgid ""
 "ink bleeds through the paper or smears; increase the density if black "
 "regions are not solid."
 msgstr ""
-"Regola la densità (quantità di inchiostro) della stampa. Ridurre la densità "
+"Regola la densità (quantità d'inchiostro) della stampa. Ridurre la densità "
 "se l'inchiostro passa attraverso la carta o macchia; aumentare la densità se "
-"le parti nere non sono solide."
+"le parti nere non sono uniformi."
 
 #: src/main/dither-main.c:100
 msgid "Dither Algorithm"
@@ -127,7 +133,7 @@ msgstr "Algoritmo di retinatura"
 
 #: src/main/dither-main.c:100
 msgid "Screening Adjustment"
-msgstr ""
+msgstr "Regolazione rilevamento"
 
 #: src/main/dither-main.c:101
 msgid ""
@@ -143,9 +149,9 @@ msgstr ""
 "Scegliere l'algoritmo di retinatura da usare.\n"
 "Ibrido adattabile di solito dà i migliori risultati in generale.\n"
 "EvenTone è un nuovo algoritmo sperimentale che spesso dà ottimi risultati.\n"
-"Ordinato è piú veloce e dà quasi la stessa qualità nelle fotografie.\n"
-"Veloce e Molto veloce sono decisamente piú veloci e vanno bene per testo e "
-"grafici.\n"
+"Ordinato è più veloce e dà quasi la stessa qualità nelle fotografie.\n"
+"Veloce e Molto veloce sono decisamente più veloci e vanno bene per testo e "
+"disegni.\n"
 "Floyd-Steinberg ibrido di solito dà risultati peggiori."
 
 #: src/main/module.c:52
@@ -165,7 +171,7 @@ msgid "Dither algorithm"
 msgstr "Algoritmo di retinatura"
 
 #: src/main/print-canon.c:199 src/main/print-escp2.c:165
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1866
 #: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Dimensione pagina"
@@ -182,8 +188,8 @@ msgstr "Dimensione pagina"
 #: src/main/print-escp2.c:254 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:1704 src/main/print-olympus.c:1710
-#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-olympus.c:1866 src/main/print-olympus.c:1872
+#: src/main/print-olympus.c:1878 src/main/print-olympus.c:1884
 #: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
 #: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
 #: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
@@ -192,31 +198,31 @@ msgid "Basic Printer Setup"
 msgstr "Impostazioni base stampante"
 
 #: src/main/print-canon.c:200 src/main/print-escp2.c:166
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1867
 #: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr "Dimensione della carta su cui stampare"
 
 #: src/main/print-canon.c:205 src/main/print-escp2.c:171
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1259 src/cups/genppd.c:1339 src/cups/genppd.c:2001
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1872
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1372 src/cups/genppd.c:2035
 msgid "Media Type"
 msgstr "Tipo di supporto"
 
 #: src/main/print-canon.c:206 src/main/print-escp2.c:172
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1873
 #: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
-msgstr "Tipo di supporto (carta normale, carta fotografica, ecc)"
+msgstr "Tipo di supporto (carta normale, carta fotografica, ecc.)"
 
 #: src/main/print-canon.c:211 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
-#: src/main/print-pcl.c:1265 src/cups/genppd.c:1368 src/cups/genppd.c:2020
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1878
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1401 src/cups/genppd.c:2054
 msgid "Media Source"
 msgstr "Ingresso dei supporti"
 
 #: src/main/print-canon.c:212 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1879
 #: src/main/print-pcl.c:1266
 msgid "Source (input slot) of the media"
 msgstr "Ingresso (vassoio) dei supporti"
@@ -227,7 +233,7 @@ msgstr "Dimensione del porta CD"
 
 #: src/main/print-canon.c:218 src/main/print-escp2.c:190
 msgid "Print only outside of the hub of the CD, or all the way to the hole"
-msgstr ""
+msgstr "Stampa solo fino al margine interno del CD o fino al buco"
 
 #: src/main/print-canon.c:223 src/main/print-escp2.c:195
 msgid "CD Size (Custom)"
@@ -239,7 +245,7 @@ msgstr "Regolazione variabile per il diametro esterno del CD"
 
 #: src/main/print-canon.c:229 src/main/print-escp2.c:201
 msgid "CD Hub Size (Custom)"
-msgstr "Dimensione del porta CD (Personalizzata)"
+msgstr "Dimensione del porta CD (personalizzata)"
 
 #: src/main/print-canon.c:230 src/main/print-escp2.c:202
 msgid "Variable adjustment to the inner hub of the CD"
@@ -252,8 +258,8 @@ msgstr "Regolazione fine orizzontale CD"
 #: src/main/print-canon.c:235 src/main/print-canon.c:241
 #: src/main/print-canon.c:253 src/main/print-escp2.c:207
 #: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1906
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr "Impostazioni avanzate stampante"
@@ -268,28 +274,28 @@ msgid "CD Vertical Fine Adjustment"
 msgstr "Regolazione fine verticale CD"
 
 #: src/main/print-canon.c:247 src/main/print-escp2.c:219
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
-#: src/main/print-pcl.c:1277 src/cups/genppd.c:1446 src/cups/genppd.c:2056
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1884
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1479 src/cups/genppd.c:2090
 msgid "Resolution"
 msgstr "Risoluzione"
 
 #: src/main/print-canon.c:248 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1723
+#: src/main/print-olympus.c:1885
 msgid "Resolution and quality of the print"
 msgstr "Risoluzione e qualità della stampa"
 
 #: src/main/print-canon.c:253 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tipo d'inchiostro"
 
 #: src/main/print-canon.c:254 src/main/print-escp2.c:231
 #: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
+#: src/main/print-olympus.c:1891 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
-msgstr "Tipo di inchiostro nella stampante"
+msgstr "Tipo d'inchiostro nella stampante"
 
 #: src/main/print-canon.c:259 src/main/print-canon.c:260
 #: src/main/print-escp2.c:314 src/main/print-escp2.c:315
@@ -304,32 +310,33 @@ msgstr "Canali inchiostro"
 #: 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-escp2.c:320 src/main/print-escp2.c:767
-#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
-#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
-#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
-#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:893 src/main/print-escp2.c:901
+#: src/main/print-escp2.c:909 src/main/print-escp2.c:925
+#: src/main/print-escp2.c:933 src/main/print-escp2.c:941
+#: src/main/print-escp2.c:949 src/main/print-escp2.c:957
+#: src/main/print-escp2.c:965 src/main/print-escp2.c:973
 #: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr "Funzionalità avanzate stampante"
 
-#: src/main/print-canon.c:265 src/main/print-escp2.c:326
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-canon.c:265 src/main/print-escp2.c:332
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1912
 #: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Modalità di stampa"
 
 #: src/main/print-canon.c:265 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:326
-#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-color.c:208 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1912 src/main/print-pcl.c:1295
 #: src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr "Parametro principale"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:327
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-canon.c:266 src/main/print-escp2.c:333
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1913
 #: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Modalità di output per la stampa"
@@ -351,83 +358,91 @@ msgstr "Impostazione fronte retro/ribaltamento verticale"
 msgid "Print Quality"
 msgstr "Qualità di stampa"
 
+# (ndt) Vedi sopra per le convenzioni
 #: src/main/print-canon.c:277 src/main/print-escp2.c:147
 #: src/main/print-escp2.c:159 src/main/print-pcl.c:1271
 #: src/main/generic-options.c:62
 msgid "Basic Output Adjustment"
-msgstr "Regolazione base dell'uscita"
+msgstr "Regolazioni base di stampa"
 
-#: src/main/print-canon.c:300 src/main/print-escp2.c:439
+#: src/main/print-canon.c:300 src/main/print-escp2.c:445
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 msgid "Cyan Density"
 msgstr "Densità ciano"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:301 src/main/print-escp2.c:446
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 msgid "Adjust the cyan density"
 msgstr "Regola la densità del ciano"
 
-#: src/main/print-canon.c:308 src/main/print-escp2.c:447
+#: src/main/print-canon.c:308 src/main/print-escp2.c:453
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 msgid "Magenta Density"
 msgstr "Densità magenta"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:309 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 msgid "Adjust the magenta density"
 msgstr "Regola la densità del magenta"
 
-#: src/main/print-canon.c:316 src/main/print-escp2.c:455
+#: src/main/print-canon.c:316 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 msgid "Yellow Density"
 msgstr "Densità giallo"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:317 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 msgid "Adjust the yellow density"
 msgstr "Regola la densità del giallo"
 
-#: src/main/print-canon.c:324 src/main/print-escp2.c:463
+#: src/main/print-canon.c:324 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 msgid "Black Density"
 msgstr "Densità nero"
 
-#: src/main/print-canon.c:325 src/main/print-escp2.c:464
+#: src/main/print-canon.c:325 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 msgid "Adjust the black density"
 msgstr "Regola la densità del nero"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:333
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:541 src/main/print-escp2.c:542
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 msgid "Light Cyan Transition"
 msgstr "Transizione ciano chiaro"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:340
-#: src/main/print-canon.c:348 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
-#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
-#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
-#: src/main/print-pcl.c:1364
+#: src/main/print-canon.c:348 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:541
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:557
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:573
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:589
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:605
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:621
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:637
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:653
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:669
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:685
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:701
+#: src/main/print-escp2.c:709 src/main/print-escp2.c:717
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:733
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:749
+#: src/main/print-escp2.c:757 src/main/print-escp2.c:765
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:781
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:797
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:813
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:829
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:845
+#: src/main/print-escp2.c:853 src/main/print-escp2.c:861
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr "Regolazione avanzata inchiostro"
 
 #: src/main/print-canon.c:340 src/main/print-canon.c:341
-#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
+#: src/main/print-escp2.c:573 src/main/print-escp2.c:574
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 msgid "Light Magenta Transition"
@@ -437,79 +452,80 @@ msgstr "Transizione magenta chiaro"
 msgid "Light Yellow Transition"
 msgstr "Transizione giallo chiaro"
 
-#: src/main/print-canon.c:368 src/main/print-escp2.c:2283
-#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3609
-#: src/xml/xmli18n-tmp.h:3614 src/xml/xmli18n-tmp.h:3620
-#: src/xml/xmli18n-tmp.h:3627
+#: src/main/print-canon.c:368 src/main/print-escp2.c:2488
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5851 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5864
 msgid "Off"
 msgstr "Disattivato"
 
-#: src/main/print-canon.c:369 src/main/print-escp2.c:2285
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2490
 #: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr "Lato lungo (standard)"
 
 #: src/main/print-canon.c:370 src/main/print-pcl.c:1592
 msgid "Short Edge (Flip)"
-msgstr "Lato corto (ribaltato)"
+msgstr "Lato corto (girato)"
 
-#: src/main/print-canon.c:646 src/main/print-escp2.c:2005
-#: src/xml/xmli18n-tmp.h:3676
+#: src/main/print-canon.c:646 src/main/print-escp2.c:2210
+#: src/xml/xmli18n-tmp.h:5913
 msgid "CD - 5 inch"
 msgstr "CD - 5 pollici"
 
-#: src/main/print-canon.c:648 src/main/print-escp2.c:2007
-#: src/xml/xmli18n-tmp.h:3677
+#: src/main/print-canon.c:648 src/main/print-escp2.c:2212
+#: src/xml/xmli18n-tmp.h:5914
 msgid "CD - 3 inch"
 msgstr "CD - 3 pollici"
 
-#: src/main/print-canon.c:650 src/main/print-escp2.c:2009
-#: src/xml/xmli18n-tmp.h:3678
+#: src/main/print-canon.c:650 src/main/print-escp2.c:2214
+#: src/xml/xmli18n-tmp.h:5915
 msgid "CD - Custom"
 msgstr "CD - Personalizzato"
 
-#: src/main/print-canon.c:673 src/main/print-escp2.c:2034
-#: src/cups/genppd.c:1323 src/cups/genppd.c:1572 src/cups/genppd.c:1988
-#: src/cups/genppd.c:2079
+#: src/main/print-canon.c:673 src/main/print-escp2.c:2239
+#: src/cups/genppd.c:1356 src/cups/genppd.c:1605 src/cups/genppd.c:2022
+#: src/cups/genppd.c:2113
 msgid "Normal"
 msgstr "Normale"
 
-#: src/main/print-canon.c:675 src/main/print-escp2.c:2036
+#: src/main/print-canon.c:675 src/main/print-escp2.c:2241
 msgid "Print To Hub"
-msgstr ""
+msgstr "Stampa su porta CD"
 
-#: src/main/print-canon.c:790 src/main/print-escp2.c:2447
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-canon.c:790 src/main/print-escp2.c:2652
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2167
 #: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
 #: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Colore"
 
-#: src/main/print-canon.c:792 src/main/print-escp2.c:2449
+#: src/main/print-canon.c:792 src/main/print-escp2.c:2654
 #: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
 #: src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "Bianco e nero"
 
-#: src/main/print-canon.c:831 src/main/print-escp2.c:2089
+#: src/main/print-canon.c:831 src/main/print-escp2.c:2294
 #: src/main/print-pcl.c:1797 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr "Controllo manuale"
 
-#: src/main/print-canon.c:833 src/main/print-escp2.c:2131
-#: src/main/print-escp2.c:2229 src/main/print-escp2.c:2241
+#: src/main/print-canon.c:833 src/main/print-escp2.c:2336
+#: src/main/print-escp2.c:2434 src/main/print-escp2.c:2446
 #: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
 #: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
-#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1215
-#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1219
-#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
-#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3170
-#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3177
-#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3461
-#: src/xml/xmli18n-tmp.h:3464 src/xml/xmli18n-tmp.h:3632
-#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3648
-#: src/xml/xmli18n-tmp.h:3657 src/xml/xmli18n-tmp.h:3665
+#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1627 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3713 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3722 src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5902
 msgid "Standard"
 msgstr "Standard"
 
@@ -546,7 +562,7 @@ msgid "Pre-Dithered"
 msgstr "Pre-retinato"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1268 src/cups/genppd.c:1971
+#: src/cups/genppd.c:1301 src/cups/genppd.c:2005
 msgid "Grayscale"
 msgstr "Toni di grigio"
 
@@ -562,11 +578,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1299 src/cups/genppd.c:1978
+#: src/main/print-color.c:129 src/cups/genppd.c:1332 src/cups/genppd.c:2012
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1306 src/cups/genppd.c:1979
+#: src/main/print-color.c:131 src/cups/genppd.c:1339 src/cups/genppd.c:2013
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -621,22 +637,22 @@ msgstr "Profondità in bit per canale"
 
 #: src/main/print-color.c:192
 msgid "Input Image Type"
-msgstr "Tipo immagine di ingresso"
+msgstr "Tipo immagine d'ingresso"
 
 #: src/main/print-color.c:193
 msgid "Input image type"
-msgstr "Tipo immagine di ingresso"
+msgstr "Tipo immagine d'ingresso"
 
 #: src/main/print-color.c:200
 msgid "Output Image Type"
-msgstr "Tipo immagine di uscita"
+msgstr "Tipo immagine d'uscita"
 
 #: src/main/print-color.c:201
 msgid "Output image type"
-msgstr "Tipo immagine di uscita"
+msgstr "Tipo immagine d'uscita"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338
 msgid "Raw Channels"
 msgstr "Canali raw"
 
@@ -646,7 +662,7 @@ msgstr "SimpleGamma"
 
 #: src/main/print-color.c:217
 msgid "Do not correct for screen gamma"
-msgstr ""
+msgstr "Non correggere per il gamma dello schermo"
 
 #: src/main/print-color.c:224
 msgid "Brightness"
@@ -670,7 +686,7 @@ msgstr "Regolazione lineare contrasto"
 
 #: src/main/print-color.c:240
 msgid "Advanced Image Control"
-msgstr "Controllo avanzato immagine"
+msgstr "Controlli avanzati immagine"
 
 #: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
@@ -686,7 +702,7 @@ 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 ""
-"Regola il gamma della stampa. L'aumento del valore produrrà una stampa piú "
+"Regola il gamma della stampa. L'aumento del valore produrrà una stampa più "
 "luminosa in generale, mentre la diminuzione scurirà la stampa. "
 
 #: src/main/print-color.c:258
@@ -699,192 +715,656 @@ msgstr "Valori gamma ipotizzati dall'applicazione"
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
 #: src/escputil/escputil.c:997 src/escputil/escputil.c:1017
-#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:1812
-#: src/xml/xmli18n-tmp.h:1823 src/xml/xmli18n-tmp.h:1836
-#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1863
-#: src/xml/xmli18n-tmp.h:1876 src/xml/xmli18n-tmp.h:1889
-#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1918
-#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1949
-#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1975
-#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:1999
-#: src/xml/xmli18n-tmp.h:2013 src/xml/xmli18n-tmp.h:2027
-#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2051
-#: src/xml/xmli18n-tmp.h:2064 src/xml/xmli18n-tmp.h:2076
-#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2102
-#: src/xml/xmli18n-tmp.h:2116 src/xml/xmli18n-tmp.h:2130
-#: src/xml/xmli18n-tmp.h:2143 src/xml/xmli18n-tmp.h:2156
-#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2184
-#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2210
-#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2236
-#: src/xml/xmli18n-tmp.h:2249 src/xml/xmli18n-tmp.h:2262
-#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2290
-#: src/xml/xmli18n-tmp.h:2305 src/xml/xmli18n-tmp.h:2320
-#: src/xml/xmli18n-tmp.h:2332 src/xml/xmli18n-tmp.h:2343
-#: src/xml/xmli18n-tmp.h:2356 src/xml/xmli18n-tmp.h:2369
-#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2392
-#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2415
-#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2442
-#: src/xml/xmli18n-tmp.h:2454 src/xml/xmli18n-tmp.h:2466
-#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2496
-#: src/xml/xmli18n-tmp.h:2509 src/xml/xmli18n-tmp.h:2522
-#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
-#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2574
-#: src/xml/xmli18n-tmp.h:2586 src/xml/xmli18n-tmp.h:2598
-#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2623
-#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2653
-#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2683
-#: src/xml/xmli18n-tmp.h:2697 src/xml/xmli18n-tmp.h:2715
-#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2745
-#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
-#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2803
-#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2828
-#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2854
-#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2881
-#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2915
-#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2943
-#: src/xml/xmli18n-tmp.h:2959 src/xml/xmli18n-tmp.h:2976
-#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:3004
-#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3032
-#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3062
-#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3093
-#: src/xml/xmli18n-tmp.h:3107 src/xml/xmli18n-tmp.h:3125
-#: src/xml/xmli18n-tmp.h:3141
+#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2387
+#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2413
+#: src/xml/xmli18n-tmp.h:2426 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2499
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2551
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2575
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2708
+#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2786
+#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2814
+#: src/xml/xmli18n-tmp.h:2829 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2893
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2966
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3005 src/xml/xmli18n-tmp.h:3020
+#: src/xml/xmli18n-tmp.h:3033 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3061 src/xml/xmli18n-tmp.h:3073
+#: src/xml/xmli18n-tmp.h:3085 src/xml/xmli18n-tmp.h:3098
+#: src/xml/xmli18n-tmp.h:3110 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3377
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3616
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3648
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3766 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3775 src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:3794 src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:3805 src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3869 src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:3880 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3902 src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:3913 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:3948 src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:3970 src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:3983 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4023 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4064 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4075 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4088 src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:4103 src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:4118 src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:4143 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:4203 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4275 src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4309 src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4356 src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4421
+#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4449
+#: src/xml/xmli18n-tmp.h:4456 src/xml/xmli18n-tmp.h:4462
+#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4485 src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:4551 src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:4694 src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4717 src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:4818 src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:4829 src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4885 src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4935
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:5041 src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:5052 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:5121 src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5165
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5182 src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:5193 src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:5271 src/xml/xmli18n-tmp.h:5299
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5327 src/xml/xmli18n-tmp.h:5331
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5347
+#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5367 src/xml/xmli18n-tmp.h:5371
+#: src/xml/xmli18n-tmp.h:5383 src/xml/xmli18n-tmp.h:5388
+#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5440
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5461 src/xml/xmli18n-tmp.h:5468
+#: src/xml/xmli18n-tmp.h:5476 src/xml/xmli18n-tmp.h:5486
+#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5514
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5525
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5543
+#: src/xml/xmli18n-tmp.h:5550 src/xml/xmli18n-tmp.h:5556
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5574 src/xml/xmli18n-tmp.h:5582
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5592
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5625
+#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5649
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5662
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5690
+#: src/xml/xmli18n-tmp.h:5694 src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5731
+#: src/xml/xmli18n-tmp.h:5738 src/xml/xmli18n-tmp.h:5742
+#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5759
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5770
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5807
+#: src/xml/xmli18n-tmp.h:5811 src/xml/xmli18n-tmp.h:5817
+#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5828
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5843
 msgid "Cyan"
 msgstr "Ciano"
 
 #: src/main/print-color.c:267
 msgid "Adjust the cyan gamma"
-msgstr "Regola la gamma del ciano"
+msgstr "Regola il gamma del ciano"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
 #: src/escputil/escputil.c:998 src/escputil/escputil.c:1018
-#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:1813
-#: src/xml/xmli18n-tmp.h:1824 src/xml/xmli18n-tmp.h:1837
-#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1864
-#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1890
-#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1919
-#: src/xml/xmli18n-tmp.h:1935 src/xml/xmli18n-tmp.h:1950
-#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1976
-#: src/xml/xmli18n-tmp.h:1988 src/xml/xmli18n-tmp.h:2000
-#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2028
-#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2052
-#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2077
-#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2103
-#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2131
-#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2157
-#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2185
-#: src/xml/xmli18n-tmp.h:2198 src/xml/xmli18n-tmp.h:2211
-#: src/xml/xmli18n-tmp.h:2224 src/xml/xmli18n-tmp.h:2237
-#: src/xml/xmli18n-tmp.h:2250 src/xml/xmli18n-tmp.h:2263
-#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2291
-#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2321
-#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2344
-#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2370
-#: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2393
-#: src/xml/xmli18n-tmp.h:2405 src/xml/xmli18n-tmp.h:2416
-#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2443
-#: src/xml/xmli18n-tmp.h:2455 src/xml/xmli18n-tmp.h:2467
-#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2497
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2523
-#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2575
-#: src/xml/xmli18n-tmp.h:2587 src/xml/xmli18n-tmp.h:2599
-#: src/xml/xmli18n-tmp.h:2611 src/xml/xmli18n-tmp.h:2624
-#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
-#: src/xml/xmli18n-tmp.h:2670 src/xml/xmli18n-tmp.h:2684
-#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2714
-#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2747
-#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2780
-#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
-#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2829
-#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2855
-#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2882
-#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2914
-#: src/xml/xmli18n-tmp.h:2931 src/xml/xmli18n-tmp.h:2944
-#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2975
-#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:3005
-#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3033
-#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3060
-#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3094
-#: src/xml/xmli18n-tmp.h:3108 src/xml/xmli18n-tmp.h:3124
-#: src/xml/xmli18n-tmp.h:3140
+#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2361
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2388
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2414
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2459 src/xml/xmli18n-tmp.h:2474
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2512 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2552
+#: src/xml/xmli18n-tmp.h:2564 src/xml/xmli18n-tmp.h:2576
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2787
+#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2815
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2868
+#: src/xml/xmli18n-tmp.h:2881 src/xml/xmli18n-tmp.h:2894
+#: src/xml/xmli18n-tmp.h:2905 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:2967
+#: src/xml/xmli18n-tmp.h:2979 src/xml/xmli18n-tmp.h:2991
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3062 src/xml/xmli18n-tmp.h:3074
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3099
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3135 src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:3163 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3353
+#: src/xml/xmli18n-tmp.h:3365 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
+#: src/xml/xmli18n-tmp.h:3420 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3542 src/xml/xmli18n-tmp.h:3556
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3600 src/xml/xmli18n-tmp.h:3617
+#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3647
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3751 src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:3784 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3795 src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:3806 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3837 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3903 src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3939 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3960 src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:3972 src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:3984 src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:3999 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:4039 src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:4104 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:4170 src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4194 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:4230 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:4276 src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4311 src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4338 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:4401 src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:4427 src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:4442 src/xml/xmli18n-tmp.h:4451
+#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4464
+#: src/xml/xmli18n-tmp.h:4470 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4486 src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:4511 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:4809 src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4909 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:5007 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5018 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5111 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5123 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5148 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:5240 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5250 src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:5261 src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5301
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5313
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5349
+#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5401
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5441
+#: src/xml/xmli18n-tmp.h:5453 src/xml/xmli18n-tmp.h:5458
+#: src/xml/xmli18n-tmp.h:5463 src/xml/xmli18n-tmp.h:5470
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5496 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5527
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5552 src/xml/xmli18n-tmp.h:5558
+#: src/xml/xmli18n-tmp.h:5564 src/xml/xmli18n-tmp.h:5568
+#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5593
+#: src/xml/xmli18n-tmp.h:5598 src/xml/xmli18n-tmp.h:5616
+#: src/xml/xmli18n-tmp.h:5620 src/xml/xmli18n-tmp.h:5626
+#: src/xml/xmli18n-tmp.h:5631 src/xml/xmli18n-tmp.h:5651
+#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
+#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5674
+#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5720
+#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5733
+#: src/xml/xmli18n-tmp.h:5739 src/xml/xmli18n-tmp.h:5743
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5818
+#: src/xml/xmli18n-tmp.h:5823 src/xml/xmli18n-tmp.h:5829
+#: src/xml/xmli18n-tmp.h:5833 src/xml/xmli18n-tmp.h:5839
+#: src/xml/xmli18n-tmp.h:5844
 msgid "Magenta"
 msgstr "Magenta"
 
 #: src/main/print-color.c:275
 msgid "Adjust the magenta gamma"
-msgstr "Regola la gamma del magenta"
+msgstr "Regola il gamma del magenta"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
 #: src/escputil/escputil.c:999 src/escputil/escputil.c:1019
-#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:1814
-#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
-#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1865
-#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1891
-#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1920
-#: src/xml/xmli18n-tmp.h:1936 src/xml/xmli18n-tmp.h:1951
-#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1977
-#: src/xml/xmli18n-tmp.h:1989 src/xml/xmli18n-tmp.h:2001
-#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2029
-#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2053
-#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2078
-#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2104
-#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
-#: src/xml/xmli18n-tmp.h:2145 src/xml/xmli18n-tmp.h:2158
-#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2186
-#: src/xml/xmli18n-tmp.h:2199 src/xml/xmli18n-tmp.h:2212
-#: src/xml/xmli18n-tmp.h:2225 src/xml/xmli18n-tmp.h:2238
-#: src/xml/xmli18n-tmp.h:2251 src/xml/xmli18n-tmp.h:2264
-#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2292
-#: src/xml/xmli18n-tmp.h:2307 src/xml/xmli18n-tmp.h:2322
-#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
-#: src/xml/xmli18n-tmp.h:2358 src/xml/xmli18n-tmp.h:2371
-#: src/xml/xmli18n-tmp.h:2382 src/xml/xmli18n-tmp.h:2394
-#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2417
-#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2444
-#: src/xml/xmli18n-tmp.h:2456 src/xml/xmli18n-tmp.h:2468
-#: src/xml/xmli18n-tmp.h:2483 src/xml/xmli18n-tmp.h:2498
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2524
-#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2551
-#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2576
-#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
-#: src/xml/xmli18n-tmp.h:2612 src/xml/xmli18n-tmp.h:2625
-#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2651
-#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2685
-#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2713
-#: src/xml/xmli18n-tmp.h:2734 src/xml/xmli18n-tmp.h:2749
-#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2779
-#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2805
-#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2830
-#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2856
-#: src/xml/xmli18n-tmp.h:2871 src/xml/xmli18n-tmp.h:2883
-#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2910
-#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2945
-#: src/xml/xmli18n-tmp.h:2960 src/xml/xmli18n-tmp.h:2974
-#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3006
-#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3034
-#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3061
-#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3095
-#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3120
-#: src/xml/xmli18n-tmp.h:3136
+#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2389
+#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2444
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2475
+#: src/xml/xmli18n-tmp.h:2488 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2513 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2565 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2602
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2762
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2788
+#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2816
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2846
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2906 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3022
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3048
+#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3075
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3124
+#: src/xml/xmli18n-tmp.h:3136 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3175
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3315 src/xml/xmli18n-tmp.h:3329
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3433
+#: src/xml/xmli18n-tmp.h:3455 src/xml/xmli18n-tmp.h:3468
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3497
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3601 src/xml/xmli18n-tmp.h:3618
+#: src/xml/xmli18n-tmp.h:3632 src/xml/xmli18n-tmp.h:3643
+#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3747 src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3834 src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:3844 src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:3867 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:3900 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3910 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3935 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:3967 src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:3979 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4005 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4062 src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4110 src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:4124 src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4167 src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:4272 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:4321 src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:4334 src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4367 src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4471
+#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4505 src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4549 src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:4562 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4580 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4602 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:4678 src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:4691 src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4770 src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4893 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4904 src/xml/xmli18n-tmp.h:4911
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:4971 src/xml/xmli18n-tmp.h:4978
+#: src/xml/xmli18n-tmp.h:5004 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5050 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5071 src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:5097 src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:5142 src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:5169 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5184
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5257 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5318
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5358
+#: src/xml/xmli18n-tmp.h:5364 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5385
+#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5438
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5454
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5465
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5511
+#: src/xml/xmli18n-tmp.h:5516 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5547 src/xml/xmli18n-tmp.h:5554
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5584 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5617 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5632
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5687
+#: src/xml/xmli18n-tmp.h:5692 src/xml/xmli18n-tmp.h:5698
+#: src/xml/xmli18n-tmp.h:5705 src/xml/xmli18n-tmp.h:5713
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5729
+#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
+#: src/xml/xmli18n-tmp.h:5744 src/xml/xmli18n-tmp.h:5756
+#: src/xml/xmli18n-tmp.h:5761 src/xml/xmli18n-tmp.h:5767
+#: src/xml/xmli18n-tmp.h:5774 src/xml/xmli18n-tmp.h:5782
+#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5792
+#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5803
+#: src/xml/xmli18n-tmp.h:5809 src/xml/xmli18n-tmp.h:5813
+#: src/xml/xmli18n-tmp.h:5819 src/xml/xmli18n-tmp.h:5824
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5845
 msgid "Yellow"
 msgstr "Giallo"
 
 #: src/main/print-color.c:283
 msgid "Adjust the yellow gamma"
-msgstr "Regola la gamma del giallo"
+msgstr "Regola il gamma del giallo"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
 #: src/escputil/escputil.c:1006 src/escputil/escputil.c:1025
-#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2700
-#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2795
-#: src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:4041 src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:4056 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4091 src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:4155 src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5155
 msgid "Red"
 msgstr "Rosso"
 
 #: src/main/print-color.c:291
 msgid "Adjust the red gamma"
-msgstr "Regola la gamma del rosso"
+msgstr "Regola il gamma del rosso"
 
 #: src/main/print-color.c:298 src/gutenprintui2/panel.c:2390
 msgid "Green"
@@ -892,77 +1372,212 @@ msgstr "Verde"
 
 #: src/main/print-color.c:299
 msgid "Adjust the green gamma"
-msgstr "Regola la gamma del verde"
+msgstr "Regola il gamma del verde"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
 #: src/escputil/escputil.c:1007 src/escputil/escputil.c:1026
-#: src/xml/xmli18n-tmp.h:2657 src/xml/xmli18n-tmp.h:2701
-#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4051 src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:4084 src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:5156
 msgid "Blue"
 msgstr "Blu"
 
 #: src/main/print-color.c:307
 msgid "Adjust the blue gamma"
-msgstr "Regola la gamma del blu"
+msgstr "Regola il gamma del blu"
 
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
 #: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1016 src/escputil/escputil.c:1285
-#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
-#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
-#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1875
-#: src/xml/xmli18n-tmp.h:1888 src/xml/xmli18n-tmp.h:1901
-#: src/xml/xmli18n-tmp.h:1917 src/xml/xmli18n-tmp.h:1933
-#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1961
-#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1986
-#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2012
-#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2038
-#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2063
-#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2090
-#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2115
-#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2142
-#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2169
-#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
-#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
-#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2248
-#: src/xml/xmli18n-tmp.h:2261 src/xml/xmli18n-tmp.h:2274
-#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2304
-#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2331
-#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
-#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
-#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2403
-#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2420
-#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2441
-#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2465
-#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2495
-#: src/xml/xmli18n-tmp.h:2508 src/xml/xmli18n-tmp.h:2521
-#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
-#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2573
-#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2597
-#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2622
-#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2672
-#: src/xml/xmli18n-tmp.h:2682 src/xml/xmli18n-tmp.h:2731
-#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2764
-#: src/xml/xmli18n-tmp.h:2781 src/xml/xmli18n-tmp.h:2794
-#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2815
-#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2839
-#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2868
-#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2894
-#: src/xml/xmli18n-tmp.h:2911 src/xml/xmli18n-tmp.h:2929
-#: src/xml/xmli18n-tmp.h:2942 src/xml/xmli18n-tmp.h:2977
-#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:3003
-#: src/xml/xmli18n-tmp.h:3017 src/xml/xmli18n-tmp.h:3031
-#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3079
-#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3110
-#: src/xml/xmli18n-tmp.h:3121 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2372
+#: src/xml/xmli18n-tmp.h:2386 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2457
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2510
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2536
+#: src/xml/xmli18n-tmp.h:2550 src/xml/xmli18n-tmp.h:2562
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2599 src/xml/xmli18n-tmp.h:2614
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2639
+#: src/xml/xmli18n-tmp.h:2653 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2965
+#: src/xml/xmli18n-tmp.h:2977 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3019
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3060 src/xml/xmli18n-tmp.h:3072
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3133 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3196
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3526
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3680 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3755 src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:3804 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3819 src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:3831 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3846 src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3873 src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:3924 src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:3943 src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:4022 src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4059 src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:4142 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4164 src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:4179 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:4255 src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4289 src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:4308 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4413 src/xml/xmli18n-tmp.h:4420
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4455
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4507 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:4565 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:4604 src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:4702 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:4733 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:4786 src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4920 src/xml/xmli18n-tmp.h:4926
+#: src/xml/xmli18n-tmp.h:4934 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:4973 src/xml/xmli18n-tmp.h:4981
+#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:4993
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:5047 src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5151
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5186
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5223 src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5270
+#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5284
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5320
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5337
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5375
+#: src/xml/xmli18n-tmp.h:5378 src/xml/xmli18n-tmp.h:5380
+#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5435
+#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5447
+#: src/xml/xmli18n-tmp.h:5449 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5474
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5492
+#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5571
+#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5590
+#: src/xml/xmli18n-tmp.h:5596 src/xml/xmli18n-tmp.h:5602
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5614
+#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5629
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5655
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5680 src/xml/xmli18n-tmp.h:5682
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5700
+#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5716
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5749
+#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5769 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5794
+#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5806
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5836
+#: src/xml/xmli18n-tmp.h:5842
 msgid "Black"
 msgstr "Nero"
 
 #: src/main/print-color.c:315
 msgid "Adjust the black gamma"
-msgstr "Regola la gamma del nero"
+msgstr "Regola il gamma del nero"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1769
+#: src/main/print-color.c:322 src/main/print-olympus.c:1935
 msgid "Cyan Balance"
 msgstr "Bilanciamento del ciano"
 
@@ -975,7 +1590,7 @@ msgstr "Bilanciamento del grigio"
 msgid "Adjust the cyan gray balance"
 msgstr "Regola il bilanciamento di grigio del ciano"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1777
+#: src/main/print-color.c:330 src/main/print-olympus.c:1943
 msgid "Magenta Balance"
 msgstr "Bilanciamento del magenta"
 
@@ -983,7 +1598,7 @@ msgstr "Bilanciamento del magenta"
 msgid "Adjust the magenta gray balance"
 msgstr "Regola il bilanciamento di grigio del magenta"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1785
+#: src/main/print-color.c:338 src/main/print-olympus.c:1951
 msgid "Yellow Balance"
 msgstr "Bilanciamento del giallo"
 
@@ -1001,49 +1616,50 @@ msgid ""
 "Use zero saturation to produce grayscale output using color and black inks"
 msgstr ""
 "Regola la saturazione (bilanciamento colore) della stampa\n"
-"Usare una saturazione pari a zero per produrre una uscita in scala di grigi "
+"Usare una saturazione pari a zero per produrre una stampa in scala di grigi "
 "usando inchiostro nero e a colori"
 
 #: src/main/print-color.c:357
 msgid "Ink Limit"
-msgstr "Limite di inchiostro"
+msgstr "Limite d'inchiostro"
 
+# (ndt) Vedi sopra per le convenzioni
 #: 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:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
-#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
-#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
-#: src/main/print-escp2.c:759
+#: src/main/print-escp2.c:344 src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356 src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368 src/main/print-escp2.c:374
+#: src/main/print-escp2.c:869 src/main/print-escp2.c:877
+#: src/main/print-escp2.c:885
 msgid "Advanced Output Control"
-msgstr "Controllo avanzato uscita"
+msgstr "Controlli avanzati di stampa"
 
 #: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
 msgstr "Limita l'inchiostro totale stampato sulla pagina"
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:743
+#: src/main/print-color.c:365 src/main/print-escp2.c:869
 msgid "GCR Transition"
 msgstr "Transizione GCR"
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:744
+#: src/main/print-color.c:366 src/main/print-escp2.c:870
 msgid "Adjust the gray component transition rate"
 msgstr "Regola il tasso di transizione della componente grigia"
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:751
+#: src/main/print-color.c:373 src/main/print-escp2.c:877
 msgid "GCR Lower Bound"
 msgstr "Limite inferiore GCR"
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:752
+#: src/main/print-color.c:374 src/main/print-escp2.c:878
 msgid "Lower bound of gray component reduction"
 msgstr "Limite inferiore alla riduzione della componente grigia (GCR)"
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:759
+#: src/main/print-color.c:381 src/main/print-escp2.c:885
 msgid "GCR Upper Bound"
 msgstr "Limite superiore GCR"
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:760
+#: src/main/print-color.c:382 src/main/print-escp2.c:886
 msgid "Upper bound of gray component reduction"
 msgstr "Limite superiore alla riduzione della componente grigia (GCR)"
 
@@ -1175,7 +1791,7 @@ msgstr "Conversione colore tradizionale Gutenprint"
 #: src/main/printers.c:549
 #, c-format
 msgid "Value must be set for %s\n"
-msgstr "Si deve impostare un valore per %s\n"
+msgstr "È necessario impostare un valore per %s\n"
 
 #: src/main/printers.c:562 src/main/printers.c:567
 #, c-format
@@ -1200,7 +1816,7 @@ msgstr "I margini %s devono essere tra %f e %f\n"
 #: src/main/printers.c:671
 #, c-format
 msgid "%s wrap mode must be %s\n"
-msgstr "La modalità di a capo di %s dovrebbe essere %s\n"
+msgstr "La modalità di a capo di %s deve essere %s\n"
 
 #: src/main/printers.c:675
 msgid "no wrap"
@@ -1278,43 +1894,44 @@ msgstr "Miglioramento della lucidità"
 
 #: src/main/print-escp2.c:237
 msgid "Add gloss enhancement"
-msgstr "Aggiungi lucido"
+msgstr "Aggiunge un miglioramento alla lucidità"
 
 #: src/main/print-escp2.c:242
 msgid "Ink Set"
-msgstr "Tipo di inchiostri"
+msgstr "Tipo d'inchiostri"
 
 #: src/main/print-escp2.c:248
 msgid "Printing Direction"
 msgstr "Direzione di stampa"
 
+# (ndt) Vedi sopra per le convenzioni
 #: src/main/print-escp2.c:248 src/main/print-escp2.c:260
 msgid "Advanced Output Adjustment"
-msgstr "Regolazione avanzata dell'uscita"
+msgstr "Regolazioni avanzate di stampa"
 
 #: src/main/print-escp2.c:249
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
-"Direzione di stampa (monodirezionale ha una qualità maggiore, ma è piú lenta)"
+"Direzione di stampa (monodirezionale ha una qualità maggiore, ma è più lenta)"
 
-#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1906
 msgid "Borderless"
 msgstr "Senza bordi"
 
-#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1907
 msgid "Print without borders"
 msgstr "Stampa senza bordi"
 
 #: src/main/print-escp2.c:260
 msgid "Interleave Method"
-msgstr "Metodo di interfoliazione"
+msgstr "Metodo d'interfoliazione"
 
 #: src/main/print-escp2.c:261
 msgid "Interleave pattern to use"
-msgstr "Modello di interfoliazione da usare"
+msgstr "Modello d'interfoliazione da usare"
 
 #: src/main/print-escp2.c:266 src/main/print-escp2.c:267
-#: src/cups/genppd.c:1567 src/cups/genppd.c:2078
+#: src/cups/genppd.c:1600 src/cups/genppd.c:2112
 msgid "Output Order"
 msgstr "Ordine d'uscita"
 
@@ -1332,11 +1949,11 @@ msgstr "Comando cambio inchiostro"
 
 #: src/main/print-escp2.c:290 src/main/print-escp2.c:291
 msgid "Alternate Alignment Passes"
-msgstr ""
+msgstr "Passi di allineamento alternativi"
 
 #: src/main/print-escp2.c:296 src/main/print-escp2.c:297
 msgid "Alternate Alignment Choices"
-msgstr ""
+msgstr "Scelte di allineamento alternative"
 
 #: src/main/print-escp2.c:302
 msgid "Supports Packet Mode"
@@ -1355,342 +1972,439 @@ msgid "Has multiple choices of ink cartridges"
 msgstr "Ha più possibili cartucce di inchiostro"
 
 #: src/main/print-escp2.c:320 src/main/print-escp2.c:321
+msgid "Raw Channel Names"
+msgstr "Nomi dei canali raw"
+
+#: src/main/print-escp2.c:326 src/main/print-escp2.c:327
+#, fuzzy
 msgid "Channel Names"
-msgstr "Nomi dei canali"
+msgstr "Nomi dei canali raw"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:339
 msgid "Raw Channel Count"
 msgstr "Numero dei canali raw"
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:344
 msgid "Cyan Map"
 msgstr "Mappa del ciano"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:345
 msgid "Adjust the cyan map"
 msgstr "Regola la mappa del ciano"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350
 msgid "Magenta Map"
 msgstr "Mappa del magenta"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:351
 msgid "Adjust the magenta map"
 msgstr "Regola la mappa del magenta"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356
 msgid "Yellow Map"
 msgstr "Mappa del giallo"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:357
 msgid "Adjust the yellow map"
 msgstr "Regola la mappa del giallo"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362
 msgid "Blue Map"
 msgstr "Mappa del blu"
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:363
 msgid "Adjust the blue map"
 msgstr "Regola la mappa del blu"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368
 msgid "Orange Map"
 msgstr "Mappa dell'arancione"
 
-#: src/main/print-escp2.c:363
+#: src/main/print-escp2.c:369
 msgid "Adjust the orange map"
 msgstr "Regola la mappa dell'arancione"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:374
 msgid "Red Map"
 msgstr "Mappa del rosso"
 
-#: src/main/print-escp2.c:369
+#: src/main/print-escp2.c:375
 msgid "Adjust the red map"
 msgstr "Regola la mappa del rosso"
 
-#: src/main/print-escp2.c:471
+#: src/main/print-escp2.c:477
 msgid "Red Density"
 msgstr "Densità del rosso"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:478
 msgid "Adjust the red density"
 msgstr "Regola la densità del rosso"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:485
 msgid "Blue Density"
 msgstr "Densità del blu"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:486
 msgid "Adjust the blue density"
 msgstr "Regola la densità del blu"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:493
 msgid "Orange Density"
 msgstr "Densità dell'arancione"
 
-#: src/main/print-escp2.c:488
+#: src/main/print-escp2.c:494
 msgid "Adjust the orange density"
 msgstr "Regola la densità dell'arancione"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:501
 msgid "Gloss Level"
 msgstr "Livello di lucido"
 
-#: src/main/print-escp2.c:496
+#: src/main/print-escp2.c:502
 msgid "Adjust the gloss level"
 msgstr "Regola il livello di lucido"
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:509
 msgid "Drop Size Small"
 msgstr "Gocce piccole"
 
-#: src/main/print-escp2.c:504
+#: src/main/print-escp2.c:510
 msgid "Drop Size 1 (small)"
 msgstr "Dimensione gocce 1 (piccole)"
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:517
 msgid "Drop Size Medium"
 msgstr "Gocce medie"
 
-#: src/main/print-escp2.c:512
+#: src/main/print-escp2.c:518
 msgid "Drop Size 2 (medium)"
 msgstr "Dimensione gocce 2 (medie)"
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:525
 msgid "Drop Size Large"
 msgstr "Gocce grandi"
 
-#: src/main/print-escp2.c:520
+#: src/main/print-escp2.c:526
 msgid "Drop Size 3 (large)"
 msgstr "Dimensione gocce 3 (grandi)"
 
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:534
 msgid "Light Cyan Value"
 msgstr "Ciano chiaro"
 
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:550
 msgid "Light Cyan Density Scale"
 msgstr "Densità ciano chiaro"
 
-#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
+#: src/main/print-escp2.c:557 src/main/print-escp2.c:558
 msgid "Light Magenta Value"
 msgstr "Magenta chiaro"
 
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:566
 msgid "Light Magenta Density Scale"
 msgstr "Densità magenta chiaro"
 
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:582
 msgid "Dark Yellow Value"
 msgstr "Giallo scuro"
 
-#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
+#: src/main/print-escp2.c:589 src/main/print-escp2.c:590
 msgid "Dark Yellow Transition"
 msgstr "Transizione giallo scuro"
 
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:598
 msgid "Dark Yellow Density Scale"
 msgstr "Densità giallo scuro"
 
-#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
+#: src/main/print-escp2.c:605 src/main/print-escp2.c:606
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:630
 msgid "Gray Value"
 msgstr "Grigio"
 
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
-#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:614
+#: src/main/print-escp2.c:637 src/main/print-escp2.c:638
 msgid "Gray Transition"
 msgstr "Transizione grigio"
 
-#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
+#: src/main/print-escp2.c:621 src/main/print-escp2.c:622
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:646
 msgid "Gray Density Scale"
 msgstr "Densità grigio"
 
-#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
+#: src/main/print-escp2.c:653 src/main/print-escp2.c:654
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:726
 msgid "Light Gray Value"
 msgstr "Grigio chiaro"
 
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
-#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:662
+#: src/main/print-escp2.c:733 src/main/print-escp2.c:734
 msgid "Light Gray Transition"
 msgstr "Transizione grigio chiaro"
 
-#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
-#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
+#: src/main/print-escp2.c:669 src/main/print-escp2.c:670
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:742
 msgid "Light Gray Density Scale"
 msgstr "Densità grigio chiaro"
 
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:678
 msgid "Dark Gray Value"
 msgstr "Grigio scuro"
 
-#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
+#: src/main/print-escp2.c:685 src/main/print-escp2.c:686
 msgid "Dark Gray Transition"
 msgstr "Transizione grigio scuro"
 
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:694
 msgid "Dark Gray Density Scale"
 msgstr "Densità grigio scuro"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:701
 msgid "Mid Gray Value"
 msgstr "Grigio medio"
 
-#: src/main/print-escp2.c:696
+#: src/main/print-escp2.c:702
 msgid "Medium Gray Value"
 msgstr "Grigio medio"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:709
 msgid "Mid Gray Transition"
 msgstr "Transizione del grigio medio"
 
-#: src/main/print-escp2.c:704
+#: src/main/print-escp2.c:710
 msgid "Medium Gray Transition"
 msgstr "Transizione del grigio medio"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:717
 msgid "Mid Gray Density Scale"
 msgstr "Densità del grigio medio"
 
-#: src/main/print-escp2.c:712
+#: src/main/print-escp2.c:718
 msgid "Medium Gray Density Scale"
 msgstr "Densità del grigio medio"
 
-#: src/main/print-escp2.c:767
+#: src/main/print-escp2.c:749
+msgid "Hextone Gray 5 Value"
+msgstr "Valore di grigio Hextone 5"
+
+#: src/main/print-escp2.c:750
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr "Valore di grigio Hextone 5 (il più scuro)"
+
+#: src/main/print-escp2.c:757
+msgid "Hextone Gray 5 Transition"
+msgstr "Transizione grigio Hextone 5"
+
+#: src/main/print-escp2.c:758
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr "Transizione grigio Hextone 5 (il più scuro)"
+
+#: src/main/print-escp2.c:765
+msgid "Hextone Gray 5 Density Scale"
+msgstr "Scala di densità del grigio Hextone 5"
+
+#: src/main/print-escp2.c:766
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr "Scala di densità del grigio Hextone 5 (il più scuro)"
+
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:774
+msgid "Hextone Gray 4 Value"
+msgstr "Valore di grigio Hextone 4"
+
+#: src/main/print-escp2.c:781 src/main/print-escp2.c:782
+msgid "Hextone Gray 4 Transition"
+msgstr "Transizione grigio Hextone 4"
+
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:790
+msgid "Hextone Gray 4 Density Scale"
+msgstr "Scala di densità del grigio Hextone 4"
+
+#: src/main/print-escp2.c:797 src/main/print-escp2.c:798
+msgid "Hextone Gray 3 Value"
+msgstr "Valore di grigio Hextone 3"
+
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:806
+msgid "Hextone Gray 3 Transition"
+msgstr "Transizione grigio Hextone 3"
+
+#: src/main/print-escp2.c:813 src/main/print-escp2.c:814
+msgid "Hextone Gray 3 Density Scale"
+msgstr "Scala di densità del grigio Hextone 3"
+
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:822
+msgid "Hextone Gray 2 Value"
+msgstr "Valore di grigio Hextone 2"
+
+#: src/main/print-escp2.c:829 src/main/print-escp2.c:830
+msgid "Hextone Gray 2 Transition"
+msgstr "Transizione grigio Hextone 2"
+
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:838
+msgid "Hextone Gray 2 Density Scale"
+msgstr "Scala di densità del grigio Hextone 2"
+
+#: src/main/print-escp2.c:845
+msgid "Hextone Gray 1 Value"
+msgstr "Valore di grigio Hextone 1"
+
+#: src/main/print-escp2.c:846
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr "Valore di grigio Hextone 1 (il più chiaro)"
+
+#: src/main/print-escp2.c:853
+msgid "Hextone Gray 1 Transition"
+msgstr "Transizione grigio Hextone 1"
+
+#: src/main/print-escp2.c:854
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr "Transizione grigio Hextone 1 (il più chiaro)"
+
+#: src/main/print-escp2.c:861
+msgid "Hextone Gray 1 Density Scale"
+msgstr "Scala di densità del grigio Hextone 1"
+
+#: src/main/print-escp2.c:862
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr "Scala di densità del grigio Hextone 1 (il più chiaro)"
+
+#: src/main/print-escp2.c:893
 msgid "Drying Time Per Page"
 msgstr "Tempo di asciugatura per pagina"
 
-#: src/main/print-escp2.c:768
+#: src/main/print-escp2.c:894
 msgid "Set drying time per page"
 msgstr "Imposta il tempo di asciugatura per ogni pagina"
 
-#: src/main/print-escp2.c:775
+#: src/main/print-escp2.c:901
 msgid "Drying Time Per Scan"
 msgstr "Tempo di asciugatura per passata"
 
-#: src/main/print-escp2.c:776
+#: src/main/print-escp2.c:902
 msgid "Set drying time per scan"
 msgstr "Imposta il tempo di asciugatura per ogni passata"
 
-#: src/main/print-escp2.c:783
+#: src/main/print-escp2.c:909
 msgid "Minimum Drying Time Per Scan"
 msgstr "Tempo minimo di asciugatura per passata"
 
-#: src/main/print-escp2.c:784
+#: src/main/print-escp2.c:910
 msgid "Set minimum drying time per scan"
 msgstr "Imposta il tempo minimo di asciugatura per ogni passata"
 
-#: src/main/print-escp2.c:799
+#: src/main/print-escp2.c:925
+msgid "Quality Enhancement"
+msgstr "Miglioramento della qualità"
+
+#: src/main/print-escp2.c:926
+msgid "Enhance print quality by additional passes"
+msgstr "Migliora la qualità di stampa con passate aggiuntive"
+
+#: src/main/print-escp2.c:933
 msgid "Paper Thickness"
 msgstr "Spessore della carta"
 
-#: src/main/print-escp2.c:800
+#: src/main/print-escp2.c:934
 msgid "Set printer paper thickness"
 msgstr "Imposta lo spessore della carta della stampante"
 
-#: src/main/print-escp2.c:807
+#: src/main/print-escp2.c:941
 msgid "Vacuum Intensity"
 msgstr "Intensità di aspirazione"
 
-#: src/main/print-escp2.c:808
+#: src/main/print-escp2.c:942
 msgid "Set vacuum intensity (printer-specific)"
-msgstr "Imposta la intensità di aspirazione (dipende dalla stampante)"
+msgstr "Imposta l'intensità di aspirazione (dipende dalla stampante)"
 
-#: src/main/print-escp2.c:815
+#: src/main/print-escp2.c:949
 msgid "Feed Sequence"
-msgstr "Sequenza di avanzamento carta"
+msgstr "Sequenza d'avanzamento carta"
 
-#: src/main/print-escp2.c:816
+#: src/main/print-escp2.c:950
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
-"Imposta la sequenza di avanzamento della carta (dipende dalla stampante)"
+"Imposta la sequenza d'avanzamento della carta (dipende dalla stampante)"
 
-#: src/main/print-escp2.c:823
+#: src/main/print-escp2.c:957
 msgid "Print Method"
 msgstr "Metodo di stampa"
 
-#: src/main/print-escp2.c:824
+#: src/main/print-escp2.c:958
 msgid "Set print method (printer-specific)"
 msgstr "Imposta la modalità di stampa (dipende dalla stampante)"
 
-#: src/main/print-escp2.c:831
+#: src/main/print-escp2.c:965
 msgid "Platen Gap"
 msgstr "Distanza testina-carta"
 
-#: src/main/print-escp2.c:832
+#: src/main/print-escp2.c:966
 msgid "Set platen gap (printer-specific)"
 msgstr "Imposta il platen gap (dipende dalla stampante)"
 
-#: src/main/print-escp2.c:839
+#: src/main/print-escp2.c:973
 msgid "Feed Adjustment"
 msgstr "Avanzamento carta"
 
-#: src/main/print-escp2.c:840
-#, c-format
+#: src/main/print-escp2.c:975
+#, fuzzy, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
-msgstr ""
+msgstr "Imposta l'avanzamento carta (a passi dello 0.01%)"
 
-#: src/main/print-escp2.c:1992
+#: src/main/print-escp2.c:2197
 msgid "Full Manual Control"
 msgstr "Controllo manuale completo"
 
-#: src/main/print-escp2.c:1994
+#: src/main/print-escp2.c:2199
 msgid "Automatic Setting Control"
 msgstr "Controllo automatico delle impostazioni"
 
-#: src/main/print-escp2.c:2208 src/cups/genppd.c:1484 src/cups/genppd.c:2059
+#: src/main/print-escp2.c:2413 src/cups/genppd.c:1517 src/cups/genppd.c:2093
 msgid "Automatic"
 msgstr "Automatico"
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2415
 msgid "Bidirectional"
 msgstr "Bidirezionale"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2417
 msgid "Unidirectional"
 msgstr "Monodirezionale"
 
-#: src/main/print-escp2.c:2243
+#: src/main/print-escp2.c:2448
 msgid "Alternate Fill"
 msgstr "Riempimento alternato"
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2450
 msgid "Ascending Fill"
 msgstr "Riempimento ascendente"
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2452
 msgid "Descending Fill"
 msgstr "Riempimento discendente"
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2454
 msgid "Ascending Double"
 msgstr "Ascendente doppio"
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2456
 msgid "Nearest Neighbor Avoidance"
-msgstr ""
+msgstr "Algoritmo nearest neighbor avoidance"
 
-#: src/main/print-escp2.c:2287
+#: src/main/print-escp2.c:2492
 msgid "Short Edge(Flip)"
 msgstr "Lato corto (girato)"
 
-#: src/main/print-escp2.c:2858
+#: src/main/print-escp2.c:3100
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Questa stampante non supporta l'uscita raw alla profondità %d\n"
 
-#: src/main/print-escp2.c:4107 src/main/print-olympus.c:2472
+#: src/main/print-escp2.c:4355 src/main/print-olympus.c:2641
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr "Opzioni di stampa non verificate, impossibile stampare.\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"
+msgstr "300 DPI × 600 DPI"
 
 #: src/main/print-lexmark.c:578 src/main/print-lexmark.c:654
 msgid "600 DPI"
@@ -1722,376 +2436,393 @@ msgstr "1200 DPI monodirezionale"
 
 #: src/main/print-lexmark.c:585
 msgid "2400 DPI x 1200 DPI"
-msgstr "2400 DPI x 1200 DPI"
+msgstr "2400 DPI × 1200 DPI"
 
 #: src/main/print-lexmark.c:586
 msgid "2400 DPI x 1200 DPI high quality"
-msgstr "2400 DPI x 1200 DPI alta qualità"
+msgstr "2400 DPI × 1200 DPI alta qualità"
 
 #: src/main/print-lexmark.c:587
 msgid "2400 DPI x 1200 DPI highest quality"
-msgstr "2400 DPI x 1200 DPI massima qualità"
+msgstr "2400 DPI × 1200 DPI massima qualità"
 
 #: src/main/print-lexmark.c:589
 msgid "test print"
 msgstr "stampa di prova"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3205
-#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3217
-#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3233
-#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3255
-#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3276
-#: src/xml/xmli18n-tmp.h:3288 src/xml/xmli18n-tmp.h:3295
-#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3315
-#: src/xml/xmli18n-tmp.h:3327 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3368
-#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3380
-#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
-#: src/xml/xmli18n-tmp.h:3412 src/xml/xmli18n-tmp.h:3424
-#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3444
-#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3472
-#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3496
-#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3521
-#: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3544
-#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3556
-#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3581
-#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3598
-#: src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3754 src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:3809 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3863 src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:4058 src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:4163 src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:4227 src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:4335 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4467 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4594 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:4879 src/xml/xmli18n-tmp.h:4946
+#: src/xml/xmli18n-tmp.h:5000 src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:5243 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5365 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5512 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5667 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5784 src/xml/xmli18n-tmp.h:5805
+#: src/xml/xmli18n-tmp.h:5826
 msgid "Four Color Standard"
 msgstr "Quattro colori standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3206
-#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3218
-#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3234
-#: src/xml/xmli18n-tmp.h:3244 src/xml/xmli18n-tmp.h:3251
-#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3268
-#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3289
-#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3306
-#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
-#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3354
-#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3377
-#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3389
-#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3413
-#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3435
-#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3455
-#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3485
-#: src/xml/xmli18n-tmp.h:3497 src/xml/xmli18n-tmp.h:3508
-#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3537
-#: src/xml/xmli18n-tmp.h:3545 src/xml/xmli18n-tmp.h:3549
-#: src/xml/xmli18n-tmp.h:3557 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3593
-#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3605
+#: src/xml/xmli18n-tmp.h:3759 src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3868 src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:4002 src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:4107 src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4472
+#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4817 src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5181 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5315 src/xml/xmli18n-tmp.h:5370
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5672
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5831
 msgid "Three Color Composite"
 msgstr "Composito a tre colori"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3241
-#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3265
-#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3286
-#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
-#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3351
-#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3374
-#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3398
-#: src/xml/xmli18n-tmp.h:3410 src/xml/xmli18n-tmp.h:3422
-#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3452
-#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3470
-#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3494
-#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3519
-#: src/xml/xmli18n-tmp.h:3534 src/xml/xmli18n-tmp.h:3542
-#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3741 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4086 src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4933
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5421
+#: src/xml/xmli18n-tmp.h:5499 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5723
 msgid "Six Color Photo"
 msgstr "Foto a sei colori"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3242
-#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3266
-#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3287
-#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3326
-#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3352
-#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3375
-#: src/xml/xmli18n-tmp.h:3387 src/xml/xmli18n-tmp.h:3399
-#: src/xml/xmli18n-tmp.h:3411 src/xml/xmli18n-tmp.h:3423
-#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3453
-#: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3483
-#: src/xml/xmli18n-tmp.h:3495 src/xml/xmli18n-tmp.h:3506
-#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3535
-#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3566
-#: src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3748 src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:3989 src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:4094 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4267 src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4940
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5661
+#: src/xml/xmli18n-tmp.h:5730
 msgid "Five Color Photo Composite"
 msgstr "Foto composita a cinque colori"
 
 #: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
-#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
-#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
-#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
-#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
-#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
-#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
-#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
-#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:849
-#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:963
-#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1077
-#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1170
-#: src/xml/xmli18n-tmp.h:1220 src/xml/xmli18n-tmp.h:1277
-#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1376
-#: src/xml/xmli18n-tmp.h:1439 src/xml/xmli18n-tmp.h:1502
-#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1619
-#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1739
-#: src/xml/xmli18n-tmp.h:1773
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1050
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1240
+#: src/xml/xmli18n-tmp.h:1335 src/xml/xmli18n-tmp.h:1449
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1580
+#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1862
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2200 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2297
 msgid "Plain Paper"
 msgstr "Carta comune"
 
-#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
-#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
-#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
-#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
-#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
-#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
-#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
-#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
-#: src/xml/xmli18n-tmp.h:819 src/xml/xmli18n-tmp.h:858
-#: src/xml/xmli18n-tmp.h:915 src/xml/xmli18n-tmp.h:972
-#: src/xml/xmli18n-tmp.h:1029 src/xml/xmli18n-tmp.h:1086
-#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1176
-#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1286
-#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1385
-#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1508
-#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1628
-#: src/xml/xmli18n-tmp.h:1685 src/xml/xmli18n-tmp.h:1743
-#: src/xml/xmli18n-tmp.h:1779
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:101 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:365 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1160 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1740
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1871
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2136
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2267
+#: src/xml/xmli18n-tmp.h:2303
 msgid "Glossy Film"
 msgstr "Pellicola lucida"
 
-#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
-#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
-#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
-#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
-#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
-#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
-#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
-#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
-#: src/xml/xmli18n-tmp.h:821 src/xml/xmli18n-tmp.h:861
-#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:975
-#: src/xml/xmli18n-tmp.h:1032 src/xml/xmli18n-tmp.h:1089
-#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1178
-#: src/xml/xmli18n-tmp.h:1232 src/xml/xmli18n-tmp.h:1289
-#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1388
-#: src/xml/xmli18n-tmp.h:1451 src/xml/xmli18n-tmp.h:1511
-#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1631
-#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1745
-#: src/xml/xmli18n-tmp.h:1781
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:845 src/xml/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:965 src/xml/xmli18n-tmp.h:1022
+#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1359
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1550
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1745 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2305
 msgid "Transparencies"
 msgstr "Trasparenze"
 
-#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
-#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
-#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
-#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
-#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
-#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
-#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
-#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
-#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:823
-#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:921
-#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:1035
-#: src/xml/xmli18n-tmp.h:1092 src/xml/xmli18n-tmp.h:1142
-#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1235
-#: src/xml/xmli18n-tmp.h:1292 src/xml/xmli18n-tmp.h:1344
-#: src/xml/xmli18n-tmp.h:1391 src/xml/xmli18n-tmp.h:1454
-#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1577
-#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1691
-#: src/xml/xmli18n-tmp.h:1747 src/xml/xmli18n-tmp.h:1783
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:55 src/xml/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:151 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1024
+#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2215
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2307
 msgid "Envelopes"
 msgstr "Buste"
 
-#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
-#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
-#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
-#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
-#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
-#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
-#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
-#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
-#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:827
-#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:927
-#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:1041
-#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1146
-#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1241
-#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1348
-#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1460
-#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1583
-#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1697
-#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1787
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:1028
+#: src/xml/xmli18n-tmp.h:1085 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1275 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1556
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1665
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1834
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2076
+#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2311
 msgid "Matte Paper"
 msgstr "Carta opaca"
 
-#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
-#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
-#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
-#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
-#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
-#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
-#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
-#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
-#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:831
-#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:933
-#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:1047
-#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1150
-#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1247
-#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1352
-#: src/xml/xmli18n-tmp.h:1403 src/xml/xmli18n-tmp.h:1466
-#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1589
-#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1703
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1791
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:167 src/xml/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:569
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1032
+#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1285 src/xml/xmli18n-tmp.h:1389
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1675
+#: src/xml/xmli18n-tmp.h:1770 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1889 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2012 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2227
+#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2315
 msgid "Inkjet Paper"
 msgstr "Carta per getto d'inchiostro"
 
-#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
-#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
-#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
-#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
-#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
-#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
-#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
-#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
-#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:833
-#: src/xml/xmli18n-tmp.h:879 src/xml/xmli18n-tmp.h:936
-#: src/xml/xmli18n-tmp.h:993 src/xml/xmli18n-tmp.h:1050
-#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1152
-#: src/xml/xmli18n-tmp.h:1190 src/xml/xmli18n-tmp.h:1250
-#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1354
-#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1469
-#: src/xml/xmli18n-tmp.h:1529 src/xml/xmli18n-tmp.h:1592
-#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1706
-#: src/xml/xmli18n-tmp.h:1757 src/xml/xmli18n-tmp.h:1793
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:425 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:512 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1034
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1499 src/xml/xmli18n-tmp.h:1562
+#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1775 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1955
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2088
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2317
 msgid "Photo Quality Inkjet Paper"
 msgstr "Carta per getto d'inchiostro di qualità fotografica"
 
-#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
-#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
-#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
-#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
-#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
-#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
-#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
-#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
-#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:835
-#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:939
-#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:1053
-#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1154
-#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1253
-#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1356
-#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1472
-#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1595
-#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1709
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1795
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1036
+#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1200
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1504 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1842
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2233
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2319
 msgid "Photo Paper"
 msgstr "Carta fotografica"
 
-#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
-#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
-#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
-#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
-#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
-#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
-#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
-#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
-#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:837
-#: src/xml/xmli18n-tmp.h:885 src/xml/xmli18n-tmp.h:942
-#: src/xml/xmli18n-tmp.h:999 src/xml/xmli18n-tmp.h:1056
-#: src/xml/xmli18n-tmp.h:1113 src/xml/xmli18n-tmp.h:1156
-#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1212
-#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1256
-#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1358
-#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1475
-#: src/xml/xmli18n-tmp.h:1535 src/xml/xmli18n-tmp.h:1598
-#: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1712
-#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1797
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:179 src/xml/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:518 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:869 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1038
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1407
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1566
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1622
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1844
+#: src/xml/xmli18n-tmp.h:1898 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2321
 msgid "Premium Glossy Photo Paper"
 msgstr "Carta fotografica lucida premium"
 
-#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
-#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
-#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
-#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
-#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
-#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
-#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
-#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
-#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:841
-#: src/xml/xmli18n-tmp.h:891 src/xml/xmli18n-tmp.h:948
-#: src/xml/xmli18n-tmp.h:1005 src/xml/xmli18n-tmp.h:1062
-#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1160
-#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1262
-#: src/xml/xmli18n-tmp.h:1319 src/xml/xmli18n-tmp.h:1362
-#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1481
-#: src/xml/xmli18n-tmp.h:1541 src/xml/xmli18n-tmp.h:1604
-#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1718
-#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1801
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1042
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1419
+#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1570
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2027 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2242
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2325
 msgid "Premium Luster Photo Paper"
 msgstr "Carta fotografica Luster premium"
 
-#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
-#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
-#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
-#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
-#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
-#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
-#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
-#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
-#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:843
-#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:951
-#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1065
-#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1162
-#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1265
-#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1368
-#: src/xml/xmli18n-tmp.h:1427 src/xml/xmli18n-tmp.h:1490
-#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1607
-#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1727
-#: src/xml/xmli18n-tmp.h:1767 src/xml/xmli18n-tmp.h:1803
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:91 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:191 src/xml/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:439 src/xml/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:787 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1044
+#: src/xml/xmli18n-tmp.h:1125 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1315 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1854
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2327
 msgid "Photo Quality Glossy Paper"
 msgstr "Carta lucida di qualità fotografica"
 
-#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
-#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
-#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
-#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
-#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
-#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
-#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
-#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:897
-#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:1011
-#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1125
-#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1206
-#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1325
-#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1430
-#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1553
-#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1667
-#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1805
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1130
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1320
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1616
+#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1856 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2329
 msgid "Ilford Heavy Paper"
 msgstr "Carta pesante Ilford"
 
-#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
-#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
-#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
-#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
-#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
-#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
-#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
-#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
-#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:847
-#: src/xml/xmli18n-tmp.h:903 src/xml/xmli18n-tmp.h:960
-#: src/xml/xmli18n-tmp.h:1017 src/xml/xmli18n-tmp.h:1074
-#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1168
-#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1214
-#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1274
-#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1374
-#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1499
-#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1616
-#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1736
-#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1809
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:129
+#: src/xml/xmli18n-tmp.h:203 src/xml/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:542 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1048
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1443
+#: src/xml/xmli18n-tmp.h:1539 src/xml/xmli18n-tmp.h:1578
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1720
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1985
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2333
 msgid "Other"
 msgstr "Altra"
 
@@ -2107,52 +2838,62 @@ msgstr "Manuale con pausa"
 msgid "Manual without Pause"
 msgstr "Manuale senza pausa"
 
-#: src/main/print-olympus.c:279
+#: src/main/print-olympus.c:281
 msgid "Coated"
-msgstr ""
+msgstr "Rivestito"
 
-#: src/main/print-olympus.c:280 src/cups/genppd.c:1685 src/cups/genppd.c:1713
-#: src/cups/genppd.c:1745 src/cups/genppd.c:1800 src/cups/genppd.c:1846
-#: src/cups/genppd.c:2147 src/cups/genppd.c:2160 src/cups/genppd.c:2183
-#: src/cups/genppd.c:2204 src/cups/genppd.c:2221
+#: src/main/print-olympus.c:282 src/cups/genppd.c:1718 src/cups/genppd.c:1746
+#: src/cups/genppd.c:1778 src/cups/genppd.c:1833 src/cups/genppd.c:1879
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2194 src/cups/genppd.c:2217
+#: src/cups/genppd.c:2238 src/cups/genppd.c:2255
 msgid "None"
 msgstr "Nessuna"
 
-#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
-#: src/main/print-olympus.c:1132
+#: src/main/print-olympus.c:998 src/main/print-olympus.c:1061
+#: src/main/print-olympus.c:1165
 msgid "Glossy"
 msgstr "Lucida"
 
-#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
-#: src/main/print-olympus.c:1133
+#: src/main/print-olympus.c:999 src/main/print-olympus.c:1062
+#: src/main/print-olympus.c:1166
 msgid "Texture"
 msgstr "Motivo"
 
-#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
+#: src/main/print-olympus.c:1063 src/main/print-olympus.c:1167
 msgid "Matte"
 msgstr "Opaca"
 
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
+# (ndt) Spiegazione dello sviluppatore:
+# «Some dye sublimation printers are able to achieve
+# better durability of output by covering it with
+# trasparent laminate surface. This surface can be
+# of different patterns: common are matte, glossy
+# or texture»
+#. TRANSLATORS: 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.
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1901
 msgid "Laminate Pattern"
-msgstr ""
+msgstr "Tipo di laminazione"
 
-#: src/main/print-olympus.c:1770
+#: src/main/print-olympus.c:1936
 msgid "Adjust the cyan balance"
 msgstr "Regola il bilanciamento del ciano"
 
-#: src/main/print-olympus.c:1778
+#: src/main/print-olympus.c:1944
 msgid "Adjust the magenta balance"
 msgstr "Regola il bilanciamento del magenta"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1952
 msgid "Adjust the yellow balance"
 msgstr "Regola il bilanciamento del giallo"
 
-#: src/main/print-olympus.c:1793
+#: src/main/print-olympus.c:1959
 msgid "Black Balance"
 msgstr "Bilanciamento del nero"
 
-#: src/main/print-olympus.c:1794
+#: src/main/print-olympus.c:1960
 msgid "Adjust the black balance"
 msgstr "Regola il bilanciamento del nero"
 
@@ -2174,17 +2915,17 @@ msgstr "Foto lucida"
 
 #: src/main/print-pcl.c:188
 msgid "Transparency"
-msgstr "Acetato per lucidi"
+msgstr "Trasparenza"
 
 #: src/main/print-pcl.c:189
 msgid "Quick-dry Photo"
-msgstr "Fotografica asciugatura rapida"
+msgstr "Fotografica ad asciugatura rapida"
 
 #: src/main/print-pcl.c:190
 msgid "Quick-dry Transparency"
-msgstr "Acetato per lucidi \"Quick Dry\""
+msgstr "Trasparenza ad asciugatura rapida"
 
-#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3687
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:5925
 msgid "Manual"
 msgstr "Manuale"
 
@@ -2242,50 +2983,50 @@ msgstr "Autoselezione"
 
 #: src/main/print-pcl.c:266
 msgid "150x150 DPI"
-msgstr "150x150 DPI"
+msgstr "150×150 DPI"
 
 #: src/main/print-pcl.c:267
 msgid "300x300 DPI"
-msgstr "300x300 DPI"
+msgstr "300×300 DPI"
 
 #: src/main/print-pcl.c:268
 msgid "600x300 DPI"
-msgstr "600x300 DPI"
+msgstr "600×300 DPI"
 
 #: src/main/print-pcl.c:269
 msgid "600x600 DPI monochrome"
-msgstr "600x600 DPI monocromatico"
+msgstr "600×600 DPI monocromatico"
 
 #: src/main/print-pcl.c:270
 msgid "600x600 DPI"
-msgstr "600x600 DPI"
+msgstr "600×600 DPI"
 
 #: src/main/print-pcl.c:271
 msgid "1200x600 DPI"
-msgstr "1200x600 DPI"
+msgstr "1200×600 DPI"
 
 #: src/main/print-pcl.c:272
 msgid "2400x600 DPI"
-msgstr "2400x600 DPI"
+msgstr "2400×600 DPI"
 
 #: src/main/print-pcl.c:278 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3638
-#: src/xml/xmli18n-tmp.h:3647 src/xml/xmli18n-tmp.h:3656
-#: src/xml/xmli18n-tmp.h:3664
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5875
+#: src/xml/xmli18n-tmp.h:5884 src/xml/xmli18n-tmp.h:5893
+#: src/xml/xmli18n-tmp.h:5901
 msgid "Draft"
 msgstr "Bozza"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:3633 src/xml/xmli18n-tmp.h:3641
-#: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3658
-#: src/xml/xmli18n-tmp.h:3666
+#: src/xml/xmli18n-tmp.h:5870 src/xml/xmli18n-tmp.h:5878
+#: src/xml/xmli18n-tmp.h:5886 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5903
 msgid "High"
 msgstr "Alta"
 
 #: src/main/print-pcl.c:282 src/main/print-pcl.c:283
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3634
-#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3650
-#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3667
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5896 src/xml/xmli18n-tmp.h:5904
 msgid "Photo"
 msgstr "Foto"
 
@@ -2317,15 +3058,15 @@ msgstr "Nome del modello PPD"
 msgid "None; please provide a PPD file"
 msgstr "Nessuno, fornire un file PPD"
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3671
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:5908
 msgid "Letter"
 msgstr "Lettera"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3708
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:5946
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3823
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6061
 msgid "Custom"
 msgstr "Personalizzato"
 
@@ -2334,33 +3075,43 @@ msgid "Image dimensions must match paper dimensions"
 msgstr ""
 "Le dimensioni dell'immagine devono corrispondere alle dimensioni della carta"
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3629
-#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3654
+#: src/main/print-weave.c:1511
+msgid "Fatal error!"
+msgstr "Errore irrecuperabile."
+
+#: src/main/print-weave.c:1547
+msgid ""
+"Please report the above information to gimp-print-devel@lists.sourceforge.net"
+msgstr ""
+"Inviare le informazioni precedenti a gimp-print-devel@lists.sourceforge.net"
+
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:5866
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5891
 msgid "Fast Economy"
 msgstr "Economica veloce"
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3630
-#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3655
-#: src/xml/xmli18n-tmp.h:3663
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5900
 msgid "Economy"
 msgstr "Economica"
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3635
-#: src/xml/xmli18n-tmp.h:3642 src/xml/xmli18n-tmp.h:3651
-#: src/xml/xmli18n-tmp.h:3660 src/xml/xmli18n-tmp.h:3668
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:5872
+#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
 msgid "Super Photo"
 msgstr "Foto super"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3636
-#: src/xml/xmli18n-tmp.h:3643 src/xml/xmli18n-tmp.h:3652
-#: src/xml/xmli18n-tmp.h:3661 src/xml/xmli18n-tmp.h:3669
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:5873
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5889
+#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5906
 msgid "Ultra Photo"
 msgstr "Foto ultra"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1326 src/cups/genppd.c:1989
-#: src/xml/xmli18n-tmp.h:3637 src/xml/xmli18n-tmp.h:3644
-#: src/xml/xmli18n-tmp.h:3653 src/xml/xmli18n-tmp.h:3662
-#: src/xml/xmli18n-tmp.h:3670
+#: src/main/generic-options.c:41 src/cups/genppd.c:1359 src/cups/genppd.c:2023
+#: src/xml/xmli18n-tmp.h:5874 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5899
+#: src/xml/xmli18n-tmp.h:5907
 msgid "Best"
 msgstr "Migliore"
 
@@ -2370,11 +3121,11 @@ msgstr "Testo"
 
 #: src/main/generic-options.c:47
 msgid "Graphics"
-msgstr "Grafici"
+msgstr "Disegni"
 
 #: src/main/generic-options.c:48
 msgid "Mixed Text and Graphics"
-msgstr "Testo e grafici"
+msgstr "Testo e disegni"
 
 #: src/main/generic-options.c:49
 msgid "Photograph"
@@ -2382,7 +3133,7 @@ msgstr "Fotografia"
 
 #: src/main/generic-options.c:50
 msgid "Line Art"
-msgstr "Line art"
+msgstr "Al tratto"
 
 #: src/main/generic-options.c:55
 msgid "Page"
@@ -2403,7 +3154,7 @@ msgstr "Tipo immagine"
 
 #: src/main/generic-options.c:69
 msgid "Type of image being printed"
-msgstr "Tipo di immagine da stampare"
+msgstr "Tipo d'immagine da stampare"
 
 #: src/main/generic-options.c:74 src/main/generic-options.c:80
 msgid "Job Mode"
@@ -2411,7 +3162,7 @@ msgstr "Modalità lavoro"
 
 #: src/main/generic-options.c:75
 msgid "Job vs. page mode"
-msgstr ""
+msgstr "Modalità lavoro vs. pagina"
 
 #: src/main/generic-options.c:80
 msgid "Page Number"
@@ -2508,9 +3259,10 @@ msgstr "Pica"
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Imposta l'unità di misura base a pica (1/12\")"
 
+# (ndt) Vedi sopra per le convenzioni
 #: src/gutenprintui2/panel.c:291
 msgid "Color output"
-msgstr "Uscita a colori"
+msgstr "Stampa a colori"
 
 #: src/gutenprintui2/panel.c:293
 msgid "Print in shades of gray using black ink"
@@ -2522,7 +3274,7 @@ msgstr "Comando standard"
 
 #: src/gutenprintui2/panel.c:305
 msgid "Use standard print command"
-msgstr "Usa comando si stampa standard"
+msgstr "Usa comando di stampa standard"
 
 #: src/gutenprintui2/panel.c:306
 msgid "Custom Command"
@@ -2551,7 +3303,7 @@ msgstr "Imposta predefinito"
 
 #: src/gutenprintui2/panel.c:536
 msgid "Restore Previous"
-msgstr "Ripristina predecente"
+msgstr "Ripristina precedente"
 
 #: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1735
 #: src/gutenprintui2/panel.c:1989 src/gutenprintui2/panel.c:2021
@@ -2648,7 +3400,7 @@ msgstr "Larghezza:"
 
 #: src/gutenprintui2/panel.c:1567
 msgid "Width of the paper that you wish to print to"
-msgstr "Larghezza della carta su cui si desidera stampare"
+msgstr "Larghezza della carta su cui stampare"
 
 #: src/gutenprintui2/panel.c:1571 src/gutenprintui2/panel.c:2267
 msgid "Height:"
@@ -2656,7 +3408,7 @@ msgstr "Altezza:"
 
 #: src/gutenprintui2/panel.c:1572
 msgid "Height of the paper that you wish to print to"
-msgstr "Altezza della carta su cui si desidera stampare"
+msgstr "Altezza della carta su cui stampare"
 
 #: src/gutenprintui2/panel.c:1577
 msgid "Automatic Paper Size"
@@ -2688,7 +3440,7 @@ msgstr "Orizzontale"
 
 #: src/gutenprintui2/panel.c:1661
 msgid "Upside down"
-msgstr "Verticale capovolto"
+msgstr "Capovolto"
 
 #: src/gutenprintui2/panel.c:1663
 msgid "Seascape"
@@ -2699,8 +3451,8 @@ msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
-"Seleziona l'orientamento: ritratto, panorama, capovolto o panorama marino "
-"(panorama capovolto)"
+"Selezionare l'orientamento: verticale, orizzontale, capovolto o orizzontale "
+"capovolto"
 
 #: src/gutenprintui2/panel.c:1669
 msgid "Orientation:"
@@ -2813,13 +3565,14 @@ msgstr "Esplora"
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Scegliere il nome di file PPD corretto per la propria stampante"
 
+# (ndt) Vedi sopra per le convenzioni
 #: src/gutenprintui2/panel.c:1912
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
 msgstr ""
-"Selezionare il nome della coda di uscita (non il tipo, o modello di "
-"stampante) su cui si desidera stampare"
+"Selezionare il nome della coda di stampa (non il tipo, o modello, di "
+"stampante) su cui stampare"
 
 #: src/gutenprintui2/panel.c:1914
 msgid "Printer Queue:"
@@ -2851,7 +3604,7 @@ msgstr "Nome stampante:"
 
 #: src/gutenprintui2/panel.c:2009
 msgid "Enter the name you wish to give this logical printer"
-msgstr "Inserire il nome che si desidera dare a questa stampante logica"
+msgstr "Inserire il nome da dare a questa stampante logica"
 
 #: src/gutenprintui2/panel.c:2019
 msgid "About Gutenprint "
@@ -2871,7 +3624,7 @@ msgid ""
 "wish to print to"
 msgstr ""
 "Seleziona il nome della stampante (non il tipo, o modello, di stampante) su "
-"cui si desidera stampare"
+"cui stampare"
 
 #: src/gutenprintui2/panel.c:2104
 msgid "Setup Printer..."
@@ -2919,7 +3672,7 @@ msgstr "Imposta la scala (dimensione) dell'immagine"
 
 #: src/gutenprintui2/panel.c:2225
 msgid "Scale by:"
-msgstr "Scala per:"
+msgstr "Ridimensiona per:"
 
 #: src/gutenprintui2/panel.c:2230
 msgid ""
@@ -2935,7 +3688,7 @@ msgstr "Percentuale"
 
 #: src/gutenprintui2/panel.c:2238
 msgid "Scale the print to the size of the page"
-msgstr "Scala la stampa all dimensione della pagina"
+msgstr "Ridimensiona la stampa in base alla dimensione della pagina"
 
 #: src/gutenprintui2/panel.c:2242
 msgid "PPI"
@@ -2943,7 +3696,7 @@ msgstr "DPI"
 
 #: src/gutenprintui2/panel.c:2247
 msgid "Scale the print to the number of dots per inch"
-msgstr "Scala la stampa al numero di punti per pollice"
+msgstr "Ridimensiona la stampa in base al numero di punti per pollice"
 
 #: src/gutenprintui2/panel.c:2265
 msgid "Set the width of the print"
@@ -2981,36 +3734,41 @@ msgstr "Chiudi"
 msgid "Image preview"
 msgstr "Anteprima dell'immagine"
 
+# (ndt) Vedi sopra per le convenzioni
 #: src/gutenprintui2/panel.c:2351
 msgid "View Output Channels:"
-msgstr "Visualizza canali di uscita:"
+msgstr "Visualizza canali di stampa:"
 
+# (ndt) Vedi sopra per le convenzioni
 #: src/gutenprintui2/panel.c:2442
 msgid "Output"
-msgstr "Uscita"
+msgstr "Stampa"
 
+# (ndt) Vedi sopra per le convenzioni
 #: src/gutenprintui2/panel.c:2470
 msgid "Output Type:"
-msgstr "Tipo di output:"
+msgstr "Tipo di stampa:"
 
+# (ndt) Vedi sopra per le convenzioni
 #: src/gutenprintui2/panel.c:2474
 msgid "Select the desired output type"
-msgstr "Seleziona il tipo di uscita desiderato"
+msgstr "Seleziona il tipo della stampa"
 
+# (ndt) Vedi sopra per le convenzioni
 #: src/gutenprintui2/panel.c:2495
 msgid "Adjust Output..."
-msgstr "Regola uscita..."
+msgstr "Impostazioni di stampa..."
 
 #: src/gutenprintui2/panel.c:2504
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
-"Regola bilanciamento del colore, luminosità, contrasto, saturazione e "
-"algoritmo di retinatura"
+"Permette di impostare il bilanciamento del colore, la luminosità, il "
+"contrasto, la saturazione e l'algoritmo di retinatura."
 
 #: src/gutenprintui2/panel.c:2523
 msgid "Size Units:"
-msgstr "Unità dimensioni:"
+msgstr "Unità di misura:"
 
 #: src/gutenprintui2/panel.c:2526
 msgid " "
@@ -3064,9 +3822,10 @@ msgstr "(Stampante predefinita)"
 msgid "Printer Features"
 msgstr "Funzioni stampante"
 
+# (ndt) Vedi sopra per le convenzioni
 #: src/cups/genppd.c:145
 msgid "Output Control"
-msgstr "Controllo uscita"
+msgstr "Controlli di stampa"
 
 #: src/cups/genppd.c:150
 msgid "Common"
@@ -3095,28 +3854,28 @@ msgstr "Extra 5"
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:960
+#: src/cups/genppd.c:993
 msgid "English"
 msgstr "Italian"
 
-#: src/cups/genppd.c:1159 src/cups/genppd.c:1175 src/cups/genppd.c:1934
-#: src/cups/genppd.c:1935
+#: src/cups/genppd.c:1192 src/cups/genppd.c:1208 src/cups/genppd.c:1968
+#: src/cups/genppd.c:1969
 msgid "Media Size"
 msgstr "Dimensioni del supporto"
 
-#: src/cups/genppd.c:1248 src/cups/genppd.c:1970
+#: src/cups/genppd.c:1281 src/cups/genppd.c:2004
 msgid "Color Model"
 msgstr "Modello colore"
 
-#: src/cups/genppd.c:1275 src/cups/genppd.c:1972
+#: src/cups/genppd.c:1308 src/cups/genppd.c:2006
 msgid "Inverted Grayscale"
 msgstr "Scala di grigio invertita"
 
-#: src/cups/genppd.c:1285 src/cups/genppd.c:1976
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2010
 msgid "RGB Color"
 msgstr "Colore RGB"
 
-#: src/cups/genppd.c:1292 src/cups/genppd.c:1977
+#: src/cups/genppd.c:1325 src/cups/genppd.c:2011
 msgid "CMY Color"
 msgstr "Colore CMY"
 
@@ -3129,55 +3888,55 @@ msgstr "Colore CMY"
 #   Desaturated
 #   Threshold
 #   Density
-#: src/cups/genppd.c:1317 src/cups/genppd.c:1987
+#: src/cups/genppd.c:1350 src/cups/genppd.c:2021
 msgid "Color Precision"
 msgstr "Precisione del colore"
 
-#: src/cups/genppd.c:1573 src/cups/genppd.c:2080
+#: src/cups/genppd.c:1606 src/cups/genppd.c:2114
 msgid "Reverse"
 msgstr "Inversa"
 
-#: src/cups/genppd.c:1590 src/cups/genppd.c:2096
+#: src/cups/genppd.c:1623 src/cups/genppd.c:2130
 msgid "2-Sided Printing"
 msgstr "Stampa fronte/retro"
 
-#: src/cups/genppd.c:1615 src/cups/genppd.c:2113
+#: src/cups/genppd.c:1648 src/cups/genppd.c:2147
 msgid "Shrink Page If Necessary to Fit Borders"
-msgstr "Riduci la dimensione della pagina se necessario per contenere i bordi"
+msgstr "Riduci la dimensione della pagina se necessario per rimanere nei bordi"
 
-#: src/cups/genppd.c:1620 src/cups/genppd.c:2114
+#: src/cups/genppd.c:1653 src/cups/genppd.c:2148
 msgid "Shrink (print the whole page)"
-msgstr "Riduci (stampa la pagina intera)"
+msgstr "Riduce la dimensione (stampa tutta la pagina)"
 
-#: src/cups/genppd.c:1621 src/cups/genppd.c:2115
+#: src/cups/genppd.c:1654 src/cups/genppd.c:2149
 msgid "Crop (preserve dimensions)"
-msgstr "Ritaglia (mantieni le dimensioni)"
+msgstr "Ritaglia (mantiene le dimensioni)"
 
-#: src/cups/genppd.c:1622 src/cups/genppd.c:2116
+#: src/cups/genppd.c:1655 src/cups/genppd.c:2150
 msgid "Expand (use maximum page area)"
-msgstr "Espandi (usa la massima area possibile nella pagina)"
+msgstr "Espande (usa la massima area possibile nella pagina)"
 
-#: src/cups/genppd.c:1716 src/cups/genppd.c:2162
+#: src/cups/genppd.c:1749 src/cups/genppd.c:2196
 msgid "No"
 msgstr "No"
 
-#: src/cups/genppd.c:1718 src/cups/genppd.c:2164
+#: src/cups/genppd.c:1751 src/cups/genppd.c:2198
 msgid "Yes"
 msgstr "Sì"
 
-#: src/cups/genppd.c:1757 src/cups/genppd.c:1820 src/cups/genppd.c:1864
-#: src/cups/genppd.c:2185 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+#: src/cups/genppd.c:1790 src/cups/genppd.c:1853 src/cups/genppd.c:1897
+#: src/cups/genppd.c:2219 src/cups/genppd.c:2249 src/cups/genppd.c:2266
 msgid "Value"
 msgstr "Valore"
 
-#: src/cups/genppd.c:1762 src/cups/genppd.c:2189
+#: src/cups/genppd.c:1795 src/cups/genppd.c:2223
 msgid "Fine Adjustment"
 msgstr "Regolazione fine"
 
-#: src/cups/genppd.c:1805 src/cups/genppd.c:2209
+#: src/cups/genppd.c:1838 src/cups/genppd.c:2243
 #, c-format
 msgid "%.1f mm"
-msgstr ""
+msgstr "%.1f mm"
 
 #: src/escputil/escputil.c:70
 msgid "Escputil version "
@@ -3282,15 +4041,15 @@ msgstr ""
 "                       pulire le testine.\n"
 "    -a|--align-head    Allinea le testine. ATTENZIONE: un uso improprio di "
 "questa\n"
-"                       utility può causare una bassa qualità di stampa e\n"
+"                       utilità può causare una bassa qualità di stampa e\n"
 "                       danni alla stampante.\n"
 "    -s|--status        Recupera lo stato della stampante.\n"
-"    -i|--ink-level     Ottiene il livello di inchiostro dalla stampante. "
+"    -i|--ink-level     Ottiene il livello d'inchiostro dalla stampante. "
 "Richiede accesso\n"
 "                       in lettura/scrittura al dispositivo raw della "
 "stampante.\n"
-"    -e|--extended-ink-info     Ottiene informazioni estese sul livello di "
-"inchiostro dalla stampante.\n"
+"    -e|--extended-ink-info     Ottiene informazioni estese sul livello "
+"d'inchiostro dalla stampante.\n"
 "                       Richiede accesso in lettura/scrittura al dispositivo "
 "raw\n"
 "                       della stampante.\n"
@@ -3382,12 +4141,12 @@ msgstr ""
 "utile\n"
 "                       pulire le testine.\n"
 "    -a Allinea le testine. ATTENZIONE: un uso improprio di questa\n"
-"          utility può causare bassa qualità di stampa e\n"
+"          utilità può causare bassa qualità di stampa e\n"
 "          danni alla stampante.\n"
 "    -s Recupera lo stato della stampante.\n"
-"    -i Ottiene il livello di inchiostro dalla stampante. Richiede accesso\n"
+"    -i Ottiene il livello d'inchiostro dalla stampante. Richiede accesso\n"
 "          in lettura/scrittura al dispositivo raw della stampante.\n"
-"    -e Ottiene informazioni estese sul livello di inchiostro dalla "
+"    -e Ottiene informazioni estese sul livello d'inchiostro dalla "
 "stampante.\n"
 "          Richiede accesso in lettura/scrittura al dispositivo raw\n"
 "          della stampante.\n"
@@ -3420,7 +4179,7 @@ msgstr "È possibile specificare solo una stampante o dispositivo raw."
 #: src/escputil/escputil.c:357
 #, c-format
 msgid "You may only specify one printer model."
-msgstr "È possibile specificare un solo modello di stampante"
+msgstr "È possibile specificare un solo modello di stampante."
 
 #: src/escputil/escputil.c:381
 #, c-format
@@ -3470,7 +4229,7 @@ msgstr "Impossibile inviare comandi alla stampante\n"
 #: src/escputil/escputil.c:580
 #, c-format
 msgid "Read from printer timed out\n"
-msgstr "Lettura dalla stampante scaduta\n"
+msgstr "Tempo esaurito per la lettura dalla stampante\n"
 
 #: src/escputil/escputil.c:585
 #, c-format
@@ -3518,51 +4277,61 @@ msgstr ""
 "Impossibile rilevare il tipo di stampante.\n"
 "Usare -m per specificare il modello di stampante.\n"
 
-#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:383
-#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
-#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
-#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
-#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
-#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
-#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
-#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
-#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
-#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
-#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
-#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
-#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
-#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
-#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
-#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
-#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
-#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
-#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
-#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
-#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
-#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
-#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
-#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
-#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
-#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
-#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
-#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
-#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
-#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
-#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1503
-#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1509
-#: src/xml/xmli18n-tmp.h:1512 src/xml/xmli18n-tmp.h:1515
-#: src/xml/xmli18n-tmp.h:1518 src/xml/xmli18n-tmp.h:1521
-#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1527
-#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
-#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
-#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
-#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
-#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
-#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:2655
-#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2717
-#: src/xml/xmli18n-tmp.h:3045 src/xml/xmli18n-tmp.h:3252
-#: src/xml/xmli18n-tmp.h:3273 src/xml/xmli18n-tmp.h:3363
-#: src/xml/xmli18n-tmp.h:3531
+#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2001
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2010 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2025
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:4085 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4612 src/xml/xmli18n-tmp.h:5481
 msgid "Photo Black"
 msgstr "Nero fotografico"
 
@@ -3573,125 +4342,297 @@ msgid "Unknown"
 msgstr "Sconosciuto"
 
 #: src/escputil/escputil.c:1000 src/escputil/escputil.c:1289
-#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1921
-#: src/xml/xmli18n-tmp.h:1937 src/xml/xmli18n-tmp.h:2002
-#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2079
-#: src/xml/xmli18n-tmp.h:2105 src/xml/xmli18n-tmp.h:2119
-#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2173
-#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
-#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
-#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2293
-#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2346
-#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2418
-#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2445
-#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2469
-#: src/xml/xmli18n-tmp.h:2484 src/xml/xmli18n-tmp.h:2512
-#: src/xml/xmli18n-tmp.h:2525 src/xml/xmli18n-tmp.h:2564
-#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2626
-#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2746
-#: src/xml/xmli18n-tmp.h:2762 src/xml/xmli18n-tmp.h:2843
-#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2895
-#: src/xml/xmli18n-tmp.h:2912 src/xml/xmli18n-tmp.h:2946
-#: src/xml/xmli18n-tmp.h:3001 src/xml/xmli18n-tmp.h:3015
-#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3122
-#: src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2461 src/xml/xmli18n-tmp.h:2526
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2683 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2711 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3101 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3661
+#: src/xml/xmli18n-tmp.h:3678 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3750 src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:3782 src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:3932 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3964 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4388 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:4639 src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:4875 src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4936
+#: src/xml/xmli18n-tmp.h:4942 src/xml/xmli18n-tmp.h:4968
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5339 src/xml/xmli18n-tmp.h:5348
+#: src/xml/xmli18n-tmp.h:5355 src/xml/xmli18n-tmp.h:5361
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5417
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5430
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5477 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5502
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5536 src/xml/xmli18n-tmp.h:5544
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5557
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5657 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5719
+#: src/xml/xmli18n-tmp.h:5726 src/xml/xmli18n-tmp.h:5732
+#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5779
 msgid "Light Cyan"
 msgstr "Chiaro chiaro"
 
 #: src/escputil/escputil.c:1001 src/escputil/escputil.c:1290
-#: src/xml/xmli18n-tmp.h:1906 src/xml/xmli18n-tmp.h:1922
-#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:2003
-#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2080
-#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2120
-#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2174
-#: src/xml/xmli18n-tmp.h:2188 src/xml/xmli18n-tmp.h:2201
-#: src/xml/xmli18n-tmp.h:2214 src/xml/xmli18n-tmp.h:2227
-#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2294
-#: src/xml/xmli18n-tmp.h:2309 src/xml/xmli18n-tmp.h:2347
-#: src/xml/xmli18n-tmp.h:2360 src/xml/xmli18n-tmp.h:2419
-#: src/xml/xmli18n-tmp.h:2432 src/xml/xmli18n-tmp.h:2446
-#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2470
-#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2513
-#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2565
-#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2627
-#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2748
-#: src/xml/xmli18n-tmp.h:2761 src/xml/xmli18n-tmp.h:2844
-#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2896
-#: src/xml/xmli18n-tmp.h:2913 src/xml/xmli18n-tmp.h:2947
-#: src/xml/xmli18n-tmp.h:3000 src/xml/xmli18n-tmp.h:3014
-#: src/xml/xmli18n-tmp.h:3028 src/xml/xmli18n-tmp.h:3123
-#: src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2446
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2527
+#: src/xml/xmli18n-tmp.h:2541 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2644
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2698
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2751
+#: src/xml/xmli18n-tmp.h:2803 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2956 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2994
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3381
+#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3662
+#: src/xml/xmli18n-tmp.h:3746 src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:3778 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3934 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3966 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:4265 src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:4390 src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:4428 src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4452
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4465
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4512 src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4586 src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:4641 src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4903
+#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4970
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:5044 src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5168
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5241 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5334
+#: src/xml/xmli18n-tmp.h:5341 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5363
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5419
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5471
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5504
+#: src/xml/xmli18n-tmp.h:5510 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5652
+#: src/xml/xmli18n-tmp.h:5659 src/xml/xmli18n-tmp.h:5665
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5721
+#: src/xml/xmli18n-tmp.h:5728 src/xml/xmli18n-tmp.h:5734
+#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5781
 msgid "Light Magenta"
 msgstr "Magenta chiaro"
 
-#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2433
-#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:3002
-#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3030
+#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3679 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4409 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:4566 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4605 src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4664 src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5376 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5450
+#: src/xml/xmli18n-tmp.h:5475 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5533 src/xml/xmli18n-tmp.h:5542
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5678 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5717
+#: src/xml/xmli18n-tmp.h:5747 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5777
 msgid "Light Black"
 msgstr "Nero chiaro"
 
-#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:384
-#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
-#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
-#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
-#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
-#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
-#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
-#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
-#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
-#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
-#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
-#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
-#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
-#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
-#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
-#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
-#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
-#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
-#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
-#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
-#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
-#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
-#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
-#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
-#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
-#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
-#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
-#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
-#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
-#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
-#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1504
-#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1510
-#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1516
-#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1522
-#: src/xml/xmli18n-tmp.h:1525 src/xml/xmli18n-tmp.h:1528
-#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1534
-#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1540
-#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1546
-#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1552
-#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1558
-#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:2654
-#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2716
-#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3264
-#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3371
-#: src/xml/xmli18n-tmp.h:3539
+#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:508 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:532 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:538 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:562 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:568 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
+#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
+#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
+#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
+#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
+#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
+#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
+#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
+#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
+#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
+#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
+#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2011 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2026
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2032
+#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2038
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:4044 src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:5530
 msgid "Matte Black"
-msgstr "Nero Matte"
-
-#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:2658
-#: src/xml/xmli18n-tmp.h:2702 src/xml/xmli18n-tmp.h:2720
-#: src/xml/xmli18n-tmp.h:3048
+msgstr "Nero opaco"
+
+#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3995 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4006 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4020 src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:4106 src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Gloss Optimizer"
 msgstr "Lucido"
 
-#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:2760
-#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3013
-#: src/xml/xmli18n-tmp.h:3027
+#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3676
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4616 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5534 src/xml/xmli18n-tmp.h:5573
 msgid "Light Light Black"
 msgstr "Nero chiarissimo"
 
 #: src/escputil/escputil.c:1010 src/escputil/escputil.c:1029
-#: src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:4099 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4189
 msgid "Orange"
 msgstr "Arancione"
 
@@ -3733,7 +4674,7 @@ msgstr "Stato: pulizia\n"
 #: src/escputil/escputil.c:1062
 #, c-format
 msgid "Status: Factory shipment\n"
-msgstr ""
+msgstr "Stato: impostazioni di fabbrica\n"
 
 #: src/escputil/escputil.c:1065
 #, c-format
@@ -3773,7 +4714,7 @@ msgstr "Errore: inchiostro terminato\n"
 #: src/escputil/escputil.c:1094
 #, c-format
 msgid "Error: Paper out\n"
-msgstr "Errore: carta finita\n"
+msgstr "Errore: carta terminata\n"
 
 #: src/escputil/escputil.c:1097
 #, c-format
@@ -3788,7 +4729,7 @@ msgstr "Errore: trabocco della tanica di manutenzione\n"
 #: src/escputil/escputil.c:1103
 #, c-format
 msgid "Error: Wait return from the tear-off position\n"
-msgstr "Errore: attesa ritorno dalla posizione di tear-off\n"
+msgstr "Errore: attendere il ritorno dalla posizione di tear-off\n"
 
 #: src/escputil/escputil.c:1106
 #, c-format
@@ -3801,7 +4742,7 @@ msgid ""
 "Error: Ink cartridge lever released\n"
 "\n"
 msgstr ""
-"Errore: la leva delle cartucce di inchiostro è rilasciata\n"
+"Errore: la leva delle cartucce d'inchiostro è rilasciata\n"
 "\n"
 
 #: src/escputil/escputil.c:1112
@@ -3979,7 +4920,7 @@ msgstr "Impossibile identificare il modello di stampante.\n"
 #: src/escputil/escputil.c:1720
 #, c-format
 msgid "Cleaning heads...\n"
-msgstr "Pulizia testine in corso...\n"
+msgstr "Pulizia testine...\n"
 
 #: src/escputil/escputil.c:1737
 #, c-format
@@ -4028,28 +4969,28 @@ msgid ""
 msgstr ""
 "Leggere molto attentamente queste istruzioni prima di procedere.\n"
 "\n"
-"Questa utility è in grado di allineare le testine delle stampanti a getto\n"
+"Questa utilità è in grado di allineare le testine delle stampanti a getto\n"
 "d'inchiostro Epson Stylus. Un suo uso errato può danneggiare\n"
 "la stampante o diminuire la qualità di stampa. La correttezza\n"
-"di questa utility non è stata verificata da Seiko Epson ed è fornita\n"
-"senza alcuna garanzia. L'intero rischio corso usando questa utility\n"
+"di questa utilità non è stata verificata da Seiko Epson ed è fornita\n"
+"senza alcuna garanzia. L'intero rischio corso usando questa utilità\n"
 "è di responsabilità dell'utente.\n"
 "\n"
-"Questa utility stampa %d motivi di verifica che consistono in una serie\n"
+"Questa utilità stampa %d motivi di verifica che consistono in una serie\n"
 "di coppie di linee verticali che si sovrappongono. Sotto ad ogni coppia\n"
 "c'è un numero compreso tra %d e %d.\n"
 "\n"
 "Quando si controllano le coppie di linee, bisogna cercare la coppia che\n"
 "è allineata meglio, cioè che forma meglio un'unica riga verticale.\n"
 "Controlla le coppie molto attentamente per trovare la migliore.\n"
-"É raccomandato l'uso di una lente per i controlli più delicati.\n"
+"È raccomandato l'uso di una lente per i controlli più delicati.\n"
 "Si suggerisce di usare una carta di buona qualità per il test,\n"
 "in modo che le linee siano ben definite e non si diffondano lungo la carta.\n"
 "Dopo aver scelto il numero che corrisponde alla coppia migliore, rimetti\n"
-"il foglio nel vassoio prima di inserire il numero.\n"
+"il foglio nel vassoio prima d'inserire il numero.\n"
 "\n"
 "Ogni motivo è simile agli altri, ma vengono usati punti sempre più fini\n"
-"per un allineamento più preciso. É necessario completare tutti i passi\n"
+"per un allineamento più preciso. È necessario completare tutti i passi\n"
 "per allineare correttamente la stampante. Dopo aver completato la "
 "procedura,\n"
 "il motivo di verifica verrà stampato un'altra volta. Si dovrebbe notare che "
@@ -4062,7 +5003,7 @@ msgstr ""
 "ripristinate le impostazioni precedenti: per farlo bisogna spegnere\n"
 "e riaccendere la stampante. Se si esce, è necessario ripetere l'intero "
 "processo\n"
-"se si vogliono salvare i risultati. É essenziale non spegnere la stampante\n"
+"se si vogliono salvare i risultati. È essenziale non spegnere la stampante\n"
 "durante la procedura.\n"
 "\n"
 
@@ -4103,25 +5044,25 @@ msgid ""
 msgstr ""
 "Leggere molto attentamente queste istruzioni prima di procedere.\n"
 "\n"
-"Questa utility è in grado di allineare le testine delle stampanti a getto\n"
+"Questa utilità è in grado di allineare le testine delle stampanti a getto\n"
 "d'inchiostro Epson Stylus. Un suo uso errato può danneggiare\n"
 "la stampante o diminuire la qualità di stampa. La correttezza\n"
-"di questa utility non è stata verificata da Seiko Epson ed è fornita\n"
-"senza alcuna garanzia. L'intero rischio corso usando questa utility\n"
+"di questa utilità non è stata verificata da Seiko Epson ed è fornita\n"
+"senza alcuna garanzia. L'intero rischio corso usando questa utilità\n"
 "è di responsabilità dell'utente.\n"
 "\n"
-"Questa utility stampa un motivo di verifica che consiste in una serie\n"
+"Questa utilità stampa un motivo di verifica che consiste in una serie\n"
 "di coppie di linee verticali che si sovrappongono. Sotto ad ogni coppia\n"
 "c'è un numero compreso tra %d e %d.\n"
 "\n"
 "Quando si controllano le coppie di linee, bisogna cercare la coppia che\n"
 "è allineata meglio, cioè che forma meglio un'unica riga verticale.\n"
 "Controlla le coppie molto attentamente per trovare la migliore.\n"
-"É raccomandato l'uso di una lente per i controlli più delicati.\n"
+"È raccomandato l'uso di una lente per i controlli più delicati.\n"
 "Si suggerisce di usare una carta di buona qualità per il test,\n"
 "in modo che le linee siano ben definite e non si diffondano lungo la carta.\n"
 "Dopo aver scelto il numero che corrisponde alla coppia migliore, rimetti\n"
-"il foglio nel vassoio prima di inserire il numero.\n"
+"il foglio nel vassoio prima d'inserire il numero.\n"
 "\n"
 "Dopo aver completato la procedura, il motivo di verifica verrà stampato\n"
 "un'altra volta. Si dovrebbe notare che la coppia centrale (la %d° tra le %d\n"
@@ -4133,7 +5074,7 @@ msgstr ""
 "ripristinate le impostazioni precedenti: per farlo bisogna spegnere\n"
 "e riaccendere la stampante.\n"
 "Se si esce, è necessario ripetere l'intero processo se si vogliono salvare\n"
-"i risultati. É essenziale non spegnere la stampante durante la procedura.\n"
+"i risultati. È essenziale non spegnere la stampante durante la procedura.\n"
 "\n"
 
 #: src/escputil/escputil.c:1820
@@ -4145,7 +5086,7 @@ msgstr ""
 #: src/escputil/escputil.c:1834 src/escputil/escputil.c:2003
 #, c-format
 msgid "Exiting\n"
-msgstr "Uscita in corso...\n"
+msgstr "Uscita in corso\n"
 
 #: src/escputil/escputil.c:1837
 #, c-format
@@ -4194,13 +5135,13 @@ msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
-"Confermare la ripetizione della procedura di allineamento premendo\n"
+"Confermare la ripetizione della procedura d'allineamento premendo\n"
 "nuovamente il tasto \"r\":\n"
 
 #: src/escputil/escputil.c:1874
 #, c-format
 msgid "Repeating the alignment process.\n"
-msgstr "Ripetizione della procedura di allineamento in corso.\n"
+msgstr "Ripetizione della procedura d'allineamento in corso.\n"
 
 #: src/escputil/escputil.c:1880
 #, c-format
@@ -4224,7 +5165,7 @@ msgstr "Salvataggio impostazioni..."
 #: src/escputil/escputil.c:1898
 #, c-format
 msgid "failed!\n"
-msgstr "fallito!\n"
+msgstr "non riuscito.\n"
 
 #: src/escputil/escputil.c:1899
 #, c-format
@@ -4233,7 +5174,7 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 "Le impostazioni non sono state salvate con successo. È necessario ripetere\n"
-"l'operazione di allineamento.\n"
+"l'operazione d'allineamento.\n"
 
 #: src/escputil/escputil.c:1903
 #, c-format
@@ -4243,7 +5184,7 @@ msgstr "Successo.\n"
 #: src/escputil/escputil.c:1904
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
-msgstr "Le impostazioni di allineamento sono state salvate nella stampante.\n"
+msgstr "Le impostazioni d'allineamento sono state salvate nella stampante.\n"
 
 #: src/escputil/escputil.c:1909
 #, c-format
@@ -4265,11 +5206,11 @@ msgid ""
 "Please place a sheet of paper in your printer to begin the head\n"
 "alignment procedure.\n"
 msgstr ""
-"Questa procedura ipotizza che la tua stampante sia una %s.\n"
-"Se non è questo il modello della tua stampante, premi Ctrl-C e scegli\n"
+"Questa procedura ipotizza che la stampante sia una %s.\n"
+"Se non è questo il modello della stampante, premere Ctrl-C e scegliere\n"
 "il modello della stampante corretto.\n"
 "\n"
-"Mettere un foglio nella stampante per uniziare la procedura di\n"
+"Mettere un foglio nella stampante per iniziare la procedura di\n"
 "allineamento delle testine.\n"
 
 #: src/escputil/escputil.c:1986 src/escputil/escputil.c:2017
@@ -4302,7 +5243,7 @@ msgstr "Inserire un nuovo foglio di carta.\n"
 #: src/escputil/escputil.c:2033
 #, c-format
 msgid "Number out of range!\n"
-msgstr "Numero fuori dall'intervallo!\n"
+msgstr "Numero fuori dall'intervallo.\n"
 
 #: src/escputil/escputil.c:2038
 #, c-format
@@ -4323,7 +5264,7 @@ msgstr "Tentativo di impostazione dell'allineamento..."
 #: src/escputil/escputil.c:2054
 #, c-format
 msgid "succeeded.\n"
-msgstr "Riuscito.\n"
+msgstr "riuscito.\n"
 
 #: src/escputil/escputil.c:2055
 #, c-format
@@ -4362,7829 +5303,8147 @@ msgstr "In stampa..."
 #: src/xml/xmli18n-tmp.h:68 src/xml/xmli18n-tmp.h:70 src/xml/xmli18n-tmp.h:72
 #: src/xml/xmli18n-tmp.h:74 src/xml/xmli18n-tmp.h:76 src/xml/xmli18n-tmp.h:78
 #: src/xml/xmli18n-tmp.h:80 src/xml/xmli18n-tmp.h:82 src/xml/xmli18n-tmp.h:84
-#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:92
-#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
-#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
-#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
-#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
-#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
-#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
-#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
-#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
-#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
-#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
-#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
-#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
-#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
-#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
-#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
-#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
-#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
-#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
-#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
-#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
-#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
-#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
-#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
-#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
-#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
-#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
-#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
-#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
-#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
-#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
-#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
-#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
-#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
-#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
-#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
-#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
-#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
-#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
-#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
-#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
-#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
-#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
-#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
-#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
-#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
-#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
-#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
-#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
-#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
-#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
-#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
-#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
-#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
-#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
-#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
-#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
-#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
-#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
-#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
-#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
-#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
-#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
-#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
-#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
-#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
-#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
-#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
-#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
-#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
-#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
-#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
-#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
-#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
-#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
-#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
-#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
-#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
-#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
-#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
-#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
-#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
-#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
-#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
-#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
-#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
-#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
-#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
-#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
-#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
-#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
-#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
-#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
-#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
-#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
-#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
-#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:92 src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:102 src/xml/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:106 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:114 src/xml/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:118 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:126 src/xml/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:130 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:136 src/xml/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:144 src/xml/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:168 src/xml/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:192 src/xml/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:216 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:232 src/xml/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:240 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:256 src/xml/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:264 src/xml/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:304 src/xml/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:312 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:320 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:328 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:336 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:344 src/xml/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:352 src/xml/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:384 src/xml/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:408 src/xml/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:412 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:432 src/xml/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:444 src/xml/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:448 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:468 src/xml/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:484 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:642 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:698 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:714 src/xml/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:722 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:738 src/xml/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:746 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:764 src/xml/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:780 src/xml/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:804 src/xml/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:814
 #: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:818
 #: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:822
 #: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:826
 #: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:830
-#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:834
-#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:838
-#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:842
-#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:846
-#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:850
-#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
-#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
-#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
-#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
-#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
-#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
-#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
-#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:898
-#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
-#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
-#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
-#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
-#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
-#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
-#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
-#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
-#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
-#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
-#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
-#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
-#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
-#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
-#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
-#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
-#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
-#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
-#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
-#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1018
-#: src/xml/xmli18n-tmp.h:1021 src/xml/xmli18n-tmp.h:1024
-#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1030
-#: src/xml/xmli18n-tmp.h:1033 src/xml/xmli18n-tmp.h:1036
-#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1042
-#: src/xml/xmli18n-tmp.h:1045 src/xml/xmli18n-tmp.h:1048
-#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1054
-#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1060
-#: src/xml/xmli18n-tmp.h:1063 src/xml/xmli18n-tmp.h:1066
-#: src/xml/xmli18n-tmp.h:1069 src/xml/xmli18n-tmp.h:1072
-#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1078
-#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1084
-#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1090
-#: src/xml/xmli18n-tmp.h:1093 src/xml/xmli18n-tmp.h:1096
-#: src/xml/xmli18n-tmp.h:1099 src/xml/xmli18n-tmp.h:1102
-#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1108
-#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1114
-#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1120
-#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1126
-#: src/xml/xmli18n-tmp.h:1129 src/xml/xmli18n-tmp.h:1132
-#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
-#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
-#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
-#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
-#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
-#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
-#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
-#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
-#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
-#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
-#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
-#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
-#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
-#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1189
-#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1193
-#: src/xml/xmli18n-tmp.h:1195 src/xml/xmli18n-tmp.h:1197
-#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1201
-#: src/xml/xmli18n-tmp.h:1203 src/xml/xmli18n-tmp.h:1205
-#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1209
-#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1221
-#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
-#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
-#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
-#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
-#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
-#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
-#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
-#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
-#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
-#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
-#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
-#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
-#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
-#: src/xml/xmli18n-tmp.h:1302 src/xml/xmli18n-tmp.h:1305
-#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1311
-#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1317
-#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1323
-#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1329
-#: src/xml/xmli18n-tmp.h:1332 src/xml/xmli18n-tmp.h:1335
-#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
-#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1343
-#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1347
-#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1351
-#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1355
-#: src/xml/xmli18n-tmp.h:1357 src/xml/xmli18n-tmp.h:1359
-#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1363
-#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1367
-#: src/xml/xmli18n-tmp.h:1369 src/xml/xmli18n-tmp.h:1371
-#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1375
-#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1566
-#: src/xml/xmli18n-tmp.h:1569 src/xml/xmli18n-tmp.h:1572
-#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1578
-#: src/xml/xmli18n-tmp.h:1581 src/xml/xmli18n-tmp.h:1584
-#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1590
-#: src/xml/xmli18n-tmp.h:1593 src/xml/xmli18n-tmp.h:1596
-#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1602
-#: src/xml/xmli18n-tmp.h:1605 src/xml/xmli18n-tmp.h:1608
-#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1614
-#: src/xml/xmli18n-tmp.h:1617 src/xml/xmli18n-tmp.h:1620
-#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1626
-#: src/xml/xmli18n-tmp.h:1629 src/xml/xmli18n-tmp.h:1632
-#: src/xml/xmli18n-tmp.h:1635 src/xml/xmli18n-tmp.h:1638
-#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1644
-#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
-#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
-#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
-#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
-#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
-#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
-#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
-#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
-#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
-#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
-#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
-#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
-#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
-#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
-#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:1778
-#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1782
-#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1786
-#: src/xml/xmli18n-tmp.h:1788 src/xml/xmli18n-tmp.h:1790
-#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1794
-#: src/xml/xmli18n-tmp.h:1796 src/xml/xmli18n-tmp.h:1798
-#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1802
-#: src/xml/xmli18n-tmp.h:1804 src/xml/xmli18n-tmp.h:1806
-#: src/xml/xmli18n-tmp.h:1808 src/xml/xmli18n-tmp.h:1810
-#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3204
-#: src/xml/xmli18n-tmp.h:3210 src/xml/xmli18n-tmp.h:3216
-#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3232
-#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3250
-#: src/xml/xmli18n-tmp.h:3294 src/xml/xmli18n-tmp.h:3302
-#: src/xml/xmli18n-tmp.h:3304 src/xml/xmli18n-tmp.h:3312
-#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3379
-#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
-#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3421
-#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3441
-#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3469
-#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3555
-#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3597
-#: src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:1017
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1025
+#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1035 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1047 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1056
+#: src/xml/xmli18n-tmp.h:1061 src/xml/xmli18n-tmp.h:1066
+#: src/xml/xmli18n-tmp.h:1071 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1086
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1096
+#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1116
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1126
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1136
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1161 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1181 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1206
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1216
+#: src/xml/xmli18n-tmp.h:1221 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1236
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1246
+#: src/xml/xmli18n-tmp.h:1251 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1261 src/xml/xmli18n-tmp.h:1266
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1281 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1291 src/xml/xmli18n-tmp.h:1296
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1311 src/xml/xmli18n-tmp.h:1316
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1326
+#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1336
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1378 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1414 src/xml/xmli18n-tmp.h:1420
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1432
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1450 src/xml/xmli18n-tmp.h:1455
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1465
+#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1480 src/xml/xmli18n-tmp.h:1485
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1540 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1551 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1583 src/xml/xmli18n-tmp.h:1585
+#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1603 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1607 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1646
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1666
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1676
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1716
+#: src/xml/xmli18n-tmp.h:1721 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1736
+#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1835
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1843
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1851
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:2049
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2057
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2065
+#: src/xml/xmli18n-tmp.h:2069 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2113
+#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2129
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2137
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2153
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2161
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2185
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2264
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2272
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2276
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2282 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2286 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2296
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2300
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2308
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2314 src/xml/xmli18n-tmp.h:2316
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2324
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:3787 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3895 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:4223 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5579
+#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5825
 msgid "EPSON Standard Inks"
 msgstr "Inchiostri standard EPSON"
 
-#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:405
 msgid "Bright White Paper"
 msgstr "Carta bianco brillante"
 
-#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
-#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
-#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
-#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
-#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
-#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
-#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
-#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:817
-#: src/xml/xmli18n-tmp.h:855 src/xml/xmli18n-tmp.h:912
-#: src/xml/xmli18n-tmp.h:969 src/xml/xmli18n-tmp.h:1026
-#: src/xml/xmli18n-tmp.h:1083 src/xml/xmli18n-tmp.h:1136
-#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1226
-#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1338
-#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1445
-#: src/xml/xmli18n-tmp.h:1505 src/xml/xmli18n-tmp.h:1568
-#: src/xml/xmli18n-tmp.h:1625 src/xml/xmli18n-tmp.h:1682
-#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1777
-#: src/xml/xmli18n-tmp.h:3675
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:139 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:959 src/xml/xmli18n-tmp.h:1018
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1155
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1546
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1931
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:5912
 msgid "Postcard"
 msgstr "Cartolina"
 
-#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
-#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
-#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
-#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
-#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
-#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
-#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
-#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:825
-#: src/xml/xmli18n-tmp.h:867 src/xml/xmli18n-tmp.h:924
-#: src/xml/xmli18n-tmp.h:981 src/xml/xmli18n-tmp.h:1038
-#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1144
-#: src/xml/xmli18n-tmp.h:1182 src/xml/xmli18n-tmp.h:1238
-#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1346
-#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1457
-#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1580
-#: src/xml/xmli18n-tmp.h:1637 src/xml/xmli18n-tmp.h:1694
-#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1785
+#: src/xml/xmli18n-tmp.h:13 src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:155 src/xml/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:415 src/xml/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:851 src/xml/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1026
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1175
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1554
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1832
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2309
 msgid "Back Light Film"
 msgstr "Pellicola per lucidi"
 
-#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
-#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
-#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
-#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
-#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
-#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
-#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
-#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:829
-#: src/xml/xmli18n-tmp.h:873 src/xml/xmli18n-tmp.h:930
-#: src/xml/xmli18n-tmp.h:987 src/xml/xmli18n-tmp.h:1044
-#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1148
-#: src/xml/xmli18n-tmp.h:1186 src/xml/xmli18n-tmp.h:1244
-#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1350
-#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1463
-#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1586
-#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1700
-#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1789
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:419 src/xml/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:857 src/xml/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1030
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1383
+#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1558
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2313
 msgid "Matte Paper Heavyweight"
 msgstr "Carta Matte pesante"
 
-#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
-#: src/xml/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:421
 msgid "Premium Presentation Paper Matte"
 msgstr "Carta Matte premium per presentazioni"
 
-#: src/xml/xmli18n-tmp.h:27
-msgid "Premium Glossy Photo Paper 170 wt"
-msgstr "Carta fotografica ultralucida premium 170 g/m²"
-
-#: src/xml/xmli18n-tmp.h:29
-msgid "Premium Glossy Photo Paper 250 wt"
-msgstr "Carta fotografica ultralucida premium 250 g/m²"
-
-#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
-#: src/xml/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:431
 msgid "Ultra Glossy Photo Paper"
 msgstr "Carta fotografica ultralucida premium"
 
-#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
-#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
-#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
-#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
-#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
-#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
-#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
-#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:839
-#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:945
-#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1059
-#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1158
-#: src/xml/xmli18n-tmp.h:1196 src/xml/xmli18n-tmp.h:1259
-#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1360
-#: src/xml/xmli18n-tmp.h:1415 src/xml/xmli18n-tmp.h:1478
-#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1601
-#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1715
-#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1210
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1413
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1568
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1695
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1964
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2176 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2287 src/xml/xmli18n-tmp.h:2323
 msgid "Premium Semigloss Photo Paper"
 msgstr "Carta fotografica semilucida premium"
 
-#: src/xml/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:437
+msgid "Ultra Premium Photo Paper Luster"
+msgstr "Carta fotografica ultra premium luster"
+
+#: src/xml/xmli18n-tmp.h:37
+msgid "CD or DVD"
+msgstr "CD o DVD"
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:93 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1230
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1437
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2331
+msgid "ColorLife Paper"
+msgstr "Carta ColorLife"
+
+#: src/xml/xmli18n-tmp.h:73
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Carta fotografica ultralucida premium 170 g/m²"
+
+#: src/xml/xmli18n-tmp.h:75
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "Carta fotografica ultralucida premium 250 g/m²"
+
+#: src/xml/xmli18n-tmp.h:81
 msgid "Premium Semigloss Photo Paper 170 wt"
 msgstr "Carta fotografica semilucida premium 170 g/m²"
 
-#: src/xml/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:83
 msgid "Premium Semigloss Photo Paper 250 wt"
 msgstr "Carta fotografica semilucida premium 250 g/m²"
 
-#: src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:87
 msgid "Premium Luster Photo Paper 250 wt"
 msgstr "Carta fotografica premium luster 250 g/m²"
 
-#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
-#: src/xml/xmli18n-tmp.h:334
-msgid "Ultra Premium Photo Paper Luster"
-msgstr "Carta fotografica ultra premium luster"
-
-#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
-#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
-#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
-#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
-#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
-#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
-#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
-#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:845
-#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:957
-#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1071
-#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1166
-#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1271
-#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1372
-#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1496
-#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1613
-#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1733
-#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1807
-msgid "ColorLife Paper"
-msgstr "Carta ColorLife"
-
-#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
-#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
-#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
-#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
-#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
-#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
-#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
-#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
-#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
-#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
-#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
-#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
-#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
-#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
-#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
-#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
-#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
-#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
-#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
-#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
-#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
-#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
-#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
-#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
-#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
-#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
-#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
-#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
-#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
-#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
-#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
-#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
-#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
-#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
-#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
-#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
-#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
-#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
-#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
-#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
-#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
-#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
-#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
-#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
-#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
-#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
-#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:851
-#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:857
-#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:863
-#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:869
-#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:875
-#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:881
-#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:887
-#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:893
-#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:899
-#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:905
-#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:911
-#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:917
-#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:923
-#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:929
-#: src/xml/xmli18n-tmp.h:932 src/xml/xmli18n-tmp.h:935
-#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:941
-#: src/xml/xmli18n-tmp.h:944 src/xml/xmli18n-tmp.h:947
-#: src/xml/xmli18n-tmp.h:950 src/xml/xmli18n-tmp.h:953
-#: src/xml/xmli18n-tmp.h:956 src/xml/xmli18n-tmp.h:959
-#: src/xml/xmli18n-tmp.h:962 src/xml/xmli18n-tmp.h:965
-#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:971
-#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:977
-#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:983
-#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:989
-#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:995
-#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1001
-#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1007
-#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1013
-#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1019
-#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1025
-#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1031
-#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1037
-#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1043
-#: src/xml/xmli18n-tmp.h:1046 src/xml/xmli18n-tmp.h:1049
-#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1055
-#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1061
-#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1067
-#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1073
-#: src/xml/xmli18n-tmp.h:1076 src/xml/xmli18n-tmp.h:1079
-#: src/xml/xmli18n-tmp.h:1082 src/xml/xmli18n-tmp.h:1085
-#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1091
-#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1097
-#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1103
-#: src/xml/xmli18n-tmp.h:1106 src/xml/xmli18n-tmp.h:1109
-#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1115
-#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1121
-#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1127
-#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1133
-#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1225
-#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1231
-#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1237
-#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1243
-#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1249
-#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1255
-#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1261
-#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1267
-#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1273
-#: src/xml/xmli18n-tmp.h:1276 src/xml/xmli18n-tmp.h:1279
-#: src/xml/xmli18n-tmp.h:1282 src/xml/xmli18n-tmp.h:1285
-#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1291
-#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1297
-#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1303
-#: src/xml/xmli18n-tmp.h:1306 src/xml/xmli18n-tmp.h:1309
-#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1315
-#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1321
-#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1327
-#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1333
-#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1567
-#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1573
-#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1579
-#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1585
-#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1591
-#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1597
-#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1603
-#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1609
-#: src/xml/xmli18n-tmp.h:1612 src/xml/xmli18n-tmp.h:1615
-#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1621
-#: src/xml/xmli18n-tmp.h:1624 src/xml/xmli18n-tmp.h:1627
-#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1633
-#: src/xml/xmli18n-tmp.h:1636 src/xml/xmli18n-tmp.h:1639
-#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1645
-#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1651
-#: src/xml/xmli18n-tmp.h:1654 src/xml/xmli18n-tmp.h:1657
-#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1663
-#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1669
-#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1675
-#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3223
-#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3231
-#: src/xml/xmli18n-tmp.h:3238 src/xml/xmli18n-tmp.h:3239
-#: src/xml/xmli18n-tmp.h:3300 src/xml/xmli18n-tmp.h:3301
-#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3311
-#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3396
-#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3408
-#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3420
-#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3432
-#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3440
-#: src/xml/xmli18n-tmp.h:3479 src/xml/xmli18n-tmp.h:3480
-#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3492
-#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3554
-#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:133 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:149 src/xml/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:173 src/xml/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:197 src/xml/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:205 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:221 src/xml/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:229 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:245 src/xml/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:253 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:261 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:269 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:277 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:285 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:293 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:301 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:309 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:317 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:325 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:333 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:341 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:349 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:357 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:619 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:643 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:667 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:691 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:707 src/xml/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:715 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:731 src/xml/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:739 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:755 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1062
+#: src/xml/xmli18n-tmp.h:1067 src/xml/xmli18n-tmp.h:1072
+#: src/xml/xmli18n-tmp.h:1077 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1092
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1102
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1112
+#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1122
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1132
+#: src/xml/xmli18n-tmp.h:1137 src/xml/xmli18n-tmp.h:1142
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1157 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1177 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1192
+#: src/xml/xmli18n-tmp.h:1197 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1212
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1222
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1242
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1252
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1272
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1287 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1297 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1327 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1385 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1445 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1461
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1516 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1647
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1657
+#: src/xml/xmli18n-tmp.h:1662 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1677
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1687
+#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1742 src/xml/xmli18n-tmp.h:1747
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1767
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1807
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2090 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2098 src/xml/xmli18n-tmp.h:2102
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2118
+#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2126
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2162 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2190
+#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:3884 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:4779 src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:4845 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4919
+#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4980
+#: src/xml/xmli18n-tmp.h:4986 src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5209 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5276
+#: src/xml/xmli18n-tmp.h:5277 src/xml/xmli18n-tmp.h:5283
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5607 src/xml/xmli18n-tmp.h:5633
+#: src/xml/xmli18n-tmp.h:5634 src/xml/xmli18n-tmp.h:5640
 msgid "Quadtone"
-msgstr "Quadricromia"
-
-#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
-#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
-#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
-#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
-#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:852
-#: src/xml/xmli18n-tmp.h:909 src/xml/xmli18n-tmp.h:966
-#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1080
-#: src/xml/xmli18n-tmp.h:1172 src/xml/xmli18n-tmp.h:1223
-#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1336
-#: src/xml/xmli18n-tmp.h:1379 src/xml/xmli18n-tmp.h:1442
-#: src/xml/xmli18n-tmp.h:1565 src/xml/xmli18n-tmp.h:1622
-#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1775
+msgstr "Quadtone"
+
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:142 src/xml/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:150 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:174 src/xml/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:198 src/xml/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:214 src/xml/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:222 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:238 src/xml/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:246 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:262 src/xml/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:302 src/xml/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:310 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:318 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:326 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:334 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:342 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:350 src/xml/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:636 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:660 src/xml/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:708 src/xml/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:716 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:732 src/xml/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:756 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1103
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1123
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1158 src/xml/xmli18n-tmp.h:1163
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1183
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1193
+#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1213
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1223
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1238 src/xml/xmli18n-tmp.h:1243
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1253
+#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1283
+#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1313
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1333
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1362 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1374 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1462
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1472
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1487 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1502
+#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:1532
+#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1542
+#: src/xml/xmli18n-tmp.h:1633 src/xml/xmli18n-tmp.h:1638
+#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1648
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1658
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1713 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1728
+#: src/xml/xmli18n-tmp.h:1733 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1768
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2071
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2095
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2115 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2123 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2139 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2183
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2191
+#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2199
+msgid "MISQuadtone"
+msgstr "Quadtone MIS"
+
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1150 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2299
 msgid "Plain Paper Fast Load"
 msgstr "Carta semplice a caricamento rapido"
 
-#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
-#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
-#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1364
-#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1484
-#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1970 src/xml/xmli18n-tmp.h:2030
+#: src/xml/xmli18n-tmp.h:2245
 msgid "Archival Matte Paper"
 msgstr "Carta opaca per archivi"
 
-#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
-#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
-#: src/xml/xmli18n-tmp.h:1202 src/xml/xmli18n-tmp.h:1366
-#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1487
-#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:881 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2248
 msgid "Watercolor Paper - Radiant White"
 msgstr "Carta telata - Radiant White"
 
-#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
-#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
-#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
-#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
-#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
-#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
-#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
-#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
-#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
-#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
-#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1377
-#: src/xml/xmli18n-tmp.h:1380 src/xml/xmli18n-tmp.h:1383
-#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1389
-#: src/xml/xmli18n-tmp.h:1392 src/xml/xmli18n-tmp.h:1395
-#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1401
-#: src/xml/xmli18n-tmp.h:1404 src/xml/xmli18n-tmp.h:1407
-#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1413
-#: src/xml/xmli18n-tmp.h:1416 src/xml/xmli18n-tmp.h:1419
-#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1425
-#: src/xml/xmli18n-tmp.h:1428 src/xml/xmli18n-tmp.h:1431
-#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1437
-#: src/xml/xmli18n-tmp.h:1440 src/xml/xmli18n-tmp.h:1443
-#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1449
-#: src/xml/xmli18n-tmp.h:1452 src/xml/xmli18n-tmp.h:1455
-#: src/xml/xmli18n-tmp.h:1458 src/xml/xmli18n-tmp.h:1461
-#: src/xml/xmli18n-tmp.h:1464 src/xml/xmli18n-tmp.h:1467
-#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1473
-#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1479
-#: src/xml/xmli18n-tmp.h:1482 src/xml/xmli18n-tmp.h:1485
-#: src/xml/xmli18n-tmp.h:1488 src/xml/xmli18n-tmp.h:1491
-#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1497
-#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1677
-#: src/xml/xmli18n-tmp.h:1680 src/xml/xmli18n-tmp.h:1683
-#: src/xml/xmli18n-tmp.h:1686 src/xml/xmli18n-tmp.h:1689
-#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1695
-#: src/xml/xmli18n-tmp.h:1698 src/xml/xmli18n-tmp.h:1701
-#: src/xml/xmli18n-tmp.h:1704 src/xml/xmli18n-tmp.h:1707
-#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1713
-#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1719
-#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1725
-#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1731
-#: src/xml/xmli18n-tmp.h:1734 src/xml/xmli18n-tmp.h:1737
-#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3503
-#: src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:1863
+#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1881
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1893
+#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1905
+#: src/xml/xmli18n-tmp.h:1908 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1923
+#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:1950 src/xml/xmli18n-tmp.h:1953
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1968 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1983
+#: src/xml/xmli18n-tmp.h:1986 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2204 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2255
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5645
 msgid "UltraChrome Photo Black"
 msgstr "Nero fotografico UltraChrome"
 
-#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
-#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
-#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
-#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
-#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
-#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
-#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
-#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
-#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
-#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
-#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1378
-#: src/xml/xmli18n-tmp.h:1381 src/xml/xmli18n-tmp.h:1384
-#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1390
-#: src/xml/xmli18n-tmp.h:1393 src/xml/xmli18n-tmp.h:1396
-#: src/xml/xmli18n-tmp.h:1399 src/xml/xmli18n-tmp.h:1402
-#: src/xml/xmli18n-tmp.h:1405 src/xml/xmli18n-tmp.h:1408
-#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1414
-#: src/xml/xmli18n-tmp.h:1417 src/xml/xmli18n-tmp.h:1420
-#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1426
-#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1432
-#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1438
-#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1444
-#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1450
-#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1456
-#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1462
-#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1468
-#: src/xml/xmli18n-tmp.h:1471 src/xml/xmli18n-tmp.h:1474
-#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1480
-#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1486
-#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1492
-#: src/xml/xmli18n-tmp.h:1495 src/xml/xmli18n-tmp.h:1498
-#: src/xml/xmli18n-tmp.h:1501 src/xml/xmli18n-tmp.h:1678
-#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1684
-#: src/xml/xmli18n-tmp.h:1687 src/xml/xmli18n-tmp.h:1690
-#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1696
-#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1702
-#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1708
-#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1714
-#: src/xml/xmli18n-tmp.h:1717 src/xml/xmli18n-tmp.h:1720
-#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1726
-#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1732
-#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1738
-#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3517
-#: src/xml/xmli18n-tmp.h:3577
+#: src/xml/xmli18n-tmp.h:835 src/xml/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:841 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1879 src/xml/xmli18n-tmp.h:1882
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1894
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1909 src/xml/xmli18n-tmp.h:1912
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1924
+#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1954
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1969 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1984
+#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2208
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2229 src/xml/xmli18n-tmp.h:2232
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2238
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2244
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2253 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2259 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5714
 msgid "UltraChrome Matte Black"
 msgstr "Nero opaco UltraChrome"
 
-#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1826
-#: src/xml/xmli18n-tmp.h:1839 src/xml/xmli18n-tmp.h:1852
-#: src/xml/xmli18n-tmp.h:1907 src/xml/xmli18n-tmp.h:1923
-#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1952
-#: src/xml/xmli18n-tmp.h:1965 src/xml/xmli18n-tmp.h:2054
-#: src/xml/xmli18n-tmp.h:2081 src/xml/xmli18n-tmp.h:2146
-#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
-#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
-#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2348
-#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2407
-#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2899
-#: src/xml/xmli18n-tmp.h:2916 src/xml/xmli18n-tmp.h:3142
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1139
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1154 src/xml/xmli18n-tmp.h:1159
+#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1179
+#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1199
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1214 src/xml/xmli18n-tmp.h:1219
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1229
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1244 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1259
+#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1274 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1289
+#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1309
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1329
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1423
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1429
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1447
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1634
+#: src/xml/xmli18n-tmp.h:1639 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1664
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1764
+#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1784
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1799 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1819
+msgid "MIS Hextone"
+msgstr "Hextone MIS"
+
+#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1463 src/xml/xmli18n-tmp.h:1468
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1478
+#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1508
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1533 src/xml/xmli18n-tmp.h:1538
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4858 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:5289
+msgid "Hextone"
+msgstr "Hextone"
+
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2489 src/xml/xmli18n-tmp.h:2578
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2713 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2752
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2885 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:3051 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3665
 msgid "360 x 90 DPI Fast Economy"
-msgstr "360 x 90 DPI bozza economica veloce"
-
-#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1828
-#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1853
-#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1879
-#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
-#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1940
-#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1966
-#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2055
-#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2133
-#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2175
-#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
-#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
-#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2336
-#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
-#: src/xml/xmli18n-tmp.h:2408 src/xml/xmli18n-tmp.h:2528
+msgstr "360 × 90 DPI bozza economica veloce"
+
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2699
+#: src/xml/xmli18n-tmp.h:2714 src/xml/xmli18n-tmp.h:2727
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2886
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:3052
 msgid "180 DPI Economy"
 msgstr "180 DPI economica"
 
-#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1830
-#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1854
-#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1880
-#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
-#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1941
-#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1967
-#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
-#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2134
-#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2176
-#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
-#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
-#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2337
-#: src/xml/xmli18n-tmp.h:2350 src/xml/xmli18n-tmp.h:2363
-#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
-#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2434
-#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2459
-#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2529
-#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2601
-#: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2703
-#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2735
-#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2768
-#: src/xml/xmli18n-tmp.h:2872 src/xml/xmli18n-tmp.h:2884
-#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2917
-#: src/xml/xmli18n-tmp.h:2961 src/xml/xmli18n-tmp.h:3007
-#: src/xml/xmli18n-tmp.h:3021 src/xml/xmli18n-tmp.h:3035
-#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3126
-#: src/xml/xmli18n-tmp.h:3143
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2404
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2658
+#: src/xml/xmli18n-tmp.h:2672 src/xml/xmli18n-tmp.h:2700
+#: src/xml/xmli18n-tmp.h:2715 src/xml/xmli18n-tmp.h:2728
+#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2754
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2919 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3053
+#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3125
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3292
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3530
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3649
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3684
 msgid "360 x 180 DPI Draft"
-msgstr "360 x 180 DPI bozza"
-
-#: src/xml/xmli18n-tmp.h:1818 src/xml/xmli18n-tmp.h:1831
-#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1855
-#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1881
-#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
-#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1942
-#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1968
-#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2135
-#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2410
+msgstr "360 × 180 DPI bozza"
+
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2392 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2418 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2479 src/xml/xmli18n-tmp.h:2492
+#: src/xml/xmli18n-tmp.h:2581 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2862 src/xml/xmli18n-tmp.h:2934
 msgid "360 DPI High Quality"
 msgstr "360 DPI alta qualità"
 
-#: src/xml/xmli18n-tmp.h:1819 src/xml/xmli18n-tmp.h:1832
-#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1856
-#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1882
-#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
-#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1943
-#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1969
-#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1992
-#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2020
-#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
-#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
-#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2096
-#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2123
-#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2149
-#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2177
-#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2205
-#: src/xml/xmli18n-tmp.h:2218 src/xml/xmli18n-tmp.h:2231
-#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2254
-#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
-#: src/xml/xmli18n-tmp.h:2297 src/xml/xmli18n-tmp.h:2312
-#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2339
-#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
-#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2385
-#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2411
-#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2435
-#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2460
-#: src/xml/xmli18n-tmp.h:2473 src/xml/xmli18n-tmp.h:2488
-#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2516
-#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2541
-#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2591
-#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
-#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2645
-#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2675
-#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2704
-#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2736
-#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2769
-#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2808
-#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2833
-#: src/xml/xmli18n-tmp.h:2847 src/xml/xmli18n-tmp.h:2861
-#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2885
-#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2918
-#: src/xml/xmli18n-tmp.h:2935 src/xml/xmli18n-tmp.h:2950
-#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2987
-#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3022
-#: src/xml/xmli18n-tmp.h:3036 src/xml/xmli18n-tmp.h:3050
-#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3081
-#: src/xml/xmli18n-tmp.h:3098 src/xml/xmli18n-tmp.h:3113
-#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2369 src/xml/xmli18n-tmp.h:2380
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2406
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2493
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2544
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
+#: src/xml/xmli18n-tmp.h:2582 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2729
+#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2806
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2836
+#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
+#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3012
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3040
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3184 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3424 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3485 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3573
+#: src/xml/xmli18n-tmp.h:3587 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3650 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3685
 msgid "360 DPI"
 msgstr "360 DPI"
 
-#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1833
-#: src/xml/xmli18n-tmp.h:1846 src/xml/xmli18n-tmp.h:1857
-#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1883
-#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1912
-#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1944
-#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1970
-#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1993
-#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2021
-#: src/xml/xmli18n-tmp.h:2033 src/xml/xmli18n-tmp.h:2045
-#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
-#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2097
-#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2124
-#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2150
-#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2178
-#: src/xml/xmli18n-tmp.h:2193 src/xml/xmli18n-tmp.h:2206
-#: src/xml/xmli18n-tmp.h:2219 src/xml/xmli18n-tmp.h:2232
-#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2255
-#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
-#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2313
-#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2340
-#: src/xml/xmli18n-tmp.h:2352 src/xml/xmli18n-tmp.h:2365
-#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2386
-#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2412
-#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2436
-#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2461
-#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2489
-#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2517
-#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2542
-#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2567
-#: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2592
-#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2616
-#: src/xml/xmli18n-tmp.h:2631 src/xml/xmli18n-tmp.h:2646
-#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2676
-#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2705
-#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2737
-#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2770
-#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2809
-#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2834
-#: src/xml/xmli18n-tmp.h:2848 src/xml/xmli18n-tmp.h:2862
-#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2886
-#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2919
-#: src/xml/xmli18n-tmp.h:2936 src/xml/xmli18n-tmp.h:2951
-#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2988
-#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3023
-#: src/xml/xmli18n-tmp.h:3037 src/xml/xmli18n-tmp.h:3051
-#: src/xml/xmli18n-tmp.h:3066 src/xml/xmli18n-tmp.h:3083
-#: src/xml/xmli18n-tmp.h:3099 src/xml/xmli18n-tmp.h:3114
-#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:2344 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2452 src/xml/xmli18n-tmp.h:2468
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2494
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2557 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:2594
+#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2648
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2674
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2807
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2837
+#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
+#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3013
+#: src/xml/xmli18n-tmp.h:3026 src/xml/xmli18n-tmp.h:3041
+#: src/xml/xmli18n-tmp.h:3055 src/xml/xmli18n-tmp.h:3066
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3140
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3170
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3229
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3333
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3358
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3385
+#: src/xml/xmli18n-tmp.h:3397 src/xml/xmli18n-tmp.h:3409
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3442
+#: src/xml/xmli18n-tmp.h:3459 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3574
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3637
+#: src/xml/xmli18n-tmp.h:3651 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3686
 msgid "720 x 360 DPI"
-msgstr "720 x 360 DPI"
-
-#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1834
-#: src/xml/xmli18n-tmp.h:1847 src/xml/xmli18n-tmp.h:1858
-#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1884
-#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1913
-#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1945
-#: src/xml/xmli18n-tmp.h:1958 src/xml/xmli18n-tmp.h:1971
-#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:1994
-#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2022
-#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2046
-#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2071
-#: src/xml/xmli18n-tmp.h:2086 src/xml/xmli18n-tmp.h:2098
-#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2125
-#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2151
-#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2179
-#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2207
-#: src/xml/xmli18n-tmp.h:2220 src/xml/xmli18n-tmp.h:2233
-#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2256
-#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
-#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2314
-#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2341
-#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
-#: src/xml/xmli18n-tmp.h:2376 src/xml/xmli18n-tmp.h:2387
-#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2413
-#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2437
-#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2462
-#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2490
-#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2518
-#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2543
-#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
-#: src/xml/xmli18n-tmp.h:2580 src/xml/xmli18n-tmp.h:2593
-#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2617
-#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
-#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2677
-#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2706
-#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2738
-#: src/xml/xmli18n-tmp.h:2753 src/xml/xmli18n-tmp.h:2771
-#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2810
-#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2835
-#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
-#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2887
-#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2921
-#: src/xml/xmli18n-tmp.h:2937 src/xml/xmli18n-tmp.h:2952
-#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2990
-#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3024
-#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3052
-#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3085
-#: src/xml/xmli18n-tmp.h:3100 src/xml/xmli18n-tmp.h:3115
-#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3146
+msgstr "720 × 360 DPI"
+
+#: src/xml/xmli18n-tmp.h:2345 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2469
+#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2546
+#: src/xml/xmli18n-tmp.h:2558 src/xml/xmli18n-tmp.h:2570
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2595
+#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2622
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2675
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2731
+#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2808
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2838
+#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2890
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2922 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3014
+#: src/xml/xmli18n-tmp.h:3027 src/xml/xmli18n-tmp.h:3042
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3067
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3186 src/xml/xmli18n-tmp.h:3201
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3334
+#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3359
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3444
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3475
+#: src/xml/xmli18n-tmp.h:3489 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3533 src/xml/xmli18n-tmp.h:3547
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3652 src/xml/xmli18n-tmp.h:3669
+#: src/xml/xmli18n-tmp.h:3687
 msgid "720 DPI"
 msgstr "720 DPI"
 
-#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
-#: src/xml/xmli18n-tmp.h:1978 src/xml/xmli18n-tmp.h:2004
-#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2030
-#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2067
-#: src/xml/xmli18n-tmp.h:2094 src/xml/xmli18n-tmp.h:2107
-#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2161
-#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2252
-#: src/xml/xmli18n-tmp.h:2280 src/xml/xmli18n-tmp.h:2295
-#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2323
-#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
-#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2486
-#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2552
-#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2613
-#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
-#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2686
-#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2806
-#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2831
-#: src/xml/xmli18n-tmp.h:2845 src/xml/xmli18n-tmp.h:2859
-#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2948
-#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3080
-#: src/xml/xmli18n-tmp.h:3097 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2554
+#: src/xml/xmli18n-tmp.h:2566 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2804 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2834 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3076
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3382
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3586 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3634
 msgid "360 x 120 DPI Economy"
-msgstr "360 x 120 DPI economica"
-
-#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1842
-#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2005
-#: src/xml/xmli18n-tmp.h:2019 src/xml/xmli18n-tmp.h:2031
-#: src/xml/xmli18n-tmp.h:2043 src/xml/xmli18n-tmp.h:2068
-#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
-#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2162
-#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2253
-#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2296
-#: src/xml/xmli18n-tmp.h:2311 src/xml/xmli18n-tmp.h:2324
-#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2384
-#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2487
-#: src/xml/xmli18n-tmp.h:2500 src/xml/xmli18n-tmp.h:2553
-#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2614
-#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2644
-#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2687
-#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2807
-#: src/xml/xmli18n-tmp.h:2820 src/xml/xmli18n-tmp.h:2832
-#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
-#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2949
-#: src/xml/xmli18n-tmp.h:3112
+msgstr "360 × 120 DPI economica"
+
+#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2555
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2632
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3077
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3211
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3383
+#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3635
 msgid "360 x 240 DPI Draft"
-msgstr "360 x 240 DPI bozza"
-
-#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1872
-#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1898
-#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1930
-#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1959
-#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:1995
-#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2023
-#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2047
-#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2087
-#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2112
-#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2139
-#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2166
-#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2328
-#: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2388
-#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2557
-#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2922
-#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2991
-#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3086
+msgstr "360 × 240 DPI bozza"
+
+#: src/xml/xmli18n-tmp.h:2383 src/xml/xmli18n-tmp.h:2396
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2422
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2470 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2507 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2704 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:3057 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3118 src/xml/xmli18n-tmp.h:3445
+#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3514
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3609
 msgid "720 DPI High Quality"
 msgstr "720 DPI alta qualità"
 
-#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1873
-#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1899
-#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1931
-#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1984
-#: src/xml/xmli18n-tmp.h:1996 src/xml/xmli18n-tmp.h:2010
-#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2036
-#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2061
-#: src/xml/xmli18n-tmp.h:2073 src/xml/xmli18n-tmp.h:2088
-#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2127
-#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2153
-#: src/xml/xmli18n-tmp.h:2167 src/xml/xmli18n-tmp.h:2181
-#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2208
-#: src/xml/xmli18n-tmp.h:2221 src/xml/xmli18n-tmp.h:2234
-#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2257
-#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2285
-#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2315
-#: src/xml/xmli18n-tmp.h:2329 src/xml/xmli18n-tmp.h:2354
-#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2389
-#: src/xml/xmli18n-tmp.h:2399 src/xml/xmli18n-tmp.h:2425
-#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2451
-#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
-#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2504
-#: src/xml/xmli18n-tmp.h:2519 src/xml/xmli18n-tmp.h:2534
-#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2558
-#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2605
-#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2633
-#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2663
-#: src/xml/xmli18n-tmp.h:2678 src/xml/xmli18n-tmp.h:2691
-#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2725
-#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2754
-#: src/xml/xmli18n-tmp.h:2772 src/xml/xmli18n-tmp.h:2787
-#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2811
-#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2836
-#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
-#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2888
-#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2923
-#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2953
-#: src/xml/xmli18n-tmp.h:2968 src/xml/xmli18n-tmp.h:2978
-#: src/xml/xmli18n-tmp.h:2992 src/xml/xmli18n-tmp.h:3011
-#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3039
-#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
-#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3101
-#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3130
-#: src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:2384 src/xml/xmli18n-tmp.h:2397
+#: src/xml/xmli18n-tmp.h:2410 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2548 src/xml/xmli18n-tmp.h:2560
+#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2691 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2794 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2839
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2923 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3105
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3129
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3231 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3311
+#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3335
+#: src/xml/xmli18n-tmp.h:3348 src/xml/xmli18n-tmp.h:3360
+#: src/xml/xmli18n-tmp.h:3372 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3427 src/xml/xmli18n-tmp.h:3446
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3576 src/xml/xmli18n-tmp.h:3593
+#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3688
 msgid "1440 x 720 DPI"
-msgstr "1440 x 720 DPI"
-
-#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1874
-#: src/xml/xmli18n-tmp.h:1887 src/xml/xmli18n-tmp.h:1900
-#: src/xml/xmli18n-tmp.h:1916 src/xml/xmli18n-tmp.h:1932
-#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1985
-#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2011
-#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2037
-#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2062
-#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2089
-#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2128
-#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2154
-#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2182
-#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2258
-#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
-#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2316
-#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2390
-#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2559
-#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2634
-#: src/xml/xmli18n-tmp.h:2865
+msgstr "1440 × 720 DPI"
+
+#: src/xml/xmli18n-tmp.h:2385 src/xml/xmli18n-tmp.h:2398
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2535
+#: src/xml/xmli18n-tmp.h:2549 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2782
+#: src/xml/xmli18n-tmp.h:2795 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3388
 msgid "1440 x 720 DPI Highest Quality"
-msgstr "1440 x 720 DPI massima qualità"
+msgstr "1440 × 720 DPI massima qualità"
 
-#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1960
-#: src/xml/xmli18n-tmp.h:2100 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2902
 msgid "720 DPI Highest Quality"
 msgstr "720 DPI massima qualità"
 
-#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2259
-#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
-#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2317
-#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2477
-#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2505
-#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2606
-#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2635
-#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2740
-#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2866
-#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2796 src/xml/xmli18n-tmp.h:2811
+#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3216 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3412
 msgid "2880 x 720 DPI"
-msgstr "2880 x 720 DPI"
+msgstr "2880 × 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2260
-#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
-#: src/xml/xmli18n-tmp.h:2303 src/xml/xmli18n-tmp.h:2318
-#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2771 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2812
+#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:3160 src/xml/xmli18n-tmp.h:3390
 msgid "2880 x 720 DPI Highest Quality"
-msgstr "2880 x 720 DPI massima qualità"
-
-#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2439
-#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2493
-#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2546
-#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2582
-#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2620
-#: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2664
-#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
-#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2726
-#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2755
-#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2789
-#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2812
-#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2878
-#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
-#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2939
-#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2969
-#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2994
-#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
-#: src/xml/xmli18n-tmp.h:3088 src/xml/xmli18n-tmp.h:3102
-#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3131
-#: src/xml/xmli18n-tmp.h:3148
+msgstr "2880 × 720 DPI massima qualità"
+
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2963
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3070
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3106
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3297 src/xml/xmli18n-tmp.h:3313
+#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
+#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3401
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3492
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3577 src/xml/xmli18n-tmp.h:3594
+#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3671 src/xml/xmli18n-tmp.h:3689
 msgid "1440 x 1440 DPI"
-msgstr "1440 x 1440 DPI"
-
-#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2426
-#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2452
-#: src/xml/xmli18n-tmp.h:2464 src/xml/xmli18n-tmp.h:2479
-#: src/xml/xmli18n-tmp.h:2494 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2547
-#: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2583
-#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2621
-#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2665
-#: src/xml/xmli18n-tmp.h:2680 src/xml/xmli18n-tmp.h:2694
-#: src/xml/xmli18n-tmp.h:2709 src/xml/xmli18n-tmp.h:2727
-#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2756
-#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2790
-#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2813
-#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2837
-#: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2879
-#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
-#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2940
-#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2970
-#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2995
-#: src/xml/xmli18n-tmp.h:3012 src/xml/xmli18n-tmp.h:3026
-#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3055
-#: src/xml/xmli18n-tmp.h:3072 src/xml/xmli18n-tmp.h:3089
-#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3118
-#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3149
+msgstr "1440 × 1440 DPI"
+
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3071
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3107
+#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3251
+#: src/xml/xmli18n-tmp.h:3266 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3298 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3324 src/xml/xmli18n-tmp.h:3337
+#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3374 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3463
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3535 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3563 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3612
+#: src/xml/xmli18n-tmp.h:3626 src/xml/xmli18n-tmp.h:3641
+#: src/xml/xmli18n-tmp.h:3655 src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:3690
 msgid "2880 x 1440 DPI"
-msgstr "2880 x 1440 DPI"
+msgstr "2880 × 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:4374
 msgid "Dark Yellow"
 msgstr "Giallo scuro"
 
-#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2584
-#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2711
-#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2743
-#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2776
-#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2908
-#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2972
-#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3057
-#: src/xml/xmli18n-tmp.h:3074 src/xml/xmli18n-tmp.h:3091
-#: src/xml/xmli18n-tmp.h:3105 src/xml/xmli18n-tmp.h:3134
-#: src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3108
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3267
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3495
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3614
+#: src/xml/xmli18n-tmp.h:3628 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3692
 msgid "2880 x 2880 DPI"
-msgstr "2880 x 2880 DPI"
-
-#: src/xml/xmli18n-tmp.h:2666 src/xml/xmli18n-tmp.h:2681
-#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2728
-#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2775
-#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2814
-#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2838
-#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2926
-#: src/xml/xmli18n-tmp.h:2941 src/xml/xmli18n-tmp.h:2971
-#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
-#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
-#: src/xml/xmli18n-tmp.h:3090 src/xml/xmli18n-tmp.h:3104
-#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3133
-#: src/xml/xmli18n-tmp.h:3150
+msgstr "2880 × 2880 DPI"
+
+#: src/xml/xmli18n-tmp.h:3190 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3234 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3325 src/xml/xmli18n-tmp.h:3338
+#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3362
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3505
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3613
+#: src/xml/xmli18n-tmp.h:3627 src/xml/xmli18n-tmp.h:3642
+#: src/xml/xmli18n-tmp.h:3656 src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:3691
 msgid "5760 x 1440 DPI"
-msgstr "5760 x 1440 DPI"
-
-#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2712
-#: src/xml/xmli18n-tmp.h:2730 src/xml/xmli18n-tmp.h:2759
-#: src/xml/xmli18n-tmp.h:2777 src/xml/xmli18n-tmp.h:2909
-#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2973
-#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3058
-#: src/xml/xmli18n-tmp.h:3075 src/xml/xmli18n-tmp.h:3092
-#: src/xml/xmli18n-tmp.h:3106 src/xml/xmli18n-tmp.h:3135
-#: src/xml/xmli18n-tmp.h:3152
+msgstr "5760 × 1440 DPI"
+
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3301 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3496
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3615
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
 msgid "5760 x 2880 DPI"
-msgstr "5760 x 2880 DPI"
+msgstr "5760 × 2880 DPI"
 
-#: src/xml/xmli18n-tmp.h:2798 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3502
 msgid "1440 x 720 DPI Transposed"
-msgstr "1440 x 720 DPI girato"
+msgstr "1440 × 720 DPI girato"
 
-#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2965
-#: src/xml/xmli18n-tmp.h:2989 src/xml/xmli18n-tmp.h:3067
-#: src/xml/xmli18n-tmp.h:3084
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:3607
 msgid "720 x 360 DPI Enhanced"
-msgstr "720 x 360 DPI Migliorato"
+msgstr "720 × 360 DPI Migliorato"
 
-#: src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:3479
 msgid "Black 1"
 msgstr "Nero 1"
 
-#: src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3480
 msgid "Black 2"
 msgstr "Nero 2"
 
-#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3065
-#: src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3605
 msgid "360 DPI Enhanced"
 msgstr "360 DPI Migliorato"
 
-#: src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3516
 msgid "1440 x 720 DPI High Quality"
-msgstr "1440 x 720 DPI alta qualità"
+msgstr "1440 × 720 DPI alta qualità"
 
-#: src/xml/xmli18n-tmp.h:3153
-#, fuzzy
-msgid "Lower Front Tray"
-msgstr "Cassetto anteriore"
+#: src/xml/xmli18n-tmp.h:3677
+msgid "Vivid Light Magenta"
+msgstr "Magenta chiaro vivido"
 
-#: src/xml/xmli18n-tmp.h:3154
-#, fuzzy
-msgid "Upper Front Tray"
-msgstr "Cassetto anteriore"
+#: src/xml/xmli18n-tmp.h:3682
+msgid "Vivid Magenta"
+msgstr "Magenta vivido"
+
+#: src/xml/xmli18n-tmp.h:3694
+msgid "Main Tray"
+msgstr "Vassoio principale"
+
+#: src/xml/xmli18n-tmp.h:3695
+msgid "Photo Tray"
+msgstr "Vassoio delle fotografie"
 
-#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3160
-#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3176
-#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3186
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3725 src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:3732
 msgid "Print to CD"
 msgstr "Stampa su CD"
 
-#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3181
-#: src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:3730
 msgid "Rear Tray"
-msgstr "Cassetto posteriore"
+msgstr "Vassoio posteriore"
 
-#: src/xml/xmli18n-tmp.h:3157 src/xml/xmli18n-tmp.h:3182
-#: src/xml/xmli18n-tmp.h:3185
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:3731
 msgid "Front Tray"
-msgstr "Cassetto anteriore"
+msgstr "Vassoio anteriore"
 
-#: src/xml/xmli18n-tmp.h:3159 src/xml/xmli18n-tmp.h:3164
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3705
 msgid "Manual Feed"
 msgstr "Inserimento manuale"
 
-#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3709
 msgid "Roll Feed (cut each page)"
 msgstr "Rullo di alimentazione (taglio di ogni pagina)"
 
-#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3710
 msgid "Roll Feed (do not cut)"
 msgstr "Rullo di alimentazione (senza taglio)"
 
-#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3171
-#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3180
-#: src/xml/xmli18n-tmp.h:3193
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3716 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3739
 msgid "Roll Feed"
 msgstr "Rullo di alimentazione"
 
-#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3714 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3723
 msgid "Manual Sheet Guide"
 msgstr "Guida manuale foglio"
 
-#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3715 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3724
 msgid "Manual Feed (Front)"
 msgstr "Alimentazione manuale (fronte)"
 
-#: src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3733
 msgid "Photo Board"
 msgstr "Cartoncino fotografico"
 
-#: src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3734
 msgid "Cut Sheet Bin 1"
 msgstr "Scomparto taglio carta 1"
 
-#: src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3735
 msgid "Cut Sheet Bin 2"
 msgstr "Scomparto taglio carta 2"
 
-#: src/xml/xmli18n-tmp.h:3190
+#: src/xml/xmli18n-tmp.h:3736
 msgid "Cut Sheet Autoselect"
 msgstr "Autoselezione taglio carta"
 
-#: src/xml/xmli18n-tmp.h:3191
+#: src/xml/xmli18n-tmp.h:3737
 msgid "Manual Selection"
 msgstr "Selezione manuale"
 
-#: src/xml/xmli18n-tmp.h:3199 src/xml/xmli18n-tmp.h:3207
-#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3219
-#: src/xml/xmli18n-tmp.h:3227 src/xml/xmli18n-tmp.h:3235
-#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3257
-#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3278
-#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3297
-#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3317
-#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3342
-#: src/xml/xmli18n-tmp.h:3356 src/xml/xmli18n-tmp.h:3382
-#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
-#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3426
-#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3446
-#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3474
-#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3498
-#: src/xml/xmli18n-tmp.h:3510 src/xml/xmli18n-tmp.h:3524
-#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3558
-#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:3584
-#: src/xml/xmli18n-tmp.h:3594 src/xml/xmli18n-tmp.h:3600
-#: src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3763 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3872 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:4067 src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4172 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4236 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:4754 src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5102 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5679 src/xml/xmli18n-tmp.h:5748
+#: src/xml/xmli18n-tmp.h:5793 src/xml/xmli18n-tmp.h:5814
+#: src/xml/xmli18n-tmp.h:5835
 msgid "One Color Raw"
 msgstr "Raw monocromatico"
 
-#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3208
-#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3220
-#: src/xml/xmli18n-tmp.h:3228 src/xml/xmli18n-tmp.h:3236
-#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3259
-#: src/xml/xmli18n-tmp.h:3270 src/xml/xmli18n-tmp.h:3280
-#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3298
-#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3318
-#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3344
-#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3383
-#: src/xml/xmli18n-tmp.h:3391 src/xml/xmli18n-tmp.h:3403
-#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3427
-#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3447
-#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3475
-#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3499
-#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3526
-#: src/xml/xmli18n-tmp.h:3551 src/xml/xmli18n-tmp.h:3559
-#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3586
-#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3601
-#: src/xml/xmli18n-tmp.h:3607
+#: src/xml/xmli18n-tmp.h:3765 src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4484 src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:4756 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5321
+#: src/xml/xmli18n-tmp.h:5382 src/xml/xmli18n-tmp.h:5451
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5795 src/xml/xmli18n-tmp.h:5816
+#: src/xml/xmli18n-tmp.h:5837
 msgid "Three Color Raw"
 msgstr "Raw a tre colori"
 
-#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
-#: src/xml/xmli18n-tmp.h:3215 src/xml/xmli18n-tmp.h:3221
-#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3237
-#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3271
-#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3299
-#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3319
-#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3345
-#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3384
-#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
-#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3428
-#: src/xml/xmli18n-tmp.h:3438 src/xml/xmli18n-tmp.h:3448
-#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3463
-#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3476
-#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3500
-#: src/xml/xmli18n-tmp.h:3513 src/xml/xmli18n-tmp.h:3527
-#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3560
-#: src/xml/xmli18n-tmp.h:3573 src/xml/xmli18n-tmp.h:3587
-#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3602
-#: src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:3824 src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5325
+#: src/xml/xmli18n-tmp.h:5386 src/xml/xmli18n-tmp.h:5455
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5757
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5841
 msgid "Four Color Raw"
 msgstr "Raw a quattro colori"
 
-#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3248
-#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
-#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3360
-#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
-#: src/xml/xmli18n-tmp.h:3417 src/xml/xmli18n-tmp.h:3429
-#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3459
-#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3501 src/xml/xmli18n-tmp.h:3514
-#: src/xml/xmli18n-tmp.h:3528 src/xml/xmli18n-tmp.h:3574
-#: src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4424 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:5066 src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:5196 src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5391
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5762
 msgid "Five Color Raw"
 msgstr "Raw a cinque colori"
 
-#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3249
-#: src/xml/xmli18n-tmp.h:3272 src/xml/xmli18n-tmp.h:3293
-#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3333
-#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3361
-#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
-#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3430
-#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3460
-#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3478
-#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3502
-#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3529
-#: src/xml/xmli18n-tmp.h:3575 src/xml/xmli18n-tmp.h:3589
+#: src/xml/xmli18n-tmp.h:3780 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:4078 src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:4430 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4972
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5150 src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5336
+#: src/xml/xmli18n-tmp.h:5397 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5768
 msgid "Six Color Raw"
 msgstr "Raw a sei colori"
 
-#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3919 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:4781 src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:4795 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4921
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:4996
+#: src/xml/xmli18n-tmp.h:5023 src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:5226 src/xml/xmli18n-tmp.h:5279
+#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5603 src/xml/xmli18n-tmp.h:5609
+#: src/xml/xmli18n-tmp.h:5636 src/xml/xmli18n-tmp.h:5642
+msgid "Gray 3"
+msgstr "Grigio 3"
+
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4782 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4796 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4916 src/xml/xmli18n-tmp.h:4922
+#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4983
+#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5286 src/xml/xmli18n-tmp.h:5294
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5643
+msgid "Gray 2"
+msgstr "Grigio 2"
+
+#: src/xml/xmli18n-tmp.h:3855 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:4856 src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:4931 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4998
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:5214 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5611
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5644
+msgid "Gray 1"
+msgstr "Grigio 1"
+
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4985 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5606 src/xml/xmli18n-tmp.h:5639
+msgid "MIS Quadtone"
+msgstr "Quadtone MIS"
+
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4114
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Raw lucido migliorato a un colore"
 
-#: src/xml/xmli18n-tmp.h:3260 src/xml/xmli18n-tmp.h:3281
+#: src/xml/xmli18n-tmp.h:4016 src/xml/xmli18n-tmp.h:4121
 msgid "Three Color Raw Gloss"
 msgstr "Raw lucido a tre colori"
 
-#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3282
+#: src/xml/xmli18n-tmp.h:4021 src/xml/xmli18n-tmp.h:4126
 msgid "Four Color Raw Gloss"
 msgstr "Raw lucido a quattro colori"
 
-#: src/xml/xmli18n-tmp.h:3262 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4132
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Raw lucido migliorato a sei colori"
 
-#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:4035 src/xml/xmli18n-tmp.h:4140
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Raw lucido migliorato a sette colori"
 
-#: src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:4141
+msgid "MatteBlack"
+msgstr "Nero opaco"
+
+#: src/xml/xmli18n-tmp.h:4224
 msgid "Default Black"
 msgstr "Nero predefinito"
 
-#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
-#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3365
-#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3504
-#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3533
-#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3564
-#: src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4446 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4573 src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:5344
+#: src/xml/xmli18n-tmp.h:5413 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Seven Color Photo"
 msgstr "Foto a sette colori"
 
-#: src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:4315
 msgid "Six Color Enhanced Composite"
 msgstr "Foto composita a sei colori migliorata"
 
-#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3348
-#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3516
-#: src/xml/xmli18n-tmp.h:3530 src/xml/xmli18n-tmp.h:3576
-#: src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:4368 src/xml/xmli18n-tmp.h:4437
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:5404
+#: src/xml/xmli18n-tmp.h:5473 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5775
 msgid "Seven Color Raw"
 msgstr "Raw a sette colori"
 
-#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3355
-#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3523
-#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5745
 msgid "Two Level Grayscale"
 msgstr "Toni di grigio a due livelli"
 
-#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3357
-#: src/xml/xmli18n-tmp.h:3511 src/xml/xmli18n-tmp.h:3525
-#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:4412 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5448
+#: src/xml/xmli18n-tmp.h:5681 src/xml/xmli18n-tmp.h:5750
 msgid "Two Color Raw"
 msgstr "Raw a due colori"
 
-#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3372
-#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3540
+#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5531
 msgid "Eight Color Photo"
 msgstr "Foto a otto colori"
 
-#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3378
-#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:4652 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5570
 msgid "Eight Color Raw"
 msgstr "Raw a otto colori"
 
-#: src/xml/xmli18n-tmp.h:3462 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:5288
+msgid "MIS Six Tone"
+msgstr "A sei toni MIS"
+
+#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:4994
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5291
+msgid "Gray 5"
+msgstr "Grigio 5"
+
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:4928 src/xml/xmli18n-tmp.h:4995
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5292
+msgid "Gray 4"
+msgstr "Grigio 4"
+
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5145
 msgid "Four Color Photo"
 msgstr "Foto a quattro colori"
 
-#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3615
-#: src/xml/xmli18n-tmp.h:3621
+#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5852
+#: src/xml/xmli18n-tmp.h:5858
 msgid "Interleave"
 msgstr "Interfoliazione"
 
-#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3616
-#: src/xml/xmli18n-tmp.h:3622
+#: src/xml/xmli18n-tmp.h:5848 src/xml/xmli18n-tmp.h:5853
+#: src/xml/xmli18n-tmp.h:5859
 msgid "Full Overlap"
 msgstr "Sovrapposizione totale"
 
-#: src/xml/xmli18n-tmp.h:3612 src/xml/xmli18n-tmp.h:3617
-#: src/xml/xmli18n-tmp.h:3623
+#: src/xml/xmli18n-tmp.h:5849 src/xml/xmli18n-tmp.h:5854
+#: src/xml/xmli18n-tmp.h:5860
 msgid "Four Pass"
 msgstr "Quattro passaggi"
 
-#: src/xml/xmli18n-tmp.h:3613 src/xml/xmli18n-tmp.h:3618
-#: src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5855
+#: src/xml/xmli18n-tmp.h:5861
 msgid "Full Overlap 2"
 msgstr "Sovrapposizione totale 2"
 
-#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:5862
 msgid "Interleave 2"
 msgstr "Interfoliazione 2"
 
-#: src/xml/xmli18n-tmp.h:3626
+#: src/xml/xmli18n-tmp.h:5863
 msgid "Eight Pass"
 msgstr "Otto passaggi"
 
-#: src/xml/xmli18n-tmp.h:3628
+#: src/xml/xmli18n-tmp.h:5865
 msgid "On"
 msgstr "Attivo"
 
-#: src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:5909
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:5910
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:3674
+#: src/xml/xmli18n-tmp.h:5911
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:3679
+#: src/xml/xmli18n-tmp.h:5916
 msgid "3x5"
-msgstr "3x5"
+msgstr "3×5"
 
-#: src/xml/xmli18n-tmp.h:3680
+#: src/xml/xmli18n-tmp.h:5917
 msgid "3 1/2 x5"
-msgstr "3 1/2 x5"
+msgstr "3 1/2 ×5"
 
-#: src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:5918
 msgid "4x6"
-msgstr "4x6"
+msgstr "4×6"
 
-#: src/xml/xmli18n-tmp.h:3682
+#: src/xml/xmli18n-tmp.h:5919
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
-msgstr "Carta fotografica Epson 4x6 (adesiva)"
+msgstr "Carta fotografica Epson 4×6 (adesiva)"
 
-#: src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:5920
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr "Carta fotografica Epson L (adesiva)"
+
+#: src/xml/xmli18n-tmp.h:5921
 msgid "5x7"
-msgstr "5x7"
+msgstr "5×7"
 
-#: src/xml/xmli18n-tmp.h:3684
+#: src/xml/xmli18n-tmp.h:5922
 msgid "5x8"
-msgstr "5x8"
+msgstr "5×8"
 
-#: src/xml/xmli18n-tmp.h:3685
+#: src/xml/xmli18n-tmp.h:5923
 msgid "6x8"
-msgstr "6x8"
+msgstr "6×8"
 
-#: src/xml/xmli18n-tmp.h:3686
+#: src/xml/xmli18n-tmp.h:5924
 msgid "8x10"
-msgstr "8x10"
+msgstr "8×10"
 
-#: src/xml/xmli18n-tmp.h:3688
+#: src/xml/xmli18n-tmp.h:5926
 msgid "12x18"
-msgstr "12x18"
+msgstr "12×18"
 
-#: src/xml/xmli18n-tmp.h:3689
+#: src/xml/xmli18n-tmp.h:5927
 msgid "Super B 13x19"
-msgstr "Super B 13x19"
+msgstr "Super B 13×19"
 
-#: src/xml/xmli18n-tmp.h:3690
+#: src/xml/xmli18n-tmp.h:5928
 msgid "Engineering C 17x22"
-msgstr "Engineering C 17x22"
+msgstr "Engineering C 17×22"
 
-#: src/xml/xmli18n-tmp.h:3691
+#: src/xml/xmli18n-tmp.h:5929
 msgid "8x12"
-msgstr "8x12"
+msgstr "8×12"
 
-#: src/xml/xmli18n-tmp.h:3692
+#: src/xml/xmli18n-tmp.h:5930
 msgid "11x14"
-msgstr "11x14"
+msgstr "11×14"
 
-#: src/xml/xmli18n-tmp.h:3693
+#: src/xml/xmli18n-tmp.h:5931
 msgid "16x20"
-msgstr "16x20"
+msgstr "16×20"
 
-#: src/xml/xmli18n-tmp.h:3694
+#: src/xml/xmli18n-tmp.h:5932
 msgid "16x24"
-msgstr "16x24"
+msgstr "16×24"
 
-#: src/xml/xmli18n-tmp.h:3695
+#: src/xml/xmli18n-tmp.h:5933
 msgid "20x24"
-msgstr "20x24"
+msgstr "20×24"
 
-#: src/xml/xmli18n-tmp.h:3696
+#: src/xml/xmli18n-tmp.h:5934
 msgid "20x30"
-msgstr "20x30"
+msgstr "20×30"
 
-#: src/xml/xmli18n-tmp.h:3697
+#: src/xml/xmli18n-tmp.h:5935
 msgid "22x30"
-msgstr "22x30"
+msgstr "22×30"
 
-#: src/xml/xmli18n-tmp.h:3698
+#: src/xml/xmli18n-tmp.h:5936
 msgid "24x30"
-msgstr "24x30"
+msgstr "24×30"
 
-#: src/xml/xmli18n-tmp.h:3699
+#: src/xml/xmli18n-tmp.h:5937
 msgid "Super A1 24x36"
-msgstr "Super A1 24x36"
+msgstr "Super A1 24×36"
 
-#: src/xml/xmli18n-tmp.h:3700
+#: src/xml/xmli18n-tmp.h:5938
 msgid "30x40"
-msgstr "30x40"
+msgstr "30×40"
 
-#: src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:5939
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:3702
+#: src/xml/xmli18n-tmp.h:5940
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:3703
+#: src/xml/xmli18n-tmp.h:5941
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:5942
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:3705
+#: src/xml/xmli18n-tmp.h:5943
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:3706
+#: src/xml/xmli18n-tmp.h:5944
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:3707
+#: src/xml/xmli18n-tmp.h:5945
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:3709
+#: src/xml/xmli18n-tmp.h:5947
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:3710
+#: src/xml/xmli18n-tmp.h:5948
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:5949
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:5950
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:3713
+#: src/xml/xmli18n-tmp.h:5951
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:3714
+#: src/xml/xmli18n-tmp.h:5952
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:3715
+#: src/xml/xmli18n-tmp.h:5953
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:3716
+#: src/xml/xmli18n-tmp.h:5954
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:5955
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:5956
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:5957
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:5958
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:5959
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:3722
+#: src/xml/xmli18n-tmp.h:5960
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:3723
+#: src/xml/xmli18n-tmp.h:5961
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:3724
+#: src/xml/xmli18n-tmp.h:5962
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:3725
+#: src/xml/xmli18n-tmp.h:5963
 msgid "4B ISO"
 msgstr "ISO 4B"
 
-#: src/xml/xmli18n-tmp.h:3726
+#: src/xml/xmli18n-tmp.h:5964
 msgid "2B ISO"
 msgstr "ISO 2B"
 
-#: src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:5965
 msgid "B0 ISO"
 msgstr "ISO B0"
 
-#: src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:5966
 msgid "B1 ISO"
 msgstr "ISO B1"
 
-#: src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:5967
 msgid "B2 ISO"
 msgstr "ISO B2"
 
-#: src/xml/xmli18n-tmp.h:3730
+#: src/xml/xmli18n-tmp.h:5968
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:3731
+#: src/xml/xmli18n-tmp.h:5969
 msgid "B4 ISO"
 msgstr "ISO B4"
 
-#: src/xml/xmli18n-tmp.h:3732
+#: src/xml/xmli18n-tmp.h:5970
 msgid "B5 ISO"
 msgstr "ISO B5"
 
-#: src/xml/xmli18n-tmp.h:3733
+#: src/xml/xmli18n-tmp.h:5971
 msgid "B6 ISO"
 msgstr "ISO B6"
 
-#: src/xml/xmli18n-tmp.h:3734
+#: src/xml/xmli18n-tmp.h:5972
 msgid "B7 ISO"
 msgstr "ISO B7"
 
-#: src/xml/xmli18n-tmp.h:3735
+#: src/xml/xmli18n-tmp.h:5973
 msgid "B8 ISO"
 msgstr "ISO B8"
 
-#: src/xml/xmli18n-tmp.h:3736
+#: src/xml/xmli18n-tmp.h:5974
 msgid "B9 ISO"
 msgstr "ISO B9"
 
-#: src/xml/xmli18n-tmp.h:3737
+#: src/xml/xmli18n-tmp.h:5975
 msgid "B10 ISO"
 msgstr "ISO B10"
 
-#: src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5976
 msgid "Super B0 JIS"
 msgstr "Super BO JIS"
 
-#: src/xml/xmli18n-tmp.h:3739
+#: src/xml/xmli18n-tmp.h:5977
 msgid "B0 JIS"
 msgstr "JIS B0"
 
-#: src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:5978
 msgid "B1 JIS"
 msgstr "JIS B1"
 
-#: src/xml/xmli18n-tmp.h:3741
+#: src/xml/xmli18n-tmp.h:5979
 msgid "B2 JIS"
 msgstr "JIS B2"
 
-#: src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:5980
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:3743
+#: src/xml/xmli18n-tmp.h:5981
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:5982
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:5983
 msgid "B6 JIS"
 msgstr "JIS B6"
 
-#: src/xml/xmli18n-tmp.h:3746
+#: src/xml/xmli18n-tmp.h:5984
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:3747
+#: src/xml/xmli18n-tmp.h:5985
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:3748
+#: src/xml/xmli18n-tmp.h:5986
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:5987
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:3750
+#: src/xml/xmli18n-tmp.h:5988
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:3751
+#: src/xml/xmli18n-tmp.h:5989
 msgid "C0 landscape"
-msgstr "C0 girato"
+msgstr "C0 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:5990
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:5991
 msgid "C1 landscape"
-msgstr "C1 girato"
+msgstr "C1 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:3754
+#: src/xml/xmli18n-tmp.h:5992
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:3755
+#: src/xml/xmli18n-tmp.h:5993
 msgid "C2 landscape"
-msgstr "C2 girato"
+msgstr "C2 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:3756
+#: src/xml/xmli18n-tmp.h:5994
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:5995
 msgid "C3 landscape"
-msgstr "C3 girato"
+msgstr "C3 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:3758
+#: src/xml/xmli18n-tmp.h:5996
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:3759
+#: src/xml/xmli18n-tmp.h:5997
 msgid "C4 landscape"
-msgstr "C4 girato"
+msgstr "C4 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:5998
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:3761
+#: src/xml/xmli18n-tmp.h:5999
 msgid "C5 landscape"
-msgstr "C5 girato"
+msgstr "C5 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:6000
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:3763
+#: src/xml/xmli18n-tmp.h:6001
 msgid "B6-C4 landscape"
-msgstr "B6-C4 girato"
+msgstr "B6-C4 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:6002
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:3765
+#: src/xml/xmli18n-tmp.h:6003
 msgid "C6 landscape"
-msgstr "C6 girato"
+msgstr "C6 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:3766
+#: src/xml/xmli18n-tmp.h:6004
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:6005
 msgid "DL landscape"
-msgstr "DL girato"
+msgstr "DL orizzontale"
 
-#: src/xml/xmli18n-tmp.h:3768
+#: src/xml/xmli18n-tmp.h:6006
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:3769
+#: src/xml/xmli18n-tmp.h:6007
 msgid "C7-6 landscape"
-msgstr "C7-6 girato"
+msgstr "C7-6 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:3770
+#: src/xml/xmli18n-tmp.h:6008
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:6009
 msgid "C7 landscape"
-msgstr "C7 girato"
+msgstr "C7 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:3772
+#: src/xml/xmli18n-tmp.h:6010
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:6011
 msgid "C8 landscape"
-msgstr "C8 girato"
+msgstr "C8 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:3774
+#: src/xml/xmli18n-tmp.h:6012
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:3775
+#: src/xml/xmli18n-tmp.h:6013
 msgid "C9 landscape"
-msgstr "C9 girato"
+msgstr "C9 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:6014
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:6015
 msgid "C10 landscape"
-msgstr "C10 girato"
+msgstr "C10 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:3778
+#: src/xml/xmli18n-tmp.h:6016
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:3779
+#: src/xml/xmli18n-tmp.h:6017
 msgid "ArchA transposed"
 msgstr "ArchA girato"
 
-#: src/xml/xmli18n-tmp.h:3780
+#: src/xml/xmli18n-tmp.h:6018
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:6019
 msgid "ArchB transposed"
 msgstr "ArchB girato"
 
-#: src/xml/xmli18n-tmp.h:3782
+#: src/xml/xmli18n-tmp.h:6020
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:6021
 msgid "ArchC transposed"
 msgstr "ArchC girato"
 
-#: src/xml/xmli18n-tmp.h:3784
+#: src/xml/xmli18n-tmp.h:6022
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:6023
 msgid "ArchD transposed"
 msgstr "ArchD girato"
 
-#: src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:6024
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:3787
+#: src/xml/xmli18n-tmp.h:6025
 msgid "ArchE transposed"
 msgstr "ArchE girato"
 
-#: src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:6026
 msgid "American foolscap"
 msgstr "Formato protocollo americano"
 
-#: src/xml/xmli18n-tmp.h:3789
+#: src/xml/xmli18n-tmp.h:6027
 msgid "European foolscap"
 msgstr "Formato protocollo europeo"
 
-#: src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:6028
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:6029
 msgid "Large Crown Quarto"
 msgstr "Crown Quarto largo"
 
-#: src/xml/xmli18n-tmp.h:3792
+#: src/xml/xmli18n-tmp.h:6030
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:6031
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/xml/xmli18n-tmp.h:3794
+#: src/xml/xmli18n-tmp.h:6032
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:3795
+#: src/xml/xmli18n-tmp.h:6033
 msgid "Large Crown Octavo"
 msgstr "Crown Octavo largo"
 
-#: src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:6034
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:6035
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:6036
 msgid "Small paperback"
 msgstr "Tascabile piccolo"
 
-#: src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:6037
 msgid "Penguin small paperback"
 msgstr "Tascabile Penguin piccolo"
 
-#: src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:6038
 msgid "Penguin large paperback"
 msgstr "Tascabile Penguin grande"
 
-#: src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:6039
 msgid "10cm x 15cm"
-msgstr "10cm x 15cm"
+msgstr "10cm × 15cm"
 
-#: src/xml/xmli18n-tmp.h:3802
+#: src/xml/xmli18n-tmp.h:6040
 msgid "Hagaki Card"
 msgstr "Biglietto Hagaki"
 
-#: src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:6041
 msgid "Oufuku Card"
 msgstr "Biglietto Ofuku"
 
-#: src/xml/xmli18n-tmp.h:3804
+#: src/xml/xmli18n-tmp.h:6042
 msgid "Japanese long envelope #3"
 msgstr "Busta giapponese lunga #3"
 
-#: src/xml/xmli18n-tmp.h:3805
+#: src/xml/xmli18n-tmp.h:6043
 msgid "Japanese long envelope #3 landscape"
-msgstr "Busta giapponese lunga #3 girata"
+msgstr "Busta giapponese lunga #3 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:3806
+#: src/xml/xmli18n-tmp.h:6044
 msgid "Japanese long envelope #4"
 msgstr "Busta giapponese lunga #4"
 
-#: src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:6045
 msgid "Japanese long envelope #4 landscape"
-msgstr "Busta giapponese lunga #4 girata"
+msgstr "Busta giapponese lunga #4 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:6046
 msgid "Japanese Kaku envelope #4"
 msgstr "Busta giapponese Kaku #4"
 
-#: src/xml/xmli18n-tmp.h:3809
+#: src/xml/xmli18n-tmp.h:6047
 msgid "Japanese Kaku envelope #4 landscape"
-msgstr "Busta giapponese Kaku #4 girata"
+msgstr "Busta giapponese Kaku #4 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:6048
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:6049
 msgid "Commercial 10 landscape"
-msgstr "Commercial 10 girata"
+msgstr "Commercial 10 orizzontale"
 
-#: src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:6050
 msgid "A2 Invitation"
 msgstr "Invito A2"
 
-#: src/xml/xmli18n-tmp.h:3813
+#: src/xml/xmli18n-tmp.h:6051
 msgid "Monarch Envelope"
 msgstr "Busta Monarch"
 
-#: src/xml/xmli18n-tmp.h:3814
+#: src/xml/xmli18n-tmp.h:6052
 msgid "Monarch Envelope landscape"
-msgstr "Busta Monarch girata"
+msgstr "Busta Monarch orizzontale"
 
-#: src/xml/xmli18n-tmp.h:3815
+#: src/xml/xmli18n-tmp.h:6053
 msgid "4x5 3/8"
-msgstr "4x5 3/8"
+msgstr "4×5 3/8"
 
-#: src/xml/xmli18n-tmp.h:3816
+#: src/xml/xmli18n-tmp.h:6054
 msgid "4x7"
-msgstr "4x7"
+msgstr "4×7"
 
-#: src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:6055
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/xml/xmli18n-tmp.h:3818
+#: src/xml/xmli18n-tmp.h:6056
 msgid "Card"
 msgstr "Tessera"
 
-#: src/xml/xmli18n-tmp.h:3819
+#: src/xml/xmli18n-tmp.h:6057
 msgid "Wide Postcard"
 msgstr "Cartolina larga"
 
-#: src/xml/xmli18n-tmp.h:3820
+#: src/xml/xmli18n-tmp.h:6058
 msgid "Chilean Office"
 msgstr "Chilean Office"
 
-#: src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:6059
 msgid "Chilean Double Letter"
 msgstr "Chilean Double Letter"
 
-#: src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:6060
 msgid "Chilean Double Office"
 msgstr "Chilean Double Office"
 
-#: src/xml/xmli18n-tmp.h:3824
+#: src/xml/xmli18n-tmp.h:6062
 msgid "89 mm Roll Paper"
 msgstr "Carta in rotolo da 89 mm"
 
-#: src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:6063
 msgid "4 Inch Roll Paper"
 msgstr "Carta in rotolo da 4 pollici"
 
-#: src/xml/xmli18n-tmp.h:3826
+#: src/xml/xmli18n-tmp.h:6064
 msgid "5 Inch Roll Paper"
 msgstr "Carta in rotolo da 5 pollici"
 
-#: src/xml/xmli18n-tmp.h:3827
+#: src/xml/xmli18n-tmp.h:6065
 msgid "210 mm Roll Paper"
 msgstr "Carta in rotolo da 210 mm"
 
-#: src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:6066
 msgid "13 Inch Roll Paper"
 msgstr "Carta in rotolo da 13 pollici"
 
-#: src/xml/xmli18n-tmp.h:3829
+#: src/xml/xmli18n-tmp.h:6067
 msgid "17 Inch Roll Paper"
 msgstr "Carta in rotolo da 17 pollici"
 
-#: src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:6068
 msgid "22 Inch Roll Paper"
 msgstr "Carta in rotolo da 22 pollici"
 
-#: src/xml/xmli18n-tmp.h:3831
+#: src/xml/xmli18n-tmp.h:6069
 msgid "24 Inch Roll Paper"
 msgstr "Carta in rotolo da 24 pollici"
 
-#: src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:6070
 msgid "36 Inch Roll Paper"
 msgstr "Carta in rotolo da 36 pollici"
 
-#: src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:6071
 msgid "44 Inch Roll Paper"
 msgstr "Carta in rotolo da 44 pollici"
 
-#: src/xml/xmli18n-tmp.h:3834
+#: src/xml/xmli18n-tmp.h:6072
 msgid "60 Inch Roll Paper"
 msgstr "Carta in rotolo da 60 pollici"
 
-#: src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:6073
 msgid "64 Inch Roll Paper"
 msgstr "Carta in rotolo da 64 pollici"
 
-#: src/xml/xmli18n-tmp.h:3836
+#: src/xml/xmli18n-tmp.h:6074
 msgid "PostScript Level 1"
 msgstr "PostScript Level 1"
 
-#: src/xml/xmli18n-tmp.h:3837
+#: src/xml/xmli18n-tmp.h:6075
 msgid "PostScript Level 2"
 msgstr "PostScript Level 2"
 
-#: src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:6076
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:6077
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:6078
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:6079
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:6080
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:6081
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/xml/xmli18n-tmp.h:3844
+#: src/xml/xmli18n-tmp.h:6082
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:6083
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/xml/xmli18n-tmp.h:3846
+#: src/xml/xmli18n-tmp.h:6084
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:3847
+#: src/xml/xmli18n-tmp.h:6085
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/xml/xmli18n-tmp.h:3848
+#: src/xml/xmli18n-tmp.h:6086
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:6087
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/xml/xmli18n-tmp.h:3850
+#: src/xml/xmli18n-tmp.h:6088
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:6089
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:6090
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/xml/xmli18n-tmp.h:3853
+#: src/xml/xmli18n-tmp.h:6091
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/xml/xmli18n-tmp.h:3854
+#: src/xml/xmli18n-tmp.h:6092
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/xml/xmli18n-tmp.h:3855
+#: src/xml/xmli18n-tmp.h:6093
 msgid "Canon BJC-5100"
 msgstr "Canon BJC-5100"
 
-#: src/xml/xmli18n-tmp.h:3856
+#: src/xml/xmli18n-tmp.h:6094
 msgid "Canon BJC-5500"
 msgstr "Canon BJC-5500"
 
-#: src/xml/xmli18n-tmp.h:3857
+#: src/xml/xmli18n-tmp.h:6095
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/xml/xmli18n-tmp.h:3858
+#: src/xml/xmli18n-tmp.h:6096
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:6097
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:6098
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:6099
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:6100
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/xml/xmli18n-tmp.h:3863
+#: src/xml/xmli18n-tmp.h:6101
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:6102
 msgid "Canon BJC-8500"
 msgstr "Canon BJC-8500"
 
-#: src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:6103
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:6104
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/xml/xmli18n-tmp.h:3867
+#: src/xml/xmli18n-tmp.h:6105
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/xml/xmli18n-tmp.h:3868
+#: src/xml/xmli18n-tmp.h:6106
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:3869
+#: src/xml/xmli18n-tmp.h:6107
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:3870
+#: src/xml/xmli18n-tmp.h:6108
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:6109
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:3872
+#: src/xml/xmli18n-tmp.h:6110
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/xml/xmli18n-tmp.h:3873
+#: src/xml/xmli18n-tmp.h:6111
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:3874
+#: src/xml/xmli18n-tmp.h:6112
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:6113
 msgid "Canon PIXMA iP2000"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:6114
 msgid "Canon PIXMA iP3000"
 msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:3877
+#: src/xml/xmli18n-tmp.h:6115
 msgid "Canon PIXMA iP3100"
 msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:3878
+#: src/xml/xmli18n-tmp.h:6116
 msgid "Canon PIXMA iP4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:6117
 msgid "Canon PIXMA iP4100"
 msgstr "Canon PIXMA iP4100"
 
-#: src/xml/xmli18n-tmp.h:3880
+#: src/xml/xmli18n-tmp.h:6118
 msgid "Canon PIXMA iP4200"
 msgstr "Canon PIXMA iP4200"
 
-#: src/xml/xmli18n-tmp.h:3881
+#: src/xml/xmli18n-tmp.h:6119
 msgid "Canon PIXMA iP4300"
 msgstr "Canon PIXMA iP4300"
 
-#: src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:6120
 msgid "Canon PIXMA iP4500"
 msgstr "Canon PIXMA iP4500"
 
-#: src/xml/xmli18n-tmp.h:3883
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6121
 msgid "Canon PIXMA iP4600"
-msgstr "Canon PIXMA iP4000"
+msgstr "Canon PIXMA iP4600"
 
-#: src/xml/xmli18n-tmp.h:3884
+#: src/xml/xmli18n-tmp.h:6122
 msgid "Canon PIXMA iP5000"
 msgstr "Canon PIXMA iP5000"
 
-#: src/xml/xmli18n-tmp.h:3885
+#: src/xml/xmli18n-tmp.h:6123
 msgid "Canon PIXMA iP5200"
 msgstr "Canon PIXMA iP5200"
 
-#: src/xml/xmli18n-tmp.h:3886
+#: src/xml/xmli18n-tmp.h:6124
 msgid "Canon PIXMA iP5300"
 msgstr "Canon PIXMA iP5300"
 
-#: src/xml/xmli18n-tmp.h:3887
+#: src/xml/xmli18n-tmp.h:6125
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:3888
+#: src/xml/xmli18n-tmp.h:6126
 msgid "Canon PIXMA iP6700"
 msgstr "Canon PIXMA iP6700"
 
-#: src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:6127
 msgid "Canon PIXMA iP8500"
 msgstr "Canon PIXMA iP8500"
 
-#: src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:6128
+#, fuzzy
+msgid "Canon PIXMA iX4000"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6129
 msgid "Canon PIXMA iX5000"
 msgstr "Canon PIXMA iP5000"
 
-#: src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:6130
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:6131
 msgid "Canon PIXMA MP150"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:6132
 msgid "Canon PIXMA MP160"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:6133
 msgid "Canon PIXMA MP170"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:3895
+#: src/xml/xmli18n-tmp.h:6134
 msgid "Canon PIXMA MP180"
 msgstr "Canon PIXMA MP180"
 
-#: src/xml/xmli18n-tmp.h:3896
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6135
 msgid "Canon PIXMA MP220"
-msgstr "Canon PIXMA MP520"
+msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:3897
+#: src/xml/xmli18n-tmp.h:6136
 msgid "Canon PIXMA MP500"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:6137
 msgid "Canon PIXMA MP520"
 msgstr "Canon PIXMA MP520"
 
-#: src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:6138
 msgid "Canon PIXMA MP610"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:3900
+#: src/xml/xmli18n-tmp.h:6139
 msgid "Canon PIXMA MP700"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:6140
 msgid "Canon PIXMA MP710"
 msgstr "Canon PIXMA MP710"
 
-#: src/xml/xmli18n-tmp.h:3902
+#: src/xml/xmli18n-tmp.h:6141
 msgid "Canon PIXMA MP730"
 msgstr "Canon PIXMA MP730"
 
-#: src/xml/xmli18n-tmp.h:3903
+#: src/xml/xmli18n-tmp.h:6142
 msgid "Canon PIXMA MP740"
 msgstr "Canon PIXMA MP740"
 
-#: src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:6143
 msgid "Canon PIXMA MP750"
 msgstr "Canon PIXMA MP750"
 
-#: src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:6144
 msgid "Canon PIXMA MP760"
 msgstr "Canon PIXMA MP760"
 
-#: src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:6145
 msgid "Canon PIXMA MP770"
 msgstr "Canon PIXMA MP770"
 
-#: src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:6146
 msgid "Canon PIXMA MP780"
 msgstr "Canon PIXMA MP780"
 
-#: src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:6147
 msgid "Canon PIXMA MP790"
 msgstr "Canon PIXMA MP790"
 
-#: src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:6148
 msgid "Canon PIXMA MP830"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:3910
+#: src/xml/xmli18n-tmp.h:6149
 msgid "Canon PIXUS iP3100"
 msgstr "Canon PIXUS iP3100"
 
-#: src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:6150
 msgid "Canon PIXUS iP4100"
 msgstr "Canon PIXUS iP4100"
 
-#: src/xml/xmli18n-tmp.h:3912
+#: src/xml/xmli18n-tmp.h:6151
 msgid "Canon i80"
 msgstr "Canon i80"
 
-#: src/xml/xmli18n-tmp.h:3913
+#: src/xml/xmli18n-tmp.h:6152
 msgid "Canon i560"
 msgstr "Canon i560"
 
-#: src/xml/xmli18n-tmp.h:3914
+#: src/xml/xmli18n-tmp.h:6153
 msgid "Canon i850"
 msgstr "Canon i850"
 
-#: src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:6154
 msgid "Canon i860"
 msgstr "Canon i860"
 
-#: src/xml/xmli18n-tmp.h:3916
+#: src/xml/xmli18n-tmp.h:6155
 msgid "Canon i865"
 msgstr "Canon i865"
 
-#: src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:6156
 msgid "Epson Artisan 700"
 msgstr "Epson Artisan 700"
 
-#: src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:6157
 msgid "Epson Artisan 800"
 msgstr "Epson Artisan C80"
 
-#: src/xml/xmli18n-tmp.h:3919
+#: src/xml/xmli18n-tmp.h:6158
 msgid "Epson B-300"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:3920
+#: src/xml/xmli18n-tmp.h:6159
 msgid "Epson B-308"
 msgstr "Epson B-308"
 
-#: src/xml/xmli18n-tmp.h:3921
+#: src/xml/xmli18n-tmp.h:6160
 msgid "Epson B-500DN"
 msgstr "Epson B-500DN"
 
-#: src/xml/xmli18n-tmp.h:3922
+#: src/xml/xmli18n-tmp.h:6161
 msgid "Epson B-508DN"
 msgstr "Epson B-508DN"
 
-#: src/xml/xmli18n-tmp.h:3923
+#: src/xml/xmli18n-tmp.h:6162
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:3924
+#: src/xml/xmli18n-tmp.h:6163
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:6164
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:6165
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:6166
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:6167
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:6168
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:6169
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:6170
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/xml/xmli18n-tmp.h:3932
+#: src/xml/xmli18n-tmp.h:6171
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:6172
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:3934
+#: src/xml/xmli18n-tmp.h:6173
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/xml/xmli18n-tmp.h:3935
+#: src/xml/xmli18n-tmp.h:6174
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:6175
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:3937
+#: src/xml/xmli18n-tmp.h:6176
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:6177
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/xml/xmli18n-tmp.h:3939
+#: src/xml/xmli18n-tmp.h:6178
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:6179
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:6180
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:3942
+#: src/xml/xmli18n-tmp.h:6181
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:3943
+#: src/xml/xmli18n-tmp.h:6182
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:6183
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:6184
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3946
+#: src/xml/xmli18n-tmp.h:6185
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:3947
+#: src/xml/xmli18n-tmp.h:6186
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:3948
+#: src/xml/xmli18n-tmp.h:6187
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/xml/xmli18n-tmp.h:3949
+#: src/xml/xmli18n-tmp.h:6188
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:6189
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/xml/xmli18n-tmp.h:3951
+#: src/xml/xmli18n-tmp.h:6190
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:6191
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/xml/xmli18n-tmp.h:3953
+#: src/xml/xmli18n-tmp.h:6192
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:6193
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C79"
 
-#: src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:6194
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3956
+#: src/xml/xmli18n-tmp.h:6195
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:3957
+#: src/xml/xmli18n-tmp.h:6196
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/xml/xmli18n-tmp.h:3958
+#: src/xml/xmli18n-tmp.h:6197
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/xml/xmli18n-tmp.h:3959
+#: src/xml/xmli18n-tmp.h:6198
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/xml/xmli18n-tmp.h:3960
+#: src/xml/xmli18n-tmp.h:6199
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:6200
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C87"
 
-#: src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:6201
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:6202
 msgid "Epson Stylus C110"
 msgstr "Epson Stylus C110"
 
-#: src/xml/xmli18n-tmp.h:3964
+#: src/xml/xmli18n-tmp.h:6203
 msgid "Epson Stylus C120"
 msgstr "Epson Stylus C120"
 
-#: src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:6204
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3966
+#: src/xml/xmli18n-tmp.h:6205
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/xml/xmli18n-tmp.h:3967
+#: src/xml/xmli18n-tmp.h:6206
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:6207
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:6208
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/xml/xmli18n-tmp.h:3970
+#: src/xml/xmli18n-tmp.h:6209
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:6210
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:3972
+#: src/xml/xmli18n-tmp.h:6211
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:6212
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:6213
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:3975
+#: src/xml/xmli18n-tmp.h:6214
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:6215
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:6216
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:6217
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:3979
+#: src/xml/xmli18n-tmp.h:6218
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:6219
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:3981
+#: src/xml/xmli18n-tmp.h:6220
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:3982
+#: src/xml/xmli18n-tmp.h:6221
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:3983
+#: src/xml/xmli18n-tmp.h:6222
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:3984
+#: src/xml/xmli18n-tmp.h:6223
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:6224
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:6225
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:3987
+#: src/xml/xmli18n-tmp.h:6226
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:6227
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:3989
+#: src/xml/xmli18n-tmp.h:6228
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:6229
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:6230
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:3992
+#: src/xml/xmli18n-tmp.h:6231
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:3993
+#: src/xml/xmli18n-tmp.h:6232
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:6233
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:3995
+#: src/xml/xmli18n-tmp.h:6234
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:6235
 msgid "Epson Stylus Office B30"
 msgstr "Epson Stylus Office B30"
 
-#: src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:6236
 msgid "Epson Stylus Office B33"
 msgstr "Epson Stylus Office B33"
 
-#: src/xml/xmli18n-tmp.h:3998
+#: src/xml/xmli18n-tmp.h:6237
 msgid "Epson Stylus Office B40W"
 msgstr "Epson Stylus Office B40W"
 
-#: src/xml/xmli18n-tmp.h:3999
+#: src/xml/xmli18n-tmp.h:6238
 msgid "Epson Stylus Office T30"
 msgstr "Epson Stylus Office T30"
 
-#: src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:6239
 msgid "Epson Stylus Office T33"
 msgstr "Epson Stylus Office T33"
 
-#: src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:6240
 msgid "Epson Stylus Office T40W"
 msgstr "Epson Stylus Office T40W"
 
-#: src/xml/xmli18n-tmp.h:4002
+#: src/xml/xmli18n-tmp.h:6241
 msgid "Epson Stylus Office BX300F"
 msgstr "Epson Stylus Office BX300F"
 
-#: src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:6242
 msgid "Epson Stylus Office BX600FW"
 msgstr "Epson Stylus Office BX600FW"
 
-#: src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:6243
 msgid "Epson Stylus Office SX600FW"
 msgstr "Epson Stylus Office SX600FW"
 
-#: src/xml/xmli18n-tmp.h:4005
-msgid "Epson Stylus Offixe TX300F"
-msgstr "Epson Stylus Offixe TX300F"
+#: src/xml/xmli18n-tmp.h:6244
+msgid "Epson Stylus Office TX300F"
+msgstr "Epson Stylus Office TX300F"
 
-#: src/xml/xmli18n-tmp.h:4006
+#: src/xml/xmli18n-tmp.h:6245
 msgid "Epson Stylus Office TX600FW"
 msgstr "Epson Stylus Office TX600FW"
 
-#: src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:6246
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:4008
+#: src/xml/xmli18n-tmp.h:6247
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4009
+#: src/xml/xmli18n-tmp.h:6248
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:6249
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:6250
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:6251
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4013
+#: src/xml/xmli18n-tmp.h:6252
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4014
+#: src/xml/xmli18n-tmp.h:6253
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:6254
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:4016
+#: src/xml/xmli18n-tmp.h:6255
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:6256
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:6257
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/xml/xmli18n-tmp.h:4019
+#: src/xml/xmli18n-tmp.h:6258
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:4020
+#: src/xml/xmli18n-tmp.h:6259
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/xml/xmli18n-tmp.h:4021
+#: src/xml/xmli18n-tmp.h:6260
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:4022
+#: src/xml/xmli18n-tmp.h:6261
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:4023
+#: src/xml/xmli18n-tmp.h:6262
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:4024
+#: src/xml/xmli18n-tmp.h:6263
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:6264
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:6265
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:4027
+#: src/xml/xmli18n-tmp.h:6266
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:6267
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:6268
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:6269
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:4031
+#: src/xml/xmli18n-tmp.h:6270
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:6271
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4033
+#: src/xml/xmli18n-tmp.h:6272
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4034
+#: src/xml/xmli18n-tmp.h:6273
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4035
+#: src/xml/xmli18n-tmp.h:6274
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1400"
 
-#: src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:6275
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 1410"
 
-#: src/xml/xmli18n-tmp.h:4037
+#: src/xml/xmli18n-tmp.h:6276
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:4038
+#: src/xml/xmli18n-tmp.h:6277
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:4039
+#: src/xml/xmli18n-tmp.h:6278
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:6279
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:4041
+#: src/xml/xmli18n-tmp.h:6280
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:6281
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:6282
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R230"
 
-#: src/xml/xmli18n-tmp.h:4044
+#: src/xml/xmli18n-tmp.h:6283
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R240"
 
-#: src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:6284
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo R245"
 
-#: src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:6285
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R260"
 
-#: src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:6286
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo R265"
 
-#: src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:6287
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo R270"
 
-#: src/xml/xmli18n-tmp.h:4049
+#: src/xml/xmli18n-tmp.h:6288
 msgid "Epson Stylus Photo R280"
 msgstr "Epson Stylus Photo R280"
 
-#: src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:6289
 msgid "Epson Stylus Photo R285"
 msgstr "Epson Stylus Photo R285"
 
-#: src/xml/xmli18n-tmp.h:4051
+#: src/xml/xmli18n-tmp.h:6290
 msgid "Epson Stylus Photo R290"
 msgstr "Epson Stylus Photo R290"
 
-#: src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:6291
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:4053
+#: src/xml/xmli18n-tmp.h:6292
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/xml/xmli18n-tmp.h:4054
+#: src/xml/xmli18n-tmp.h:6293
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:6294
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/xml/xmli18n-tmp.h:4056
+#: src/xml/xmli18n-tmp.h:6295
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R350"
 
-#: src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:6296
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R360"
 
-#: src/xml/xmli18n-tmp.h:4058
+#: src/xml/xmli18n-tmp.h:6297
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R380"
 
-#: src/xml/xmli18n-tmp.h:4059
+#: src/xml/xmli18n-tmp.h:6298
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R390"
 
-#: src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:6299
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:6300
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:4062
+#: src/xml/xmli18n-tmp.h:6301
 msgid "Epson Stylus Photo R1900"
 msgstr "Epson Stylus Photo R1900"
 
-#: src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:6302
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:4064
+#: src/xml/xmli18n-tmp.h:6303
+msgid "Epson Stylus Photo R2880"
+msgstr "Epson Stylus Photo R2880"
+
+#: src/xml/xmli18n-tmp.h:6304
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:4065
+#: src/xml/xmli18n-tmp.h:6305
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:6306
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4067
+#: src/xml/xmli18n-tmp.h:6307
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:6308
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4069
+#: src/xml/xmli18n-tmp.h:6309
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:6310
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX560"
 
-#: src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:6311
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX580"
 
-#: src/xml/xmli18n-tmp.h:4072
+#: src/xml/xmli18n-tmp.h:6312
 msgid "Epson Stylus Photo RX585"
 msgstr "Epson Stylus Photo RX585"
 
-#: src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:6313
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX590"
 
-#: src/xml/xmli18n-tmp.h:4074
+#: src/xml/xmli18n-tmp.h:6314
 msgid "Epson Stylus Photo RX595"
 msgstr "Epson Stylus Photo RX595"
 
-#: src/xml/xmli18n-tmp.h:4075
+#: src/xml/xmli18n-tmp.h:6315
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:4076
+#: src/xml/xmli18n-tmp.h:6316
 msgid "Epson Stylus Photo RX610"
 msgstr "Epson Stylus Photo RX610"
 
-#: src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:6317
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/xml/xmli18n-tmp.h:4078
+#: src/xml/xmli18n-tmp.h:6318
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:6319
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX640"
 
-#: src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:6320
 msgid "Epson Stylus Photo RX680"
 msgstr "Epson Stylus Photo RX680"
 
-#: src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:6321
 msgid "Epson Stylus Photo RX685"
 msgstr "Epson Stylus Photo RX685"
 
-#: src/xml/xmli18n-tmp.h:4082
+#: src/xml/xmli18n-tmp.h:6322
 msgid "Epson Stylus Photo RX690"
 msgstr "Epson Stylus Photo RX690"
 
-#: src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:6323
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:4084
+#: src/xml/xmli18n-tmp.h:6324
 msgid "Epson Stylus Photo TX700W"
 msgstr "Epson Stylus Photo TX700W"
 
-#: src/xml/xmli18n-tmp.h:4085
-msgid "Epson Stylus Photo TX800W"
-msgstr "Epson Stylus Photo TX800W"
+#: src/xml/xmli18n-tmp.h:6325
+msgid "Epson Stylus Photo TX800FW"
+msgstr "Epson Stylus Photo TX800FW"
 
-#: src/xml/xmli18n-tmp.h:4086
+#: src/xml/xmli18n-tmp.h:6326
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:4087
+#: src/xml/xmli18n-tmp.h:6327
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:4088
+#: src/xml/xmli18n-tmp.h:6328
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4089
+#: src/xml/xmli18n-tmp.h:6329
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:6330
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:4091
+#: src/xml/xmli18n-tmp.h:6331
 msgid "Epson Stylus Pro 7800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:6332
 msgid "Epson Stylus Pro 7880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:4093
+#: src/xml/xmli18n-tmp.h:6333
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4094
+#: src/xml/xmli18n-tmp.h:6334
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:6335
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:6336
 msgid "Epson Stylus Pro 9800"
 msgstr "Epson Stylus Pro 9800"
 
-#: src/xml/xmli18n-tmp.h:4097
+#: src/xml/xmli18n-tmp.h:6337
 msgid "Epson Stylus Pro 9880"
 msgstr "Epson Stylus Pro 9880"
 
-#: src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:6338
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4099
+#: src/xml/xmli18n-tmp.h:6339
 msgid "Epson Stylus Pro 11880"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:6340
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:6341
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:6342
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:6343
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:6344
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:6345
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:6346
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:6347
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:6348
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:6349
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:4110
+#: src/xml/xmli18n-tmp.h:6350
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:6351
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:6352
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4113
+#: src/xml/xmli18n-tmp.h:6353
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Epson Stylus CX4400"
 msgstr "Epson Stylus CX4400"
 
-#: src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:6355
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/xml/xmli18n-tmp.h:4116
+#: src/xml/xmli18n-tmp.h:6356
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:6357
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/xml/xmli18n-tmp.h:4118
+#: src/xml/xmli18n-tmp.h:6358
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/xml/xmli18n-tmp.h:4119
+#: src/xml/xmli18n-tmp.h:6359
 msgid "Epson Stylus CX4900"
 msgstr "Epson Stylus CX4900"
 
-#: src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:6360
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX5000"
 
-#: src/xml/xmli18n-tmp.h:4121
+#: src/xml/xmli18n-tmp.h:6361
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX5000F"
 
-#: src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:6362
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:6363
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/xml/xmli18n-tmp.h:4124
+#: src/xml/xmli18n-tmp.h:6364
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:6365
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/xml/xmli18n-tmp.h:4126
+#: src/xml/xmli18n-tmp.h:6366
 msgid "Epson Stylus CX5500"
 msgstr "Epson Stylus CX5500"
 
-#: src/xml/xmli18n-tmp.h:4127
+#: src/xml/xmli18n-tmp.h:6367
 msgid "Epson Stylus CX5600"
 msgstr "Epson Stylus CX5600"
 
-#: src/xml/xmli18n-tmp.h:4128
+#: src/xml/xmli18n-tmp.h:6368
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/xml/xmli18n-tmp.h:4129
+#: src/xml/xmli18n-tmp.h:6369
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:6370
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX6000"
 
-#: src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:6371
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:6372
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:6373
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:6374
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:6375
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX7000F"
 
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:6376
 msgid "Epson Stylus CX7400"
 msgstr "Epson Stylus CX7400"
 
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:6377
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:6378
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:6379
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:6380
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:6381
 msgid "Epson Stylus CX9300F"
 msgstr "Epson Stylus CX9300F"
 
-#: src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:6382
 msgid "Epson Stylus CX9400"
 msgstr "Epson Stylus CX9400"
 
-#: src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:6383
 msgid "Epson Stylus CX9400F"
 msgstr "Epson Stylus CX9400F"
 
-#: src/xml/xmli18n-tmp.h:4144
+#: src/xml/xmli18n-tmp.h:6384
 msgid "Epson Stylus CX9475F"
 msgstr "Epson Stylus CX9475F"
 
-#: src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:6385
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:6386
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:6387
 msgid "Epson Stylus D92"
 msgstr "Epson Stylus D92"
 
-#: src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:6388
 msgid "Epson Stylus D120"
 msgstr "Epson Stylus D120"
 
-#: src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:6389
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:6390
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:6391
+msgid "Epson Stylus DX4000"
+msgstr "Epson Stylus DX4000"
+
+#: src/xml/xmli18n-tmp.h:6392
 msgid "Epson Stylus DX4050"
 msgstr "Epson Stylus DX4050"
 
-#: src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:6393
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:6394
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:4154
+#: src/xml/xmli18n-tmp.h:6395
 msgid "Epson Stylus DX4400"
 msgstr "Epson Stylus DX4400"
 
-#: src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:6396
 msgid "Epson Stylus DX4450"
 msgstr "Epson Stylus DX4450"
 
-#: src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:6397
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/xml/xmli18n-tmp.h:4157
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6398
 msgid "Epson Stylus DX4850"
-msgstr "Epson Stylus DX3850"
+msgstr "Epson Stylus DX4850"
 
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:6399
 msgid "Epson Stylus DX7000F"
 msgstr "Epson Stylus DX7000F"
 
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:6400
 msgid "Epson Stylus DX7400"
 msgstr "Epson Stylus DX7400"
 
-#: src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:6401
 msgid "Epson Stylus DX7450"
 msgstr "Epson Stylus DX7450"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:6402
 msgid "Epson Stylus DX8400"
 msgstr "Epson Stylus DX8400"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:6403
 msgid "Epson Stylus DX8450"
 msgstr "Epson Stylus DX8450"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:6404
 msgid "Epson Stylus DX9400F"
 msgstr "Epson Stylus DX9400F"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:6405
 msgid "Epson Stylus NX100"
 msgstr "Epson Stylus NX100"
 
-#: src/xml/xmli18n-tmp.h:4165
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6406
 msgid "Epson Stylus NX105"
-msgstr "Epson Stylus NX100"
+msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:6407
 msgid "Epson Stylus NX200"
 msgstr "Epson Stylus NX200"
 
-#: src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:6408
 msgid "Epson Stylus NX300"
 msgstr "Epson Stylus NX300"
 
-#: src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:6409
 msgid "Epson Stylus NX400"
 msgstr "Epson Stylus NX400"
 
-#: src/xml/xmli18n-tmp.h:4169
-msgid "Epson Stylus PX700FW"
-msgstr "Epson Stylus PX700FW"
+#: src/xml/xmli18n-tmp.h:6410
+msgid "Epson Stylus PX700W"
+msgstr "Epson Stylus PX700W"
 
-#: src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:6411
 msgid "Epson Stylus PX800FW"
 msgstr "Epson Stylus PX800FW"
 
-#: src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:6412
 msgid "Epson Stylus S20"
 msgstr "Epson Stylus S20"
 
-#: src/xml/xmli18n-tmp.h:4172
+#: src/xml/xmli18n-tmp.h:6413
 msgid "Epson Stylus SX100"
 msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:6414
 msgid "Epson Stylus SX105"
 msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:4174
+#: src/xml/xmli18n-tmp.h:6415
 msgid "Epson Stylus SX200"
 msgstr "Epson Stylus SX200"
 
-#: src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:6416
 msgid "Epson Stylus SX205"
 msgstr "Epson Stylus SX205"
 
-#: src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:6417
 msgid "Epson Stylus SX400"
 msgstr "Epson Stylus SX400"
 
-#: src/xml/xmli18n-tmp.h:4177
+#: src/xml/xmli18n-tmp.h:6418
 msgid "Epson Stylus SX405"
 msgstr "Epson Stylus SX405"
 
-#: src/xml/xmli18n-tmp.h:4178
+#: src/xml/xmli18n-tmp.h:6419
 msgid "Epson Stylus T20"
 msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:4179
+#: src/xml/xmli18n-tmp.h:6420
 msgid "Epson Stylus TX100"
 msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:4180
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6421
 msgid "Epson Stylus TX101"
-msgstr "Epson Stylus TX100"
+msgstr "Epson Stylus TX101"
 
-#: src/xml/xmli18n-tmp.h:4181
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6422
 msgid "Epson Stylus TX102"
-msgstr "Epson Stylus TX100"
+msgstr "Epson Stylus TX102"
 
-#: src/xml/xmli18n-tmp.h:4182
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6423
 msgid "Epson Stylus TX103"
-msgstr "Epson Stylus TX100"
+msgstr "Epson Stylus TX103"
 
-#: src/xml/xmli18n-tmp.h:4183
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6424
 msgid "Epson Stylus TX104"
-msgstr "Epson Stylus TX100"
+msgstr "Epson Stylus TX104"
 
-#: src/xml/xmli18n-tmp.h:4184
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6425
 msgid "Epson Stylus TX105"
-msgstr "Epson Stylus SX105"
+msgstr "Epson Stylus TX105"
 
-#: src/xml/xmli18n-tmp.h:4185
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6426
 msgid "Epson Stylus TX106"
-msgstr "Epson Stylus TX100"
+msgstr "Epson Stylus TX106"
 
-#: src/xml/xmli18n-tmp.h:4186
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6427
 msgid "Epson Stylus TX109"
-msgstr "Epson Stylus TX100"
+msgstr "Epson Stylus TX109"
 
-#: src/xml/xmli18n-tmp.h:4187
+#: src/xml/xmli18n-tmp.h:6428
 msgid "Epson Stylus TX200"
 msgstr "Epson Stylus TX200"
 
-#: src/xml/xmli18n-tmp.h:4188
+#: src/xml/xmli18n-tmp.h:6429
 msgid "Epson Stylus TX400"
 msgstr "Epson Stylus TX400"
 
-#: src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:6430
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:6431
 msgid "Epson PictureMate Dash"
 msgstr "Epson PictureMate Dash"
 
-#: src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:6432
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/xml/xmli18n-tmp.h:4192
+#: src/xml/xmli18n-tmp.h:6433
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate Flash"
 
-#: src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:6434
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate Pal"
 
-#: src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:6435
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate Snap"
 
-#: src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:6436
 msgid "Epson PictureMate 100"
 msgstr "Epson PictureMate 100"
 
-#: src/xml/xmli18n-tmp.h:4196
+#: src/xml/xmli18n-tmp.h:6437
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate 200"
 
-#: src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:6438
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate 210"
 
-#: src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:6439
 msgid "Epson PictureMate 215"
 msgstr "Epson PictureMate 215"
 
-#: src/xml/xmli18n-tmp.h:4199
+#: src/xml/xmli18n-tmp.h:6440
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate 240"
 
-#: src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:6441
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate 250"
 
-#: src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:6442
 msgid "Epson PictureMate 260"
 msgstr "Epson PictureMate 260"
 
-#: src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:6443
 msgid "Epson PictureMate 270"
 msgstr "Epson PictureMate 270"
 
-#: src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate 280"
 
-#: src/xml/xmli18n-tmp.h:4204
+#: src/xml/xmli18n-tmp.h:6445
 msgid "Epson PictureMate 290"
 msgstr "Epson PictureMate 290"
 
-#: src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:6446
 msgid "Epson PictureMate 500"
 msgstr "Epson PictureMate 500"
 
-#: src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:6447
 msgid "Epson PictureMate 2005"
 msgstr "Epson PictureMate 2005"
 
-#: src/xml/xmli18n-tmp.h:4207
+#: src/xml/xmli18n-tmp.h:6448
 msgid "Epson WorkForce 30"
 msgstr "Epson WorkForce 30"
 
-#: src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:6449
 msgid "Epson WorkForce 40"
 msgstr "Epson WorkForce 40"
 
-#: src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:6450
 msgid "Epson WorkForce 500"
 msgstr "Epson WorkForce 500"
 
-#: src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:6451
 msgid "Epson WorkForce 600"
 msgstr "Epson WorkForce 600"
 
-#: src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:6452
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/xml/xmli18n-tmp.h:4212
+#: src/xml/xmli18n-tmp.h:6453
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:6454
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:6455
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4215
+#: src/xml/xmli18n-tmp.h:6456
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:4216
+#: src/xml/xmli18n-tmp.h:6457
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:6458
 msgid "Epson E 300"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:6459
 msgid "Epson E 500"
 msgstr "Epson E 500"
 
-#: src/xml/xmli18n-tmp.h:4219
+#: src/xml/xmli18n-tmp.h:6460
 msgid "Epson E 520"
 msgstr "Epson E 520"
 
-#: src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:6461
 msgid "Epson E 700"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:6462
 msgid "Epson E 720"
 msgstr "Epson E 720"
 
-#: src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:6463
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:6464
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/xml/xmli18n-tmp.h:4224
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6465
 msgid "Epson EP 801A"
-msgstr "Epson PX 101"
+msgstr "Epson EP 801A"
 
-#: src/xml/xmli18n-tmp.h:4225
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6466
 msgid "Epson EP 901A"
-msgstr "Epson PX 101"
+msgstr "Epson EP 901A"
 
-#: src/xml/xmli18n-tmp.h:4226
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6467
 msgid "Epson EP 901F"
-msgstr "Epson PX 601F"
+msgstr "Epson EP 901F"
 
-#: src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:6468
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:4228
+#: src/xml/xmli18n-tmp.h:6469
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4229
+#: src/xml/xmli18n-tmp.h:6470
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:6471
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:6472
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/xml/xmli18n-tmp.h:4232
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6473
 msgid "Epson ME 300"
-msgstr "Epson E 300"
+msgstr "Epson ME 300"
 
-#: src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:6474
 msgid "Epson ME Office 70"
 msgstr "Epson ME Office 70"
 
-#: src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:6475
 msgid "Epson ME Office 80W"
 msgstr "Epson ME Office 80W"
 
-#: src/xml/xmli18n-tmp.h:4235
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6476
 msgid "Epson ME Office 360"
-msgstr "Epson ME Office 70"
+msgstr "Epson ME Office 360"
 
-#: src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:6477
 msgid "Epson ME Office 700FW"
 msgstr "Epson ME Office 700FW"
 
-#: src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:6478
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/xml/xmli18n-tmp.h:4238
+#: src/xml/xmli18n-tmp.h:6479
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:6480
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:6481
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:6482
 msgid "Epson PM 670C"
 msgstr "Epson PM 670C"
 
-#: src/xml/xmli18n-tmp.h:4242
+#: src/xml/xmli18n-tmp.h:6483
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:4243
+#: src/xml/xmli18n-tmp.h:6484
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:6485
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:6486
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/xml/xmli18n-tmp.h:4246
+#: src/xml/xmli18n-tmp.h:6487
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:6488
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:6490
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/xml/xmli18n-tmp.h:4251
+#: src/xml/xmli18n-tmp.h:6492
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:4253
+#: src/xml/xmli18n-tmp.h:6494
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/xml/xmli18n-tmp.h:4254
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:6496
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:6497
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:6498
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:6499
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/xml/xmli18n-tmp.h:4259
+#: src/xml/xmli18n-tmp.h:6500
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/xml/xmli18n-tmp.h:4260
+#: src/xml/xmli18n-tmp.h:6501
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:6502
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/xml/xmli18n-tmp.h:4262
+#: src/xml/xmli18n-tmp.h:6503
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/xml/xmli18n-tmp.h:4263
+#: src/xml/xmli18n-tmp.h:6504
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/xml/xmli18n-tmp.h:4264
+#: src/xml/xmli18n-tmp.h:6505
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/xml/xmli18n-tmp.h:4265
+#: src/xml/xmli18n-tmp.h:6506
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:6507
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:6508
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:6509
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:6510
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:6511
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:6512
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:6513
 msgid "Epson PM A820"
 msgstr "Epson PM A820"
 
-#: src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:6514
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:4274
+#: src/xml/xmli18n-tmp.h:6515
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/xml/xmli18n-tmp.h:4275
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6516
 msgid "Epson PM A940"
-msgstr "Epson PM 940C"
+msgstr "Epson PM A940"
 
-#: src/xml/xmli18n-tmp.h:4276
+#: src/xml/xmli18n-tmp.h:6517
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:6518
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:6519
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:6520
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:6521
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:6522
 msgid "Epson PM D870"
 msgstr "Epson PM D870"
 
-#: src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:6523
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:6524
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:6525
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/xml/xmli18n-tmp.h:4285
+#: src/xml/xmli18n-tmp.h:6526
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/xml/xmli18n-tmp.h:4286
+#: src/xml/xmli18n-tmp.h:6527
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:6528
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:6529
 msgid "Epson PM G850"
 msgstr "Epson PM G850"
 
-#: src/xml/xmli18n-tmp.h:4289
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6530
 msgid "Epson PM T960"
-msgstr "Epson PM 670C"
+msgstr "Epson PM T960"
 
-#: src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:6531
 msgid "Epson PM G4500"
 msgstr "Epson PM G4500"
 
-#: src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:6532
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4292
+#: src/xml/xmli18n-tmp.h:6533
 msgid "Epson Offirio PX B300"
 msgstr "Epson Offirio PX B300"
 
-#: src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:6534
 msgid "Epson Offirio PX B500"
 msgstr "Epson Offirio PX B500"
 
-#: src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:6535
 msgid "Epson PX 101"
 msgstr "Epson PX 101"
 
-#: src/xml/xmli18n-tmp.h:4295
+#: src/xml/xmli18n-tmp.h:6536
 msgid "Epson PX 201"
 msgstr "Epson PX 201"
 
-#: src/xml/xmli18n-tmp.h:4296
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6537
 msgid "Epson PX 401A"
-msgstr "Epson PX 101"
+msgstr "Epson PX 401A"
 
-#: src/xml/xmli18n-tmp.h:4297
+#: src/xml/xmli18n-tmp.h:6538
 msgid "Epson PX 601F"
 msgstr "Epson PX 601F"
 
-#: src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:6539
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:4299
+#: src/xml/xmli18n-tmp.h:6540
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:6541
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:6542
 msgid "Epson PX G5300"
 msgstr "Epson PX G5300"
 
-#: src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:6543
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:6544
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/xml/xmli18n-tmp.h:4305
+#: src/xml/xmli18n-tmp.h:6546
 msgid "Epson PX V780"
 msgstr "Epson PX V780"
 
-#: src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:6547
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/xml/xmli18n-tmp.h:4307
+#: src/xml/xmli18n-tmp.h:6548
+msgid "Epson PX G5600"
+msgstr "Epson PX G5600"
+
+#: src/xml/xmli18n-tmp.h:6549
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/xml/xmli18n-tmp.h:4308
+#: src/xml/xmli18n-tmp.h:6550
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/xml/xmli18n-tmp.h:4309
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/xml/xmli18n-tmp.h:4310
+#: src/xml/xmli18n-tmp.h:6552
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:6553
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:6554
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/xml/xmli18n-tmp.h:4313
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:6556
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/xml/xmli18n-tmp.h:4315
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:6559
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:6560
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:6561
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:6562
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:6563
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:6564
 msgid "Brother DCP-8045D"
 msgstr "Brother DCP-8045D"
 
-#: src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:6565
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:4324
+#: src/xml/xmli18n-tmp.h:6566
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:6567
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/xml/xmli18n-tmp.h:4326
+#: src/xml/xmli18n-tmp.h:6568
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:4327
+#: src/xml/xmli18n-tmp.h:6569
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:6570
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:6571
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Brother HL-1430"
 msgstr "Brother HL-1430"
 
-#: src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:6576
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Brother HL-1450"
 msgstr "Brother HL-1450"
 
-#: src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Brother HL-1470N"
 msgstr "Brother HL-1470N"
 
-#: src/xml/xmli18n-tmp.h:4337
+#: src/xml/xmli18n-tmp.h:6579
 msgid "Brother HL-1650"
 msgstr "Brother HL-1650"
 
-#: src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:6580
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:6581
 msgid "Brother HL-1670N"
 msgstr "Brother HL-1670N"
 
-#: src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:6582
 msgid "Brother HL-1850"
 msgstr "Brother HL-1850"
 
-#: src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:6583
 msgid "Brother HL-1870N"
 msgstr "Brother HL-1870N"
 
-#: src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:6584
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:6585
 msgid "Brother HL-2460"
 msgstr "Brother HL-2460"
 
-#: src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:6586
 msgid "Brother HL-2460N"
 msgstr "Brother HL-2460N"
 
-#: src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:6587
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/xml/xmli18n-tmp.h:4346
+#: src/xml/xmli18n-tmp.h:6588
 msgid "Brother HL-5030"
 msgstr "Brother HL-5030"
 
-#: src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:6589
 msgid "Brother HL-5040"
 msgstr "Brother HL-5040"
 
-#: src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:6590
 msgid "Brother HL-5050"
 msgstr "Brother HL-5050"
 
-#: src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:6591
 msgid "Brother HL-5070N"
 msgstr "Brother HL-5070N"
 
-#: src/xml/xmli18n-tmp.h:4350
+#: src/xml/xmli18n-tmp.h:6592
 msgid "Brother HL-5140"
 msgstr "Brother HL-5140"
 
-#: src/xml/xmli18n-tmp.h:4351
+#: src/xml/xmli18n-tmp.h:6593
 msgid "Brother HL-5150D"
 msgstr "Brother HL-5150D"
 
-#: src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:6594
 msgid "Brother HL-5170DN"
 msgstr "Brother HL-5170DN"
 
-#: src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:6595
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:4354
+#: src/xml/xmli18n-tmp.h:6596
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:6597
 msgid "Brother HL-7050"
 msgstr "Brother HL-7050"
 
-#: src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:6598
 msgid "Brother HL-7050N"
 msgstr "Brother HL-7050N"
 
-#: src/xml/xmli18n-tmp.h:4357
+#: src/xml/xmli18n-tmp.h:6599
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/xml/xmli18n-tmp.h:4358
+#: src/xml/xmli18n-tmp.h:6600
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:6601
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:6602
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:6603
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:6604
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:6605
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:6606
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:6607
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:6608
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:6609
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:6610
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:6611
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:6612
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:6613
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:6614
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/xml/xmli18n-tmp.h:4373
+#: src/xml/xmli18n-tmp.h:6615
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/xml/xmli18n-tmp.h:4374
+#: src/xml/xmli18n-tmp.h:6616
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:6617
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/xml/xmli18n-tmp.h:4376
+#: src/xml/xmli18n-tmp.h:6618
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:6619
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:6620
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:6621
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:6622
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:6623
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:6624
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:6625
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/xml/xmli18n-tmp.h:4384
+#: src/xml/xmli18n-tmp.h:6626
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:4385
+#: src/xml/xmli18n-tmp.h:6627
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:4386
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:4387
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:6630
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/xml/xmli18n-tmp.h:4389
+#: src/xml/xmli18n-tmp.h:6631
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/xml/xmli18n-tmp.h:4392
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Epson EPL-N2050"
 msgstr "Epson EPL-N2050"
 
-#: src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Epson EPL-N2050+"
 msgstr "Epson EPL-N2050+"
 
-#: src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:6636
 msgid "Epson EPL-N2050PS"
 msgstr "Epson EPL-N2050PS"
 
-#: src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:6637
 msgid "Epson EPL-N2050PS+"
 msgstr "Epson EPL-N2050PS+"
 
-#: src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:6638
 msgid "Epson EPL-N2120"
 msgstr "Epson EPL-N2120"
 
-#: src/xml/xmli18n-tmp.h:4397
+#: src/xml/xmli18n-tmp.h:6639
 msgid "Epson EPL-N2500"
 msgstr "Epson EPL-N2500"
 
-#: src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:6640
 msgid "Epson EPL-N2500PS"
 msgstr "Epson EPL-N2500PS"
 
-#: src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:6641
 msgid "Epson EPL-N2750"
 msgstr "Epson EPL-N2750"
 
-#: src/xml/xmli18n-tmp.h:4400
+#: src/xml/xmli18n-tmp.h:6642
 msgid "Epson EPL-N2750PS"
 msgstr "Epson EPL-N2750PS"
 
-#: src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:6643
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/xml/xmli18n-tmp.h:4403
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:6646
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:6647
 msgid "Generic PCL 4 Printer"
 msgstr "Stampante PCL 4 generica"
 
-#: src/xml/xmli18n-tmp.h:4406
+#: src/xml/xmli18n-tmp.h:6648
 msgid "Generic PCL 4 LF Printer"
 msgstr "Stampante PCL 4 LF generica"
 
-#: src/xml/xmli18n-tmp.h:4407
+#: src/xml/xmli18n-tmp.h:6649
 msgid "Generic PCL 5 Printer"
 msgstr "Stampante PCL 5 generica"
 
-#: src/xml/xmli18n-tmp.h:4408
+#: src/xml/xmli18n-tmp.h:6650
 msgid "Generic PCL 5 LF Printer"
 msgstr "Stampante PCL 5 LF generica"
 
-#: src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:6651
 msgid "Generic PCL 5c Printer"
 msgstr "Stampante PCL 5c generica"
 
-#: src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Generic PCL 5c LF Printer"
 msgstr "Stampante PCL 5c LF generica"
 
-#: src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:6653
 msgid "Generic PCL 5e Printer"
 msgstr "Stampante PCL 5e generica"
 
-#: src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:6654
 msgid "Generic PCL 5e LF Printer"
 msgstr "Stampante PCL 5e LF generica"
 
-#: src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Stampante PCL 6/PCL XL generica"
 
-#: src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Stampante PCL 6/PCL XL LF generica"
 
-#: src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:6657
 msgid "Gestetner 10512"
 msgstr "Gestetner 10512"
 
-#: src/xml/xmli18n-tmp.h:4416
+#: src/xml/xmli18n-tmp.h:6658
 msgid "Gestetner 2212"
 msgstr "Gestetner 2212"
 
-#: src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:6659
 msgid "Gestetner 2712"
 msgstr "Gestetner 2712"
 
-#: src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:6660
 msgid "Gestetner 3212"
 msgstr "Gestetner 3212"
 
-#: src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:6661
 msgid "Gestetner 3502"
 msgstr "Gestetner 3502"
 
-#: src/xml/xmli18n-tmp.h:4420
-msgid "Gestetner 3532"
-msgstr "Gestetner 3532"
+#: src/xml/xmli18n-tmp.h:6662
+msgid "Gestetner 3532/4235g"
+msgstr "Gestetner 3532/4235g"
 
-#: src/xml/xmli18n-tmp.h:4421
-msgid "Gestetner 4235g"
-msgstr "Gestetner 4235g"
-
-#: src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:6663
 msgid "Gestetner 4502"
 msgstr "Gestetner 4502"
 
-#: src/xml/xmli18n-tmp.h:4423
-msgid "Gestetner 4532"
-msgstr "Gestetner 4532"
-
-#: src/xml/xmli18n-tmp.h:4424
-msgid "Gestetner 4245g"
-msgstr "Gestetner 4245g"
+#: src/xml/xmli18n-tmp.h:6664
+msgid "Gestetner 4532/4245g"
+msgstr "Gestetner 4532/4245g"
 
-#: src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:6665
 msgid "Gestetner 6002"
 msgstr "Gestetner 6002"
 
-#: src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:6666
 msgid "Gestetner 7502"
 msgstr "Gestetner 7502"
 
-#: src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Gestetner 9002"
 msgstr "Gestetner 9002"
 
-#: src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:6668
 msgid "Gestetner DSm415"
 msgstr "Gestetner DSm415"
 
-#: src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:6669
 msgid "Gestetner DSm615"
 msgstr "Gestetner DSm615"
 
-#: src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:6670
 msgid "Gestetner DSm616"
 msgstr "Gestetner DSm616"
 
-#: src/xml/xmli18n-tmp.h:4431
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Gestetner DSm618"
 msgstr "Gestetner DSm618"
 
-#: src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:6672
 msgid "Gestetner DSm618d"
 msgstr "Gestetner DSm618d"
 
-#: src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:6673
 msgid "Gestetner DSm620"
 msgstr "Gestetner DSm620"
 
-#: src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:6674
 msgid "Gestetner DSm620d"
 msgstr "Gestetner DSm620d"
 
-#: src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:6675
 msgid "Gestetner DSm622"
 msgstr "Gestetner DSm622"
 
-#: src/xml/xmli18n-tmp.h:4436
+#: src/xml/xmli18n-tmp.h:6676
 msgid "Gestetner DSm627"
 msgstr "Gestetner DSm627"
 
-#: src/xml/xmli18n-tmp.h:4437
-msgid "Gestetner DSm635"
-msgstr "Gestetner DSm635"
-
-#: src/xml/xmli18n-tmp.h:4438
-msgid "Gestetner DSm635G"
-msgstr "Gestetner DSm635G"
+#: src/xml/xmli18n-tmp.h:6677
+msgid "Gestetner DSm635/635G"
+msgstr "Gestetner DSm635/635G"
 
-#: src/xml/xmli18n-tmp.h:4439
-msgid "Gestetner DSm645"
-msgstr "Gestetner DSm645"
+#: src/xml/xmli18n-tmp.h:6678
+msgid "Gestetner DSm645/645G"
+msgstr "Gestetner DSm645/645G"
 
-#: src/xml/xmli18n-tmp.h:4440
-msgid "Gestetner DS645G"
-msgstr "Gestetner DS645G"
-
-#: src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:6679
 msgid "Gestetner DSm651"
 msgstr "Gestetner DSm651"
 
-#: src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:6680
 msgid "Gestetner DSm660"
 msgstr "Gestetner DSm660"
 
-#: src/xml/xmli18n-tmp.h:4443
+#: src/xml/xmli18n-tmp.h:6681
 msgid "Gestetner DSm675"
 msgstr "Gestetner DSm675"
 
-#: src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:6682
 msgid "Gestetner DSm725"
 msgstr "Gestetner DSm725"
 
-#: src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:6683
 msgid "Gestetner DSm730"
 msgstr "Gestetner DSm730"
 
-#: src/xml/xmli18n-tmp.h:4446
-msgid "Gestetner DSm735"
-msgstr "Gestetner DSm735"
-
-#: src/xml/xmli18n-tmp.h:4447
-msgid "Gestetner DSm735G"
-msgstr "Gestetner DSm735G"
-
-#: src/xml/xmli18n-tmp.h:4448
-msgid "Gestetner DSm745"
-msgstr "Gestetner DSm745"
-
-#: src/xml/xmli18n-tmp.h:4449
-msgid "Gestetner DSm745G"
-msgstr "Gestetner DSm745G"
-
-#: src/xml/xmli18n-tmp.h:4450
-msgid "Gestetner MP1100"
-msgstr "Gestetner MP1100"
-
-#: src/xml/xmli18n-tmp.h:4451
-msgid "Gestetner DSm7110"
-msgstr "Gestetner DSm7110"
-
-#: src/xml/xmli18n-tmp.h:4452
-msgid "Gestetner MP1350"
-msgstr "Gestetner MP1350"
-
-#: src/xml/xmli18n-tmp.h:4453
-msgid "Gestetner DSm7135"
-msgstr "Gestetner DSm7135"
-
-#: src/xml/xmli18n-tmp.h:4454
-msgid "Gestetner MP1600"
-msgstr "Gestetner MP1600"
-
-#: src/xml/xmli18n-tmp.h:4455
-msgid "Gestetner DSm716"
-msgstr "Gestetner DSm716"
-
-#: src/xml/xmli18n-tmp.h:4456
-msgid "Gestetner MP2000"
-msgstr "Gestetner MP2000"
-
-#: src/xml/xmli18n-tmp.h:4457
-msgid "Gestetner DSm721d"
-msgstr "Gestetner DSm721d"
-
-#: src/xml/xmli18n-tmp.h:4458
-msgid "Gestetner MP2500"
-msgstr "Gestetner MP2500"
-
-#: src/xml/xmli18n-tmp.h:4459
-msgid "Gestetner DSm625"
-msgstr "Gestetner DSm625"
-
-#: src/xml/xmli18n-tmp.h:4460
-msgid "Gestetner MP3500"
-msgstr " Gestetner MP3500"
+#: src/xml/xmli18n-tmp.h:6684
+msgid "Gestetner DSm735/735G"
+msgstr "Gestetner DSm735/735G"
 
-#: src/xml/xmli18n-tmp.h:4461
-msgid "Gestetner DSm735e"
-msgstr "Gestetner DSm735e"
+#: src/xml/xmli18n-tmp.h:6685
+msgid "Gestetner DSm745/745G"
+msgstr "Gestetner DSm745/745G"
 
-#: src/xml/xmli18n-tmp.h:4462
-msgid "Gestetner MP4500"
-msgstr "Gestetner MP4500"
+#: src/xml/xmli18n-tmp.h:6686
+msgid "Gestetner MP1100/DSm7110"
+msgstr "Gestetner MP1100/DSm7110"
 
-#: src/xml/xmli18n-tmp.h:4463
-msgid "Gestetner DSm745e"
-msgstr "Gestetner DSm745e"
+#: src/xml/xmli18n-tmp.h:6687
+msgid "Gestetner MP1350/DSm7135"
+msgstr "Gestetner MP1350/DSm7135"
 
-#: src/xml/xmli18n-tmp.h:4464
-msgid "Gestetner MP5500"
-msgstr "Gestetner MP5500"
+#: src/xml/xmli18n-tmp.h:6688
+msgid "Gestetner MP1600/DSm716"
+msgstr "Gestetner MP1600/DSm716"
 
-#: src/xml/xmli18n-tmp.h:4465
-msgid "Gestetner DSm755"
-msgstr "Gestetner DSm755"
+#: src/xml/xmli18n-tmp.h:6689
+msgid "Gestetner MP2000/DSm721d"
+msgstr "Gestetner MP2000/DSm721d"
 
-#: src/xml/xmli18n-tmp.h:4466
-msgid "Gestetner MP6500"
-msgstr "Gestetner MP6500"
+#: src/xml/xmli18n-tmp.h:6690
+msgid "Gestetner MP2500/DSm625"
+msgstr "Gestetner MP2500/DSm625"
 
-#: src/xml/xmli18n-tmp.h:4467
-msgid "Gestetner DSm765"
-msgstr "Gestetner DSm765"
+#: src/xml/xmli18n-tmp.h:6691
+msgid "Gestetner MP3500/DSm735e"
+msgstr "Gestetner MP3500/DSm735e"
 
-#: src/xml/xmli18n-tmp.h:4468
-msgid "Gestetner MP7500"
-msgstr "Gestetner MP7500"
+#: src/xml/xmli18n-tmp.h:6692
+msgid "Gestetner MP4500/DSm745e"
+msgstr "Gestetner MP4500/DSm745e"
 
-#: src/xml/xmli18n-tmp.h:4469
-msgid "Gestetner DSm775"
-msgstr "Gestetner DSm775"
+#: src/xml/xmli18n-tmp.h:6693
+msgid "Gestetner MP5500/DSm755"
+msgstr "Gestetner MP5500/DSm755"
 
-#: src/xml/xmli18n-tmp.h:4470
-msgid "Gestetner MP9000"
-msgstr "Gestetner MP9000"
+#: src/xml/xmli18n-tmp.h:6694
+msgid "Gestetner MP6500/DSm765"
+msgstr "Gestetner MP6500/DSm765"
 
-#: src/xml/xmli18n-tmp.h:4471
-msgid "Gestetner DSm790"
-msgstr "Gestetner DSm790"
+#: src/xml/xmli18n-tmp.h:6695
+msgid "Gestetner MP7500/DSm775"
+msgstr "Gestetner MP7500/DSm775"
 
-#: src/xml/xmli18n-tmp.h:4472
-msgid "Gestetner MP 161"
-msgstr "Gestetner MP 161"
+#: src/xml/xmli18n-tmp.h:6696
+msgid "Gestetner MP9000/DSm790"
+msgstr "Gestetner MP9000/DSm790"
 
-#: src/xml/xmli18n-tmp.h:4473
-msgid "Gestetner DSm416"
-msgstr "Gestetner DSm416"
+#: src/xml/xmli18n-tmp.h:6697
+msgid "Gestetner MP 161/DSm416"
+msgstr "Gestetner MP 161/DSm416"
 
-#: src/xml/xmli18n-tmp.h:4474
-msgid "Gestetner MP 2510"
-msgstr "Gestetner MP 2510"
+#: src/xml/xmli18n-tmp.h:6698
+msgid "Gestetner MP 2510/DSm725e"
+msgstr "Gestetner MP 2510/DSm725e"
 
-#: src/xml/xmli18n-tmp.h:4475
-msgid "Gestetner DSm725e"
-msgstr "Gestetner DSm725e"
-
-#: src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:6699
 msgid "Gestetner MP 2550"
 msgstr "Gestetner MP 2550"
 
-#: src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:6700
 msgid "Gestetner MP 2550B"
 msgstr "Gestetner MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:4478
-msgid "Gestetner MP 3010"
-msgstr "Gestetner MP 3010"
-
-#: src/xml/xmli18n-tmp.h:4479
-msgid "Gestetner DSm730e"
-msgstr "Gestetner DSm730e"
+#: src/xml/xmli18n-tmp.h:6701
+msgid "Gestetner MP 3010/DSm730e"
+msgstr "Gestetner MP 3010/DSm730e"
 
-#: src/xml/xmli18n-tmp.h:4480
+#: src/xml/xmli18n-tmp.h:6702
 msgid "Gestetner MP 3350"
 msgstr "Gestetner MP 3350"
 
-#: src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:6703
 msgid "Gestetner MP 3350B"
 msgstr "Gestetner MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:6704
 msgid "Gestetner MP 4000"
 msgstr "Gestetner MP 4000"
 
-#: src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:6705
 msgid "Gestetner MP 4000B"
 msgstr "Gestetner MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Gestetner MP 5000"
 msgstr "Gestetner MP 5000"
 
-#: src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:6707
 msgid "Gestetner MP 5000B"
 msgstr "Gestetner MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:6708
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:6709
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:6710
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/xml/xmli18n-tmp.h:4489
+#: src/xml/xmli18n-tmp.h:6711
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:6712
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:6713
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/xml/xmli18n-tmp.h:4492
+#: src/xml/xmli18n-tmp.h:6714
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:6715
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:6716
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/xml/xmli18n-tmp.h:4495
+#: src/xml/xmli18n-tmp.h:6717
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/xml/xmli18n-tmp.h:4496
+#: src/xml/xmli18n-tmp.h:6718
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/xml/xmli18n-tmp.h:4497
+#: src/xml/xmli18n-tmp.h:6719
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:6720
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:6721
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:6722
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:6723
 msgid "HP DesignJet 230"
 msgstr "HP DeskJet 230"
 
-#: src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:6724
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:6725
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:6726
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:6727
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:4506
+#: src/xml/xmli18n-tmp.h:6728
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:6729
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:4508
+#: src/xml/xmli18n-tmp.h:6730
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/xml/xmli18n-tmp.h:4509
+#: src/xml/xmli18n-tmp.h:6731
 msgid "HP DesignJet 750C"
 msgstr "HO DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:4510
+#: src/xml/xmli18n-tmp.h:6732
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:6733
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:6734
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:6735
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:6736
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:6737
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:6738
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:6739
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:4518
+#: src/xml/xmli18n-tmp.h:6740
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:6741
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:6742
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:6743
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:6744
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:4523
+#: src/xml/xmli18n-tmp.h:6745
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:6746
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:6747
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:6748
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:6749
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/xml/xmli18n-tmp.h:4528
+#: src/xml/xmli18n-tmp.h:6750
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/xml/xmli18n-tmp.h:4529
+#: src/xml/xmli18n-tmp.h:6751
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/xml/xmli18n-tmp.h:4530
+#: src/xml/xmli18n-tmp.h:6752
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:6753
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/xml/xmli18n-tmp.h:4532
+#: src/xml/xmli18n-tmp.h:6754
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:6755
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:6756
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:6757
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:6758
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:6759
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:6760
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/xml/xmli18n-tmp.h:4539
+#: src/xml/xmli18n-tmp.h:6761
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/xml/xmli18n-tmp.h:4540
+#: src/xml/xmli18n-tmp.h:6762
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/xml/xmli18n-tmp.h:4541
+#: src/xml/xmli18n-tmp.h:6763
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/xml/xmli18n-tmp.h:4542
+#: src/xml/xmli18n-tmp.h:6764
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/xml/xmli18n-tmp.h:4543
+#: src/xml/xmli18n-tmp.h:6765
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:6766
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:6767
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/xml/xmli18n-tmp.h:4546
+#: src/xml/xmli18n-tmp.h:6768
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:6769
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:6770
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:6771
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:6772
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:6773
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/xml/xmli18n-tmp.h:4552
+#: src/xml/xmli18n-tmp.h:6774
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:6775
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:6776
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:6777
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:6778
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:6779
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:6780
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:6781
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:6782
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:6783
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:6784
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:6785
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:6786
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:6787
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:6788
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/xml/xmli18n-tmp.h:4567
+#: src/xml/xmli18n-tmp.h:6789
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/xml/xmli18n-tmp.h:4568
+#: src/xml/xmli18n-tmp.h:6790
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:6791
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/xml/xmli18n-tmp.h:4570
+#: src/xml/xmli18n-tmp.h:6792
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/xml/xmli18n-tmp.h:4571
+#: src/xml/xmli18n-tmp.h:6793
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:6794
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:6795
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:6796
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:6797
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:6798
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:6799
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:6800
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:6801
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:6802
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:6803
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/xml/xmli18n-tmp.h:4582
+#: src/xml/xmli18n-tmp.h:6804
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/xml/xmli18n-tmp.h:4583
+#: src/xml/xmli18n-tmp.h:6805
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/xml/xmli18n-tmp.h:4584
+#: src/xml/xmli18n-tmp.h:6806
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/xml/xmli18n-tmp.h:4585
+#: src/xml/xmli18n-tmp.h:6807
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:6808
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:6809
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:6810
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:6811
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:6812
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:6813
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:6814
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:4593
+#: src/xml/xmli18n-tmp.h:6815
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/xml/xmli18n-tmp.h:4594
+#: src/xml/xmli18n-tmp.h:6816
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:6817
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:6818
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/xml/xmli18n-tmp.h:4597
+#: src/xml/xmli18n-tmp.h:6819
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:6820
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:6821
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:6822
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:6823
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/xml/xmli18n-tmp.h:4602
+#: src/xml/xmli18n-tmp.h:6824
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:6825
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:6826
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:6827
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:6828
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:4607
+#: src/xml/xmli18n-tmp.h:6829
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:6830
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/xml/xmli18n-tmp.h:4609
+#: src/xml/xmli18n-tmp.h:6831
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/xml/xmli18n-tmp.h:4610
+#: src/xml/xmli18n-tmp.h:6832
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:6833
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:6834
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4613
+#: src/xml/xmli18n-tmp.h:6835
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:6836
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:6837
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:6838
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:6839
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:6840
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:6841
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:6842
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:6843
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:6844
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:6845
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4624
+#: src/xml/xmli18n-tmp.h:6846
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/xml/xmli18n-tmp.h:4625
+#: src/xml/xmli18n-tmp.h:6847
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:6848
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/xml/xmli18n-tmp.h:4627
+#: src/xml/xmli18n-tmp.h:6849
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/xml/xmli18n-tmp.h:4628
+#: src/xml/xmli18n-tmp.h:6850
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:6851
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:6852
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:6853
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 1022"
 
-#: src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:6854
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:6855
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:6856
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:6857
 msgid "HP LaserJet 1160"
 msgstr "HP LaserJet 1160"
 
-#: src/xml/xmli18n-tmp.h:4636
+#: src/xml/xmli18n-tmp.h:6858
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:4637
+#: src/xml/xmli18n-tmp.h:6859
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/xml/xmli18n-tmp.h:4638
+#: src/xml/xmli18n-tmp.h:6860
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:6861
 msgid "HP LaserJet 1320"
 msgstr "HP LaserJet 1320"
 
-#: src/xml/xmli18n-tmp.h:4640
+#: src/xml/xmli18n-tmp.h:6862
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:6863
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:6864
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:6865
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:4644
+#: src/xml/xmli18n-tmp.h:6866
 msgid "HP LaserJet 2410"
 msgstr "HP LaserJet 2410"
 
-#: src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:6867
 msgid "HP LaserJet 2420"
 msgstr "HP LaserJet 2420"
 
-#: src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:6868
 msgid "HP LaserJet 2430"
 msgstr "HP LaserJet 2430"
 
-#: src/xml/xmli18n-tmp.h:4647
+#: src/xml/xmli18n-tmp.h:6869
 msgid "HP LaserJet 3015"
 msgstr "HP LaserJet 3015"
 
-#: src/xml/xmli18n-tmp.h:4648
+#: src/xml/xmli18n-tmp.h:6870
 msgid "HP LaserJet 3020"
 msgstr "HP LaserJet 3020"
 
-#: src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:6871
 msgid "HP LaserJet 3030"
 msgstr "HP LaserJet 3030"
 
-#: src/xml/xmli18n-tmp.h:4650
+#: src/xml/xmli18n-tmp.h:6872
 msgid "HP LaserJet 3050"
 msgstr "HP LaserJet 3050"
 
-#: src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:6873
 msgid "HP LaserJet 3052"
 msgstr "HP LaserJet 3052"
 
-#: src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:6874
 msgid "HP LaserJet 3055"
 msgstr "HP LaserJet 3055"
 
-#: src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:6875
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:6876
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:6877
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:6878
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:6879
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:6880
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:6881
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/xml/xmli18n-tmp.h:4660
+#: src/xml/xmli18n-tmp.h:6882
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:6883
 msgid "HP LaserJet 3380"
 msgstr "HP LaserJet 3380"
 
-#: src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:6884
 msgid "HP LaserJet 3390"
 msgstr "HP LaserJet 3390"
 
-#: src/xml/xmli18n-tmp.h:4663
+#: src/xml/xmli18n-tmp.h:6885
 msgid "HP LaserJet 3392"
 msgstr "HP LaserJet 3392"
 
-#: src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:6886
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:6887
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:6888
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/xml/xmli18n-tmp.h:4667
+#: src/xml/xmli18n-tmp.h:6889
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:6890
 msgid "HP LaserJet 4240"
 msgstr "HP LaserJet 4240"
 
-#: src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:6891
 msgid "HP LaserJet 4250"
 msgstr "HP LaserJet 4250"
 
-#: src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:6892
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/xml/xmli18n-tmp.h:4671
+#: src/xml/xmli18n-tmp.h:6893
 msgid "HP LaserJet 4345 mfp"
 msgstr "HP LaserJet 4345 mfp"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:6894
 msgid "HP LaserJet 4350"
 msgstr "HP LaserJet 4350"
 
-#: src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:6895
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:6896
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:6897
 msgid "HP LaserJet 5200"
 msgstr "HP LaserJet 5200"
 
-#: src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:6898
 msgid "HP LaserJet 5200L"
 msgstr "HP LaserJet 5200L"
 
-#: src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:6899
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:6900
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:6901
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/xml/xmli18n-tmp.h:4680
+#: src/xml/xmli18n-tmp.h:6902
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:6903
 msgid "HP LaserJet 9040"
 msgstr "HP LaserJet 9040"
 
-#: src/xml/xmli18n-tmp.h:4682
+#: src/xml/xmli18n-tmp.h:6904
 msgid "HP LaserJet 9040 MFP"
 msgstr "HP LaserJet 9040 MFP"
 
-#: src/xml/xmli18n-tmp.h:4683
+#: src/xml/xmli18n-tmp.h:6905
 msgid "HP LaserJet 9050"
 msgstr "HP LaserJet 9050"
 
-#: src/xml/xmli18n-tmp.h:4684
+#: src/xml/xmli18n-tmp.h:6906
 msgid "HP LaserJet 9050 MFP"
 msgstr "HP LaserJet 9050 MFP"
 
-#: src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:6907
 msgid "HP LaserJet M3027 MFP"
 msgstr "HP LaserJet M3027 MFP"
 
-#: src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:6908
 msgid "HP LaserJet M3035 MFP"
 msgstr "HP LaserJet M3035 MFP"
 
-#: src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:6909
 msgid "HP LaserJet M4345 MFP"
 msgstr "HP LaserJet M4345 MFP"
 
-#: src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:6910
 msgid "HP LaserJet M5025 MFP"
 msgstr "HP LaserJet M5025 MFP"
 
-#: src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:6911
 msgid "HP LaserJet M5035 MFP"
 msgstr "HP LaserJet M5035 MFP"
 
-#: src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:6912
 msgid "HP LaserJet P2010"
 msgstr "HP LaserJet P2010"
 
-#: src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:6913
 msgid "HP LaserJet P2015"
 msgstr "HP LaserJet P2015"
 
-#: src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:6914
 msgid "HP LaserJet P3004"
 msgstr "HP LaserJet P3004"
 
-#: src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:6915
 msgid "HP LaserJet P3005"
 msgstr "HP LaserJet P3005"
 
-#: src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:6916
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/xml/xmli18n-tmp.h:4695
+#: src/xml/xmli18n-tmp.h:6917
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:6918
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:6919
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:6920
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:6921
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/xml/xmli18n-tmp.h:4700
+#: src/xml/xmli18n-tmp.h:6922
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:6923
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:6924
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/xml/xmli18n-tmp.h:4703
+#: src/xml/xmli18n-tmp.h:6925
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:6926
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:6927
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/xml/xmli18n-tmp.h:4706
+#: src/xml/xmli18n-tmp.h:6928
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/xml/xmli18n-tmp.h:4707
+#: src/xml/xmli18n-tmp.h:6929
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:6930
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:6931
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/xml/xmli18n-tmp.h:4710
+#: src/xml/xmli18n-tmp.h:6932
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:6933
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:6934
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:6935
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:6936
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:6937
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:6938
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:6939
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/xml/xmli18n-tmp.h:4718
+#: src/xml/xmli18n-tmp.h:6940
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:6941
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:6942
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/xml/xmli18n-tmp.h:4721
+#: src/xml/xmli18n-tmp.h:6943
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:6944
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:6945
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:6946
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/xml/xmli18n-tmp.h:4725
+#: src/xml/xmli18n-tmp.h:6947
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:6948
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:6949
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/xml/xmli18n-tmp.h:4728
+#: src/xml/xmli18n-tmp.h:6950
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/xml/xmli18n-tmp.h:4729
+#: src/xml/xmli18n-tmp.h:6951
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:6952
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:6953
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/xml/xmli18n-tmp.h:4732
+#: src/xml/xmli18n-tmp.h:6954
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:6955
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:6956
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:6957
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:6958
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:6959
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:6960
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/xml/xmli18n-tmp.h:4739
+#: src/xml/xmli18n-tmp.h:6961
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/xml/xmli18n-tmp.h:4740
+#: src/xml/xmli18n-tmp.h:6962
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/xml/xmli18n-tmp.h:4741
+#: src/xml/xmli18n-tmp.h:6963
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/xml/xmli18n-tmp.h:4742
+#: src/xml/xmli18n-tmp.h:6964
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:6965
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:6966
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/xml/xmli18n-tmp.h:4745
+#: src/xml/xmli18n-tmp.h:6967
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:6968
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:6969
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:6970
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/xml/xmli18n-tmp.h:4749
+#: src/xml/xmli18n-tmp.h:6971
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:6972
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:6973
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/xml/xmli18n-tmp.h:4752
+#: src/xml/xmli18n-tmp.h:6974
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:6975
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:6976
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/xml/xmli18n-tmp.h:4755
+#: src/xml/xmli18n-tmp.h:6977
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:6978
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:6979
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:6980
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/xml/xmli18n-tmp.h:4759
+#: src/xml/xmli18n-tmp.h:6981
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/xml/xmli18n-tmp.h:4760
+#: src/xml/xmli18n-tmp.h:6982
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:6983
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/xml/xmli18n-tmp.h:4762
+#: src/xml/xmli18n-tmp.h:6984
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:6985
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:6986
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/xml/xmli18n-tmp.h:4765
+#: src/xml/xmli18n-tmp.h:6987
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:6988
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:6989
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:6990
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:6991
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:6992
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:6993
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/xml/xmli18n-tmp.h:4772
+#: src/xml/xmli18n-tmp.h:6994
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:6995
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/xml/xmli18n-tmp.h:4774
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Infotec 4353 MF"
 msgstr "Infotec 4353 MF"
 
-#: src/xml/xmli18n-tmp.h:4775
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Infotec 4452 MF"
 msgstr "Infotec 4452 MF"
 
-#: src/xml/xmli18n-tmp.h:4776
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:6999
 msgid "Infotec IS2022"
 msgstr "Infotec IS2022"
 
-#: src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:7000
 msgid "Infotec IS2027"
 msgstr "Infotec IS2027"
 
-#: src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Infotec IS2032"
 msgstr "Infotec IS2032"
 
-#: src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:7002
 msgid "Infotec IS2035"
 msgstr "Infotec IS2035"
 
-#: src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:7003
 msgid "Infotec IS2045"
 msgstr "Infotec IS2045"
 
-#: src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:7004
 msgid "Infotec IS2090"
 msgstr "Infotec IS2090"
 
-#: src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:7005
 msgid "Infotec IS2105"
 msgstr "Infotec IS2105"
 
-#: src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:7006
 msgid "Infotec IS 2015"
 msgstr "Infotec IS 2015"
 
-#: src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:7007
 msgid "Infotec IS 2018"
 msgstr "Infotec IS 2018"
 
-#: src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:7008
 msgid "Infotec IS 2018D"
 msgstr "Infotec IS 2018D"
 
-#: src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:7009
 msgid "Infotec IS 2060"
 msgstr "Infotec IS 2060"
 
-#: src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:7010
 msgid "Infotec IS 2075"
 msgstr "Infotec IS 2075"
 
-#: src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:7011
 msgid "Infotec IS 2122"
 msgstr "Infotec IS 2122"
 
-#: src/xml/xmli18n-tmp.h:4790
+#: src/xml/xmli18n-tmp.h:7012
 msgid "Infotec IS 2127"
 msgstr "Infotec IS 2127"
 
-#: src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:7013
 msgid "Infotec IS 2132"
 msgstr "Infotec IS 2132"
 
-#: src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:7014
 msgid "Infotec IS 2135"
 msgstr "Infotec IS 2135"
 
-#: src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:7015
 msgid "Infotec IS 2145"
 msgstr "Infotec IS 2145"
 
-#: src/xml/xmli18n-tmp.h:4794
+#: src/xml/xmli18n-tmp.h:7016
 msgid "Infotec IS 2151"
 msgstr "Infotec IS 2151"
 
-#: src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:7017
 msgid "Infotec IS 2160"
 msgstr "Infotec IS 2160"
 
-#: src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:7018
 msgid "Infotec IS 2175"
 msgstr "Infotec IS 2175"
 
-#: src/xml/xmli18n-tmp.h:4797
+#: src/xml/xmli18n-tmp.h:7019
 msgid "Infotec IS 2215"
 msgstr "Infotec IS 2215"
 
-#: src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:7020
 msgid "Infotec IS 2216"
 msgstr "Infotec IS 2216"
 
-#: src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:7021
 msgid "Infotec IS 2220"
 msgstr "Infotec IS 2220"
 
-#: src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:7022
 msgid "Infotec IS 2220D"
 msgstr "Infotec IS 2220D"
 
-#: src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:7023
 msgid "Infotec IS 2225"
 msgstr "Infotec IS 2225"
 
-#: src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Infotec IS 2230"
 msgstr "Infotec IS 2230"
 
-#: src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:7025
 msgid "Infotec IS 2235"
 msgstr "Infotec IS 2235"
 
-#: src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:7026
 msgid "Infotec IS 2245"
 msgstr "Infotec IS 2245"
 
-#: src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:7027
 msgid "Infotec IS 2255"
 msgstr "Infotec IS 2255"
 
-#: src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:7028
 msgid "Infotec IS 2265"
 msgstr "Infotec IS 2265"
 
-#: src/xml/xmli18n-tmp.h:4807
+#: src/xml/xmli18n-tmp.h:7029
 msgid "Infotec IS 2275"
 msgstr "Infotec IS 2275"
 
-#: src/xml/xmli18n-tmp.h:4808
+#: src/xml/xmli18n-tmp.h:7030
 msgid "Infotec IS 2316"
 msgstr "Infotec IS 2316"
 
-#: src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:7031
 msgid "Infotec IS 2320"
 msgstr "Infotec IS 2320"
 
-#: src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:7032
 msgid "Infotec IS 2325"
 msgstr "Infotec IS 2325"
 
-#: src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Infotec IS 2416"
 msgstr "Infotec IS 2416"
 
-#: src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:7034
 msgid "Infotec IS 2425"
 msgstr "Infotec IS 2425"
 
-#: src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:7035
 msgid "Infotec IS 2430"
 msgstr "Infotec IS 2430"
 
-#: src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Infotec IS 2435"
 msgstr "Infotec IS 2435"
 
-#: src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:7037
 msgid "Infotec IS 2445"
 msgstr "Infotec IS 2445"
 
-#: src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Infotec IS 3090"
 msgstr "Infotec IS 3090"
 
-#: src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:7039
 msgid "Infotec IS 3110"
 msgstr "Infotec IS 3110"
 
-#: src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:7040
 msgid "Infotec IS 3135"
 msgstr "Infotec IS 3135"
 
-#: src/xml/xmli18n-tmp.h:4819
+#: src/xml/xmli18n-tmp.h:7041
 msgid "Infotec MP 2550"
 msgstr "Infotec MP 2550"
 
-#: src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:7042
 msgid "Infotec MP 2550B"
 msgstr "Infotec MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:7043
 msgid "Infotec MP 3350"
 msgstr "Infotec MP 3350"
 
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:7044
 msgid "Infotec MP 3350B"
 msgstr "Infotec MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:7045
 msgid "Infotec MP 4000"
 msgstr "Infotec MP 4000"
 
-#: src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:7046
 msgid "Infotec MP 4000B"
 msgstr "Infotec MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:7047
 msgid "Infotec MP 5000"
 msgstr "Infotec MP 5000"
 
-#: src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:7048
 msgid "Infotec MP 5000B"
 msgstr "Infotec MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:7049
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:7050
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:7051
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:4830
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:7057
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:4837
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:4840
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:4842
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:4852
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/xml/xmli18n-tmp.h:4853
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/xml/xmli18n-tmp.h:4854
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/xml/xmli18n-tmp.h:4855
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:4866
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/xml/xmli18n-tmp.h:4867
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/xml/xmli18n-tmp.h:4873
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Lanier 5622"
 msgstr "Lanier 5622"
 
-#: src/xml/xmli18n-tmp.h:4874
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Lanier 5627"
 msgstr "Lanier 5627"
 
-#: src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Lanier 5632"
 msgstr "Lanier 5632"
 
-#: src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Lanier 5635"
 msgstr "Lanier 5635"
 
-#: src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Lanier 5645"
 msgstr "Lanier 5645"
 
-#: src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Lanier LD0105"
 msgstr "Lanier LD0105"
 
-#: src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Lanier LD015"
 msgstr "Lanier LD015"
 
-#: src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Lanier LD035"
 msgstr "Lanier LD035"
 
-#: src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Lanier LD045"
 msgstr "Lanier LD045"
 
-#: src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Lanier LD060"
 msgstr "Lanier LD060"
 
-#: src/xml/xmli18n-tmp.h:4883
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Lanier LD075"
 msgstr "Lanier LD075"
 
-#: src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Lanier LD090"
 msgstr "Lanier LD090"
 
-#: src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Lanier LD115"
 msgstr "Lanier LD115"
 
-#: src/xml/xmli18n-tmp.h:4886
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Lanier LD116"
 msgstr "Lanier LD116"
 
-#: src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Lanier LD118"
 msgstr "Lanier LD118"
 
-#: src/xml/xmli18n-tmp.h:4888
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Lanier LD118d"
 msgstr "Lanier LD118d"
 
-#: src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Lanier LD120"
 msgstr "Lanier LD120"
 
-#: src/xml/xmli18n-tmp.h:4890
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Lanier LD120d"
 msgstr "Lanier LD120d"
 
-#: src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Lanier LD122"
 msgstr "Lanier LD122"
 
-#: src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Lanier LD127"
 msgstr "Lanier LD127"
 
-#: src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Lanier LD132"
 msgstr "Lanier LD132"
 
-#: src/xml/xmli18n-tmp.h:4894
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Lanier LD135"
 msgstr "Lanier LD135"
 
-#: src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Lanier LD145"
 msgstr "Lanier LD145"
 
-#: src/xml/xmli18n-tmp.h:4896
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Lanier LD151"
 msgstr "Lanier LD151"
 
-#: src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Lanier LD160"
 msgstr "Lanier LD160"
 
-#: src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Lanier LD175"
 msgstr "Lanier LD175"
 
-#: src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Lanier LD225"
 msgstr "Lanier LD225"
 
-#: src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Lanier LD230"
 msgstr "Lanier LD230"
 
-#: src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Lanier LD235"
 msgstr "Lanier LD235"
 
-#: src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Lanier LD245"
 msgstr "Lanier LD245"
 
-#: src/xml/xmli18n-tmp.h:4903
-msgid "Lanier MP 2500"
-msgstr "Lanier MP 2500"
-
-#: src/xml/xmli18n-tmp.h:4904
-msgid "Lanier LD125"
-msgstr "Lanier LD125"
-
-#: src/xml/xmli18n-tmp.h:4905
-msgid "Lanier MP 1100"
-msgstr "Lanier MP 1100"
-
-#: src/xml/xmli18n-tmp.h:4906
-msgid "Lanier LD1100"
-msgstr "Lanier LD1100"
-
-#: src/xml/xmli18n-tmp.h:4907
-msgid "Lanier MP 1350"
-msgstr "Lanier MP 1350"
-
-#: src/xml/xmli18n-tmp.h:4908
-msgid "Lanier LD1135"
-msgstr "Lanier LD1135"
-
-#: src/xml/xmli18n-tmp.h:4909
-msgid "Lanier MP 1600"
-msgstr "Lanier MP 1600"
-
-#: src/xml/xmli18n-tmp.h:4910
-msgid "Lanier LD316"
-msgstr "Lanier LD316"
-
-#: src/xml/xmli18n-tmp.h:4911
-msgid "Lanier MP 161"
-msgstr "Lanier MP 161"
-
-#: src/xml/xmli18n-tmp.h:4912
-msgid "Lanier LD016"
-msgstr "Lanier LD016"
-
-#: src/xml/xmli18n-tmp.h:4913
-msgid "Lanier MP 2000"
-msgstr "Lanier MP 2000"
-
-#: src/xml/xmli18n-tmp.h:4914
-msgid "Lanier LD320d"
-msgstr "Lanier LD320d"
-
-#: src/xml/xmli18n-tmp.h:4915
-msgid "Lanier MP 2510"
-msgstr "Lanier MP 2510"
-
-#: src/xml/xmli18n-tmp.h:4916
-msgid "Lanier LD325"
-msgstr "Lanier LD325"
+#: src/xml/xmli18n-tmp.h:7125
+msgid "Lanier MP2500/LD125"
+msgstr "Lanier MP2500/LD125"
 
-#: src/xml/xmli18n-tmp.h:4917
-msgid "Lanier MP 2550B"
-msgstr "Lanier MP 2550B"
+#: src/xml/xmli18n-tmp.h:7126
+msgid "Lanier MP 1100/LD1100"
+msgstr "Lanier MP 1100/LD1100"
 
-#: src/xml/xmli18n-tmp.h:4918
-msgid "Lanier LD425B"
-msgstr "Lanier LD425B"
+#: src/xml/xmli18n-tmp.h:7127
+msgid "Lanier MP 1350/LD1135"
+msgstr "Lanier MP 1350/LD1135"
 
-#: src/xml/xmli18n-tmp.h:4919
-msgid "Lanier MP 2550"
-msgstr "Lanier MP 2550"
+#: src/xml/xmli18n-tmp.h:7128
+msgid "Lanier MP 1600/LD316"
+msgstr "Lanier MP 1600/LD316"
 
-#: src/xml/xmli18n-tmp.h:4920
-msgid "Lanier LD425"
-msgstr "Lanier LD425"
+#: src/xml/xmli18n-tmp.h:7129
+msgid "Lanier MP 161/LD016"
+msgstr "Lanier MP 161/LD016"
 
-#: src/xml/xmli18n-tmp.h:4921
-msgid "Lanier MP 3010"
-msgstr "Lanier MP 3010"
+#: src/xml/xmli18n-tmp.h:7130
+msgid "Lanier MP 2000/LD320d"
+msgstr "Lanier MP 2000/LD320d"
 
-#: src/xml/xmli18n-tmp.h:4922
-msgid "Lanier LD330"
-msgstr "Lanier LD330"
+#: src/xml/xmli18n-tmp.h:7131
+msgid "Lanier MP 2510/LD325"
+msgstr "Lanier MP 2510/LD325"
 
-#: src/xml/xmli18n-tmp.h:4923
-msgid "Lanier MP 3350B"
-msgstr "Lanier MP 3350B"
+#: src/xml/xmli18n-tmp.h:7132
+msgid "Lanier MP 2550B/LD425B"
+msgstr "Lanier MP 2550B/LD425B"
 
-#: src/xml/xmli18n-tmp.h:4924
-msgid "Lanier LD433B"
-msgstr "Lanier LD433B"
+#: src/xml/xmli18n-tmp.h:7133
+msgid "Lanier MP 2550/LD425"
+msgstr "Lanier MP 2550/LD425"
 
-#: src/xml/xmli18n-tmp.h:4925
-msgid "Lanier MP 3350"
-msgstr "Lanier MP 3350"
+#: src/xml/xmli18n-tmp.h:7134
+msgid "Lanier MP 3010/LD330"
+msgstr "Lanier MP 3010/LD330"
 
-#: src/xml/xmli18n-tmp.h:4926
-msgid "Lanier LD433"
-msgstr "Lanier LD433"
+#: src/xml/xmli18n-tmp.h:7135
+msgid "Lanier MP 3350B/LD433B"
+msgstr "Lanier MP 3350B/LD433B"
 
-#: src/xml/xmli18n-tmp.h:4927
-msgid "Lanier MP 3500"
-msgstr "Lanier MP 3500"
+#: src/xml/xmli18n-tmp.h:7136
+msgid "Lanier MP 3350/LD433"
+msgstr "Lanier MP 3350/LD433"
 
-#: src/xml/xmli18n-tmp.h:4928
-msgid "Lanier LD335"
-msgstr "Lanier LD335"
+#: src/xml/xmli18n-tmp.h:7137
+msgid "Lanier MP 3500/LD335"
+msgstr "Lanier MP 3500/LD335"
 
-#: src/xml/xmli18n-tmp.h:4929
-msgid "Lanier MP 4000B"
-msgstr "Lanier MP 4000B"
+#: src/xml/xmli18n-tmp.h:7138
+msgid "Lanier MP 4000B/LD040B"
+msgstr "Lanier MP 4000B/LD040B"
 
-#: src/xml/xmli18n-tmp.h:4930
-msgid "Lanier LD040B"
-msgstr "Lanier LD040B"
+#: src/xml/xmli18n-tmp.h:7139
+msgid "Lanier MP 4000/LD040"
+msgstr "Lanier MP 4000/LD040"
 
-#: src/xml/xmli18n-tmp.h:4931
-msgid "Lanier MP 4000"
-msgstr "Lanier MP 4000"
+#: src/xml/xmli18n-tmp.h:7140
+msgid "Lanier MP 4500/LD345"
+msgstr "Lanier MP 4500/LD345"
 
-#: src/xml/xmli18n-tmp.h:4932
-msgid "Lanier LD040"
-msgstr "Lanier LD040"
+#: src/xml/xmli18n-tmp.h:7141
+msgid "Lanier MP 5000B/LD050B"
+msgstr "Lanier MP 5000B/LD050B"
 
-#: src/xml/xmli18n-tmp.h:4933
-msgid "Lanier MP 4500"
-msgstr "Lanier MP 4500"
+#: src/xml/xmli18n-tmp.h:7142
+msgid "Lanier MP 5000/LD050"
+msgstr "Lanier MP 5000/LD050"
 
-#: src/xml/xmli18n-tmp.h:4934
-msgid "Lanier LD345"
-msgstr "Lanier LD345"
+#: src/xml/xmli18n-tmp.h:7143
+msgid "Lanier MP 5500/LD255"
+msgstr "Lanier MP 5500/LD255"
 
-#: src/xml/xmli18n-tmp.h:4935
-msgid "Lanier MP 5000B"
-msgstr "Lanier MP 5000B"
+#: src/xml/xmli18n-tmp.h:7144
+msgid "Lanier MP 6500/LD265"
+msgstr "Lanier MP 6500/LD265"
 
-#: src/xml/xmli18n-tmp.h:4936
-msgid "Lanier LD050B"
-msgstr "Lanier LD050B"
+#: src/xml/xmli18n-tmp.h:7145
+msgid "Lanier MP 7500/LD275"
+msgstr "Lanier MP 7500/LD275"
 
-#: src/xml/xmli18n-tmp.h:4937
-msgid "Lanier MP 5000"
-msgstr "Lanier MP 5000"
+#: src/xml/xmli18n-tmp.h:7146
+msgid "Lanier MP 9000/LD190"
+msgstr "Lanier MP 9000/LD190"
 
-#: src/xml/xmli18n-tmp.h:4938
-msgid "Lanier LD050"
-msgstr "Lanier LD050"
-
-#: src/xml/xmli18n-tmp.h:4939
-msgid "Lanier MP 5500"
-msgstr "Lanier MP 5500"
-
-#: src/xml/xmli18n-tmp.h:4940
-msgid "Lanier LD255"
-msgstr "Lanier LD255"
-
-#: src/xml/xmli18n-tmp.h:4941
-msgid "Lanier MP 6500"
-msgstr "Lanier MP 6500"
-
-#: src/xml/xmli18n-tmp.h:4942
-msgid "Lanier LD265"
-msgstr "Lanier LD265"
-
-#: src/xml/xmli18n-tmp.h:4943
-msgid "Lanier MP 7500"
-msgstr "Lanier MP 7500"
-
-#: src/xml/xmli18n-tmp.h:4944
-msgid "Lanier LD275"
-msgstr "Lanier LD275"
-
-#: src/xml/xmli18n-tmp.h:4945
-msgid "Lanier MP 9000"
-msgstr "Lanier MP 9000"
-
-#: src/xml/xmli18n-tmp.h:4946
-msgid "Lanier LD190"
-msgstr "Lanier LD190"
-
-#: src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:7148
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/xml/xmli18n-tmp.h:4950
+#: src/xml/xmli18n-tmp.h:7150
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E220"
 
-#: src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:7151
 msgid "Lexmark Optra E321"
 msgstr "Lexmark Optra E321"
 
-#: src/xml/xmli18n-tmp.h:4952
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Lexmark Optra E323"
 msgstr "Lexmark Optra E323"
 
-#: src/xml/xmli18n-tmp.h:4953
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:7155
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/xml/xmli18n-tmp.h:4960
+#: src/xml/xmli18n-tmp.h:7160
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:7161
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:7162
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/xml/xmli18n-tmp.h:4963
+#: src/xml/xmli18n-tmp.h:7163
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:7164
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:7165
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/xml/xmli18n-tmp.h:4966
-msgid "NRG 10515"
-msgstr "NRG 10515"
-
-#: src/xml/xmli18n-tmp.h:4967
-msgid "NRG 10518"
-msgstr "NRG 10518"
-
-#: src/xml/xmli18n-tmp.h:4968
-msgid "NRG 10512"
-msgstr "NRG 10512"
-
-#: src/xml/xmli18n-tmp.h:4969
-msgid "NRG 2205"
-msgstr "NRG 2205"
-
-#: src/xml/xmli18n-tmp.h:4970
-msgid "NRG 2238"
-msgstr "NRG 2238"
-
-#: src/xml/xmli18n-tmp.h:4971
-msgid "NRG 2212"
-msgstr "NRG 2212"
-
-#: src/xml/xmli18n-tmp.h:4972
-msgid "NRG 2705"
-msgstr "NRG 2705"
-
-#: src/xml/xmli18n-tmp.h:4973
-msgid "NRG 2738"
-msgstr "NRG 2738"
-
-#: src/xml/xmli18n-tmp.h:4974
-msgid "NRG 2712"
-msgstr "NRG 2712"
-
-#: src/xml/xmli18n-tmp.h:4975
-msgid "NRG 3205"
-msgstr "NRG 3205"
-
-#: src/xml/xmli18n-tmp.h:4976
-msgid "NRG 3238"
-msgstr "NRG 3238"
-
-#: src/xml/xmli18n-tmp.h:4977
-msgid "NRG 3212"
-msgstr "NRG 3212"
-
-#: src/xml/xmli18n-tmp.h:4978
-msgid "NRG 3525"
-msgstr "NRG 3525"
-
-#: src/xml/xmli18n-tmp.h:4979
-msgid "NRG 3508"
-msgstr "NRG 3508"
-
-#: src/xml/xmli18n-tmp.h:4980
-msgid "NRG 3502"
-msgstr "NRG 3502"
-
-#: src/xml/xmli18n-tmp.h:4981
-msgid "NRG 3545"
-msgstr "NRG 3545"
-
-#: src/xml/xmli18n-tmp.h:4982
-msgid "NRG 3518"
-msgstr "NRG 3518"
-
-#: src/xml/xmli18n-tmp.h:4983
-msgid "NRG 3532"
-msgstr "NRG 3532"
-
-#: src/xml/xmli18n-tmp.h:4984
-msgid "NRG 4525"
-msgstr "NRG 4525"
-
-#: src/xml/xmli18n-tmp.h:4985
-msgid "NRG 4508"
-msgstr "NRG 4508"
-
-#: src/xml/xmli18n-tmp.h:4986
-msgid "NRG 4502"
-msgstr "NRG 4502"
-
-#: src/xml/xmli18n-tmp.h:4987
-msgid "NRG 4545"
-msgstr "NRG 4545"
+#: src/xml/xmli18n-tmp.h:7166
+msgid "NRG 10515/10518/10512"
+msgstr "NRG 10515/10518/10512"
 
-#: src/xml/xmli18n-tmp.h:4988
-msgid "NRG 4518"
-msgstr "NRG 4518"
+#: src/xml/xmli18n-tmp.h:7167
+msgid "NRG 2205/2238/2212"
+msgstr "NRG 2205/2238/2212"
 
-#: src/xml/xmli18n-tmp.h:4989
-msgid "NRG 4532"
-msgstr "NRG 4532"
+#: src/xml/xmli18n-tmp.h:7168
+msgid "NRG 2705/2738/2712"
+msgstr "NRG 2705/2738/2712"
 
-#: src/xml/xmli18n-tmp.h:4990
-msgid "NRG 6002"
-msgstr "NRG 6002"
+#: src/xml/xmli18n-tmp.h:7169
+msgid "NRG 3205/3238/3212"
+msgstr "NRG 3205/3238/3212"
 
-#: src/xml/xmli18n-tmp.h:4991
-msgid "NRG 6005"
-msgstr "NRG 6005"
+#: src/xml/xmli18n-tmp.h:7170
+msgid "NRG 3525/3508/3502"
+msgstr "NRG 3525/3508/3502"
 
-#: src/xml/xmli18n-tmp.h:4992
-msgid "NRG 6008"
-msgstr "NRG 6008"
+#: src/xml/xmli18n-tmp.h:7171
+msgid "NRG 3545/3518/3532"
+msgstr "NRG 3545/3518/3532"
 
-#: src/xml/xmli18n-tmp.h:4993
-msgid "NRG 7502"
-msgstr "NRG 7502"
+#: src/xml/xmli18n-tmp.h:7172
+msgid "NRG 4525/4508/4502"
+msgstr "NRG 4525/4508/4502"
 
-#: src/xml/xmli18n-tmp.h:4994
-msgid "NRG 7505"
-msgstr "NRG 7505"
+#: src/xml/xmli18n-tmp.h:7173
+msgid "NRG 4545/4518/4532"
+msgstr "NRG 4545/4518/4532"
 
-#: src/xml/xmli18n-tmp.h:4995
-msgid "NRG 7508"
-msgstr "NRG 7508"
+#: src/xml/xmli18n-tmp.h:7174
+msgid "NRG 6002/6005/6008"
+msgstr "NRG 6002/6005/6008"
 
-#: src/xml/xmli18n-tmp.h:4996
-msgid "NRG 9005"
-msgstr "NRG 9005"
+#: src/xml/xmli18n-tmp.h:7175
+msgid "NRG 7502/7505/7508"
+msgstr "NRG 7502/7505/7508"
 
-#: src/xml/xmli18n-tmp.h:4997
-msgid "NRG 9008"
-msgstr "NRG 9008"
+#: src/xml/xmli18n-tmp.h:7176
+msgid "NRG 9005/9008/9002"
+msgstr "NRG 9005/9008/9002"
 
-#: src/xml/xmli18n-tmp.h:4998
-msgid "NRG 9002"
-msgstr "NRG 9002"
-
-#: src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:7177
 msgid "NRG DSm415"
 msgstr "NRG DSm415"
 
-#: src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:7178
 msgid "NRG DSm615"
 msgstr "NRG DSm615"
 
-#: src/xml/xmli18n-tmp.h:5001
+#: src/xml/xmli18n-tmp.h:7179
 msgid "NRG DSm616"
 msgstr "NRG DSm616"
 
-#: src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:7180
 msgid "NRG DSm618"
 msgstr "NRG DSm618"
 
-#: src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:7181
 msgid "NRG DSm618d"
 msgstr "NRG DSm618d"
 
-#: src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:7182
 msgid "NRG DSm620"
 msgstr "NRG DSm620"
 
-#: src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:7183
 msgid "NRG DSm620d"
 msgstr "NRG DSm620d"
 
-#: src/xml/xmli18n-tmp.h:5006
+#: src/xml/xmli18n-tmp.h:7184
 msgid "NRG DSm622"
 msgstr "NRG DSm622"
 
-#: src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:7185
 msgid "NRG DSm627"
 msgstr "NRG DSm627"
 
-#: src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:7186
 msgid "NRG DSm632"
 msgstr "NRG DSm632"
 
-#: src/xml/xmli18n-tmp.h:5009
+#: src/xml/xmli18n-tmp.h:7187
 msgid "NRG DSm635"
 msgstr "NRG DSm635"
 
-#: src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:7188
 msgid "NRG DSm645"
 msgstr "NRG DSm645"
 
-#: src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:7189
 msgid "NRG DSm651"
 msgstr "NRG DSm651"
 
-#: src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:7190
 msgid "NRG DSm660"
 msgstr "NRG DSm660"
 
-#: src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:7191
 msgid "NRG DSm675"
 msgstr "NRG DSm675"
 
-#: src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:7192
 msgid "NRG DSm725"
 msgstr "NRG DSm725"
 
-#: src/xml/xmli18n-tmp.h:5015
+#: src/xml/xmli18n-tmp.h:7193
 msgid "NRG DSm730"
 msgstr "NRG DSm730"
 
-#: src/xml/xmli18n-tmp.h:5016
+#: src/xml/xmli18n-tmp.h:7194
 msgid "NRG DSm735"
 msgstr "NRG DSm735"
 
-#: src/xml/xmli18n-tmp.h:5017
+#: src/xml/xmli18n-tmp.h:7195
 msgid "NRG DSm745"
 msgstr "NRG DSm745"
 
-#: src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:7196
 msgid "NRG MP 1100"
 msgstr "NRG MP 1100"
 
-#: src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:7197
 msgid "NRG MP 1350"
 msgstr "NRG MP 1350"
 
-#: src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:7198
 msgid "NRG MP 1600"
 msgstr "NRG MP 1600"
 
-#: src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:7199
 msgid "NRG MP 161"
 msgstr "NRG MP 161"
 
-#: src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:7200
 msgid "NRG MP 2000"
 msgstr "NRG MP 2000"
 
-#: src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:7201
 msgid "NRG MP 2500"
 msgstr "NRG MP 2500"
 
-#: src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:7202
 msgid "NRG MP 2510"
 msgstr "NRG MP 2510"
 
-#: src/xml/xmli18n-tmp.h:5025
+#: src/xml/xmli18n-tmp.h:7203
 msgid "NRG MP 2550"
 msgstr "NRG MP 2550"
 
-#: src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:7204
 msgid "NRG MP 2550B"
 msgstr "NRG MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:7205
 msgid "NRG MP 3010"
 msgstr "NRG MP 3010"
 
-#: src/xml/xmli18n-tmp.h:5028
+#: src/xml/xmli18n-tmp.h:7206
 msgid "NRG MP 3350"
 msgstr "NRG MP 3350"
 
-#: src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:7207
 msgid "NRG MP 3350B"
 msgstr "NRG MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:7208
 msgid "NRG MP 3500"
 msgstr "NRG MP 3500"
 
-#: src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:7209
 msgid "NRG MP 4000"
 msgstr "NRG MP 4000"
 
-#: src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:7210
 msgid "NRG MP 4000B"
 msgstr "NRG MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:5033
+#: src/xml/xmli18n-tmp.h:7211
 msgid "NRG MP 4500"
 msgstr "NRG MP 4500"
 
-#: src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:7212
 msgid "NRG MP 5000"
 msgstr "NRG MP 5000"
 
-#: src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:7213
 msgid "NRG MP 5000B"
 msgstr "NRG MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:7214
 msgid "NRG MP 5500"
 msgstr "NRG MP 5500"
 
-#: src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:7215
 msgid "NRG MP 6500"
 msgstr "NRG MP 6500"
 
-#: src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:7216
 msgid "NRG MP 7500"
 msgstr "NRG MP 7500"
 
-#: src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:7217
 msgid "NRG MP 9000"
 msgstr "NRG MP 9000"
 
-#: src/xml/xmli18n-tmp.h:5040
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Oki OL400"
 msgstr "Oki OL400"
 
-#: src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Oki OL400e"
 msgstr "Oki OL400e"
 
-#: src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Oki OL400ex"
 msgstr "Oki OL400ex"
 
-#: src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Oki OL410e"
 msgstr "Oki OL410e"
 
-#: src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Oki OL600e"
 msgstr "Oki OL600e"
 
-#: src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Oki OL610e/S"
 msgstr "Oki OL610e/S"
 
-#: src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Oki OL800"
 msgstr "Oki OL800"
 
-#: src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Oki OL810ex"
 msgstr "Oki OL810ex"
 
-#: src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Oki Okipage 6e"
 msgstr "Oki Okipage 6e"
 
-#: src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Oki Okipage 6ex"
 msgstr "Oki Okipage 6ex"
 
-#: src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Oki Okipage 8p"
 msgstr "Oki Okipage 8p"
 
-#: src/xml/xmli18n-tmp.h:5051
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Oki Okipage 10e"
 msgstr "Oki Okipage 10e"
 
-#: src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Oki Okipage 10ex"
 msgstr "Oki Okipage 10ex"
 
-#: src/xml/xmli18n-tmp.h:5053
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Oki Okipage 14ex"
 msgstr "Oki Okipage 14ex"
 
-#: src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:7232
 msgid "Oki Super 6e"
 msgstr "Oki Super 6e"
 
-#: src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:7234
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:7235
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/xml/xmli18n-tmp.h:5060
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/xml/xmli18n-tmp.h:5062
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5063
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Ricoh Aficio 1022"
 msgstr "Ricoh Aficio 1022"
 
-#: src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:7242
 msgid "Ricoh Aficio 1027"
 msgstr "Ricoh Aficio 1027"
 
-#: src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:7243
 msgid "Ricoh Aficio 1032"
 msgstr "Ricoh Aficio 1032"
 
-#: src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:7244
 msgid "Ricoh Aficio 1035"
 msgstr "Ricoh Aficio 1035"
 
-#: src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:7245
 msgid "Ricoh Aficio 1045"
 msgstr "Ricoh Aficio 1045"
 
-#: src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:7246
 msgid "Ricoh Aficio 1060"
 msgstr "Ricoh Aficio 1060"
 
-#: src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:7247
 msgid "Ricoh Aficio 1075"
 msgstr "Ricoh Aficio 1075"
 
-#: src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:7248
 msgid "Ricoh Aficio 1515"
 msgstr "Ricoh Aficio 1515"
 
-#: src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:7249
 msgid "Ricoh Aficio 2015"
 msgstr "Ricoh Aficio 2015"
 
-#: src/xml/xmli18n-tmp.h:5072
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Ricoh Aficio 2016"
 msgstr "Ricoh Aficio 2016"
 
-#: src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Ricoh Aficio 2018"
 msgstr "Ricoh Aficio 2018"
 
-#: src/xml/xmli18n-tmp.h:5074
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Ricoh Aficio 2018D"
 msgstr "Ricoh Aficio 2018D"
 
-#: src/xml/xmli18n-tmp.h:5075
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Ricoh Aficio 2020"
 msgstr "Ricoh Aficio 2020"
 
-#: src/xml/xmli18n-tmp.h:5076
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Ricoh Aficio 2020D"
 msgstr "Ricoh Aficio 2020D"
 
-#: src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:7255
 msgid "Ricoh Aficio 2022"
 msgstr "Ricoh Aficio 2022"
 
-#: src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Ricoh Aficio 2027"
 msgstr "Ricoh Aficio 2027"
 
-#: src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Ricoh Aficio 2032"
 msgstr "Ricoh Aficio 2032"
 
-#: src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:7258
 msgid "Ricoh Aficio 2035"
 msgstr "Ricoh Aficio 2035"
 
-#: src/xml/xmli18n-tmp.h:5081
+#: src/xml/xmli18n-tmp.h:7259
 msgid "Ricoh Aficio 2035e"
 msgstr "Ricoh Aficio 2035e"
 
-#: src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Ricoh Aficio 2045"
 msgstr "Ricoh Aficio 2045"
 
-#: src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Ricoh Aficio 2045e"
 msgstr "Ricoh Aficio 2045e"
 
-#: src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Ricoh Aficio 2051"
 msgstr "Ricoh Aficio 2051"
 
-#: src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:7263
 msgid "Ricoh Aficio 2060"
 msgstr "Ricoh Aficio 2060"
 
-#: src/xml/xmli18n-tmp.h:5086
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Ricoh Aficio 2075"
 msgstr "Ricoh Aficio 2075"
 
-#: src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Ricoh Aficio 2090"
 msgstr "Ricoh Aficio 2090"
 
-#: src/xml/xmli18n-tmp.h:5088
+#: src/xml/xmli18n-tmp.h:7266
 msgid "Ricoh Aficio 2105"
 msgstr "Ricoh Aficio 2105"
 
-#: src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:7267
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5090
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Ricoh Aficio 3025"
 msgstr "Ricoh Aficio 3025"
 
-#: src/xml/xmli18n-tmp.h:5091
+#: src/xml/xmli18n-tmp.h:7269
 msgid "Ricoh Aficio 3030"
 msgstr "Ricoh Aficio 3030"
 
-#: src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:7270
 msgid "Ricoh Aficio 3035"
 msgstr "Ricoh Aficio 3035"
 
-#: src/xml/xmli18n-tmp.h:5093
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Ricoh Aficio 3045"
 msgstr "Ricoh Aficio 3045"
 
-#: src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Ricoh Aficio MP 1100"
 msgstr "Ricoh Aficio MP 1100"
 
-#: src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Ricoh Aficio MP 1350"
 msgstr "Ricoh Aficio MP 1350"
 
-#: src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Ricoh Aficio MP 1600"
 msgstr "Ricoh Aficio MP 1600"
 
-#: src/xml/xmli18n-tmp.h:5099
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Ricoh Aficio MP 161"
 msgstr "Ricoh Aficio MP 161"
 
-#: src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Ricoh Aficio MP 2000"
 msgstr "Ricoh Aficio MP 2000"
 
-#: src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Ricoh Aficio MP 2500"
 msgstr "Ricoh Aficio MP 2500"
 
-#: src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Ricoh Aficio MP 2510"
 msgstr "Ricoh Aficio MP 2510"
 
-#: src/xml/xmli18n-tmp.h:5103
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Ricoh Aficio MP 2550"
 msgstr "Ricoh Aficio MP 2550"
 
-#: src/xml/xmli18n-tmp.h:5104
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Ricoh Aficio MP 2550B"
 msgstr "Ricoh Aficio MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Ricoh Aficio MP 3010"
 msgstr "Ricoh Aficio MP 3010"
 
-#: src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:7284
 msgid "Ricoh Aficio MP 3350"
 msgstr "Ricoh Aficio MP 3350"
 
-#: src/xml/xmli18n-tmp.h:5107
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Ricoh Aficio MP 3350B"
 msgstr "Ricoh Aficio MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:5108
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Ricoh Aficio MP 3500"
 msgstr "Ricoh Aficio MP 3500"
 
-#: src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Ricoh Aficio MP 4000"
 msgstr "Ricoh Aficio MP 4000"
 
-#: src/xml/xmli18n-tmp.h:5110
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Ricoh Aficio MP 4000B"
 msgstr "Ricoh Aficio MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Ricoh Aficio MP 4500"
 msgstr "Ricoh Aficio MP 4500"
 
-#: src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Ricoh Aficio MP 5000"
 msgstr "Ricoh Aficio MP 5000"
 
-#: src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Ricoh Aficio MP 5000B"
 msgstr "Ricoh Aficio MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Ricoh Aficio MP 5500"
 msgstr "Ricoh Aficio MP 5500"
 
-#: src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Ricoh Aficio MP 6500"
 msgstr "Ricoh Aficio MP 6500"
 
-#: src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Ricoh Aficio MP 7500"
 msgstr "Ricoh Aficio MP 7500"
 
-#: src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Ricoh Aficio MP 9000"
 msgstr "Ricoh Aficio MP 9000"
 
-#: src/xml/xmli18n-tmp.h:5118
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Samsung ML-1250"
 msgstr "Samsung ML-1250"
 
-#: src/xml/xmli18n-tmp.h:5120
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Samsung ML-1450"
 msgstr "Samsung ML-1450"
 
-#: src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Samsung ML-1450PS"
 msgstr "Samsung ML-1450PS"
 
-#: src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Samsung ML-1650"
 msgstr "Samsung ML-1650"
 
-#: src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Samsung ML-1651N"
 msgstr "Samsung ML-1651N"
 
-#: src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Samsung ML-1750"
 msgstr "Samsung ML-1750"
 
-#: src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Samsung ML-2150"
 msgstr "Samsung ML-2150"
 
-#: src/xml/xmli18n-tmp.h:5126
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Samsung ML-2150PS"
 msgstr "Samsung ML-2150PS"
 
-#: src/xml/xmli18n-tmp.h:5127
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Samsung ML-2151N"
 msgstr "Samsung ML-2151N"
 
-#: src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Samsung ML-2151NPS"
 msgstr "Samsung ML-2151NPS"
 
-#: src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Samsung ML-2152W"
 msgstr "Samsung ML-2152W"
 
-#: src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Samsung ML-2152WPS"
 msgstr "Samsung ML-2152WPS"
 
-#: src/xml/xmli18n-tmp.h:5131
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Samsung ML-2250"
 msgstr "Samsung ML-2250"
 
-#: src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Samsung ML-2550"
 msgstr "Samsung ML-2550"
 
-#: src/xml/xmli18n-tmp.h:5133
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Samsung ML-2551N"
 msgstr "Samsung ML-2551N"
 
-#: src/xml/xmli18n-tmp.h:5134
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Samsung ML-2552W"
 msgstr "Samsung ML-2552W"
 
-#: src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/xml/xmli18n-tmp.h:5138
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Samsung ML-7300"
 msgstr "Samsung ML-7300"
 
-#: src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Samsung ML-7300N"
 msgstr "Samsung ML-7300N"
 
-#: src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/xml/xmli18n-tmp.h:5146
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/xml/xmli18n-tmp.h:5147
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Savin 2522"
 msgstr "Savin 2522"
 
-#: src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Savin 2527"
 msgstr "Savin 2527"
 
-#: src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Savin 2532"
 msgstr "Savin 2532"
 
-#: src/xml/xmli18n-tmp.h:5150
-msgid "Savin 2535"
-msgstr "Savin 2535"
-
-#: src/xml/xmli18n-tmp.h:5151
-msgid "Savin 2235"
-msgstr "Savin 2235"
+#: src/xml/xmli18n-tmp.h:7328
+msgid "Savin 2535/2235"
+msgstr "Savin 2535/2235"
 
-#: src/xml/xmli18n-tmp.h:5152
-msgid "Savin 2545"
-msgstr "Savin 2545"
+#: src/xml/xmli18n-tmp.h:7329
+msgid "Savin 2545/2245"
+msgstr "Savin 2545/2245"
 
-#: src/xml/xmli18n-tmp.h:5153
-msgid "Savin 2245"
-msgstr "Savin 2245"
-
-#: src/xml/xmli18n-tmp.h:5154
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Savin 2560"
 msgstr "Savin 2560"
 
-#: src/xml/xmli18n-tmp.h:5155
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Savin 2575"
 msgstr "Savin 2575"
 
-#: src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Savin 3515"
 msgstr "Savin 3515"
 
-#: src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Savin 40105"
 msgstr "Savin 40105"
 
-#: src/xml/xmli18n-tmp.h:5158
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Savin 4015"
 msgstr "Savin 4015"
 
-#: src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Savin 4018"
 msgstr "Savin 4018"
 
-#: src/xml/xmli18n-tmp.h:5160
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Savin 4018d"
 msgstr "Savin 4018d"
 
-#: src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Savin 4022"
 msgstr "Savin 4022"
 
-#: src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Savin 4027"
 msgstr "Savin 4027"
 
-#: src/xml/xmli18n-tmp.h:5163
-msgid "Savin 4035"
-msgstr "Savin 4035"
-
-#: src/xml/xmli18n-tmp.h:5164
-msgid "Savin 4135g"
-msgstr "Savin 4135g"
-
-#: src/xml/xmli18n-tmp.h:5165
-msgid "Savin 4035e"
-msgstr "Savin 4035e"
-
-#: src/xml/xmli18n-tmp.h:5166
-msgid "Savin 4135eG"
-msgstr "Savin 4135eG"
+#: src/xml/xmli18n-tmp.h:7339
+msgid "Savin 4035/4135g"
+msgstr "Savin 4035/4135g"
 
-#: src/xml/xmli18n-tmp.h:5167
-msgid "Savin 4045"
-msgstr "Savin 4045"
+#: src/xml/xmli18n-tmp.h:7340
+msgid "Savin 4035e/4135eG"
+msgstr "Savin 4035e/4135eG"
 
-#: src/xml/xmli18n-tmp.h:5168
-msgid "Savin 4145g"
-msgstr "Savin 4145g"
+#: src/xml/xmli18n-tmp.h:7341
+msgid "Savin 4045/4145g"
+msgstr "Savin 4045/4145g"
 
-#: src/xml/xmli18n-tmp.h:5169
-msgid "Savin 4045e"
-msgstr "Savin 4045e"
+#: src/xml/xmli18n-tmp.h:7342
+msgid "Savin 4045e/4145eG"
+msgstr "Savin 4045e/4145eG"
 
-#: src/xml/xmli18n-tmp.h:5170
-msgid "Savin 4145eG"
-msgstr "Savin 4145eG"
-
-#: src/xml/xmli18n-tmp.h:5171
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Savin 4051"
 msgstr "Savin 4051"
 
-#: src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Savin 4060"
 msgstr "Savin 4060"
 
-#: src/xml/xmli18n-tmp.h:5173
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Savin 4075"
 msgstr "Savin 4075"
 
-#: src/xml/xmli18n-tmp.h:5174
+#: src/xml/xmli18n-tmp.h:7346
 msgid "Savin 4090"
 msgstr "Savin 4090"
 
-#: src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Savin 7025"
 msgstr "Savin 7025"
 
-#: src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:7348
 msgid "Savin 8016"
 msgstr "Savin 8016"
 
-#: src/xml/xmli18n-tmp.h:5177
+#: src/xml/xmli18n-tmp.h:7349
 msgid "Savin 8020"
 msgstr "Savin 8020"
 
-#: src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Savin 8020d"
 msgstr "Savin 8020d"
 
-#: src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Savin 8025"
 msgstr "Savin 8025"
 
-#: src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Savin 8025e"
 msgstr "Savin 8025e"
 
-#: src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:7353
 msgid "Savin 8030"
 msgstr "Savin 8030"
 
-#: src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Savin 8030e"
 msgstr "Savin 8030e"
 
-#: src/xml/xmli18n-tmp.h:5183
-msgid "Savin 8035"
-msgstr "Savin 8035"
-
-#: src/xml/xmli18n-tmp.h:5184
-msgid "Savin 8035g"
-msgstr "Savin 8035g"
+#: src/xml/xmli18n-tmp.h:7355
+msgid "Savin 8035/8035g"
+msgstr "Savin 8035/8035g"
 
-#: src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Savin 8035e"
 msgstr "Savin 8035e"
 
-#: src/xml/xmli18n-tmp.h:5186
-msgid "Savin 8045"
-msgstr "Savin 8045"
+#: src/xml/xmli18n-tmp.h:7357
+msgid "Savin 8045/8045g"
+msgstr "Savin 8045/8045g"
 
-#: src/xml/xmli18n-tmp.h:5187
-msgid "Savin 8045g"
-msgstr "Savin 8045g"
-
-#: src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Savin 8045e"
 msgstr "Savin 8045e"
 
-#: src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Savin 8055"
 msgstr "Savin 8055"
 
-#: src/xml/xmli18n-tmp.h:5190
+#: src/xml/xmli18n-tmp.h:7360
 msgid "Savin 8065"
 msgstr "Savin 8065"
 
-#: src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Savin 8075"
 msgstr "Savin 8075"
 
-#: src/xml/xmli18n-tmp.h:5192
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Savin 8090"
 msgstr "Savin 8090"
 
-#: src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Savin 8110"
 msgstr "Savin 8110"
 
-#: src/xml/xmli18n-tmp.h:5194
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Savin 8135"
 msgstr "Savin 8135"
 
-#: src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Savin 816"
 msgstr "Savin 816"
 
-#: src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Savin 9016"
 msgstr "Savin 9016"
 
-#: src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Savin 9021d"
 msgstr "Savin 9021d"
 
-#: src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Savin 9025"
 msgstr "Savin 9025"
 
-#: src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Savin 9025b"
 msgstr "Savin 9025b"
 
-#: src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:7370
 msgid "Savin 9033"
 msgstr "Savin 9033"
 
-#: src/xml/xmli18n-tmp.h:5201
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Savin 9033b"
 msgstr "Savin 9033b"
 
-#: src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Savin 9040"
 msgstr "Savin 9040"
 
-#: src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:7373
 msgid "Savin 9040b"
 msgstr "Savin 9040b"
 
-#: src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:7374
 msgid "Savin 9050"
 msgstr "Savin 9050"
 
-#: src/xml/xmli18n-tmp.h:5205
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Savin 9050b"
 msgstr "Savin 9050b"
 
-#: src/xml/xmli18n-tmp.h:5206
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Sharp AR-M257"
 msgstr "Sharp AR-M257"
 
-#: src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:7379
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/xml/xmli18n-tmp.h:5211
+#: src/xml/xmli18n-tmp.h:7381
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/xml/xmli18n-tmp.h:5212
+#: src/xml/xmli18n-tmp.h:7382
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/xml/xmli18n-tmp.h:5213
+#: src/xml/xmli18n-tmp.h:7383
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/xml/xmli18n-tmp.h:5216
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/xml/xmli18n-tmp.h:5221
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox WorkCentre M118"
 
-#: src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Compaq IJ1200"
 msgstr "Compaq IJ1200"
 
-#: src/xml/xmli18n-tmp.h:5224
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Lexmark X73"
 msgstr "Lexmark X73"
 
-#: src/xml/xmli18n-tmp.h:5225
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:5227
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:5230
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:7404
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/xml/xmli18n-tmp.h:5236
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:7409
 msgid "Olympus P-S100"
 msgstr "Olympus P-S100"
 
-#: src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:7410
 msgid "Canon CP-10"
 msgstr "Canon CP-10"
 
-#: src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/xml/xmli18n-tmp.h:5244
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Canon SELPHY-CP-400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:5247
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Canon SELPHY-CP-500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Canon SELPHY-CP-510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:5249
+#: src/xml/xmli18n-tmp.h:7419
+msgid "Canon SELPHY-CP-520"
+msgstr "Canon SELPHY-CP-520"
+
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Canon SELPHY-CP-600"
 msgstr "Canon SELPHY-CP-600"
 
-#: src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Canon SELPHY-CP-710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Canon SELPHY-CP-720"
 msgstr "Canon SELPHY-CP-720"
 
-#: src/xml/xmli18n-tmp.h:5252
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Canon SELPHY-CP-730"
 msgstr "Canon SELPHY-CP-730"
 
-#: src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Canon SELPHY-CP-740"
 msgstr "Canon SELPHY-CP-740"
 
-#: src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Canon SELPHY-CP-750"
 msgstr "Canon SELPHY-CP-750"
 
-#: src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Canon SELPHY ES1"
 msgstr "Canon SELPHY ES1"
 
-#: src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Canon SELPHY ES2"
 msgstr "Canon SELPHY ES2"
 
-#: src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Canon SELPHY ES20"
 msgstr "Canon SELPHY ES20"
 
-#: src/xml/xmli18n-tmp.h:5258
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Sony DPP-EX5"
 msgstr "Sony DPP-EX5"
 
-#: src/xml/xmli18n-tmp.h:5259
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Sony DPP-EX7"
 msgstr "Sony DPP-EX7"
 
-#: src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR100"
 
-#: src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:7434
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm FinePix-NX-500"
 
-#: src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:7438
 msgid "Shinko CHC-S9045"
 msgstr "Shinko CHC-S9045"
 
-#: src/xml/xmli18n-tmp.h:5268
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Dai Nippon Printing DS40"
+msgstr "Dai Nippon Printing DS40"
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Dai Nippon Printing DS80"
+msgstr "Dai Nippon Printing DS80"
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "RAW DATA 16 bit"
 msgstr "Dati RAW 16 bit"
 
-#: src/xml/xmli18n-tmp.h:5269
+#: src/xml/xmli18n-tmp.h:7442
 msgid "RAW DATA 8 bit"
 msgstr "Dati RAW 8 bit"
+
+#~ msgid "Gestetner 3532"
+#~ msgstr "Gestetner 3532"
+
+#~ msgid "Gestetner 4532"
+#~ msgstr "Gestetner 4532"
+
+#~ msgid "Gestetner DSm635"
+#~ msgstr "Gestetner DSm635"
+
+#~ msgid "Gestetner DS645G"
+#~ msgstr "Gestetner DS645G"
+
+#~ msgid "Gestetner DSm735"
+#~ msgstr "Gestetner DSm735"
+
+#~ msgid "Gestetner DSm745"
+#~ msgstr "Gestetner DSm745"
+
+#~ msgid "Gestetner MP1100"
+#~ msgstr "Gestetner MP1100"
+
+#~ msgid "Gestetner MP1350"
+#~ msgstr "Gestetner MP1350"
+
+#~ msgid "Gestetner DSm716"
+#~ msgstr "Gestetner DSm716"
+
+#~ msgid "Gestetner MP2000"
+#~ msgstr "Gestetner MP2000"
+
+#~ msgid "Gestetner DSm625"
+#~ msgstr "Gestetner DSm625"
+
+#~ msgid "Gestetner MP3500"
+#~ msgstr " Gestetner MP3500"
+
+#~ msgid "Gestetner MP4500"
+#~ msgstr "Gestetner MP4500"
+
+#~ msgid "Gestetner DSm755"
+#~ msgstr "Gestetner DSm755"
+
+#~ msgid "Gestetner DSm765"
+#~ msgstr "Gestetner DSm765"
+
+#~ msgid "Gestetner DSm775"
+#~ msgstr "Gestetner DSm775"
+
+#~ msgid "Gestetner DSm790"
+#~ msgstr "Gestetner DSm790"
+
+#~ msgid "Gestetner DSm416"
+#~ msgstr "Gestetner DSm416"
+
+#~ msgid "Gestetner DSm725e"
+#~ msgstr "Gestetner DSm725e"
+
+#~ msgid "Gestetner DSm730e"
+#~ msgstr "Gestetner DSm730e"
+
+#~ msgid "Lanier LD125"
+#~ msgstr "Lanier LD125"
+
+#~ msgid "Lanier LD1100"
+#~ msgstr "Lanier LD1100"
+
+#~ msgid "Lanier LD1135"
+#~ msgstr "Lanier LD1135"
+
+#~ msgid "Lanier LD316"
+#~ msgstr "Lanier LD316"
+
+#~ msgid "Lanier LD016"
+#~ msgstr "Lanier LD016"
+
+#~ msgid "Lanier LD320d"
+#~ msgstr "Lanier LD320d"
+
+#~ msgid "Lanier LD325"
+#~ msgstr "Lanier LD325"
+
+#~ msgid "Lanier LD425B"
+#~ msgstr "Lanier LD425B"
+
+#~ msgid "Lanier LD425"
+#~ msgstr "Lanier LD425"
+
+#~ msgid "Lanier LD330"
+#~ msgstr "Lanier LD330"
+
+#~ msgid "Lanier LD433B"
+#~ msgstr "Lanier LD433B"
+
+#~ msgid "Lanier LD433"
+#~ msgstr "Lanier LD433"
+
+#~ msgid "Lanier LD335"
+#~ msgstr "Lanier LD335"
+
+#~ msgid "Lanier LD040B"
+#~ msgstr "Lanier LD040B"
+
+#~ msgid "Lanier LD040"
+#~ msgstr "Lanier LD040"
+
+#~ msgid "Lanier LD345"
+#~ msgstr "Lanier LD345"
+
+#~ msgid "Lanier LD050B"
+#~ msgstr "Lanier LD050B"
+
+#~ msgid "Lanier LD050"
+#~ msgstr "Lanier LD050"
+
+#~ msgid "Lanier LD255"
+#~ msgstr "Lanier LD255"
+
+#~ msgid "Lanier LD265"
+#~ msgstr "Lanier LD265"
+
+#~ msgid "Lanier LD275"
+#~ msgstr "Lanier LD275"
+
+#~ msgid "Lanier LD190"
+#~ msgstr "Lanier LD190"
+
+#~ msgid "NRG 10518"
+#~ msgstr "NRG 10518"
+
+#~ msgid "NRG 10512"
+#~ msgstr "NRG 10512"
+
+#~ msgid "NRG 2212"
+#~ msgstr "NRG 2212"
+
+#~ msgid "NRG 2738"
+#~ msgstr "NRG 2738"
+
+#~ msgid "NRG 2712"
+#~ msgstr "NRG 2712"
+
+#~ msgid "NRG 3238"
+#~ msgstr "NRG 3238"
+
+#~ msgid "NRG 3212"
+#~ msgstr "NRG 3212"
+
+#~ msgid "NRG 3525"
+#~ msgstr "NRG 3525"
+
+#~ msgid "NRG 3508"
+#~ msgstr "NRG 3508"
+
+#~ msgid "NRG 3502"
+#~ msgstr "NRG 3502"
+
+#~ msgid "NRG 3518"
+#~ msgstr "NRG 3518"
+
+#~ msgid "NRG 3532"
+#~ msgstr "NRG 3532"
+
+#~ msgid "NRG 4508"
+#~ msgstr "NRG 4508"
+
+#~ msgid "NRG 4502"
+#~ msgstr "NRG 4502"
+
+#~ msgid "NRG 4518"
+#~ msgstr "NRG 4518"
+
+#~ msgid "NRG 4532"
+#~ msgstr "NRG 4532"
+
+#~ msgid "NRG 6005"
+#~ msgstr "NRG 6005"
+
+#~ msgid "NRG 6008"
+#~ msgstr "NRG 6008"
+
+#~ msgid "NRG 7502"
+#~ msgstr "NRG 7502"
+
+#~ msgid "NRG 7505"
+#~ msgstr "NRG 7505"
+
+#~ msgid "NRG 7508"
+#~ msgstr "NRG 7508"
+
+#~ msgid "NRG 9008"
+#~ msgstr "NRG 9008"
+
+#~ msgid "NRG 9002"
+#~ msgstr "NRG 9002"
+
+#~ msgid "Savin 2535"
+#~ msgstr "Savin 2535"
+
+#~ msgid "Savin 2235"
+#~ msgstr "Savin 2235"
+
+#~ msgid "Savin 2545"
+#~ msgstr "Savin 2545"
+
+#~ msgid "Savin 2245"
+#~ msgstr "Savin 2245"
+
+#~ msgid "Savin 4035"
+#~ msgstr "Savin 4035"
+
+#~ msgid "Savin 4035e"
+#~ msgstr "Savin 4035e"
+
+#~ msgid "Savin 4045"
+#~ msgstr "Savin 4045"
+
+#~ msgid "Savin 4045e"
+#~ msgstr "Savin 4045e"
+
+#~ msgid "Savin 8035"
+#~ msgstr "Savin 8035"
+
+#~ msgid "Savin 8045"
+#~ msgstr "Savin 8045"
+
+#~ msgid "Epson Stylus Offixe TX300F"
+#~ msgstr "Epson Stylus Offixe TX300F"
diff --git a/po/ja.gmo b/po/ja.gmo
index a5553de..fccbaf0 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index c178524..4459c95 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: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-21 22:25-0500\n"
+"POT-Creation-Date: 2009-07-26 19:14-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"
@@ -17,7 +17,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2109 src/main/print-pcl.c:1779
+#: src/main/print-escp2.c:2314 src/main/print-pcl.c:1779
 #, fuzzy
 msgid "Default"
 msgstr "½é´üÃͤËÌ᤹"
@@ -97,15 +97,15 @@ msgstr "Ç»ÅÙ:"
 
 #: src/main/dither-main.c:91 src/main/print-canon.c:300
 #: src/main/print-canon.c:308 src/main/print-canon.c:316
-#: src/main/print-canon.c:324 src/main/print-escp2.c:439
-#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
-#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-canon.c:324 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: 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-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:1769
-#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
-#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1935
+#: src/main/print-olympus.c:1943 src/main/print-olympus.c:1951
+#: src/main/print-olympus.c:1959 src/main/print-pcl.c:1324
 #: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
 #: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
@@ -167,7 +167,7 @@ msgid "Dither algorithm"
 msgstr "¥Ç¥£¥¶Êý¼°"
 
 #: src/main/print-canon.c:199 src/main/print-escp2.c:165
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1866
 #: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
@@ -185,8 +185,8 @@ msgstr "²èÁü¤Î¥µ¥¤¥º"
 #: src/main/print-escp2.c:254 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:1704 src/main/print-olympus.c:1710
-#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-olympus.c:1866 src/main/print-olympus.c:1872
+#: src/main/print-olympus.c:1878 src/main/print-olympus.c:1884
 #: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
 #: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
 #: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
@@ -196,32 +196,32 @@ msgid "Basic Printer Setup"
 msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê"
 
 #: src/main/print-canon.c:200 src/main/print-escp2.c:166
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1867
 #: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¥µ¥¤¥º¤Ç¤¹¡£"
 
 #: src/main/print-canon.c:205 src/main/print-escp2.c:171
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1259 src/cups/genppd.c:1339 src/cups/genppd.c:2001
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1872
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1372 src/cups/genppd.c:2035
 msgid "Media Type"
 msgstr "ÍÑ»æ¤Î¼ïÎà"
 
 #: src/main/print-canon.c:206 src/main/print-escp2.c:172
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1873
 #: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
 #: src/main/print-canon.c:211 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
-#: src/main/print-pcl.c:1265 src/cups/genppd.c:1368 src/cups/genppd.c:2020
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1878
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1401 src/cups/genppd.c:2054
 msgid "Media Source"
 msgstr "µë»æÊýË¡"
 
 #: src/main/print-canon.c:212 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1879
 #: src/main/print-pcl.c:1266
 #, fuzzy
 msgid "Source (input slot) of the media"
@@ -259,8 +259,8 @@ msgstr ""
 #: src/main/print-canon.c:235 src/main/print-canon.c:241
 #: src/main/print-canon.c:253 src/main/print-escp2.c:207
 #: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1906
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
@@ -275,25 +275,25 @@ msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:247 src/main/print-escp2.c:219
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
-#: src/main/print-pcl.c:1277 src/cups/genppd.c:1446 src/cups/genppd.c:2056
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1884
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1479 src/cups/genppd.c:2090
 msgid "Resolution"
 msgstr "²òÁüÅÙ"
 
 #: src/main/print-canon.c:248 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1723
+#: src/main/print-olympus.c:1885
 msgid "Resolution and quality of the print"
 msgstr "°õºþ»þ¤Î²òÁüÅÙ¤ÈÉʼÁ¤Ç¤¹¡£"
 
 #: src/main/print-canon.c:253 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "¥¤¥ó¥¯¤Î¼ïÎà"
 
 #: src/main/print-canon.c:254 src/main/print-escp2.c:231
 #: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
+#: src/main/print-olympus.c:1891 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "°õºþ»þ¤Î¥¤¥ó¥¯¤Î¼ïÎà¤Ç¤¹¡£"
@@ -311,17 +311,18 @@ msgstr ""
 #: 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-escp2.c:320 src/main/print-escp2.c:767
-#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
-#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
-#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
-#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:893 src/main/print-escp2.c:901
+#: src/main/print-escp2.c:909 src/main/print-escp2.c:925
+#: src/main/print-escp2.c:933 src/main/print-escp2.c:941
+#: src/main/print-escp2.c:949 src/main/print-escp2.c:957
+#: src/main/print-escp2.c:965 src/main/print-escp2.c:973
 #: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:265 src/main/print-escp2.c:326
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-canon.c:265 src/main/print-escp2.c:332
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1912
 #: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
@@ -329,16 +330,16 @@ msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°:"
 
 #: src/main/print-canon.c:265 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:326
-#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-color.c:208 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1912 src/main/print-pcl.c:1295
 #: src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "ColorLife Paper"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:327
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-canon.c:266 src/main/print-escp2.c:333
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1913
 #: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
@@ -367,56 +368,56 @@ msgstr "720 DPI Highest Quality"
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:300 src/main/print-escp2.c:439
+#: src/main/print-canon.c:300 src/main/print-escp2.c:445
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:301 src/main/print-escp2.c:446
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-canon.c:308 src/main/print-escp2.c:447
+#: src/main/print-canon.c:308 src/main/print-escp2.c:453
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 #, fuzzy
 msgid "Magenta Density"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:309 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-canon.c:316 src/main/print-escp2.c:455
+#: src/main/print-canon.c:316 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:317 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-canon.c:324 src/main/print-escp2.c:463
+#: src/main/print-canon.c:324 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 #, fuzzy
 msgid "Black Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/print-canon.c:325 src/main/print-escp2.c:464
+#: src/main/print-canon.c:325 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:333
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:541 src/main/print-escp2.c:542
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 #, fuzzy
@@ -424,29 +425,36 @@ msgid "Light Cyan Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:340
-#: src/main/print-canon.c:348 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
-#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
-#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
-#: src/main/print-pcl.c:1364
+#: src/main/print-canon.c:348 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:541
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:557
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:573
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:589
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:605
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:621
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:637
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:653
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:669
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:685
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:701
+#: src/main/print-escp2.c:709 src/main/print-escp2.c:717
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:733
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:749
+#: src/main/print-escp2.c:757 src/main/print-escp2.c:765
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:781
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:797
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:813
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:829
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:845
+#: src/main/print-escp2.c:853 src/main/print-escp2.c:861
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:340 src/main/print-canon.c:341
-#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
+#: src/main/print-escp2.c:573 src/main/print-escp2.c:574
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #, fuzzy
@@ -458,14 +466,14 @@ msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
 msgid "Light Yellow Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-canon.c:368 src/main/print-escp2.c:2283
-#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3609
-#: src/xml/xmli18n-tmp.h:3614 src/xml/xmli18n-tmp.h:3620
-#: src/xml/xmli18n-tmp.h:3627
+#: src/main/print-canon.c:368 src/main/print-escp2.c:2488
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5851 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5864
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:369 src/main/print-escp2.c:2285
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2490
 #: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
@@ -474,67 +482,68 @@ msgstr ""
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:646 src/main/print-escp2.c:2005
-#: src/xml/xmli18n-tmp.h:3676
+#: src/main/print-canon.c:646 src/main/print-escp2.c:2210
+#: src/xml/xmli18n-tmp.h:5913
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:648 src/main/print-escp2.c:2007
-#: src/xml/xmli18n-tmp.h:3677
+#: src/main/print-canon.c:648 src/main/print-escp2.c:2212
+#: src/xml/xmli18n-tmp.h:5914
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:650 src/main/print-escp2.c:2009
-#: src/xml/xmli18n-tmp.h:3678
+#: src/main/print-canon.c:650 src/main/print-escp2.c:2214
+#: src/xml/xmli18n-tmp.h:5915
 #, fuzzy
 msgid "CD - Custom"
 msgstr "¥«¥¹¥¿¥à"
 
-#: src/main/print-canon.c:673 src/main/print-escp2.c:2034
-#: src/cups/genppd.c:1323 src/cups/genppd.c:1572 src/cups/genppd.c:1988
-#: src/cups/genppd.c:2079
+#: src/main/print-canon.c:673 src/main/print-escp2.c:2239
+#: src/cups/genppd.c:1356 src/cups/genppd.c:1605 src/cups/genppd.c:2022
+#: src/cups/genppd.c:2113
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:675 src/main/print-escp2.c:2036
+#: src/main/print-canon.c:675 src/main/print-escp2.c:2241
 #, fuzzy
 msgid "Print To Hub"
 msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
 
-#: src/main/print-canon.c:790 src/main/print-escp2.c:2447
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-canon.c:790 src/main/print-escp2.c:2652
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2167
 #: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
 #: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "¥«¥é¡¼"
 
-#: src/main/print-canon.c:792 src/main/print-escp2.c:2449
+#: src/main/print-canon.c:792 src/main/print-escp2.c:2654
 #: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
 #: src/main/print-ps.c:331 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
 msgstr "¹õ¤ÈÇò"
 
-#: src/main/print-canon.c:831 src/main/print-escp2.c:2089
+#: src/main/print-canon.c:831 src/main/print-escp2.c:2294
 #: src/main/print-pcl.c:1797 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/main/print-canon.c:833 src/main/print-escp2.c:2131
-#: src/main/print-escp2.c:2229 src/main/print-escp2.c:2241
+#: src/main/print-canon.c:833 src/main/print-escp2.c:2336
+#: src/main/print-escp2.c:2434 src/main/print-escp2.c:2446
 #: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
 #: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
-#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1215
-#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1219
-#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
-#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3170
-#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3177
-#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3461
-#: src/xml/xmli18n-tmp.h:3464 src/xml/xmli18n-tmp.h:3632
-#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3648
-#: src/xml/xmli18n-tmp.h:3657 src/xml/xmli18n-tmp.h:3665
+#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1627 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3713 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3722 src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5902
 msgid "Standard"
 msgstr "ɸ½à"
 
@@ -573,7 +582,7 @@ msgid "Pre-Dithered"
 msgstr "°õºþ"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1268 src/cups/genppd.c:1971
+#: src/cups/genppd.c:1301 src/cups/genppd.c:2005
 msgid "Grayscale"
 msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
 
@@ -590,11 +599,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1299 src/cups/genppd.c:1978
+#: src/main/print-color.c:129 src/cups/genppd.c:1332 src/cups/genppd.c:2012
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1306 src/cups/genppd.c:1979
+#: src/main/print-color.c:131 src/cups/genppd.c:1339 src/cups/genppd.c:2013
 msgid "KCMY"
 msgstr ""
 
@@ -660,7 +669,7 @@ msgid "Output image type"
 msgstr "½ÐÎϤμïÎà:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338
 msgid "Raw Channels"
 msgstr ""
 
@@ -730,56 +739,208 @@ msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
 #: src/escputil/escputil.c:997 src/escputil/escputil.c:1017
-#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:1812
-#: src/xml/xmli18n-tmp.h:1823 src/xml/xmli18n-tmp.h:1836
-#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1863
-#: src/xml/xmli18n-tmp.h:1876 src/xml/xmli18n-tmp.h:1889
-#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1918
-#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1949
-#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1975
-#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:1999
-#: src/xml/xmli18n-tmp.h:2013 src/xml/xmli18n-tmp.h:2027
-#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2051
-#: src/xml/xmli18n-tmp.h:2064 src/xml/xmli18n-tmp.h:2076
-#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2102
-#: src/xml/xmli18n-tmp.h:2116 src/xml/xmli18n-tmp.h:2130
-#: src/xml/xmli18n-tmp.h:2143 src/xml/xmli18n-tmp.h:2156
-#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2184
-#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2210
-#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2236
-#: src/xml/xmli18n-tmp.h:2249 src/xml/xmli18n-tmp.h:2262
-#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2290
-#: src/xml/xmli18n-tmp.h:2305 src/xml/xmli18n-tmp.h:2320
-#: src/xml/xmli18n-tmp.h:2332 src/xml/xmli18n-tmp.h:2343
-#: src/xml/xmli18n-tmp.h:2356 src/xml/xmli18n-tmp.h:2369
-#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2392
-#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2415
-#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2442
-#: src/xml/xmli18n-tmp.h:2454 src/xml/xmli18n-tmp.h:2466
-#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2496
-#: src/xml/xmli18n-tmp.h:2509 src/xml/xmli18n-tmp.h:2522
-#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
-#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2574
-#: src/xml/xmli18n-tmp.h:2586 src/xml/xmli18n-tmp.h:2598
-#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2623
-#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2653
-#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2683
-#: src/xml/xmli18n-tmp.h:2697 src/xml/xmli18n-tmp.h:2715
-#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2745
-#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
-#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2803
-#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2828
-#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2854
-#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2881
-#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2915
-#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2943
-#: src/xml/xmli18n-tmp.h:2959 src/xml/xmli18n-tmp.h:2976
-#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:3004
-#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3032
-#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3062
-#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3093
-#: src/xml/xmli18n-tmp.h:3107 src/xml/xmli18n-tmp.h:3125
-#: src/xml/xmli18n-tmp.h:3141
+#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2387
+#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2413
+#: src/xml/xmli18n-tmp.h:2426 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2499
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2551
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2575
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2708
+#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2786
+#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2814
+#: src/xml/xmli18n-tmp.h:2829 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2893
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2966
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3005 src/xml/xmli18n-tmp.h:3020
+#: src/xml/xmli18n-tmp.h:3033 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3061 src/xml/xmli18n-tmp.h:3073
+#: src/xml/xmli18n-tmp.h:3085 src/xml/xmli18n-tmp.h:3098
+#: src/xml/xmli18n-tmp.h:3110 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3377
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3616
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3648
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3766 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3775 src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:3794 src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:3805 src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3869 src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:3880 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3902 src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:3913 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:3948 src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:3970 src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:3983 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4023 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4064 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4075 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4088 src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:4103 src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:4118 src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:4143 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:4203 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4275 src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4309 src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4356 src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4421
+#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4449
+#: src/xml/xmli18n-tmp.h:4456 src/xml/xmli18n-tmp.h:4462
+#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4485 src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:4551 src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:4694 src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4717 src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:4818 src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:4829 src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4885 src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4935
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:5041 src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:5052 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:5121 src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5165
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5182 src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:5193 src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:5271 src/xml/xmli18n-tmp.h:5299
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5327 src/xml/xmli18n-tmp.h:5331
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5347
+#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5367 src/xml/xmli18n-tmp.h:5371
+#: src/xml/xmli18n-tmp.h:5383 src/xml/xmli18n-tmp.h:5388
+#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5440
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5461 src/xml/xmli18n-tmp.h:5468
+#: src/xml/xmli18n-tmp.h:5476 src/xml/xmli18n-tmp.h:5486
+#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5514
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5525
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5543
+#: src/xml/xmli18n-tmp.h:5550 src/xml/xmli18n-tmp.h:5556
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5574 src/xml/xmli18n-tmp.h:5582
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5592
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5625
+#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5649
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5662
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5690
+#: src/xml/xmli18n-tmp.h:5694 src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5731
+#: src/xml/xmli18n-tmp.h:5738 src/xml/xmli18n-tmp.h:5742
+#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5759
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5770
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5807
+#: src/xml/xmli18n-tmp.h:5811 src/xml/xmli18n-tmp.h:5817
+#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5828
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5843
 msgid "Cyan"
 msgstr "¥·¥¢¥ó (C)"
 
@@ -790,56 +951,208 @@ msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
 #: src/escputil/escputil.c:998 src/escputil/escputil.c:1018
-#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:1813
-#: src/xml/xmli18n-tmp.h:1824 src/xml/xmli18n-tmp.h:1837
-#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1864
-#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1890
-#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1919
-#: src/xml/xmli18n-tmp.h:1935 src/xml/xmli18n-tmp.h:1950
-#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1976
-#: src/xml/xmli18n-tmp.h:1988 src/xml/xmli18n-tmp.h:2000
-#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2028
-#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2052
-#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2077
-#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2103
-#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2131
-#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2157
-#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2185
-#: src/xml/xmli18n-tmp.h:2198 src/xml/xmli18n-tmp.h:2211
-#: src/xml/xmli18n-tmp.h:2224 src/xml/xmli18n-tmp.h:2237
-#: src/xml/xmli18n-tmp.h:2250 src/xml/xmli18n-tmp.h:2263
-#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2291
-#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2321
-#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2344
-#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2370
-#: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2393
-#: src/xml/xmli18n-tmp.h:2405 src/xml/xmli18n-tmp.h:2416
-#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2443
-#: src/xml/xmli18n-tmp.h:2455 src/xml/xmli18n-tmp.h:2467
-#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2497
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2523
-#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2575
-#: src/xml/xmli18n-tmp.h:2587 src/xml/xmli18n-tmp.h:2599
-#: src/xml/xmli18n-tmp.h:2611 src/xml/xmli18n-tmp.h:2624
-#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
-#: src/xml/xmli18n-tmp.h:2670 src/xml/xmli18n-tmp.h:2684
-#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2714
-#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2747
-#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2780
-#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
-#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2829
-#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2855
-#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2882
-#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2914
-#: src/xml/xmli18n-tmp.h:2931 src/xml/xmli18n-tmp.h:2944
-#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2975
-#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:3005
-#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3033
-#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3060
-#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3094
-#: src/xml/xmli18n-tmp.h:3108 src/xml/xmli18n-tmp.h:3124
-#: src/xml/xmli18n-tmp.h:3140
+#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2361
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2388
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2414
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2459 src/xml/xmli18n-tmp.h:2474
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2512 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2552
+#: src/xml/xmli18n-tmp.h:2564 src/xml/xmli18n-tmp.h:2576
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2787
+#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2815
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2868
+#: src/xml/xmli18n-tmp.h:2881 src/xml/xmli18n-tmp.h:2894
+#: src/xml/xmli18n-tmp.h:2905 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:2967
+#: src/xml/xmli18n-tmp.h:2979 src/xml/xmli18n-tmp.h:2991
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3062 src/xml/xmli18n-tmp.h:3074
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3099
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3135 src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:3163 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3353
+#: src/xml/xmli18n-tmp.h:3365 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
+#: src/xml/xmli18n-tmp.h:3420 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3542 src/xml/xmli18n-tmp.h:3556
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3600 src/xml/xmli18n-tmp.h:3617
+#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3647
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3751 src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:3784 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3795 src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:3806 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3837 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3903 src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3939 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3960 src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:3972 src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:3984 src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:3999 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:4039 src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:4104 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:4170 src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4194 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:4230 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:4276 src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4311 src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4338 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:4401 src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:4427 src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:4442 src/xml/xmli18n-tmp.h:4451
+#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4464
+#: src/xml/xmli18n-tmp.h:4470 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4486 src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:4511 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:4809 src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4909 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:5007 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5018 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5111 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5123 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5148 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:5240 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5250 src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:5261 src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5301
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5313
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5349
+#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5401
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5441
+#: src/xml/xmli18n-tmp.h:5453 src/xml/xmli18n-tmp.h:5458
+#: src/xml/xmli18n-tmp.h:5463 src/xml/xmli18n-tmp.h:5470
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5496 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5527
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5552 src/xml/xmli18n-tmp.h:5558
+#: src/xml/xmli18n-tmp.h:5564 src/xml/xmli18n-tmp.h:5568
+#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5593
+#: src/xml/xmli18n-tmp.h:5598 src/xml/xmli18n-tmp.h:5616
+#: src/xml/xmli18n-tmp.h:5620 src/xml/xmli18n-tmp.h:5626
+#: src/xml/xmli18n-tmp.h:5631 src/xml/xmli18n-tmp.h:5651
+#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
+#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5674
+#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5720
+#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5733
+#: src/xml/xmli18n-tmp.h:5739 src/xml/xmli18n-tmp.h:5743
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5818
+#: src/xml/xmli18n-tmp.h:5823 src/xml/xmli18n-tmp.h:5829
+#: src/xml/xmli18n-tmp.h:5833 src/xml/xmli18n-tmp.h:5839
+#: src/xml/xmli18n-tmp.h:5844
 msgid "Magenta"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
 
@@ -850,56 +1163,208 @@ msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
 #: src/escputil/escputil.c:999 src/escputil/escputil.c:1019
-#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:1814
-#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
-#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1865
-#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1891
-#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1920
-#: src/xml/xmli18n-tmp.h:1936 src/xml/xmli18n-tmp.h:1951
-#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1977
-#: src/xml/xmli18n-tmp.h:1989 src/xml/xmli18n-tmp.h:2001
-#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2029
-#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2053
-#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2078
-#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2104
-#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
-#: src/xml/xmli18n-tmp.h:2145 src/xml/xmli18n-tmp.h:2158
-#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2186
-#: src/xml/xmli18n-tmp.h:2199 src/xml/xmli18n-tmp.h:2212
-#: src/xml/xmli18n-tmp.h:2225 src/xml/xmli18n-tmp.h:2238
-#: src/xml/xmli18n-tmp.h:2251 src/xml/xmli18n-tmp.h:2264
-#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2292
-#: src/xml/xmli18n-tmp.h:2307 src/xml/xmli18n-tmp.h:2322
-#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
-#: src/xml/xmli18n-tmp.h:2358 src/xml/xmli18n-tmp.h:2371
-#: src/xml/xmli18n-tmp.h:2382 src/xml/xmli18n-tmp.h:2394
-#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2417
-#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2444
-#: src/xml/xmli18n-tmp.h:2456 src/xml/xmli18n-tmp.h:2468
-#: src/xml/xmli18n-tmp.h:2483 src/xml/xmli18n-tmp.h:2498
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2524
-#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2551
-#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2576
-#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
-#: src/xml/xmli18n-tmp.h:2612 src/xml/xmli18n-tmp.h:2625
-#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2651
-#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2685
-#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2713
-#: src/xml/xmli18n-tmp.h:2734 src/xml/xmli18n-tmp.h:2749
-#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2779
-#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2805
-#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2830
-#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2856
-#: src/xml/xmli18n-tmp.h:2871 src/xml/xmli18n-tmp.h:2883
-#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2910
-#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2945
-#: src/xml/xmli18n-tmp.h:2960 src/xml/xmli18n-tmp.h:2974
-#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3006
-#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3034
-#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3061
-#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3095
-#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3120
-#: src/xml/xmli18n-tmp.h:3136
+#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2389
+#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2444
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2475
+#: src/xml/xmli18n-tmp.h:2488 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2513 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2565 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2602
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2762
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2788
+#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2816
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2846
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2906 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3022
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3048
+#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3075
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3124
+#: src/xml/xmli18n-tmp.h:3136 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3175
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3315 src/xml/xmli18n-tmp.h:3329
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3433
+#: src/xml/xmli18n-tmp.h:3455 src/xml/xmli18n-tmp.h:3468
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3497
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3601 src/xml/xmli18n-tmp.h:3618
+#: src/xml/xmli18n-tmp.h:3632 src/xml/xmli18n-tmp.h:3643
+#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3747 src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3834 src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:3844 src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:3867 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:3900 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3910 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3935 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:3967 src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:3979 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4005 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4062 src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4110 src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:4124 src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4167 src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:4272 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:4321 src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:4334 src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4367 src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4471
+#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4505 src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4549 src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:4562 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4580 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4602 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:4678 src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:4691 src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4770 src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4893 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4904 src/xml/xmli18n-tmp.h:4911
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:4971 src/xml/xmli18n-tmp.h:4978
+#: src/xml/xmli18n-tmp.h:5004 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5050 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5071 src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:5097 src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:5142 src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:5169 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5184
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5257 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5318
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5358
+#: src/xml/xmli18n-tmp.h:5364 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5385
+#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5438
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5454
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5465
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5511
+#: src/xml/xmli18n-tmp.h:5516 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5547 src/xml/xmli18n-tmp.h:5554
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5584 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5617 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5632
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5687
+#: src/xml/xmli18n-tmp.h:5692 src/xml/xmli18n-tmp.h:5698
+#: src/xml/xmli18n-tmp.h:5705 src/xml/xmli18n-tmp.h:5713
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5729
+#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
+#: src/xml/xmli18n-tmp.h:5744 src/xml/xmli18n-tmp.h:5756
+#: src/xml/xmli18n-tmp.h:5761 src/xml/xmli18n-tmp.h:5767
+#: src/xml/xmli18n-tmp.h:5774 src/xml/xmli18n-tmp.h:5782
+#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5792
+#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5803
+#: src/xml/xmli18n-tmp.h:5809 src/xml/xmli18n-tmp.h:5813
+#: src/xml/xmli18n-tmp.h:5819 src/xml/xmli18n-tmp.h:5824
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5845
 msgid "Yellow"
 msgstr "²«¿§ (Y)"
 
@@ -910,9 +1375,17 @@ msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
 #: src/escputil/escputil.c:1006 src/escputil/escputil.c:1025
-#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2700
-#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2795
-#: src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:4041 src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:4056 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4091 src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:4155 src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5155
 msgid "Red"
 msgstr ""
 
@@ -932,8 +1405,13 @@ msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
 #: src/escputil/escputil.c:1007 src/escputil/escputil.c:1026
-#: src/xml/xmli18n-tmp.h:2657 src/xml/xmli18n-tmp.h:2701
-#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4051 src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:4084 src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:5156
 msgid "Blue"
 msgstr ""
 
@@ -945,53 +1423,183 @@ msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
 #: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1016 src/escputil/escputil.c:1285
-#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
-#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
-#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1875
-#: src/xml/xmli18n-tmp.h:1888 src/xml/xmli18n-tmp.h:1901
-#: src/xml/xmli18n-tmp.h:1917 src/xml/xmli18n-tmp.h:1933
-#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1961
-#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1986
-#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2012
-#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2038
-#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2063
-#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2090
-#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2115
-#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2142
-#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2169
-#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
-#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
-#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2248
-#: src/xml/xmli18n-tmp.h:2261 src/xml/xmli18n-tmp.h:2274
-#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2304
-#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2331
-#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
-#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
-#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2403
-#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2420
-#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2441
-#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2465
-#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2495
-#: src/xml/xmli18n-tmp.h:2508 src/xml/xmli18n-tmp.h:2521
-#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
-#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2573
-#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2597
-#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2622
-#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2672
-#: src/xml/xmli18n-tmp.h:2682 src/xml/xmli18n-tmp.h:2731
-#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2764
-#: src/xml/xmli18n-tmp.h:2781 src/xml/xmli18n-tmp.h:2794
-#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2815
-#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2839
-#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2868
-#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2894
-#: src/xml/xmli18n-tmp.h:2911 src/xml/xmli18n-tmp.h:2929
-#: src/xml/xmli18n-tmp.h:2942 src/xml/xmli18n-tmp.h:2977
-#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:3003
-#: src/xml/xmli18n-tmp.h:3017 src/xml/xmli18n-tmp.h:3031
-#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3079
-#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3110
-#: src/xml/xmli18n-tmp.h:3121 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2372
+#: src/xml/xmli18n-tmp.h:2386 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2457
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2510
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2536
+#: src/xml/xmli18n-tmp.h:2550 src/xml/xmli18n-tmp.h:2562
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2599 src/xml/xmli18n-tmp.h:2614
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2639
+#: src/xml/xmli18n-tmp.h:2653 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2965
+#: src/xml/xmli18n-tmp.h:2977 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3019
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3060 src/xml/xmli18n-tmp.h:3072
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3133 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3196
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3526
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3680 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3755 src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:3804 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3819 src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:3831 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3846 src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3873 src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:3924 src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:3943 src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:4022 src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4059 src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:4142 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4164 src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:4179 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:4255 src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4289 src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:4308 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4413 src/xml/xmli18n-tmp.h:4420
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4455
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4507 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:4565 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:4604 src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:4702 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:4733 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:4786 src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4920 src/xml/xmli18n-tmp.h:4926
+#: src/xml/xmli18n-tmp.h:4934 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:4973 src/xml/xmli18n-tmp.h:4981
+#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:4993
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:5047 src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5151
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5186
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5223 src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5270
+#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5284
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5320
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5337
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5375
+#: src/xml/xmli18n-tmp.h:5378 src/xml/xmli18n-tmp.h:5380
+#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5435
+#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5447
+#: src/xml/xmli18n-tmp.h:5449 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5474
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5492
+#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5571
+#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5590
+#: src/xml/xmli18n-tmp.h:5596 src/xml/xmli18n-tmp.h:5602
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5614
+#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5629
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5655
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5680 src/xml/xmli18n-tmp.h:5682
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5700
+#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5716
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5749
+#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5769 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5794
+#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5806
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5836
+#: src/xml/xmli18n-tmp.h:5842
 msgid "Black"
 msgstr "¹õ¿§"
 
@@ -1000,7 +1608,7 @@ msgstr "¹õ¿§"
 msgid "Adjust the black gamma"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1769
+#: src/main/print-color.c:322 src/main/print-olympus.c:1935
 msgid "Cyan Balance"
 msgstr ""
 
@@ -1015,7 +1623,7 @@ msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
 msgid "Adjust the cyan gray balance"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1777
+#: src/main/print-color.c:330 src/main/print-olympus.c:1943
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
@@ -1025,7 +1633,7 @@ msgstr "¥Þ¥¼¥ó¥¿ (M)"
 msgid "Adjust the magenta gray balance"
 msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1785
+#: src/main/print-color.c:338 src/main/print-olympus.c:1951
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
@@ -1056,11 +1664,11 @@ msgstr "¥¤¥ó¥¯¤Î¼ïÎà"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
-#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
-#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
-#: src/main/print-escp2.c:759
+#: src/main/print-escp2.c:344 src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356 src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368 src/main/print-escp2.c:374
+#: src/main/print-escp2.c:869 src/main/print-escp2.c:877
+#: src/main/print-escp2.c:885
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "½ÐÎϤμïÎà:"
@@ -1069,27 +1677,27 @@ msgstr "½ÐÎϤμïÎà:"
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:743
+#: src/main/print-color.c:365 src/main/print-escp2.c:869
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:744
+#: src/main/print-color.c:366 src/main/print-escp2.c:870
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:751
+#: src/main/print-color.c:373 src/main/print-escp2.c:877
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:752
+#: src/main/print-color.c:374 src/main/print-escp2.c:878
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:759
+#: src/main/print-color.c:381 src/main/print-escp2.c:885
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:760
+#: src/main/print-color.c:382 src/main/print-escp2.c:886
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -1360,11 +1968,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1906
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1907
 msgid "Print without borders"
 msgstr ""
 
@@ -1377,7 +1985,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:266 src/main/print-escp2.c:267
-#: src/cups/genppd.c:1567 src/cups/genppd.c:2078
+#: src/cups/genppd.c:1600 src/cups/genppd.c:2112
 #, fuzzy
 msgid "Output Order"
 msgstr "½ÐÎϤμïÎà:"
@@ -1422,382 +2030,498 @@ msgstr ""
 
 #: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 #, fuzzy
+msgid "Raw Channel Names"
+msgstr "¼è¤ê¾Ã¤·"
+
+#: src/main/print-escp2.c:326 src/main/print-escp2.c:327
+#, fuzzy
 msgid "Channel Names"
 msgstr "¼è¤ê¾Ã¤·"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:339
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:344
 #, fuzzy
 msgid "Cyan Map"
 msgstr "¥·¥¢¥ó (C)"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:345
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350
 #, fuzzy
 msgid "Magenta Map"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:351
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356
 #, fuzzy
 msgid "Yellow Map"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:357
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362
 #, fuzzy
 msgid "Blue Map"
 msgstr "¹õ¤ÈÇò"
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:363
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368
 #, fuzzy
 msgid "Orange Map"
 msgstr "¥·¥¢¥ó (C)"
 
-#: src/main/print-escp2.c:363
+#: src/main/print-escp2.c:369
 #, fuzzy
 msgid "Adjust the orange map"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:374
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:369
+#: src/main/print-escp2.c:375
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:471
+#: src/main/print-escp2.c:477
 #, fuzzy
 msgid "Red Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:478
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:485
 #, fuzzy
 msgid "Blue Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:486
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:493
 #, fuzzy
 msgid "Orange Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/print-escp2.c:488
+#: src/main/print-escp2.c:494
 #, fuzzy
 msgid "Adjust the orange density"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:501
 #, fuzzy
 msgid "Gloss Level"
 msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
 
-#: src/main/print-escp2.c:496
+#: src/main/print-escp2.c:502
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:509
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:504
+#: src/main/print-escp2.c:510
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:517
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:512
+#: src/main/print-escp2.c:518
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:525
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:520
+#: src/main/print-escp2.c:526
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:534
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:550
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
+#: src/main/print-escp2.c:557 src/main/print-escp2.c:558
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
 
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:566
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
 
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:582
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
+#: src/main/print-escp2.c:589 src/main/print-escp2.c:590
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:598
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
+#: src/main/print-escp2.c:605 src/main/print-escp2.c:606
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:630
 #, fuzzy
 msgid "Gray Value"
 msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
 
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
-#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:614
+#: src/main/print-escp2.c:637 src/main/print-escp2.c:638
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
+#: src/main/print-escp2.c:621 src/main/print-escp2.c:622
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:646
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
 
-#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
+#: src/main/print-escp2.c:653 src/main/print-escp2.c:654
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:726
 #, fuzzy
 msgid "Light Gray Value"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
-#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:662
+#: src/main/print-escp2.c:733 src/main/print-escp2.c:734
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
-#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
+#: src/main/print-escp2.c:669 src/main/print-escp2.c:670
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:742
 #, fuzzy
 msgid "Light Gray Density Scale"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:678
 #, fuzzy
 msgid "Dark Gray Value"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
+#: src/main/print-escp2.c:685 src/main/print-escp2.c:686
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:694
 #, fuzzy
 msgid "Dark Gray Density Scale"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:701
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
 
-#: src/main/print-escp2.c:696
+#: src/main/print-escp2.c:702
 #, fuzzy
 msgid "Medium Gray Value"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:709
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:704
+#: src/main/print-escp2.c:710
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:717
 #, fuzzy
 msgid "Mid Gray Density Scale"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:712
+#: src/main/print-escp2.c:718
 #, fuzzy
 msgid "Medium Gray Density Scale"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:767
+#: src/main/print-escp2.c:749
+#, fuzzy
+msgid "Hextone Gray 5 Value"
+msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+
+#: src/main/print-escp2.c:750
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:757
+#, fuzzy
+msgid "Hextone Gray 5 Transition"
+msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+
+#: src/main/print-escp2.c:758
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+
+#: src/main/print-escp2.c:765
+#, fuzzy
+msgid "Hextone Gray 5 Density Scale"
+msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+
+#: src/main/print-escp2.c:766
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:774
+#, fuzzy
+msgid "Hextone Gray 4 Value"
+msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+
+#: src/main/print-escp2.c:781 src/main/print-escp2.c:782
+#, fuzzy
+msgid "Hextone Gray 4 Transition"
+msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:790
+#, fuzzy
+msgid "Hextone Gray 4 Density Scale"
+msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+
+#: src/main/print-escp2.c:797 src/main/print-escp2.c:798
+#, fuzzy
+msgid "Hextone Gray 3 Value"
+msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:806
+#, fuzzy
+msgid "Hextone Gray 3 Transition"
+msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+
+#: src/main/print-escp2.c:813 src/main/print-escp2.c:814
+#, fuzzy
+msgid "Hextone Gray 3 Density Scale"
+msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:822
+#, fuzzy
+msgid "Hextone Gray 2 Value"
+msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+
+#: src/main/print-escp2.c:829 src/main/print-escp2.c:830
+#, fuzzy
+msgid "Hextone Gray 2 Transition"
+msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:838
+#, fuzzy
+msgid "Hextone Gray 2 Density Scale"
+msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+
+#: src/main/print-escp2.c:845
+#, fuzzy
+msgid "Hextone Gray 1 Value"
+msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+
+#: src/main/print-escp2.c:846
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:853
+#, fuzzy
+msgid "Hextone Gray 1 Transition"
+msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
+
+#: src/main/print-escp2.c:854
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
+
+#: src/main/print-escp2.c:861
+#, fuzzy
+msgid "Hextone Gray 1 Density Scale"
+msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
+
+#: src/main/print-escp2.c:862
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
+
+#: src/main/print-escp2.c:893
 msgid "Drying Time Per Page"
 msgstr ""
 
-#: src/main/print-escp2.c:768
+#: src/main/print-escp2.c:894
 msgid "Set drying time per page"
 msgstr ""
 
-#: src/main/print-escp2.c:775
+#: src/main/print-escp2.c:901
 msgid "Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:776
+#: src/main/print-escp2.c:902
 msgid "Set drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:783
+#: src/main/print-escp2.c:909
 msgid "Minimum Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:784
+#: src/main/print-escp2.c:910
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:799
+#: src/main/print-escp2.c:925
+msgid "Quality Enhancement"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Enhance print quality by additional passes"
+msgstr ""
+
+#: src/main/print-escp2.c:933
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "²èÁü¤Î¥µ¥¤¥º"
 
-#: src/main/print-escp2.c:800
+#: src/main/print-escp2.c:934
 #, fuzzy
 msgid "Set printer paper thickness"
 msgstr "½é´üÃͤËÌ᤹"
 
-#: src/main/print-escp2.c:807
+#: src/main/print-escp2.c:941
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/print-escp2.c:808
+#: src/main/print-escp2.c:942
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:815
+#: src/main/print-escp2.c:949
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:816
+#: src/main/print-escp2.c:950
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:823
+#: src/main/print-escp2.c:957
 #, fuzzy
 msgid "Print Method"
 msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°:"
 
-#: src/main/print-escp2.c:824
+#: src/main/print-escp2.c:958
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:831
+#: src/main/print-escp2.c:965
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Ä̾ï¤ÎÍÑ»æ"
 
-#: src/main/print-escp2.c:832
+#: src/main/print-escp2.c:966
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:839
+#: src/main/print-escp2.c:973
 msgid "Feed Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:840
-#, c-format
+#: src/main/print-escp2.c:975
+#, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:1992
+#: src/main/print-escp2.c:2197
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/main/print-escp2.c:1994
+#: src/main/print-escp2.c:2199
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2208 src/cups/genppd.c:1484 src/cups/genppd.c:2059
+#: src/main/print-escp2.c:2413 src/cups/genppd.c:1517 src/cups/genppd.c:2093
 #, fuzzy
 msgid "Automatic"
 msgstr "²èÁü¤Î¥µ¥¤¥º"
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2415
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2417
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:2243
+#: src/main/print-escp2.c:2448
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2450
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2452
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2454
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2456
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2287
+#: src/main/print-escp2.c:2492
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:2858
+#: src/main/print-escp2.c:3100
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "¥×¥ê¥ó¥¿¤Ï¥«¥é¡¼°õºþ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: src/main/print-escp2.c:4107 src/main/print-olympus.c:2472
+#: src/main/print-escp2.c:4355 src/main/print-olympus.c:2641
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1851,361 +2575,378 @@ msgid "test print"
 msgstr "¥Æ¥¹¥È°õºþ"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3205
-#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3217
-#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3233
-#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3255
-#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3276
-#: src/xml/xmli18n-tmp.h:3288 src/xml/xmli18n-tmp.h:3295
-#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3315
-#: src/xml/xmli18n-tmp.h:3327 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3368
-#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3380
-#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
-#: src/xml/xmli18n-tmp.h:3412 src/xml/xmli18n-tmp.h:3424
-#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3444
-#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3472
-#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3496
-#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3521
-#: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3544
-#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3556
-#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3581
-#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3598
-#: src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3754 src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:3809 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3863 src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:4058 src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:4163 src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:4227 src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:4335 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4467 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4594 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:4879 src/xml/xmli18n-tmp.h:4946
+#: src/xml/xmli18n-tmp.h:5000 src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:5243 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5365 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5512 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5667 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5784 src/xml/xmli18n-tmp.h:5805
+#: src/xml/xmli18n-tmp.h:5826
 msgid "Four Color Standard"
 msgstr "Four Color Standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3206
-#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3218
-#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3234
-#: src/xml/xmli18n-tmp.h:3244 src/xml/xmli18n-tmp.h:3251
-#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3268
-#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3289
-#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3306
-#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
-#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3354
-#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3377
-#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3389
-#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3413
-#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3435
-#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3455
-#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3485
-#: src/xml/xmli18n-tmp.h:3497 src/xml/xmli18n-tmp.h:3508
-#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3537
-#: src/xml/xmli18n-tmp.h:3545 src/xml/xmli18n-tmp.h:3549
-#: src/xml/xmli18n-tmp.h:3557 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3593
-#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3605
+#: src/xml/xmli18n-tmp.h:3759 src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3868 src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:4002 src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:4107 src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4472
+#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4817 src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5181 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5315 src/xml/xmli18n-tmp.h:5370
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5672
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5831
 msgid "Three Color Composite"
 msgstr "Three Color Composite"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3241
-#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3265
-#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3286
-#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
-#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3351
-#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3374
-#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3398
-#: src/xml/xmli18n-tmp.h:3410 src/xml/xmli18n-tmp.h:3422
-#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3452
-#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3470
-#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3494
-#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3519
-#: src/xml/xmli18n-tmp.h:3534 src/xml/xmli18n-tmp.h:3542
-#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3741 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4086 src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4933
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5421
+#: src/xml/xmli18n-tmp.h:5499 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5723
 msgid "Six Color Photo"
 msgstr "Six Color Photo"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3242
-#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3266
-#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3287
-#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3326
-#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3352
-#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3375
-#: src/xml/xmli18n-tmp.h:3387 src/xml/xmli18n-tmp.h:3399
-#: src/xml/xmli18n-tmp.h:3411 src/xml/xmli18n-tmp.h:3423
-#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3453
-#: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3483
-#: src/xml/xmli18n-tmp.h:3495 src/xml/xmli18n-tmp.h:3506
-#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3535
-#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3566
-#: src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3748 src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:3989 src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:4094 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4267 src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4940
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5661
+#: src/xml/xmli18n-tmp.h:5730
 msgid "Five Color Photo Composite"
 msgstr "Five Color Photo Composite"
 
 #: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
-#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
-#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
-#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
-#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
-#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
-#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
-#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
-#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:849
-#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:963
-#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1077
-#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1170
-#: src/xml/xmli18n-tmp.h:1220 src/xml/xmli18n-tmp.h:1277
-#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1376
-#: src/xml/xmli18n-tmp.h:1439 src/xml/xmli18n-tmp.h:1502
-#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1619
-#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1739
-#: src/xml/xmli18n-tmp.h:1773
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1050
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1240
+#: src/xml/xmli18n-tmp.h:1335 src/xml/xmli18n-tmp.h:1449
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1580
+#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1862
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2200 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2297
 msgid "Plain Paper"
 msgstr "Ä̾ï¤ÎÍÑ»æ"
 
-#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
-#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
-#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
-#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
-#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
-#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
-#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
-#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
-#: src/xml/xmli18n-tmp.h:819 src/xml/xmli18n-tmp.h:858
-#: src/xml/xmli18n-tmp.h:915 src/xml/xmli18n-tmp.h:972
-#: src/xml/xmli18n-tmp.h:1029 src/xml/xmli18n-tmp.h:1086
-#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1176
-#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1286
-#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1385
-#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1508
-#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1628
-#: src/xml/xmli18n-tmp.h:1685 src/xml/xmli18n-tmp.h:1743
-#: src/xml/xmli18n-tmp.h:1779
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:101 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:365 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1160 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1740
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1871
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2136
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2267
+#: src/xml/xmli18n-tmp.h:2303
 msgid "Glossy Film"
 msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
 
-#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
-#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
-#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
-#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
-#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
-#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
-#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
-#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
-#: src/xml/xmli18n-tmp.h:821 src/xml/xmli18n-tmp.h:861
-#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:975
-#: src/xml/xmli18n-tmp.h:1032 src/xml/xmli18n-tmp.h:1089
-#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1178
-#: src/xml/xmli18n-tmp.h:1232 src/xml/xmli18n-tmp.h:1289
-#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1388
-#: src/xml/xmli18n-tmp.h:1451 src/xml/xmli18n-tmp.h:1511
-#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1631
-#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1745
-#: src/xml/xmli18n-tmp.h:1781
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:845 src/xml/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:965 src/xml/xmli18n-tmp.h:1022
+#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1359
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1550
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1745 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2305
 msgid "Transparencies"
 msgstr "¥¹¥é¥¤¥ÉÍÑ»æ"
 
-#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
-#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
-#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
-#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
-#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
-#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
-#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
-#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
-#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:823
-#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:921
-#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:1035
-#: src/xml/xmli18n-tmp.h:1092 src/xml/xmli18n-tmp.h:1142
-#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1235
-#: src/xml/xmli18n-tmp.h:1292 src/xml/xmli18n-tmp.h:1344
-#: src/xml/xmli18n-tmp.h:1391 src/xml/xmli18n-tmp.h:1454
-#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1577
-#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1691
-#: src/xml/xmli18n-tmp.h:1747 src/xml/xmli18n-tmp.h:1783
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:55 src/xml/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:151 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1024
+#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2215
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2307
 msgid "Envelopes"
 msgstr "ÉõÅû"
 
-#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
-#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
-#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
-#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
-#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
-#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
-#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
-#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
-#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:827
-#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:927
-#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:1041
-#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1146
-#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1241
-#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1348
-#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1460
-#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1583
-#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1697
-#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1787
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:1028
+#: src/xml/xmli18n-tmp.h:1085 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1275 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1556
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1665
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1834
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2076
+#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2311
 msgid "Matte Paper"
 msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
-#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
-#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
-#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
-#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
-#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
-#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
-#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
-#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:831
-#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:933
-#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:1047
-#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1150
-#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1247
-#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1352
-#: src/xml/xmli18n-tmp.h:1403 src/xml/xmli18n-tmp.h:1466
-#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1589
-#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1703
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1791
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:167 src/xml/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:569
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1032
+#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1285 src/xml/xmli18n-tmp.h:1389
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1675
+#: src/xml/xmli18n-tmp.h:1770 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1889 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2012 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2227
+#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2315
 msgid "Inkjet Paper"
 msgstr "¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍÑ»æ"
 
-#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
-#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
-#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
-#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
-#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
-#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
-#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
-#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
-#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:833
-#: src/xml/xmli18n-tmp.h:879 src/xml/xmli18n-tmp.h:936
-#: src/xml/xmli18n-tmp.h:993 src/xml/xmli18n-tmp.h:1050
-#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1152
-#: src/xml/xmli18n-tmp.h:1190 src/xml/xmli18n-tmp.h:1250
-#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1354
-#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1469
-#: src/xml/xmli18n-tmp.h:1529 src/xml/xmli18n-tmp.h:1592
-#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1706
-#: src/xml/xmli18n-tmp.h:1757 src/xml/xmli18n-tmp.h:1793
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:425 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:512 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1034
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1499 src/xml/xmli18n-tmp.h:1562
+#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1775 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1955
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2088
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2317
 msgid "Photo Quality Inkjet Paper"
 msgstr "¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍÑ»æ (¥Õ¥©¥ÈÍѹâÉʼÁ)"
 
-#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
-#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
-#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
-#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
-#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
-#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
-#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
-#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
-#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:835
-#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:939
-#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:1053
-#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1154
-#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1253
-#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1356
-#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1472
-#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1595
-#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1709
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1795
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1036
+#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1200
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1504 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1842
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2233
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2319
 msgid "Photo Paper"
 msgstr "¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
-#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
-#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
-#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
-#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
-#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
-#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
-#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
-#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:837
-#: src/xml/xmli18n-tmp.h:885 src/xml/xmli18n-tmp.h:942
-#: src/xml/xmli18n-tmp.h:999 src/xml/xmli18n-tmp.h:1056
-#: src/xml/xmli18n-tmp.h:1113 src/xml/xmli18n-tmp.h:1156
-#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1212
-#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1256
-#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1358
-#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1475
-#: src/xml/xmli18n-tmp.h:1535 src/xml/xmli18n-tmp.h:1598
-#: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1712
-#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1797
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:179 src/xml/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:518 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:869 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1038
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1407
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1566
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1622
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1844
+#: src/xml/xmli18n-tmp.h:1898 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2321
 msgid "Premium Glossy Photo Paper"
 msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
-#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
-#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
-#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
-#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
-#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
-#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
-#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
-#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:841
-#: src/xml/xmli18n-tmp.h:891 src/xml/xmli18n-tmp.h:948
-#: src/xml/xmli18n-tmp.h:1005 src/xml/xmli18n-tmp.h:1062
-#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1160
-#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1262
-#: src/xml/xmli18n-tmp.h:1319 src/xml/xmli18n-tmp.h:1362
-#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1481
-#: src/xml/xmli18n-tmp.h:1541 src/xml/xmli18n-tmp.h:1604
-#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1718
-#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1801
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1042
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1419
+#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1570
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2027 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2242
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2325
 msgid "Premium Luster Photo Paper"
 msgstr "¹âµé¤Ä¤ä½Ð¤·¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
-#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
-#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
-#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
-#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
-#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
-#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
-#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
-#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:843
-#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:951
-#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1065
-#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1162
-#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1265
-#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1368
-#: src/xml/xmli18n-tmp.h:1427 src/xml/xmli18n-tmp.h:1490
-#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1607
-#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1727
-#: src/xml/xmli18n-tmp.h:1767 src/xml/xmli18n-tmp.h:1803
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:91 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:191 src/xml/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:439 src/xml/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:787 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1044
+#: src/xml/xmli18n-tmp.h:1125 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1315 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1854
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2327
 msgid "Photo Quality Glossy Paper"
 msgstr "¸÷ÂôÉÕ¤­ÍÑ»æ (¥Õ¥©¥ÈÍѹâÉʼÁ)"
 
-#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
-#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
-#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
-#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
-#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
-#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
-#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
-#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:897
-#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:1011
-#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1125
-#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1206
-#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1325
-#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1430
-#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1553
-#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1667
-#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1805
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1130
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1320
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1616
+#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1856 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2329
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Paper"
 
-#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
-#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
-#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
-#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
-#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
-#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
-#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
-#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
-#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:847
-#: src/xml/xmli18n-tmp.h:903 src/xml/xmli18n-tmp.h:960
-#: src/xml/xmli18n-tmp.h:1017 src/xml/xmli18n-tmp.h:1074
-#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1168
-#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1214
-#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1274
-#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1374
-#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1499
-#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1616
-#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1736
-#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1809
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:129
+#: src/xml/xmli18n-tmp.h:203 src/xml/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:542 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1048
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1443
+#: src/xml/xmli18n-tmp.h:1539 src/xml/xmli18n-tmp.h:1578
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1720
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1985
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2333
 msgid "Other"
 msgstr "¤½¤Î¾"
 
@@ -2221,58 +2962,62 @@ msgstr "¥Ý¡¼¥ºÉÕ¤­¼êÆ°µë»æ"
 msgid "Manual without Pause"
 msgstr "¥Ý¡¼¥º¤Ê¤·¼êÆ°µë»æ"
 
-#: src/main/print-olympus.c:279
+#: src/main/print-olympus.c:281
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:280 src/cups/genppd.c:1685 src/cups/genppd.c:1713
-#: src/cups/genppd.c:1745 src/cups/genppd.c:1800 src/cups/genppd.c:1846
-#: src/cups/genppd.c:2147 src/cups/genppd.c:2160 src/cups/genppd.c:2183
-#: src/cups/genppd.c:2204 src/cups/genppd.c:2221
+#: src/main/print-olympus.c:282 src/cups/genppd.c:1718 src/cups/genppd.c:1746
+#: src/cups/genppd.c:1778 src/cups/genppd.c:1833 src/cups/genppd.c:1879
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2194 src/cups/genppd.c:2217
+#: src/cups/genppd.c:2238 src/cups/genppd.c:2255
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
-#: src/main/print-olympus.c:1132
+#: src/main/print-olympus.c:998 src/main/print-olympus.c:1061
+#: src/main/print-olympus.c:1165
 #, fuzzy
 msgid "Glossy"
 msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
 
-#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
-#: src/main/print-olympus.c:1133
+#: src/main/print-olympus.c:999 src/main/print-olympus.c:1062
+#: src/main/print-olympus.c:1166
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
+#: src/main/print-olympus.c:1063 src/main/print-olympus.c:1167
 #, fuzzy
 msgid "Matte"
 msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
+#. TRANSLATORS: 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.
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1901
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1770
+#: src/main/print-olympus.c:1936
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-olympus.c:1778
+#: src/main/print-olympus.c:1944
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1952
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-olympus.c:1793
+#: src/main/print-olympus.c:1959
 #, fuzzy
 msgid "Black Balance"
 msgstr "¹õ¤ÈÇò"
 
-#: src/main/print-olympus.c:1794
+#: src/main/print-olympus.c:1960
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
@@ -2305,7 +3050,7 @@ msgstr "¨´¥¥Õ¥©¥È"
 msgid "Quick-dry Transparency"
 msgstr "¨´¥¥¹¥é¥¤¥É"
 
-#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3687
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:5925
 msgid "Manual"
 msgstr "¼êÆ°"
 
@@ -2390,24 +3135,24 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:278 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3638
-#: src/xml/xmli18n-tmp.h:3647 src/xml/xmli18n-tmp.h:3656
-#: src/xml/xmli18n-tmp.h:3664
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5875
+#: src/xml/xmli18n-tmp.h:5884 src/xml/xmli18n-tmp.h:5893
+#: src/xml/xmli18n-tmp.h:5901
 msgid "Draft"
 msgstr ""
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:3633 src/xml/xmli18n-tmp.h:3641
-#: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3658
-#: src/xml/xmli18n-tmp.h:3666
+#: src/xml/xmli18n-tmp.h:5870 src/xml/xmli18n-tmp.h:5878
+#: src/xml/xmli18n-tmp.h:5886 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5903
 #, fuzzy
 msgid "High"
 msgstr "¹â¤µ:"
 
 #: src/main/print-pcl.c:282 src/main/print-pcl.c:283
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3634
-#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3650
-#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3667
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5896 src/xml/xmli18n-tmp.h:5904
 #, fuzzy
 msgid "Photo"
 msgstr "¼Ì¿¿"
@@ -2443,15 +3188,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3671
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:5908
 msgid "Letter"
 msgstr "¥ì¥¿¡¼"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3708
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:5946
 msgid "A4"
 msgstr "A4ÈÇ"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3823
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6061
 msgid "Custom"
 msgstr "¥«¥¹¥¿¥à"
 
@@ -2459,35 +3204,44 @@ msgstr "¥«¥¹¥¿¥à"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3629
-#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3654
+#: src/main/print-weave.c:1511
+msgid "Fatal error!"
+msgstr ""
+
+#: src/main/print-weave.c:1547
+msgid ""
+"Please report the above information to gimp-print-devel@lists.sourceforge.net"
+msgstr ""
+
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:5866
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5891
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3630
-#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3655
-#: src/xml/xmli18n-tmp.h:3663
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5900
 msgid "Economy"
 msgstr ""
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3635
-#: src/xml/xmli18n-tmp.h:3642 src/xml/xmli18n-tmp.h:3651
-#: src/xml/xmli18n-tmp.h:3660 src/xml/xmli18n-tmp.h:3668
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:5872
+#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3636
-#: src/xml/xmli18n-tmp.h:3643 src/xml/xmli18n-tmp.h:3652
-#: src/xml/xmli18n-tmp.h:3661 src/xml/xmli18n-tmp.h:3669
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:5873
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5889
+#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5906
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Six Color Photo"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1326 src/cups/genppd.c:1989
-#: src/xml/xmli18n-tmp.h:3637 src/xml/xmli18n-tmp.h:3644
-#: src/xml/xmli18n-tmp.h:3653 src/xml/xmli18n-tmp.h:3662
-#: src/xml/xmli18n-tmp.h:3670
+#: src/main/generic-options.c:41 src/cups/genppd.c:1359 src/cups/genppd.c:2023
+#: src/xml/xmli18n-tmp.h:5874 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5899
+#: src/xml/xmli18n-tmp.h:5907
 msgid "Best"
 msgstr ""
 
@@ -3246,81 +4000,81 @@ msgstr ""
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:960
+#: src/cups/genppd.c:993
 msgid "English"
 msgstr "Japanese"
 
-#: src/cups/genppd.c:1159 src/cups/genppd.c:1175 src/cups/genppd.c:1934
-#: src/cups/genppd.c:1935
+#: src/cups/genppd.c:1192 src/cups/genppd.c:1208 src/cups/genppd.c:1968
+#: src/cups/genppd.c:1969
 #, fuzzy
 msgid "Media Size"
 msgstr "Íѻ極¥¤¥º:"
 
-#: src/cups/genppd.c:1248 src/cups/genppd.c:1970
+#: src/cups/genppd.c:1281 src/cups/genppd.c:2004
 #, fuzzy
 msgid "Color Model"
 msgstr "¥«¥é¡¼"
 
-#: src/cups/genppd.c:1275 src/cups/genppd.c:1972
+#: src/cups/genppd.c:1308 src/cups/genppd.c:2006
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
 
-#: src/cups/genppd.c:1285 src/cups/genppd.c:1976
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2010
 #, fuzzy
 msgid "RGB Color"
 msgstr "¥«¥é¡¼"
 
-#: src/cups/genppd.c:1292 src/cups/genppd.c:1977
+#: src/cups/genppd.c:1325 src/cups/genppd.c:2011
 msgid "CMY Color"
 msgstr "CMY ¿§"
 
-#: src/cups/genppd.c:1317 src/cups/genppd.c:1987
+#: src/cups/genppd.c:1350 src/cups/genppd.c:2021
 msgid "Color Precision"
 msgstr ""
 
-#: src/cups/genppd.c:1573 src/cups/genppd.c:2080
+#: src/cups/genppd.c:1606 src/cups/genppd.c:2114
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:1590 src/cups/genppd.c:2096
+#: src/cups/genppd.c:1623 src/cups/genppd.c:2130
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:1615 src/cups/genppd.c:2113
+#: src/cups/genppd.c:1648 src/cups/genppd.c:2147
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1620 src/cups/genppd.c:2114
+#: src/cups/genppd.c:1653 src/cups/genppd.c:2148
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1621 src/cups/genppd.c:2115
+#: src/cups/genppd.c:1654 src/cups/genppd.c:2149
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1622 src/cups/genppd.c:2116
+#: src/cups/genppd.c:1655 src/cups/genppd.c:2150
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1716 src/cups/genppd.c:2162
+#: src/cups/genppd.c:1749 src/cups/genppd.c:2196
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1718 src/cups/genppd.c:2164
+#: src/cups/genppd.c:1751 src/cups/genppd.c:2198
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1757 src/cups/genppd.c:1820 src/cups/genppd.c:1864
-#: src/cups/genppd.c:2185 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+#: src/cups/genppd.c:1790 src/cups/genppd.c:1853 src/cups/genppd.c:1897
+#: src/cups/genppd.c:2219 src/cups/genppd.c:2249 src/cups/genppd.c:2266
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1762 src/cups/genppd.c:2189
+#: src/cups/genppd.c:1795 src/cups/genppd.c:2223
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/cups/genppd.c:1805 src/cups/genppd.c:2209
+#: src/cups/genppd.c:1838 src/cups/genppd.c:2243
 #, c-format
 msgid "%.1f mm"
 msgstr ""
@@ -3638,51 +4392,61 @@ msgstr ""
 "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò¸¡½Ð¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÆÃÄꤹ¤ë¤¿¤á¤Ë '-m' ¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:383
-#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
-#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
-#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
-#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
-#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
-#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
-#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
-#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
-#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
-#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
-#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
-#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
-#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
-#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
-#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
-#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
-#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
-#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
-#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
-#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
-#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
-#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
-#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
-#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
-#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
-#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
-#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
-#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
-#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
-#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1503
-#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1509
-#: src/xml/xmli18n-tmp.h:1512 src/xml/xmli18n-tmp.h:1515
-#: src/xml/xmli18n-tmp.h:1518 src/xml/xmli18n-tmp.h:1521
-#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1527
-#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
-#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
-#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
-#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
-#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
-#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:2655
-#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2717
-#: src/xml/xmli18n-tmp.h:3045 src/xml/xmli18n-tmp.h:3252
-#: src/xml/xmli18n-tmp.h:3273 src/xml/xmli18n-tmp.h:3363
-#: src/xml/xmli18n-tmp.h:3531
+#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2001
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2010 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2025
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:4085 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4612 src/xml/xmli18n-tmp.h:5481
 #, fuzzy
 msgid "Photo Black"
 msgstr "¥Õ¥©¥ÈÍÑ»æ"
@@ -3694,131 +4458,303 @@ msgid "Unknown"
 msgstr ""
 
 #: src/escputil/escputil.c:1000 src/escputil/escputil.c:1289
-#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1921
-#: src/xml/xmli18n-tmp.h:1937 src/xml/xmli18n-tmp.h:2002
-#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2079
-#: src/xml/xmli18n-tmp.h:2105 src/xml/xmli18n-tmp.h:2119
-#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2173
-#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
-#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
-#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2293
-#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2346
-#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2418
-#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2445
-#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2469
-#: src/xml/xmli18n-tmp.h:2484 src/xml/xmli18n-tmp.h:2512
-#: src/xml/xmli18n-tmp.h:2525 src/xml/xmli18n-tmp.h:2564
-#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2626
-#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2746
-#: src/xml/xmli18n-tmp.h:2762 src/xml/xmli18n-tmp.h:2843
-#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2895
-#: src/xml/xmli18n-tmp.h:2912 src/xml/xmli18n-tmp.h:2946
-#: src/xml/xmli18n-tmp.h:3001 src/xml/xmli18n-tmp.h:3015
-#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3122
-#: src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2461 src/xml/xmli18n-tmp.h:2526
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2683 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2711 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3101 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3661
+#: src/xml/xmli18n-tmp.h:3678 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3750 src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:3782 src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:3932 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3964 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4388 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:4639 src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:4875 src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4936
+#: src/xml/xmli18n-tmp.h:4942 src/xml/xmli18n-tmp.h:4968
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5339 src/xml/xmli18n-tmp.h:5348
+#: src/xml/xmli18n-tmp.h:5355 src/xml/xmli18n-tmp.h:5361
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5417
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5430
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5477 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5502
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5536 src/xml/xmli18n-tmp.h:5544
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5557
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5657 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5719
+#: src/xml/xmli18n-tmp.h:5726 src/xml/xmli18n-tmp.h:5732
+#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5779
 #, fuzzy
 msgid "Light Cyan"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
 #: src/escputil/escputil.c:1001 src/escputil/escputil.c:1290
-#: src/xml/xmli18n-tmp.h:1906 src/xml/xmli18n-tmp.h:1922
-#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:2003
-#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2080
-#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2120
-#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2174
-#: src/xml/xmli18n-tmp.h:2188 src/xml/xmli18n-tmp.h:2201
-#: src/xml/xmli18n-tmp.h:2214 src/xml/xmli18n-tmp.h:2227
-#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2294
-#: src/xml/xmli18n-tmp.h:2309 src/xml/xmli18n-tmp.h:2347
-#: src/xml/xmli18n-tmp.h:2360 src/xml/xmli18n-tmp.h:2419
-#: src/xml/xmli18n-tmp.h:2432 src/xml/xmli18n-tmp.h:2446
-#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2470
-#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2513
-#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2565
-#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2627
-#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2748
-#: src/xml/xmli18n-tmp.h:2761 src/xml/xmli18n-tmp.h:2844
-#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2896
-#: src/xml/xmli18n-tmp.h:2913 src/xml/xmli18n-tmp.h:2947
-#: src/xml/xmli18n-tmp.h:3000 src/xml/xmli18n-tmp.h:3014
-#: src/xml/xmli18n-tmp.h:3028 src/xml/xmli18n-tmp.h:3123
-#: src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2446
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2527
+#: src/xml/xmli18n-tmp.h:2541 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2644
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2698
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2751
+#: src/xml/xmli18n-tmp.h:2803 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2956 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2994
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3381
+#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3662
+#: src/xml/xmli18n-tmp.h:3746 src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:3778 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3934 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3966 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:4265 src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:4390 src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:4428 src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4452
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4465
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4512 src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4586 src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:4641 src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4903
+#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4970
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:5044 src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5168
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5241 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5334
+#: src/xml/xmli18n-tmp.h:5341 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5363
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5419
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5471
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5504
+#: src/xml/xmli18n-tmp.h:5510 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5652
+#: src/xml/xmli18n-tmp.h:5659 src/xml/xmli18n-tmp.h:5665
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5721
+#: src/xml/xmli18n-tmp.h:5728 src/xml/xmli18n-tmp.h:5734
+#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5781
 #, fuzzy
 msgid "Light Magenta"
 msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
 
-#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2433
-#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:3002
-#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3030
+#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3679 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4409 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:4566 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4605 src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4664 src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5376 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5450
+#: src/xml/xmli18n-tmp.h:5475 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5533 src/xml/xmli18n-tmp.h:5542
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5678 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5717
+#: src/xml/xmli18n-tmp.h:5747 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5777
 #, fuzzy
 msgid "Light Black"
 msgstr "¹õ¿§"
 
-#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:384
-#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
-#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
-#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
-#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
-#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
-#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
-#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
-#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
-#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
-#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
-#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
-#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
-#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
-#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
-#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
-#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
-#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
-#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
-#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
-#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
-#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
-#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
-#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
-#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
-#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
-#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
-#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
-#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
-#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
-#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1504
-#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1510
-#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1516
-#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1522
-#: src/xml/xmli18n-tmp.h:1525 src/xml/xmli18n-tmp.h:1528
-#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1534
-#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1540
-#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1546
-#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1552
-#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1558
-#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:2654
-#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2716
-#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3264
-#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3371
-#: src/xml/xmli18n-tmp.h:3539
+#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:508 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:532 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:538 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:562 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:568 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
+#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
+#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
+#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
+#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
+#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
+#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
+#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
+#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
+#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
+#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
+#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2011 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2026
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2032
+#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2038
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:4044 src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:5530
 #, fuzzy
 msgid "Matte Black"
 msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:2658
-#: src/xml/xmli18n-tmp.h:2702 src/xml/xmli18n-tmp.h:2720
-#: src/xml/xmli18n-tmp.h:3048
+#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3995 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4006 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4020 src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:4106 src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4148
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
 
-#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:2760
-#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3013
-#: src/xml/xmli18n-tmp.h:3027
+#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3676
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4616 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5534 src/xml/xmli18n-tmp.h:5573
 #, fuzzy
 msgid "Light Light Black"
 msgstr "¹õ¿§"
 
 #: src/escputil/escputil.c:1010 src/escputil/escputil.c:1029
-#: src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:4099 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4189
 #, fuzzy
 msgid "Orange"
 msgstr "²èÁü¤Î¥µ¥¤¥º"
@@ -4468,8230 +5404,8360 @@ msgstr "°õºþÃæ..."
 #: src/xml/xmli18n-tmp.h:68 src/xml/xmli18n-tmp.h:70 src/xml/xmli18n-tmp.h:72
 #: src/xml/xmli18n-tmp.h:74 src/xml/xmli18n-tmp.h:76 src/xml/xmli18n-tmp.h:78
 #: src/xml/xmli18n-tmp.h:80 src/xml/xmli18n-tmp.h:82 src/xml/xmli18n-tmp.h:84
-#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:92
-#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
-#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
-#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
-#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
-#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
-#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
-#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
-#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
-#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
-#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
-#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
-#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
-#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
-#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
-#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
-#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
-#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
-#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
-#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
-#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
-#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
-#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
-#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
-#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
-#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
-#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
-#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
-#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
-#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
-#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
-#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
-#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
-#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
-#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
-#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
-#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
-#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
-#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
-#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
-#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
-#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
-#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
-#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
-#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
-#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
-#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
-#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
-#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
-#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
-#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
-#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
-#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
-#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
-#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
-#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
-#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
-#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
-#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
-#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
-#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
-#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
-#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
-#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
-#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
-#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
-#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
-#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
-#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
-#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
-#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
-#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
-#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
-#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
-#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
-#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
-#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
-#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
-#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
-#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
-#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
-#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
-#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
-#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
-#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
-#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
-#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
-#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
-#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
-#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
-#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
-#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
-#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
-#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
-#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
-#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
-#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:92 src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:102 src/xml/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:106 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:114 src/xml/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:118 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:126 src/xml/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:130 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:136 src/xml/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:144 src/xml/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:168 src/xml/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:192 src/xml/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:216 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:232 src/xml/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:240 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:256 src/xml/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:264 src/xml/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:304 src/xml/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:312 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:320 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:328 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:336 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:344 src/xml/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:352 src/xml/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:384 src/xml/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:408 src/xml/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:412 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:432 src/xml/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:444 src/xml/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:448 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:468 src/xml/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:484 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:642 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:698 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:714 src/xml/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:722 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:738 src/xml/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:746 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:764 src/xml/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:780 src/xml/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:804 src/xml/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:814
 #: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:818
 #: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:822
 #: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:826
 #: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:830
-#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:834
-#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:838
-#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:842
-#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:846
-#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:850
-#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
-#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
-#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
-#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
-#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
-#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
-#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
-#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:898
-#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
-#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
-#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
-#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
-#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
-#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
-#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
-#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
-#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
-#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
-#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
-#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
-#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
-#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
-#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
-#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
-#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
-#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
-#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
-#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1018
-#: src/xml/xmli18n-tmp.h:1021 src/xml/xmli18n-tmp.h:1024
-#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1030
-#: src/xml/xmli18n-tmp.h:1033 src/xml/xmli18n-tmp.h:1036
-#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1042
-#: src/xml/xmli18n-tmp.h:1045 src/xml/xmli18n-tmp.h:1048
-#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1054
-#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1060
-#: src/xml/xmli18n-tmp.h:1063 src/xml/xmli18n-tmp.h:1066
-#: src/xml/xmli18n-tmp.h:1069 src/xml/xmli18n-tmp.h:1072
-#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1078
-#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1084
-#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1090
-#: src/xml/xmli18n-tmp.h:1093 src/xml/xmli18n-tmp.h:1096
-#: src/xml/xmli18n-tmp.h:1099 src/xml/xmli18n-tmp.h:1102
-#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1108
-#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1114
-#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1120
-#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1126
-#: src/xml/xmli18n-tmp.h:1129 src/xml/xmli18n-tmp.h:1132
-#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
-#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
-#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
-#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
-#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
-#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
-#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
-#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
-#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
-#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
-#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
-#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
-#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
-#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1189
-#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1193
-#: src/xml/xmli18n-tmp.h:1195 src/xml/xmli18n-tmp.h:1197
-#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1201
-#: src/xml/xmli18n-tmp.h:1203 src/xml/xmli18n-tmp.h:1205
-#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1209
-#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1221
-#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
-#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
-#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
-#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
-#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
-#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
-#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
-#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
-#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
-#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
-#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
-#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
-#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
-#: src/xml/xmli18n-tmp.h:1302 src/xml/xmli18n-tmp.h:1305
-#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1311
-#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1317
-#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1323
-#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1329
-#: src/xml/xmli18n-tmp.h:1332 src/xml/xmli18n-tmp.h:1335
-#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
-#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1343
-#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1347
-#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1351
-#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1355
-#: src/xml/xmli18n-tmp.h:1357 src/xml/xmli18n-tmp.h:1359
-#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1363
-#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1367
-#: src/xml/xmli18n-tmp.h:1369 src/xml/xmli18n-tmp.h:1371
-#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1375
-#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1566
-#: src/xml/xmli18n-tmp.h:1569 src/xml/xmli18n-tmp.h:1572
-#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1578
-#: src/xml/xmli18n-tmp.h:1581 src/xml/xmli18n-tmp.h:1584
-#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1590
-#: src/xml/xmli18n-tmp.h:1593 src/xml/xmli18n-tmp.h:1596
-#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1602
-#: src/xml/xmli18n-tmp.h:1605 src/xml/xmli18n-tmp.h:1608
-#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1614
-#: src/xml/xmli18n-tmp.h:1617 src/xml/xmli18n-tmp.h:1620
-#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1626
-#: src/xml/xmli18n-tmp.h:1629 src/xml/xmli18n-tmp.h:1632
-#: src/xml/xmli18n-tmp.h:1635 src/xml/xmli18n-tmp.h:1638
-#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1644
-#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
-#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
-#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
-#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
-#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
-#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
-#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
-#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
-#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
-#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
-#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
-#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
-#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
-#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
-#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:1778
-#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1782
-#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1786
-#: src/xml/xmli18n-tmp.h:1788 src/xml/xmli18n-tmp.h:1790
-#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1794
-#: src/xml/xmli18n-tmp.h:1796 src/xml/xmli18n-tmp.h:1798
-#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1802
-#: src/xml/xmli18n-tmp.h:1804 src/xml/xmli18n-tmp.h:1806
-#: src/xml/xmli18n-tmp.h:1808 src/xml/xmli18n-tmp.h:1810
-#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3204
-#: src/xml/xmli18n-tmp.h:3210 src/xml/xmli18n-tmp.h:3216
-#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3232
-#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3250
-#: src/xml/xmli18n-tmp.h:3294 src/xml/xmli18n-tmp.h:3302
-#: src/xml/xmli18n-tmp.h:3304 src/xml/xmli18n-tmp.h:3312
-#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3379
-#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
-#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3421
-#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3441
-#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3469
-#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3555
-#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3597
-#: src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:1017
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1025
+#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1035 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1047 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1056
+#: src/xml/xmli18n-tmp.h:1061 src/xml/xmli18n-tmp.h:1066
+#: src/xml/xmli18n-tmp.h:1071 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1086
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1096
+#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1116
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1126
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1136
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1161 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1181 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1206
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1216
+#: src/xml/xmli18n-tmp.h:1221 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1236
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1246
+#: src/xml/xmli18n-tmp.h:1251 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1261 src/xml/xmli18n-tmp.h:1266
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1281 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1291 src/xml/xmli18n-tmp.h:1296
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1311 src/xml/xmli18n-tmp.h:1316
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1326
+#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1336
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1378 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1414 src/xml/xmli18n-tmp.h:1420
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1432
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1450 src/xml/xmli18n-tmp.h:1455
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1465
+#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1480 src/xml/xmli18n-tmp.h:1485
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1540 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1551 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1583 src/xml/xmli18n-tmp.h:1585
+#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1603 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1607 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1646
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1666
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1676
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1716
+#: src/xml/xmli18n-tmp.h:1721 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1736
+#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1835
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1843
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1851
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:2049
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2057
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2065
+#: src/xml/xmli18n-tmp.h:2069 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2113
+#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2129
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2137
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2153
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2161
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2185
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2264
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2272
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2276
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2282 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2286 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2296
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2300
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2308
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2314 src/xml/xmli18n-tmp.h:2316
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2324
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:3787 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3895 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:4223 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5579
+#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5825
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Bright White Paper"
 msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
-#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
-#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
-#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
-#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
-#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
-#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
-#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:817
-#: src/xml/xmli18n-tmp.h:855 src/xml/xmli18n-tmp.h:912
-#: src/xml/xmli18n-tmp.h:969 src/xml/xmli18n-tmp.h:1026
-#: src/xml/xmli18n-tmp.h:1083 src/xml/xmli18n-tmp.h:1136
-#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1226
-#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1338
-#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1445
-#: src/xml/xmli18n-tmp.h:1505 src/xml/xmli18n-tmp.h:1568
-#: src/xml/xmli18n-tmp.h:1625 src/xml/xmli18n-tmp.h:1682
-#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1777
-#: src/xml/xmli18n-tmp.h:3675
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:139 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:959 src/xml/xmli18n-tmp.h:1018
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1155
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1546
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1931
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:5912
 msgid "Postcard"
 msgstr "¤Ï¤¬¤­"
 
-#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
-#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
-#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
-#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
-#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
-#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
-#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
-#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:825
-#: src/xml/xmli18n-tmp.h:867 src/xml/xmli18n-tmp.h:924
-#: src/xml/xmli18n-tmp.h:981 src/xml/xmli18n-tmp.h:1038
-#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1144
-#: src/xml/xmli18n-tmp.h:1182 src/xml/xmli18n-tmp.h:1238
-#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1346
-#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1457
-#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1580
-#: src/xml/xmli18n-tmp.h:1637 src/xml/xmli18n-tmp.h:1694
-#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1785
+#: src/xml/xmli18n-tmp.h:13 src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:155 src/xml/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:415 src/xml/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:851 src/xml/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1026
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1175
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1554
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1832
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2309
 msgid "Back Light Film"
 msgstr "¥Ð¥Ã¥¯¥é¥¤¥È¡¦¥Õ¥£¥ë¥à"
 
-#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
-#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
-#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
-#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
-#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
-#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
-#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
-#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:829
-#: src/xml/xmli18n-tmp.h:873 src/xml/xmli18n-tmp.h:930
-#: src/xml/xmli18n-tmp.h:987 src/xml/xmli18n-tmp.h:1044
-#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1148
-#: src/xml/xmli18n-tmp.h:1186 src/xml/xmli18n-tmp.h:1244
-#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1350
-#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1463
-#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1586
-#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1700
-#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1789
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:419 src/xml/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:857 src/xml/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1030
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1383
+#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1558
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2313
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
-#: src/xml/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:421
 #, fuzzy
 msgid "Premium Presentation Paper Matte"
 msgstr "¹âµé¤Ä¤ä½Ð¤·¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:431
 #, fuzzy
-msgid "Premium Glossy Photo Paper 170 wt"
+msgid "Ultra Glossy Photo Paper"
+msgstr "¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
+
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1210
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1413
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1568
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1695
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1964
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2176 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2287 src/xml/xmli18n-tmp.h:2323
+#, fuzzy
+msgid "Premium Semigloss Photo Paper"
 msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/xml/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:437
 #, fuzzy
-msgid "Premium Glossy Photo Paper 250 wt"
+msgid "Ultra Premium Photo Paper Luster"
 msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
-#: src/xml/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:37
+msgid "CD or DVD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:93 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1230
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1437
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2331
 #, fuzzy
-msgid "Ultra Glossy Photo Paper"
-msgstr "¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
+msgid "ColorLife Paper"
+msgstr "ColorLife Paper"
 
-#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
-#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
-#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
-#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
-#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
-#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
-#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
-#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:839
-#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:945
-#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1059
-#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1158
-#: src/xml/xmli18n-tmp.h:1196 src/xml/xmli18n-tmp.h:1259
-#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1360
-#: src/xml/xmli18n-tmp.h:1415 src/xml/xmli18n-tmp.h:1478
-#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1601
-#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1715
-#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:73
 #, fuzzy
-msgid "Premium Semigloss Photo Paper"
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
+
+#: src/xml/xmli18n-tmp.h:75
+#, fuzzy
+msgid "Premium Glossy Photo Paper 250 wt"
 msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/xml/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:81
 #, fuzzy
 msgid "Premium Semigloss Photo Paper 170 wt"
 msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/xml/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:83
 #, fuzzy
 msgid "Premium Semigloss Photo Paper 250 wt"
 msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:87
 #, fuzzy
 msgid "Premium Luster Photo Paper 250 wt"
 msgstr "¹âµé¤Ä¤ä½Ð¤·¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
-#: src/xml/xmli18n-tmp.h:334
-#, fuzzy
-msgid "Ultra Premium Photo Paper Luster"
-msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
-
-#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
-#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
-#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
-#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
-#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
-#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
-#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
-#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:845
-#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:957
-#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1071
-#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1166
-#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1271
-#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1372
-#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1496
-#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1613
-#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1733
-#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1807
-#, fuzzy
-msgid "ColorLife Paper"
-msgstr "ColorLife Paper"
-
-#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
-#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
-#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
-#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
-#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
-#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
-#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
-#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
-#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
-#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
-#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
-#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
-#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
-#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
-#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
-#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
-#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
-#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
-#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
-#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
-#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
-#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
-#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
-#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
-#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
-#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
-#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
-#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
-#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
-#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
-#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
-#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
-#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
-#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
-#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
-#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
-#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
-#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
-#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
-#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
-#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
-#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
-#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
-#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
-#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
-#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
-#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:851
-#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:857
-#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:863
-#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:869
-#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:875
-#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:881
-#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:887
-#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:893
-#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:899
-#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:905
-#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:911
-#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:917
-#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:923
-#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:929
-#: src/xml/xmli18n-tmp.h:932 src/xml/xmli18n-tmp.h:935
-#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:941
-#: src/xml/xmli18n-tmp.h:944 src/xml/xmli18n-tmp.h:947
-#: src/xml/xmli18n-tmp.h:950 src/xml/xmli18n-tmp.h:953
-#: src/xml/xmli18n-tmp.h:956 src/xml/xmli18n-tmp.h:959
-#: src/xml/xmli18n-tmp.h:962 src/xml/xmli18n-tmp.h:965
-#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:971
-#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:977
-#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:983
-#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:989
-#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:995
-#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1001
-#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1007
-#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1013
-#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1019
-#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1025
-#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1031
-#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1037
-#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1043
-#: src/xml/xmli18n-tmp.h:1046 src/xml/xmli18n-tmp.h:1049
-#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1055
-#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1061
-#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1067
-#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1073
-#: src/xml/xmli18n-tmp.h:1076 src/xml/xmli18n-tmp.h:1079
-#: src/xml/xmli18n-tmp.h:1082 src/xml/xmli18n-tmp.h:1085
-#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1091
-#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1097
-#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1103
-#: src/xml/xmli18n-tmp.h:1106 src/xml/xmli18n-tmp.h:1109
-#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1115
-#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1121
-#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1127
-#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1133
-#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1225
-#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1231
-#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1237
-#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1243
-#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1249
-#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1255
-#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1261
-#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1267
-#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1273
-#: src/xml/xmli18n-tmp.h:1276 src/xml/xmli18n-tmp.h:1279
-#: src/xml/xmli18n-tmp.h:1282 src/xml/xmli18n-tmp.h:1285
-#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1291
-#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1297
-#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1303
-#: src/xml/xmli18n-tmp.h:1306 src/xml/xmli18n-tmp.h:1309
-#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1315
-#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1321
-#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1327
-#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1333
-#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1567
-#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1573
-#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1579
-#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1585
-#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1591
-#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1597
-#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1603
-#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1609
-#: src/xml/xmli18n-tmp.h:1612 src/xml/xmli18n-tmp.h:1615
-#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1621
-#: src/xml/xmli18n-tmp.h:1624 src/xml/xmli18n-tmp.h:1627
-#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1633
-#: src/xml/xmli18n-tmp.h:1636 src/xml/xmli18n-tmp.h:1639
-#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1645
-#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1651
-#: src/xml/xmli18n-tmp.h:1654 src/xml/xmli18n-tmp.h:1657
-#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1663
-#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1669
-#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1675
-#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3223
-#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3231
-#: src/xml/xmli18n-tmp.h:3238 src/xml/xmli18n-tmp.h:3239
-#: src/xml/xmli18n-tmp.h:3300 src/xml/xmli18n-tmp.h:3301
-#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3311
-#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3396
-#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3408
-#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3420
-#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3432
-#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3440
-#: src/xml/xmli18n-tmp.h:3479 src/xml/xmli18n-tmp.h:3480
-#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3492
-#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3554
-#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:133 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:149 src/xml/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:173 src/xml/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:197 src/xml/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:205 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:221 src/xml/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:229 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:245 src/xml/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:253 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:261 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:269 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:277 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:285 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:293 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:301 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:309 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:317 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:325 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:333 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:341 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:349 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:357 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:619 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:643 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:667 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:691 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:707 src/xml/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:715 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:731 src/xml/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:739 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:755 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1062
+#: src/xml/xmli18n-tmp.h:1067 src/xml/xmli18n-tmp.h:1072
+#: src/xml/xmli18n-tmp.h:1077 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1092
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1102
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1112
+#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1122
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1132
+#: src/xml/xmli18n-tmp.h:1137 src/xml/xmli18n-tmp.h:1142
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1157 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1177 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1192
+#: src/xml/xmli18n-tmp.h:1197 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1212
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1222
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1242
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1252
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1272
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1287 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1297 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1327 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1385 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1445 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1461
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1516 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1647
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1657
+#: src/xml/xmli18n-tmp.h:1662 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1677
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1687
+#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1742 src/xml/xmli18n-tmp.h:1747
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1767
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1807
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2090 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2098 src/xml/xmli18n-tmp.h:2102
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2118
+#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2126
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2162 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2190
+#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:3884 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:4779 src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:4845 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4919
+#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4980
+#: src/xml/xmli18n-tmp.h:4986 src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5209 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5276
+#: src/xml/xmli18n-tmp.h:5277 src/xml/xmli18n-tmp.h:5283
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5607 src/xml/xmli18n-tmp.h:5633
+#: src/xml/xmli18n-tmp.h:5634 src/xml/xmli18n-tmp.h:5640
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
-#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
-#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
-#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
-#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:852
-#: src/xml/xmli18n-tmp.h:909 src/xml/xmli18n-tmp.h:966
-#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1080
-#: src/xml/xmli18n-tmp.h:1172 src/xml/xmli18n-tmp.h:1223
-#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1336
-#: src/xml/xmli18n-tmp.h:1379 src/xml/xmli18n-tmp.h:1442
-#: src/xml/xmli18n-tmp.h:1565 src/xml/xmli18n-tmp.h:1622
-#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1775
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:142 src/xml/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:150 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:174 src/xml/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:198 src/xml/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:214 src/xml/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:222 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:238 src/xml/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:246 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:262 src/xml/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:302 src/xml/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:310 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:318 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:326 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:334 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:342 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:350 src/xml/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:636 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:660 src/xml/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:708 src/xml/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:716 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:732 src/xml/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:756 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1103
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1123
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1158 src/xml/xmli18n-tmp.h:1163
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1183
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1193
+#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1213
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1223
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1238 src/xml/xmli18n-tmp.h:1243
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1253
+#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1283
+#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1313
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1333
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1362 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1374 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1462
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1472
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1487 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1502
+#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:1532
+#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1542
+#: src/xml/xmli18n-tmp.h:1633 src/xml/xmli18n-tmp.h:1638
+#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1648
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1658
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1713 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1728
+#: src/xml/xmli18n-tmp.h:1733 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1768
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2071
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2095
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2115 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2123 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2139 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2183
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2191
+#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2199
+#, fuzzy
+msgid "MISQuadtone"
+msgstr "Quadtone"
+
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1150 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2299
 msgid "Plain Paper Fast Load"
 msgstr "Ä̾ïÍÑ»æ¤Î¹â®Æɹþ¤ß"
 
-#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
-#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
-#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1364
-#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1484
-#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1970 src/xml/xmli18n-tmp.h:2030
+#: src/xml/xmli18n-tmp.h:2245
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
-#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
-#: src/xml/xmli18n-tmp.h:1202 src/xml/xmli18n-tmp.h:1366
-#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1487
-#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:881 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2248
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
-#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
-#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
-#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
-#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
-#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
-#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
-#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
-#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
-#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
-#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1377
-#: src/xml/xmli18n-tmp.h:1380 src/xml/xmli18n-tmp.h:1383
-#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1389
-#: src/xml/xmli18n-tmp.h:1392 src/xml/xmli18n-tmp.h:1395
-#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1401
-#: src/xml/xmli18n-tmp.h:1404 src/xml/xmli18n-tmp.h:1407
-#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1413
-#: src/xml/xmli18n-tmp.h:1416 src/xml/xmli18n-tmp.h:1419
-#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1425
-#: src/xml/xmli18n-tmp.h:1428 src/xml/xmli18n-tmp.h:1431
-#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1437
-#: src/xml/xmli18n-tmp.h:1440 src/xml/xmli18n-tmp.h:1443
-#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1449
-#: src/xml/xmli18n-tmp.h:1452 src/xml/xmli18n-tmp.h:1455
-#: src/xml/xmli18n-tmp.h:1458 src/xml/xmli18n-tmp.h:1461
-#: src/xml/xmli18n-tmp.h:1464 src/xml/xmli18n-tmp.h:1467
-#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1473
-#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1479
-#: src/xml/xmli18n-tmp.h:1482 src/xml/xmli18n-tmp.h:1485
-#: src/xml/xmli18n-tmp.h:1488 src/xml/xmli18n-tmp.h:1491
-#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1497
-#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1677
-#: src/xml/xmli18n-tmp.h:1680 src/xml/xmli18n-tmp.h:1683
-#: src/xml/xmli18n-tmp.h:1686 src/xml/xmli18n-tmp.h:1689
-#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1695
-#: src/xml/xmli18n-tmp.h:1698 src/xml/xmli18n-tmp.h:1701
-#: src/xml/xmli18n-tmp.h:1704 src/xml/xmli18n-tmp.h:1707
-#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1713
-#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1719
-#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1725
-#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1731
-#: src/xml/xmli18n-tmp.h:1734 src/xml/xmli18n-tmp.h:1737
-#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3503
-#: src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:1863
+#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1881
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1893
+#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1905
+#: src/xml/xmli18n-tmp.h:1908 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1923
+#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:1950 src/xml/xmli18n-tmp.h:1953
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1968 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1983
+#: src/xml/xmli18n-tmp.h:1986 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2204 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2255
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5645
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Six Color Photo"
 
-#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
-#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
-#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
-#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
-#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
-#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
-#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
-#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
-#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
-#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
-#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1378
-#: src/xml/xmli18n-tmp.h:1381 src/xml/xmli18n-tmp.h:1384
-#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1390
-#: src/xml/xmli18n-tmp.h:1393 src/xml/xmli18n-tmp.h:1396
-#: src/xml/xmli18n-tmp.h:1399 src/xml/xmli18n-tmp.h:1402
-#: src/xml/xmli18n-tmp.h:1405 src/xml/xmli18n-tmp.h:1408
-#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1414
-#: src/xml/xmli18n-tmp.h:1417 src/xml/xmli18n-tmp.h:1420
-#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1426
-#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1432
-#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1438
-#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1444
-#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1450
-#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1456
-#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1462
-#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1468
-#: src/xml/xmli18n-tmp.h:1471 src/xml/xmli18n-tmp.h:1474
-#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1480
-#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1486
-#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1492
-#: src/xml/xmli18n-tmp.h:1495 src/xml/xmli18n-tmp.h:1498
-#: src/xml/xmli18n-tmp.h:1501 src/xml/xmli18n-tmp.h:1678
-#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1684
-#: src/xml/xmli18n-tmp.h:1687 src/xml/xmli18n-tmp.h:1690
-#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1696
-#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1702
-#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1708
-#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1714
-#: src/xml/xmli18n-tmp.h:1717 src/xml/xmli18n-tmp.h:1720
-#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1726
-#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1732
-#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1738
-#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3517
-#: src/xml/xmli18n-tmp.h:3577
+#: src/xml/xmli18n-tmp.h:835 src/xml/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:841 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1879 src/xml/xmli18n-tmp.h:1882
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1894
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1909 src/xml/xmli18n-tmp.h:1912
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1924
+#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1954
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1969 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1984
+#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2208
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2229 src/xml/xmli18n-tmp.h:2232
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2238
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2244
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2253 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2259 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5714
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1826
-#: src/xml/xmli18n-tmp.h:1839 src/xml/xmli18n-tmp.h:1852
-#: src/xml/xmli18n-tmp.h:1907 src/xml/xmli18n-tmp.h:1923
-#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1952
-#: src/xml/xmli18n-tmp.h:1965 src/xml/xmli18n-tmp.h:2054
-#: src/xml/xmli18n-tmp.h:2081 src/xml/xmli18n-tmp.h:2146
-#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
-#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
-#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2348
-#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2407
-#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2899
-#: src/xml/xmli18n-tmp.h:2916 src/xml/xmli18n-tmp.h:3142
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1139
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1154 src/xml/xmli18n-tmp.h:1159
+#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1179
+#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1199
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1214 src/xml/xmli18n-tmp.h:1219
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1229
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1244 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1259
+#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1274 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1289
+#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1309
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1329
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1423
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1429
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1447
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1634
+#: src/xml/xmli18n-tmp.h:1639 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1664
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1764
+#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1784
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1799 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1819
+msgid "MIS Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1463 src/xml/xmli18n-tmp.h:1468
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1478
+#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1508
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1533 src/xml/xmli18n-tmp.h:1538
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4858 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:5289
+msgid "Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2489 src/xml/xmli18n-tmp.h:2578
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2713 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2752
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2885 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:3051 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3665
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1828
-#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1853
-#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1879
-#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
-#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1940
-#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1966
-#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2055
-#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2133
-#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2175
-#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
-#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
-#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2336
-#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
-#: src/xml/xmli18n-tmp.h:2408 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2699
+#: src/xml/xmli18n-tmp.h:2714 src/xml/xmli18n-tmp.h:2727
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2886
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:3052
 msgid "180 DPI Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1830
-#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1854
-#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1880
-#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
-#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1941
-#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1967
-#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
-#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2134
-#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2176
-#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
-#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
-#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2337
-#: src/xml/xmli18n-tmp.h:2350 src/xml/xmli18n-tmp.h:2363
-#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
-#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2434
-#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2459
-#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2529
-#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2601
-#: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2703
-#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2735
-#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2768
-#: src/xml/xmli18n-tmp.h:2872 src/xml/xmli18n-tmp.h:2884
-#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2917
-#: src/xml/xmli18n-tmp.h:2961 src/xml/xmli18n-tmp.h:3007
-#: src/xml/xmli18n-tmp.h:3021 src/xml/xmli18n-tmp.h:3035
-#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3126
-#: src/xml/xmli18n-tmp.h:3143
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2404
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2658
+#: src/xml/xmli18n-tmp.h:2672 src/xml/xmli18n-tmp.h:2700
+#: src/xml/xmli18n-tmp.h:2715 src/xml/xmli18n-tmp.h:2728
+#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2754
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2919 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3053
+#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3125
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3292
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3530
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3649
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3684
 #, fuzzy
 msgid "360 x 180 DPI Draft"
 msgstr "150x150 DPI"
 
-#: src/xml/xmli18n-tmp.h:1818 src/xml/xmli18n-tmp.h:1831
-#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1855
-#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1881
-#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
-#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1942
-#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1968
-#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2135
-#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2392 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2418 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2479 src/xml/xmli18n-tmp.h:2492
+#: src/xml/xmli18n-tmp.h:2581 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2862 src/xml/xmli18n-tmp.h:2934
 #, fuzzy
 msgid "360 DPI High Quality"
 msgstr "600 DPI ¹âÉʼÁ"
 
-#: src/xml/xmli18n-tmp.h:1819 src/xml/xmli18n-tmp.h:1832
-#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1856
-#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1882
-#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
-#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1943
-#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1969
-#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1992
-#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2020
-#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
-#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
-#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2096
-#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2123
-#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2149
-#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2177
-#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2205
-#: src/xml/xmli18n-tmp.h:2218 src/xml/xmli18n-tmp.h:2231
-#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2254
-#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
-#: src/xml/xmli18n-tmp.h:2297 src/xml/xmli18n-tmp.h:2312
-#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2339
-#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
-#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2385
-#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2411
-#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2435
-#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2460
-#: src/xml/xmli18n-tmp.h:2473 src/xml/xmli18n-tmp.h:2488
-#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2516
-#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2541
-#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2591
-#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
-#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2645
-#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2675
-#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2704
-#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2736
-#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2769
-#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2808
-#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2833
-#: src/xml/xmli18n-tmp.h:2847 src/xml/xmli18n-tmp.h:2861
-#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2885
-#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2918
-#: src/xml/xmli18n-tmp.h:2935 src/xml/xmli18n-tmp.h:2950
-#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2987
-#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3022
-#: src/xml/xmli18n-tmp.h:3036 src/xml/xmli18n-tmp.h:3050
-#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3081
-#: src/xml/xmli18n-tmp.h:3098 src/xml/xmli18n-tmp.h:3113
-#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2369 src/xml/xmli18n-tmp.h:2380
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2406
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2493
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2544
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
+#: src/xml/xmli18n-tmp.h:2582 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2729
+#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2806
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2836
+#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
+#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3012
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3040
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3184 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3424 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3485 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3573
+#: src/xml/xmli18n-tmp.h:3587 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3650 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3685
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
 
-#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1833
-#: src/xml/xmli18n-tmp.h:1846 src/xml/xmli18n-tmp.h:1857
-#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1883
-#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1912
-#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1944
-#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1970
-#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1993
-#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2021
-#: src/xml/xmli18n-tmp.h:2033 src/xml/xmli18n-tmp.h:2045
-#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
-#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2097
-#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2124
-#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2150
-#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2178
-#: src/xml/xmli18n-tmp.h:2193 src/xml/xmli18n-tmp.h:2206
-#: src/xml/xmli18n-tmp.h:2219 src/xml/xmli18n-tmp.h:2232
-#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2255
-#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
-#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2313
-#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2340
-#: src/xml/xmli18n-tmp.h:2352 src/xml/xmli18n-tmp.h:2365
-#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2386
-#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2412
-#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2436
-#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2461
-#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2489
-#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2517
-#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2542
-#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2567
-#: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2592
-#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2616
-#: src/xml/xmli18n-tmp.h:2631 src/xml/xmli18n-tmp.h:2646
-#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2676
-#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2705
-#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2737
-#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2770
-#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2809
-#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2834
-#: src/xml/xmli18n-tmp.h:2848 src/xml/xmli18n-tmp.h:2862
-#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2886
-#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2919
-#: src/xml/xmli18n-tmp.h:2936 src/xml/xmli18n-tmp.h:2951
-#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2988
-#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3023
-#: src/xml/xmli18n-tmp.h:3037 src/xml/xmli18n-tmp.h:3051
-#: src/xml/xmli18n-tmp.h:3066 src/xml/xmli18n-tmp.h:3083
-#: src/xml/xmli18n-tmp.h:3099 src/xml/xmli18n-tmp.h:3114
-#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:2344 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2452 src/xml/xmli18n-tmp.h:2468
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2494
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2557 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:2594
+#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2648
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2674
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2807
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2837
+#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
+#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3013
+#: src/xml/xmli18n-tmp.h:3026 src/xml/xmli18n-tmp.h:3041
+#: src/xml/xmli18n-tmp.h:3055 src/xml/xmli18n-tmp.h:3066
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3140
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3170
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3229
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3333
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3358
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3385
+#: src/xml/xmli18n-tmp.h:3397 src/xml/xmli18n-tmp.h:3409
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3442
+#: src/xml/xmli18n-tmp.h:3459 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3574
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3637
+#: src/xml/xmli18n-tmp.h:3651 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3686
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1834
-#: src/xml/xmli18n-tmp.h:1847 src/xml/xmli18n-tmp.h:1858
-#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1884
-#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1913
-#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1945
-#: src/xml/xmli18n-tmp.h:1958 src/xml/xmli18n-tmp.h:1971
-#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:1994
-#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2022
-#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2046
-#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2071
-#: src/xml/xmli18n-tmp.h:2086 src/xml/xmli18n-tmp.h:2098
-#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2125
-#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2151
-#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2179
-#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2207
-#: src/xml/xmli18n-tmp.h:2220 src/xml/xmli18n-tmp.h:2233
-#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2256
-#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
-#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2314
-#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2341
-#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
-#: src/xml/xmli18n-tmp.h:2376 src/xml/xmli18n-tmp.h:2387
-#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2413
-#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2437
-#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2462
-#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2490
-#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2518
-#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2543
-#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
-#: src/xml/xmli18n-tmp.h:2580 src/xml/xmli18n-tmp.h:2593
-#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2617
-#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
-#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2677
-#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2706
-#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2738
-#: src/xml/xmli18n-tmp.h:2753 src/xml/xmli18n-tmp.h:2771
-#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2810
-#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2835
-#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
-#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2887
-#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2921
-#: src/xml/xmli18n-tmp.h:2937 src/xml/xmli18n-tmp.h:2952
-#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2990
-#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3024
-#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3052
-#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3085
-#: src/xml/xmli18n-tmp.h:3100 src/xml/xmli18n-tmp.h:3115
-#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:2345 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2469
+#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2546
+#: src/xml/xmli18n-tmp.h:2558 src/xml/xmli18n-tmp.h:2570
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2595
+#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2622
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2675
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2731
+#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2808
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2838
+#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2890
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2922 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3014
+#: src/xml/xmli18n-tmp.h:3027 src/xml/xmli18n-tmp.h:3042
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3067
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3186 src/xml/xmli18n-tmp.h:3201
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3334
+#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3359
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3444
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3475
+#: src/xml/xmli18n-tmp.h:3489 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3533 src/xml/xmli18n-tmp.h:3547
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3652 src/xml/xmli18n-tmp.h:3669
+#: src/xml/xmli18n-tmp.h:3687
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
-#: src/xml/xmli18n-tmp.h:1978 src/xml/xmli18n-tmp.h:2004
-#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2030
-#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2067
-#: src/xml/xmli18n-tmp.h:2094 src/xml/xmli18n-tmp.h:2107
-#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2161
-#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2252
-#: src/xml/xmli18n-tmp.h:2280 src/xml/xmli18n-tmp.h:2295
-#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2323
-#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
-#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2486
-#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2552
-#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2613
-#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
-#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2686
-#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2806
-#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2831
-#: src/xml/xmli18n-tmp.h:2845 src/xml/xmli18n-tmp.h:2859
-#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2948
-#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3080
-#: src/xml/xmli18n-tmp.h:3097 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2554
+#: src/xml/xmli18n-tmp.h:2566 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2804 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2834 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3076
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3382
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3586 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3634
 #, fuzzy
 msgid "360 x 120 DPI Economy"
 msgstr "600x600 DPI ¥â¥Î¥¯¥í"
 
-#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1842
-#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2005
-#: src/xml/xmli18n-tmp.h:2019 src/xml/xmli18n-tmp.h:2031
-#: src/xml/xmli18n-tmp.h:2043 src/xml/xmli18n-tmp.h:2068
-#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
-#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2162
-#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2253
-#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2296
-#: src/xml/xmli18n-tmp.h:2311 src/xml/xmli18n-tmp.h:2324
-#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2384
-#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2487
-#: src/xml/xmli18n-tmp.h:2500 src/xml/xmli18n-tmp.h:2553
-#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2614
-#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2644
-#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2687
-#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2807
-#: src/xml/xmli18n-tmp.h:2820 src/xml/xmli18n-tmp.h:2832
-#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
-#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2949
-#: src/xml/xmli18n-tmp.h:3112
+#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2555
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2632
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3077
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3211
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3383
+#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3635
 #, fuzzy
 msgid "360 x 240 DPI Draft"
 msgstr "600x600 DPI"
 
-#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1872
-#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1898
-#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1930
-#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1959
-#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:1995
-#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2023
-#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2047
-#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2087
-#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2112
-#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2139
-#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2166
-#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2328
-#: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2388
-#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2557
-#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2922
-#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2991
-#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3086
+#: src/xml/xmli18n-tmp.h:2383 src/xml/xmli18n-tmp.h:2396
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2422
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2470 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2507 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2704 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:3057 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3118 src/xml/xmli18n-tmp.h:3445
+#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3514
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3609
 #, fuzzy
 msgid "720 DPI High Quality"
 msgstr "1200 DPI ¹âÉʼÁ"
 
-#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1873
-#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1899
-#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1931
-#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1984
-#: src/xml/xmli18n-tmp.h:1996 src/xml/xmli18n-tmp.h:2010
-#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2036
-#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2061
-#: src/xml/xmli18n-tmp.h:2073 src/xml/xmli18n-tmp.h:2088
-#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2127
-#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2153
-#: src/xml/xmli18n-tmp.h:2167 src/xml/xmli18n-tmp.h:2181
-#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2208
-#: src/xml/xmli18n-tmp.h:2221 src/xml/xmli18n-tmp.h:2234
-#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2257
-#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2285
-#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2315
-#: src/xml/xmli18n-tmp.h:2329 src/xml/xmli18n-tmp.h:2354
-#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2389
-#: src/xml/xmli18n-tmp.h:2399 src/xml/xmli18n-tmp.h:2425
-#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2451
-#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
-#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2504
-#: src/xml/xmli18n-tmp.h:2519 src/xml/xmli18n-tmp.h:2534
-#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2558
-#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2605
-#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2633
-#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2663
-#: src/xml/xmli18n-tmp.h:2678 src/xml/xmli18n-tmp.h:2691
-#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2725
-#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2754
-#: src/xml/xmli18n-tmp.h:2772 src/xml/xmli18n-tmp.h:2787
-#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2811
-#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2836
-#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
-#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2888
-#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2923
-#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2953
-#: src/xml/xmli18n-tmp.h:2968 src/xml/xmli18n-tmp.h:2978
-#: src/xml/xmli18n-tmp.h:2992 src/xml/xmli18n-tmp.h:3011
-#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3039
-#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
-#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3101
-#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3130
-#: src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:2384 src/xml/xmli18n-tmp.h:2397
+#: src/xml/xmli18n-tmp.h:2410 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2548 src/xml/xmli18n-tmp.h:2560
+#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2691 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2794 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2839
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2923 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3105
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3129
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3231 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3311
+#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3335
+#: src/xml/xmli18n-tmp.h:3348 src/xml/xmli18n-tmp.h:3360
+#: src/xml/xmli18n-tmp.h:3372 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3427 src/xml/xmli18n-tmp.h:3446
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3576 src/xml/xmli18n-tmp.h:3593
+#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3688
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1874
-#: src/xml/xmli18n-tmp.h:1887 src/xml/xmli18n-tmp.h:1900
-#: src/xml/xmli18n-tmp.h:1916 src/xml/xmli18n-tmp.h:1932
-#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1985
-#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2011
-#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2037
-#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2062
-#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2089
-#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2128
-#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2154
-#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2182
-#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2258
-#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
-#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2316
-#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2390
-#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2559
-#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2634
-#: src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2385 src/xml/xmli18n-tmp.h:2398
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2535
+#: src/xml/xmli18n-tmp.h:2549 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2782
+#: src/xml/xmli18n-tmp.h:2795 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3388
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1200 DPI ¹âÉʼÁ"
 
-#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1960
-#: src/xml/xmli18n-tmp.h:2100 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2902
 #, fuzzy
 msgid "720 DPI Highest Quality"
 msgstr "1200 DPI ¹âÉʼÁ"
 
-#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2259
-#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
-#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2317
-#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2477
-#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2505
-#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2606
-#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2635
-#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2740
-#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2866
-#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2796 src/xml/xmli18n-tmp.h:2811
+#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3216 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3412
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2260
-#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
-#: src/xml/xmli18n-tmp.h:2303 src/xml/xmli18n-tmp.h:2318
-#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2771 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2812
+#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:3160 src/xml/xmli18n-tmp.h:3390
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1200 DPI ¹âÉʼÁ"
 
-#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2439
-#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2493
-#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2546
-#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2582
-#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2620
-#: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2664
-#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
-#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2726
-#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2755
-#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2789
-#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2812
-#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2878
-#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
-#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2939
-#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2969
-#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2994
-#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
-#: src/xml/xmli18n-tmp.h:3088 src/xml/xmli18n-tmp.h:3102
-#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3131
-#: src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2963
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3070
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3106
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3297 src/xml/xmli18n-tmp.h:3313
+#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
+#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3401
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3492
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3577 src/xml/xmli18n-tmp.h:3594
+#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3671 src/xml/xmli18n-tmp.h:3689
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2426
-#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2452
-#: src/xml/xmli18n-tmp.h:2464 src/xml/xmli18n-tmp.h:2479
-#: src/xml/xmli18n-tmp.h:2494 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2547
-#: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2583
-#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2621
-#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2665
-#: src/xml/xmli18n-tmp.h:2680 src/xml/xmli18n-tmp.h:2694
-#: src/xml/xmli18n-tmp.h:2709 src/xml/xmli18n-tmp.h:2727
-#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2756
-#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2790
-#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2813
-#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2837
-#: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2879
-#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
-#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2940
-#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2970
-#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2995
-#: src/xml/xmli18n-tmp.h:3012 src/xml/xmli18n-tmp.h:3026
-#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3055
-#: src/xml/xmli18n-tmp.h:3072 src/xml/xmli18n-tmp.h:3089
-#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3118
-#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3071
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3107
+#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3251
+#: src/xml/xmli18n-tmp.h:3266 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3298 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3324 src/xml/xmli18n-tmp.h:3337
+#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3374 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3463
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3535 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3563 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3612
+#: src/xml/xmli18n-tmp.h:3626 src/xml/xmli18n-tmp.h:3641
+#: src/xml/xmli18n-tmp.h:3655 src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:3690
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:4374
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "²«¿§ (Y)"
 
-#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2584
-#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2711
-#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2743
-#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2776
-#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2908
-#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2972
-#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3057
-#: src/xml/xmli18n-tmp.h:3074 src/xml/xmli18n-tmp.h:3091
-#: src/xml/xmli18n-tmp.h:3105 src/xml/xmli18n-tmp.h:3134
-#: src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3108
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3267
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3495
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3614
+#: src/xml/xmli18n-tmp.h:3628 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3692
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2666 src/xml/xmli18n-tmp.h:2681
-#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2728
-#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2775
-#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2814
-#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2838
-#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2926
-#: src/xml/xmli18n-tmp.h:2941 src/xml/xmli18n-tmp.h:2971
-#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
-#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
-#: src/xml/xmli18n-tmp.h:3090 src/xml/xmli18n-tmp.h:3104
-#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3133
-#: src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3190 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3234 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3325 src/xml/xmli18n-tmp.h:3338
+#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3362
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3505
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3613
+#: src/xml/xmli18n-tmp.h:3627 src/xml/xmli18n-tmp.h:3642
+#: src/xml/xmli18n-tmp.h:3656 src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:3691
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2712
-#: src/xml/xmli18n-tmp.h:2730 src/xml/xmli18n-tmp.h:2759
-#: src/xml/xmli18n-tmp.h:2777 src/xml/xmli18n-tmp.h:2909
-#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2973
-#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3058
-#: src/xml/xmli18n-tmp.h:3075 src/xml/xmli18n-tmp.h:3092
-#: src/xml/xmli18n-tmp.h:3106 src/xml/xmli18n-tmp.h:3135
-#: src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3301 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3496
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3615
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2798 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3502
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2965
-#: src/xml/xmli18n-tmp.h:2989 src/xml/xmli18n-tmp.h:3067
-#: src/xml/xmli18n-tmp.h:3084
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:3607
 #, fuzzy
 msgid "720 x 360 DPI Enhanced"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:3479
 #, fuzzy
 msgid "Black 1"
 msgstr "¹õ¿§"
 
-#: src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3480
 #, fuzzy
 msgid "Black 2"
 msgstr "¹õ¿§"
 
-#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3065
-#: src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3605
 #, fuzzy
 msgid "360 DPI Enhanced"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3516
 #, fuzzy
 msgid "1440 x 720 DPI High Quality"
 msgstr "1200 DPI ¹âÉʼÁ"
 
-#: src/xml/xmli18n-tmp.h:3153
-msgid "Lower Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3677
+#, fuzzy
+msgid "Vivid Light Magenta"
+msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
 
-#: src/xml/xmli18n-tmp.h:3154
-msgid "Upper Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3682
+#, fuzzy
+msgid "Vivid Magenta"
+msgstr "¥Þ¥¼¥ó¥¿ (M)"
+
+#: src/xml/xmli18n-tmp.h:3694
+#, fuzzy
+msgid "Main Tray"
+msgstr "¥È¥ì¥¤"
+
+#: src/xml/xmli18n-tmp.h:3695
+#, fuzzy
+msgid "Photo Tray"
+msgstr "¼Ì¿¿"
 
-#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3160
-#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3176
-#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3186
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3725 src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:3732
 #, fuzzy
 msgid "Print to CD"
 msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
 
-#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3181
-#: src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:3730
 #, fuzzy
 msgid "Rear Tray"
 msgstr "¥È¥ì¥¤"
 
-#: src/xml/xmli18n-tmp.h:3157 src/xml/xmli18n-tmp.h:3182
-#: src/xml/xmli18n-tmp.h:3185
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:3731
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3159 src/xml/xmli18n-tmp.h:3164
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3705
 #, fuzzy
 msgid "Manual Feed"
 msgstr "¼êÆ°"
 
-#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3709
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3710
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3171
-#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3180
-#: src/xml/xmli18n-tmp.h:3193
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3716 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3739
 msgid "Roll Feed"
 msgstr "¥í¡¼¥ë¼°µë»æ"
 
-#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3714 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3723
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "¼êÆ°"
 
-#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3715 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3724
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "¼êÆ°"
 
-#: src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3733
 #, fuzzy
 msgid "Photo Board"
 msgstr "¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3734
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3735
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3190
+#: src/xml/xmli18n-tmp.h:3736
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "¼«Æ°ÁªÂò"
 
-#: src/xml/xmli18n-tmp.h:3191
+#: src/xml/xmli18n-tmp.h:3737
 msgid "Manual Selection"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3199 src/xml/xmli18n-tmp.h:3207
-#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3219
-#: src/xml/xmli18n-tmp.h:3227 src/xml/xmli18n-tmp.h:3235
-#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3257
-#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3278
-#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3297
-#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3317
-#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3342
-#: src/xml/xmli18n-tmp.h:3356 src/xml/xmli18n-tmp.h:3382
-#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
-#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3426
-#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3446
-#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3474
-#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3498
-#: src/xml/xmli18n-tmp.h:3510 src/xml/xmli18n-tmp.h:3524
-#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3558
-#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:3584
-#: src/xml/xmli18n-tmp.h:3594 src/xml/xmli18n-tmp.h:3600
-#: src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3763 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3872 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:4067 src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4172 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4236 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:4754 src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5102 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5679 src/xml/xmli18n-tmp.h:5748
+#: src/xml/xmli18n-tmp.h:5793 src/xml/xmli18n-tmp.h:5814
+#: src/xml/xmli18n-tmp.h:5835
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Seven Color Photo"
 
-#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3208
-#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3220
-#: src/xml/xmli18n-tmp.h:3228 src/xml/xmli18n-tmp.h:3236
-#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3259
-#: src/xml/xmli18n-tmp.h:3270 src/xml/xmli18n-tmp.h:3280
-#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3298
-#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3318
-#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3344
-#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3383
-#: src/xml/xmli18n-tmp.h:3391 src/xml/xmli18n-tmp.h:3403
-#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3427
-#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3447
-#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3475
-#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3499
-#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3526
-#: src/xml/xmli18n-tmp.h:3551 src/xml/xmli18n-tmp.h:3559
-#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3586
-#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3601
-#: src/xml/xmli18n-tmp.h:3607
+#: src/xml/xmli18n-tmp.h:3765 src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4484 src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:4756 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5321
+#: src/xml/xmli18n-tmp.h:5382 src/xml/xmli18n-tmp.h:5451
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5795 src/xml/xmli18n-tmp.h:5816
+#: src/xml/xmli18n-tmp.h:5837
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Three Color Composite"
 
-#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
-#: src/xml/xmli18n-tmp.h:3215 src/xml/xmli18n-tmp.h:3221
-#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3237
-#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3271
-#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3299
-#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3319
-#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3345
-#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3384
-#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
-#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3428
-#: src/xml/xmli18n-tmp.h:3438 src/xml/xmli18n-tmp.h:3448
-#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3463
-#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3476
-#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3500
-#: src/xml/xmli18n-tmp.h:3513 src/xml/xmli18n-tmp.h:3527
-#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3560
-#: src/xml/xmli18n-tmp.h:3573 src/xml/xmli18n-tmp.h:3587
-#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3602
-#: src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:3824 src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5325
+#: src/xml/xmli18n-tmp.h:5386 src/xml/xmli18n-tmp.h:5455
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5757
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5841
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Four Color Standard"
 
-#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3248
-#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
-#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3360
-#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
-#: src/xml/xmli18n-tmp.h:3417 src/xml/xmli18n-tmp.h:3429
-#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3459
-#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3501 src/xml/xmli18n-tmp.h:3514
-#: src/xml/xmli18n-tmp.h:3528 src/xml/xmli18n-tmp.h:3574
-#: src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4424 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:5066 src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:5196 src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5391
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5762
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Seven Color Photo"
 
-#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3249
-#: src/xml/xmli18n-tmp.h:3272 src/xml/xmli18n-tmp.h:3293
-#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3333
-#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3361
-#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
-#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3430
-#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3460
-#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3478
-#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3502
-#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3529
-#: src/xml/xmli18n-tmp.h:3575 src/xml/xmli18n-tmp.h:3589
+#: src/xml/xmli18n-tmp.h:3780 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:4078 src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:4430 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4972
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5150 src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5336
+#: src/xml/xmli18n-tmp.h:5397 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5768
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Six Color Photo"
 
-#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3919 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:4781 src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:4795 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4921
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:4996
+#: src/xml/xmli18n-tmp.h:5023 src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:5226 src/xml/xmli18n-tmp.h:5279
+#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5603 src/xml/xmli18n-tmp.h:5609
+#: src/xml/xmli18n-tmp.h:5636 src/xml/xmli18n-tmp.h:5642
+#, fuzzy
+msgid "Gray 3"
+msgstr "¥È¥ì¥¤£³"
+
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4782 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4796 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4916 src/xml/xmli18n-tmp.h:4922
+#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4983
+#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5286 src/xml/xmli18n-tmp.h:5294
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5643
+#, fuzzy
+msgid "Gray 2"
+msgstr "¥È¥ì¥¤£²"
+
+#: src/xml/xmli18n-tmp.h:3855 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:4856 src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:4931 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4998
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:5214 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5611
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5644
+#, fuzzy
+msgid "Gray 1"
+msgstr "¥È¥ì¥¤£±"
+
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4985 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5606 src/xml/xmli18n-tmp.h:5639
+#, fuzzy
+msgid "MIS Quadtone"
+msgstr "Quadtone"
+
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4114
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Seven Color Enhanced"
 
-#: src/xml/xmli18n-tmp.h:3260 src/xml/xmli18n-tmp.h:3281
+#: src/xml/xmli18n-tmp.h:4016 src/xml/xmli18n-tmp.h:4121
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Three Color Composite"
 
-#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3282
+#: src/xml/xmli18n-tmp.h:4021 src/xml/xmli18n-tmp.h:4126
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Four Color Standard"
 
-#: src/xml/xmli18n-tmp.h:3262 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4132
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Six Color Enhanced Composite"
 
-#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:4035 src/xml/xmli18n-tmp.h:4140
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Seven Color Enhanced"
 
-#: src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:4141
+#, fuzzy
+msgid "MatteBlack"
+msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
+
+#: src/xml/xmli18n-tmp.h:4224
 #, fuzzy
 msgid "Default Black"
 msgstr "½é´üÃͤËÌ᤹"
 
-#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
-#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3365
-#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3504
-#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3533
-#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3564
-#: src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4446 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4573 src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:5344
+#: src/xml/xmli18n-tmp.h:5413 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Seven Color Photo"
 msgstr "Seven Color Photo"
 
-#: src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:4315
 msgid "Six Color Enhanced Composite"
 msgstr "Six Color Enhanced Composite"
 
-#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3348
-#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3516
-#: src/xml/xmli18n-tmp.h:3530 src/xml/xmli18n-tmp.h:3576
-#: src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:4368 src/xml/xmli18n-tmp.h:4437
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:5404
+#: src/xml/xmli18n-tmp.h:5473 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5775
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Seven Color Photo"
 
-#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3355
-#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3523
-#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5745
 msgid "Two Level Grayscale"
 msgstr "Two Level Grayscale"
 
-#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3357
-#: src/xml/xmli18n-tmp.h:3511 src/xml/xmli18n-tmp.h:3525
-#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:4412 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5448
+#: src/xml/xmli18n-tmp.h:5681 src/xml/xmli18n-tmp.h:5750
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Four Color Standard"
 
-#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3372
-#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3540
+#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5531
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Six Color Photo"
 
-#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3378
-#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:4652 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5570
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Six Color Photo"
 
-#: src/xml/xmli18n-tmp.h:3462 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:5288
+msgid "MIS Six Tone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:4994
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5291
+#, fuzzy
+msgid "Gray 5"
+msgstr "¥È¥ì¥¤£±"
+
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:4928 src/xml/xmli18n-tmp.h:4995
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5292
+#, fuzzy
+msgid "Gray 4"
+msgstr "¥È¥ì¥¤£´"
+
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5145
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Six Color Photo"
 
-#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3615
-#: src/xml/xmli18n-tmp.h:3621
+#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5852
+#: src/xml/xmli18n-tmp.h:5858
 #, fuzzy
 msgid "Interleave"
 msgstr "¥×¥ê¥ó¥¿Ì¾:"
 
-#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3616
-#: src/xml/xmli18n-tmp.h:3622
+#: src/xml/xmli18n-tmp.h:5848 src/xml/xmli18n-tmp.h:5853
+#: src/xml/xmli18n-tmp.h:5859
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3612 src/xml/xmli18n-tmp.h:3617
-#: src/xml/xmli18n-tmp.h:3623
+#: src/xml/xmli18n-tmp.h:5849 src/xml/xmli18n-tmp.h:5854
+#: src/xml/xmli18n-tmp.h:5860
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3613 src/xml/xmli18n-tmp.h:3618
-#: src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5855
+#: src/xml/xmli18n-tmp.h:5861
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:5862
 #, fuzzy
 msgid "Interleave 2"
 msgstr "¥×¥ê¥ó¥¿Ì¾:"
 
-#: src/xml/xmli18n-tmp.h:3626
+#: src/xml/xmli18n-tmp.h:5863
 #, fuzzy
 msgid "Eight Pass"
 msgstr "ÌÀ¤ë¤µ:"
 
-#: src/xml/xmli18n-tmp.h:3628
+#: src/xml/xmli18n-tmp.h:5865
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:5909
 msgid "Legal"
 msgstr "¥ê¡¼¥¬¥ë"
 
-#: src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:5910
 msgid "Tabloid"
 msgstr "¥¿¥Ö¥í¥¤¥É"
 
-#: src/xml/xmli18n-tmp.h:3674
+#: src/xml/xmli18n-tmp.h:5911
 msgid "Executive"
 msgstr "¥¨¥¯¥¼¥¯¥Æ¥£¥Ö"
 
-#: src/xml/xmli18n-tmp.h:3679
+#: src/xml/xmli18n-tmp.h:5916
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:3680
+#: src/xml/xmli18n-tmp.h:5917
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:5918
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:3682
+#: src/xml/xmli18n-tmp.h:5919
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "EPSON 4x6 ¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:5920
+#, fuzzy
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr "EPSON 4x6 ¥Õ¥©¥ÈÍÑ»æ"
+
+#: src/xml/xmli18n-tmp.h:5921
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:3684
+#: src/xml/xmli18n-tmp.h:5922
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:3685
+#: src/xml/xmli18n-tmp.h:5923
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:3686
+#: src/xml/xmli18n-tmp.h:5924
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:3688
+#: src/xml/xmli18n-tmp.h:5926
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:3689
+#: src/xml/xmli18n-tmp.h:5927
 msgid "Super B 13x19"
 msgstr "¥¹¡¼¥Ñ¡¼ B 13x19"
 
-#: src/xml/xmli18n-tmp.h:3690
+#: src/xml/xmli18n-tmp.h:5928
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3691
+#: src/xml/xmli18n-tmp.h:5929
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:3692
+#: src/xml/xmli18n-tmp.h:5930
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:3693
+#: src/xml/xmli18n-tmp.h:5931
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:3694
+#: src/xml/xmli18n-tmp.h:5932
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:3695
+#: src/xml/xmli18n-tmp.h:5933
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:3696
+#: src/xml/xmli18n-tmp.h:5934
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:3697
+#: src/xml/xmli18n-tmp.h:5935
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:3698
+#: src/xml/xmli18n-tmp.h:5936
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:3699
+#: src/xml/xmli18n-tmp.h:5937
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3700
+#: src/xml/xmli18n-tmp.h:5938
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:5939
 msgid "4A"
 msgstr "4AÈÇ"
 
-#: src/xml/xmli18n-tmp.h:3702
+#: src/xml/xmli18n-tmp.h:5940
 msgid "2A"
 msgstr "2AÈÇ"
 
-#: src/xml/xmli18n-tmp.h:3703
+#: src/xml/xmli18n-tmp.h:5941
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:5942
 msgid "A0"
 msgstr "A0ÈÇ"
 
-#: src/xml/xmli18n-tmp.h:3705
+#: src/xml/xmli18n-tmp.h:5943
 msgid "A1"
 msgstr "A1ÈÇ"
 
-#: src/xml/xmli18n-tmp.h:3706
+#: src/xml/xmli18n-tmp.h:5944
 msgid "A2"
 msgstr "A2ÈÇ"
 
-#: src/xml/xmli18n-tmp.h:3707
+#: src/xml/xmli18n-tmp.h:5945
 msgid "A3"
 msgstr "A3ÈÇ"
 
-#: src/xml/xmli18n-tmp.h:3709
+#: src/xml/xmli18n-tmp.h:5947
 msgid "A5"
 msgstr "A5ÈÇ"
 
-#: src/xml/xmli18n-tmp.h:3710
+#: src/xml/xmli18n-tmp.h:5948
 msgid "A6"
 msgstr "A6ÈÇ"
 
-#: src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:5949
 msgid "A7"
 msgstr "A7ÈÇ"
 
-#: src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:5950
 msgid "A8"
 msgstr "A8ÈÇ"
 
-#: src/xml/xmli18n-tmp.h:3713
+#: src/xml/xmli18n-tmp.h:5951
 msgid "A9"
 msgstr "A9ÈÇ"
 
-#: src/xml/xmli18n-tmp.h:3714
+#: src/xml/xmli18n-tmp.h:5952
 msgid "A10"
 msgstr "A10ÈÇ"
 
-#: src/xml/xmli18n-tmp.h:3715
+#: src/xml/xmli18n-tmp.h:5953
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:3716
+#: src/xml/xmli18n-tmp.h:5954
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:5955
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:5956
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:5957
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:5958
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:5959
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:3722
+#: src/xml/xmli18n-tmp.h:5960
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:3723
+#: src/xml/xmli18n-tmp.h:5961
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:3724
+#: src/xml/xmli18n-tmp.h:5962
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:3725
+#: src/xml/xmli18n-tmp.h:5963
 msgid "4B ISO"
 msgstr "4B (ISO)"
 
-#: src/xml/xmli18n-tmp.h:3726
+#: src/xml/xmli18n-tmp.h:5964
 msgid "2B ISO"
 msgstr "2B (ISO)"
 
-#: src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:5965
 msgid "B0 ISO"
 msgstr "B0 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:5966
 msgid "B1 ISO"
 msgstr "B1 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:5967
 msgid "B2 ISO"
 msgstr "B2 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:3730
+#: src/xml/xmli18n-tmp.h:5968
 msgid "B3 ISO"
 msgstr "B3 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:3731
+#: src/xml/xmli18n-tmp.h:5969
 msgid "B4 ISO"
 msgstr "B4 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:3732
+#: src/xml/xmli18n-tmp.h:5970
 msgid "B5 ISO"
 msgstr "B5 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:3733
+#: src/xml/xmli18n-tmp.h:5971
 msgid "B6 ISO"
 msgstr "B6 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:3734
+#: src/xml/xmli18n-tmp.h:5972
 msgid "B7 ISO"
 msgstr "B7 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:3735
+#: src/xml/xmli18n-tmp.h:5973
 msgid "B8 ISO"
 msgstr "B8 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:3736
+#: src/xml/xmli18n-tmp.h:5974
 msgid "B9 ISO"
 msgstr "B9 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:3737
+#: src/xml/xmli18n-tmp.h:5975
 msgid "B10 ISO"
 msgstr "B10 (ISO)"
 
-#: src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5976
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:3739
+#: src/xml/xmli18n-tmp.h:5977
 msgid "B0 JIS"
 msgstr "B0 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:5978
 msgid "B1 JIS"
 msgstr "B1 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:3741
+#: src/xml/xmli18n-tmp.h:5979
 msgid "B2 JIS"
 msgstr "B2 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:5980
 msgid "B3 JIS"
 msgstr "B3 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:3743
+#: src/xml/xmli18n-tmp.h:5981
 msgid "B4 JIS"
 msgstr "B4 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:5982
 msgid "B5 JIS"
 msgstr "B5 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:5983
 msgid "B6 JIS"
 msgstr "B6 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:3746
+#: src/xml/xmli18n-tmp.h:5984
 msgid "B7 JIS"
 msgstr "B7 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:3747
+#: src/xml/xmli18n-tmp.h:5985
 msgid "B8 JIS"
 msgstr "B8 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:3748
+#: src/xml/xmli18n-tmp.h:5986
 msgid "B9 JIS"
 msgstr "B9 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:5987
 msgid "B10 JIS"
 msgstr "B10 (JIS)"
 
-#: src/xml/xmli18n-tmp.h:3750
+#: src/xml/xmli18n-tmp.h:5988
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:3751
+#: src/xml/xmli18n-tmp.h:5989
 #, fuzzy
 msgid "C0 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:5990
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:5991
 #, fuzzy
 msgid "C1 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/xml/xmli18n-tmp.h:3754
+#: src/xml/xmli18n-tmp.h:5992
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:3755
+#: src/xml/xmli18n-tmp.h:5993
 #, fuzzy
 msgid "C2 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/xml/xmli18n-tmp.h:3756
+#: src/xml/xmli18n-tmp.h:5994
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:5995
 #, fuzzy
 msgid "C3 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/xml/xmli18n-tmp.h:3758
+#: src/xml/xmli18n-tmp.h:5996
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:3759
+#: src/xml/xmli18n-tmp.h:5997
 #, fuzzy
 msgid "C4 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:5998
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:3761
+#: src/xml/xmli18n-tmp.h:5999
 #, fuzzy
 msgid "C5 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:6000
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:3763
+#: src/xml/xmli18n-tmp.h:6001
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:6002
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:3765
+#: src/xml/xmli18n-tmp.h:6003
 #, fuzzy
 msgid "C6 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/xml/xmli18n-tmp.h:3766
+#: src/xml/xmli18n-tmp.h:6004
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:6005
 #, fuzzy
 msgid "DL landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/xml/xmli18n-tmp.h:3768
+#: src/xml/xmli18n-tmp.h:6006
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:3769
+#: src/xml/xmli18n-tmp.h:6007
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/xml/xmli18n-tmp.h:3770
+#: src/xml/xmli18n-tmp.h:6008
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:6009
 #, fuzzy
 msgid "C7 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/xml/xmli18n-tmp.h:3772
+#: src/xml/xmli18n-tmp.h:6010
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:6011
 #, fuzzy
 msgid "C8 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/xml/xmli18n-tmp.h:3774
+#: src/xml/xmli18n-tmp.h:6012
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:3775
+#: src/xml/xmli18n-tmp.h:6013
 #, fuzzy
 msgid "C9 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:6014
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:6015
 #, fuzzy
 msgid "C10 landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/xml/xmli18n-tmp.h:3778
+#: src/xml/xmli18n-tmp.h:6016
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:3779
+#: src/xml/xmli18n-tmp.h:6017
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3780
+#: src/xml/xmli18n-tmp.h:6018
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:6019
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3782
+#: src/xml/xmli18n-tmp.h:6020
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:6021
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3784
+#: src/xml/xmli18n-tmp.h:6022
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:6023
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:6024
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:3787
+#: src/xml/xmli18n-tmp.h:6025
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:6026
 msgid "American foolscap"
 msgstr "American foolscap"
 
-#: src/xml/xmli18n-tmp.h:3789
+#: src/xml/xmli18n-tmp.h:6027
 msgid "European foolscap"
 msgstr "European foolscap"
 
-#: src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:6028
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:6029
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:3792
+#: src/xml/xmli18n-tmp.h:6030
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:6031
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/xml/xmli18n-tmp.h:3794
+#: src/xml/xmli18n-tmp.h:6032
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:3795
+#: src/xml/xmli18n-tmp.h:6033
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:6034
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:6035
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:6036
 msgid "Small paperback"
 msgstr "Small paperback"
 
-#: src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:6037
 msgid "Penguin small paperback"
 msgstr "Penguin small paperback"
 
-#: src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:6038
 msgid "Penguin large paperback"
 msgstr "Penguin large paperback"
 
-#: src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:6039
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3802
+#: src/xml/xmli18n-tmp.h:6040
 msgid "Hagaki Card"
 msgstr "Hagaki Card"
 
-#: src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:6041
 msgid "Oufuku Card"
 msgstr "Oufuku Card"
 
-#: src/xml/xmli18n-tmp.h:3804
+#: src/xml/xmli18n-tmp.h:6042
 msgid "Japanese long envelope #3"
 msgstr "ÆüËܤÎŤ¤ÉõÅû #3"
 
-#: src/xml/xmli18n-tmp.h:3805
+#: src/xml/xmli18n-tmp.h:6043
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "ÆüËܤÎŤ¤ÉõÅû #3"
 
-#: src/xml/xmli18n-tmp.h:3806
+#: src/xml/xmli18n-tmp.h:6044
 msgid "Japanese long envelope #4"
 msgstr "ÆüËܤÎŤ¤ÉõÅû #4"
 
-#: src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:6045
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "ÆüËܤÎŤ¤ÉõÅû #4"
 
-#: src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:6046
 msgid "Japanese Kaku envelope #4"
 msgstr "ÆüËܤλͳѤ¤ÉõÅû #4"
 
-#: src/xml/xmli18n-tmp.h:3809
+#: src/xml/xmli18n-tmp.h:6047
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "ÆüËܤλͳѤ¤ÉõÅû #4"
 
-#: src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:6048
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:6049
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:6050
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/xml/xmli18n-tmp.h:3813
+#: src/xml/xmli18n-tmp.h:6051
 msgid "Monarch Envelope"
 msgstr "Monarch Envelope"
 
-#: src/xml/xmli18n-tmp.h:3814
+#: src/xml/xmli18n-tmp.h:6052
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Monarch Envelope"
 
-#: src/xml/xmli18n-tmp.h:3815
+#: src/xml/xmli18n-tmp.h:6053
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3816
+#: src/xml/xmli18n-tmp.h:6054
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:6055
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3818
+#: src/xml/xmli18n-tmp.h:6056
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3819
+#: src/xml/xmli18n-tmp.h:6057
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "¤Ï¤¬¤­"
 
-#: src/xml/xmli18n-tmp.h:3820
+#: src/xml/xmli18n-tmp.h:6058
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:6059
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:6060
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3824
+#: src/xml/xmli18n-tmp.h:6062
 msgid "89 mm Roll Paper"
 msgstr "89mm ¥í¡¼¥ë»æ"
 
-#: src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:6063
 msgid "4 Inch Roll Paper"
 msgstr "4 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/xml/xmli18n-tmp.h:3826
+#: src/xml/xmli18n-tmp.h:6064
 msgid "5 Inch Roll Paper"
 msgstr "5 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/xml/xmli18n-tmp.h:3827
+#: src/xml/xmli18n-tmp.h:6065
 msgid "210 mm Roll Paper"
 msgstr "210mm ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:6066
 msgid "13 Inch Roll Paper"
 msgstr "13 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/xml/xmli18n-tmp.h:3829
+#: src/xml/xmli18n-tmp.h:6067
 #, fuzzy
 msgid "17 Inch Roll Paper"
 msgstr "13 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:6068
 msgid "22 Inch Roll Paper"
 msgstr "22 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/xml/xmli18n-tmp.h:3831
+#: src/xml/xmli18n-tmp.h:6069
 msgid "24 Inch Roll Paper"
 msgstr "24 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:6070
 msgid "36 Inch Roll Paper"
 msgstr "36 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:6071
 msgid "44 Inch Roll Paper"
 msgstr "44 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/xml/xmli18n-tmp.h:3834
+#: src/xml/xmli18n-tmp.h:6072
 #, fuzzy
 msgid "60 Inch Roll Paper"
 msgstr "36 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:6073
 #, fuzzy
 msgid "64 Inch Roll Paper"
 msgstr "4 ¥¤¥ó¥Á¥í¡¼¥ë»æ"
 
-#: src/xml/xmli18n-tmp.h:3836
+#: src/xml/xmli18n-tmp.h:6074
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3837
+#: src/xml/xmli18n-tmp.h:6075
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:6076
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:6077
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:6078
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:6079
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:6080
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:6081
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3844
+#: src/xml/xmli18n-tmp.h:6082
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:6083
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3846
+#: src/xml/xmli18n-tmp.h:6084
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3847
+#: src/xml/xmli18n-tmp.h:6085
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3848
+#: src/xml/xmli18n-tmp.h:6086
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:6087
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3850
+#: src/xml/xmli18n-tmp.h:6088
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:6089
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:6090
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3853
+#: src/xml/xmli18n-tmp.h:6091
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3854
+#: src/xml/xmli18n-tmp.h:6092
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3855
+#: src/xml/xmli18n-tmp.h:6093
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3856
+#: src/xml/xmli18n-tmp.h:6094
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3857
+#: src/xml/xmli18n-tmp.h:6095
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3858
+#: src/xml/xmli18n-tmp.h:6096
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:6097
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:6098
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:6099
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:6100
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3863
+#: src/xml/xmli18n-tmp.h:6101
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:6102
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:6103
 msgid "Canon S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:6104
 msgid "Canon S200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3867
+#: src/xml/xmli18n-tmp.h:6105
 msgid "Canon S300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3868
+#: src/xml/xmli18n-tmp.h:6106
 msgid "Canon S400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3869
+#: src/xml/xmli18n-tmp.h:6107
 msgid "Canon S450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3870
+#: src/xml/xmli18n-tmp.h:6108
 msgid "Canon S500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:6109
 msgid "Canon S600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3872
+#: src/xml/xmli18n-tmp.h:6110
 msgid "Canon S630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3873
+#: src/xml/xmli18n-tmp.h:6111
 msgid "Canon S800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3874
+#: src/xml/xmli18n-tmp.h:6112
 msgid "Canon S4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:6113
 msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:6114
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3877
+#: src/xml/xmli18n-tmp.h:6115
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3878
+#: src/xml/xmli18n-tmp.h:6116
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:6117
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3880
+#: src/xml/xmli18n-tmp.h:6118
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3881
+#: src/xml/xmli18n-tmp.h:6119
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:6120
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:6121
 msgid "Canon PIXMA iP4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3884
+#: src/xml/xmli18n-tmp.h:6122
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3885
+#: src/xml/xmli18n-tmp.h:6123
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3886
+#: src/xml/xmli18n-tmp.h:6124
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3887
+#: src/xml/xmli18n-tmp.h:6125
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3888
+#: src/xml/xmli18n-tmp.h:6126
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:6127
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:6128
+msgid "Canon PIXMA iX4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6129
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:6130
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:6131
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:6132
 msgid "Canon PIXMA MP160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:6133
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3895
+#: src/xml/xmli18n-tmp.h:6134
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:6135
 msgid "Canon PIXMA MP220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3897
+#: src/xml/xmli18n-tmp.h:6136
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:6137
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:6138
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3900
+#: src/xml/xmli18n-tmp.h:6139
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:6140
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3902
+#: src/xml/xmli18n-tmp.h:6141
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3903
+#: src/xml/xmli18n-tmp.h:6142
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:6143
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:6144
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:6145
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:6146
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:6147
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:6148
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3910
+#: src/xml/xmli18n-tmp.h:6149
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:6150
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3912
+#: src/xml/xmli18n-tmp.h:6151
 msgid "Canon i80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3913
+#: src/xml/xmli18n-tmp.h:6152
 msgid "Canon i560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3914
+#: src/xml/xmli18n-tmp.h:6153
 msgid "Canon i850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:6154
 msgid "Canon i860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3916
+#: src/xml/xmli18n-tmp.h:6155
 msgid "Canon i865"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:6156
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:6157
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3919
+#: src/xml/xmli18n-tmp.h:6158
 #, fuzzy
 msgid "Epson B-300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3920
+#: src/xml/xmli18n-tmp.h:6159
 #, fuzzy
 msgid "Epson B-308"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3921
+#: src/xml/xmli18n-tmp.h:6160
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3922
+#: src/xml/xmli18n-tmp.h:6161
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3923
+#: src/xml/xmli18n-tmp.h:6162
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:3924
+#: src/xml/xmli18n-tmp.h:6163
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:6164
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:6165
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:6166
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:6167
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:6168
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C41sx"
 
-#: src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:6169
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C41ux"
 
-#: src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:6170
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C41ux"
 
-#: src/xml/xmli18n-tmp.h:3932
+#: src/xml/xmli18n-tmp.h:6171
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C42sx"
 
-#: src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:6172
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3934
+#: src/xml/xmli18n-tmp.h:6173
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3935
+#: src/xml/xmli18n-tmp.h:6174
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:6175
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3937
+#: src/xml/xmli18n-tmp.h:6176
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:6177
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3939
+#: src/xml/xmli18n-tmp.h:6178
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:6179
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:6180
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3942
+#: src/xml/xmli18n-tmp.h:6181
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3943
+#: src/xml/xmli18n-tmp.h:6182
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:6183
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:6184
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3946
+#: src/xml/xmli18n-tmp.h:6185
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:3947
+#: src/xml/xmli18n-tmp.h:6186
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:3948
+#: src/xml/xmli18n-tmp.h:6187
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3949
+#: src/xml/xmli18n-tmp.h:6188
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:6189
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3951
+#: src/xml/xmli18n-tmp.h:6190
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:6191
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3953
+#: src/xml/xmli18n-tmp.h:6192
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:6193
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:6194
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3956
+#: src/xml/xmli18n-tmp.h:6195
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:3957
+#: src/xml/xmli18n-tmp.h:6196
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3958
+#: src/xml/xmli18n-tmp.h:6197
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3959
+#: src/xml/xmli18n-tmp.h:6198
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3960
+#: src/xml/xmli18n-tmp.h:6199
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:6200
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:6201
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:6202
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3964
+#: src/xml/xmli18n-tmp.h:6203
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:6204
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3966
+#: src/xml/xmli18n-tmp.h:6205
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3967
+#: src/xml/xmli18n-tmp.h:6206
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:6207
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:6208
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3970
+#: src/xml/xmli18n-tmp.h:6209
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:6210
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:3972
+#: src/xml/xmli18n-tmp.h:6211
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:6212
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:6213
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:3975
+#: src/xml/xmli18n-tmp.h:6214
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:6215
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:6216
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:6217
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:3979
+#: src/xml/xmli18n-tmp.h:6218
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:6219
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:3981
+#: src/xml/xmli18n-tmp.h:6220
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:3982
+#: src/xml/xmli18n-tmp.h:6221
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:3983
+#: src/xml/xmli18n-tmp.h:6222
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:3984
+#: src/xml/xmli18n-tmp.h:6223
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:6224
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:6225
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:3987
+#: src/xml/xmli18n-tmp.h:6226
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:6227
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:3989
+#: src/xml/xmli18n-tmp.h:6228
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:6229
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:6230
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:3992
+#: src/xml/xmli18n-tmp.h:6231
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:3993
+#: src/xml/xmli18n-tmp.h:6232
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:6233
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:3995
+#: src/xml/xmli18n-tmp.h:6234
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:6235
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:6236
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3998
+#: src/xml/xmli18n-tmp.h:6237
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3999
+#: src/xml/xmli18n-tmp.h:6238
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:6239
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:6240
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:4002
+#: src/xml/xmli18n-tmp.h:6241
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:6242
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:6243
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4005
+#: src/xml/xmli18n-tmp.h:6244
 #, fuzzy
-msgid "Epson Stylus Offixe TX300F"
+msgid "Epson Stylus Office TX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4006
+#: src/xml/xmli18n-tmp.h:6245
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:6246
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:4008
+#: src/xml/xmli18n-tmp.h:6247
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4009
+#: src/xml/xmli18n-tmp.h:6248
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:6249
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:6250
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:6251
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4013
+#: src/xml/xmli18n-tmp.h:6252
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4014
+#: src/xml/xmli18n-tmp.h:6253
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:6254
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:4016
+#: src/xml/xmli18n-tmp.h:6255
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:6256
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:6257
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4019
+#: src/xml/xmli18n-tmp.h:6258
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:4020
+#: src/xml/xmli18n-tmp.h:6259
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:4021
+#: src/xml/xmli18n-tmp.h:6260
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:4022
+#: src/xml/xmli18n-tmp.h:6261
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:4023
+#: src/xml/xmli18n-tmp.h:6262
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:4024
+#: src/xml/xmli18n-tmp.h:6263
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:6264
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:6265
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:4027
+#: src/xml/xmli18n-tmp.h:6266
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:6267
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:6268
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:6269
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:4031
+#: src/xml/xmli18n-tmp.h:6270
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:6271
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4033
+#: src/xml/xmli18n-tmp.h:6272
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4034
+#: src/xml/xmli18n-tmp.h:6273
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4035
+#: src/xml/xmli18n-tmp.h:6274
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:6275
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4037
+#: src/xml/xmli18n-tmp.h:6276
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:4038
+#: src/xml/xmli18n-tmp.h:6277
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:4039
+#: src/xml/xmli18n-tmp.h:6278
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:6279
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4041
+#: src/xml/xmli18n-tmp.h:6280
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:6281
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:6282
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4044
+#: src/xml/xmli18n-tmp.h:6283
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:6284
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:6285
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:6286
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:6287
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4049
+#: src/xml/xmli18n-tmp.h:6288
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:6289
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4051
+#: src/xml/xmli18n-tmp.h:6290
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:6291
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4053
+#: src/xml/xmli18n-tmp.h:6292
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4054
+#: src/xml/xmli18n-tmp.h:6293
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:6294
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4056
+#: src/xml/xmli18n-tmp.h:6295
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:6296
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4058
+#: src/xml/xmli18n-tmp.h:6297
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4059
+#: src/xml/xmli18n-tmp.h:6298
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:6299
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:6300
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4062
+#: src/xml/xmli18n-tmp.h:6301
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:6302
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4064
+#: src/xml/xmli18n-tmp.h:6303
+#, fuzzy
+msgid "Epson Stylus Photo R2880"
+msgstr "Stylus Photo 1280"
+
+#: src/xml/xmli18n-tmp.h:6304
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4065
+#: src/xml/xmli18n-tmp.h:6305
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:6306
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4067
+#: src/xml/xmli18n-tmp.h:6307
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:6308
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4069
+#: src/xml/xmli18n-tmp.h:6309
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:6310
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:6311
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4072
+#: src/xml/xmli18n-tmp.h:6312
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:6313
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4074
+#: src/xml/xmli18n-tmp.h:6314
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4075
+#: src/xml/xmli18n-tmp.h:6315
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4076
+#: src/xml/xmli18n-tmp.h:6316
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:6317
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4078
+#: src/xml/xmli18n-tmp.h:6318
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:6319
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:6320
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:6321
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4082
+#: src/xml/xmli18n-tmp.h:6322
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:6323
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4084
+#: src/xml/xmli18n-tmp.h:6324
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4085
+#: src/xml/xmli18n-tmp.h:6325
 #, fuzzy
-msgid "Epson Stylus Photo TX800W"
+msgid "Epson Stylus Photo TX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4086
+#: src/xml/xmli18n-tmp.h:6326
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:4087
+#: src/xml/xmli18n-tmp.h:6327
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:4088
+#: src/xml/xmli18n-tmp.h:6328
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4089
+#: src/xml/xmli18n-tmp.h:6329
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:6330
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:4091
+#: src/xml/xmli18n-tmp.h:6331
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:6332
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4093
+#: src/xml/xmli18n-tmp.h:6333
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4094
+#: src/xml/xmli18n-tmp.h:6334
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:6335
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:6336
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4097
+#: src/xml/xmli18n-tmp.h:6337
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:6338
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4099
+#: src/xml/xmli18n-tmp.h:6339
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:6340
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:6341
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:6342
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:6343
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:6344
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:6345
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:6346
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:6347
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:6348
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:6349
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4110
+#: src/xml/xmli18n-tmp.h:6350
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:6351
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:6352
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4113
+#: src/xml/xmli18n-tmp.h:6353
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:6354
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:6355
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4116
+#: src/xml/xmli18n-tmp.h:6356
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:6357
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4118
+#: src/xml/xmli18n-tmp.h:6358
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4119
+#: src/xml/xmli18n-tmp.h:6359
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:6360
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4121
+#: src/xml/xmli18n-tmp.h:6361
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:6362
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:6363
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4124
+#: src/xml/xmli18n-tmp.h:6364
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:6365
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4126
+#: src/xml/xmli18n-tmp.h:6366
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4127
+#: src/xml/xmli18n-tmp.h:6367
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4128
+#: src/xml/xmli18n-tmp.h:6368
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4129
+#: src/xml/xmli18n-tmp.h:6369
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:6370
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:6371
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:6372
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:6373
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:6374
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:6375
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:6376
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:6377
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:6378
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:6379
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:6380
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:6381
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:6382
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:6383
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4144
+#: src/xml/xmli18n-tmp.h:6384
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:6385
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:6386
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:6387
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:6388
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:6389
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:6390
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:6391
+#, fuzzy
+msgid "Epson Stylus DX4000"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:6392
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:6393
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:6394
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4154
+#: src/xml/xmli18n-tmp.h:6395
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:6396
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:6397
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:6398
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:6399
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:6400
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:6401
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:6402
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:6403
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:6404
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:6405
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:6406
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:6407
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:6408
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:6409
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:6410
 #, fuzzy
-msgid "Epson Stylus PX700FW"
+msgid "Epson Stylus PX700W"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:6411
 #, fuzzy
 msgid "Epson Stylus PX800FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:6412
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4172
+#: src/xml/xmli18n-tmp.h:6413
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:6414
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4174
+#: src/xml/xmli18n-tmp.h:6415
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:6416
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:6417
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4177
+#: src/xml/xmli18n-tmp.h:6418
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4178
+#: src/xml/xmli18n-tmp.h:6419
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4179
+#: src/xml/xmli18n-tmp.h:6420
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4180
+#: src/xml/xmli18n-tmp.h:6421
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4181
+#: src/xml/xmli18n-tmp.h:6422
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:6423
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:6424
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:6425
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:6426
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:6427
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4187
+#: src/xml/xmli18n-tmp.h:6428
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4188
+#: src/xml/xmli18n-tmp.h:6429
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:6430
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:6431
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:6432
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4192
+#: src/xml/xmli18n-tmp.h:6433
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:6434
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:6435
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:6436
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4196
+#: src/xml/xmli18n-tmp.h:6437
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:6438
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:6439
 msgid "Epson PictureMate 215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4199
+#: src/xml/xmli18n-tmp.h:6440
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:6441
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:6442
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:6443
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4204
+#: src/xml/xmli18n-tmp.h:6445
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:6446
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:6447
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4207
+#: src/xml/xmli18n-tmp.h:6448
 msgid "Epson WorkForce 30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:6449
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:6450
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:6451
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:6452
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4212
+#: src/xml/xmli18n-tmp.h:6453
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:6454
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:6455
 msgid "Epson E 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4215
+#: src/xml/xmli18n-tmp.h:6456
 msgid "Epson E 150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4216
+#: src/xml/xmli18n-tmp.h:6457
 msgid "Epson E 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:6458
 msgid "Epson E 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:6459
 msgid "Epson E 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4219
+#: src/xml/xmli18n-tmp.h:6460
 msgid "Epson E 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:6461
 msgid "Epson E 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:6462
 msgid "Epson E 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:6463
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:6464
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4224
+#: src/xml/xmli18n-tmp.h:6465
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:6466
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:6467
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:6468
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4228
+#: src/xml/xmli18n-tmp.h:6469
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4229
+#: src/xml/xmli18n-tmp.h:6470
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:6471
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:6472
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:6473
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:6474
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:6475
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:6476
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:6477
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:6478
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4238
+#: src/xml/xmli18n-tmp.h:6479
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:6480
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:6481
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:6482
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4242
+#: src/xml/xmli18n-tmp.h:6483
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4243
+#: src/xml/xmli18n-tmp.h:6484
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:6485
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:6486
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4246
+#: src/xml/xmli18n-tmp.h:6487
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:6488
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:6490
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4251
+#: src/xml/xmli18n-tmp.h:6492
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4253
+#: src/xml/xmli18n-tmp.h:6494
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4254
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:6496
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:6497
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:6498
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:6499
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4259
+#: src/xml/xmli18n-tmp.h:6500
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4260
+#: src/xml/xmli18n-tmp.h:6501
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:6502
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4262
+#: src/xml/xmli18n-tmp.h:6503
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4263
+#: src/xml/xmli18n-tmp.h:6504
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4264
+#: src/xml/xmli18n-tmp.h:6505
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4265
+#: src/xml/xmli18n-tmp.h:6506
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:6507
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:6508
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:6509
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:6510
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:6511
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:6512
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:6513
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:6514
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4274
+#: src/xml/xmli18n-tmp.h:6515
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4275
+#: src/xml/xmli18n-tmp.h:6516
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4276
+#: src/xml/xmli18n-tmp.h:6517
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:6518
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:6519
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:6520
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:6521
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:6522
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:6523
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:6524
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:6525
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4285
+#: src/xml/xmli18n-tmp.h:6526
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4286
+#: src/xml/xmli18n-tmp.h:6527
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:6528
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:6529
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:6530
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:6531
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:6532
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4292
+#: src/xml/xmli18n-tmp.h:6533
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:6534
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:6535
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4295
+#: src/xml/xmli18n-tmp.h:6536
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4296
+#: src/xml/xmli18n-tmp.h:6537
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4297
+#: src/xml/xmli18n-tmp.h:6538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:6539
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4299
+#: src/xml/xmli18n-tmp.h:6540
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:6541
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:6542
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:6543
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:6544
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4305
+#: src/xml/xmli18n-tmp.h:6546
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:6547
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4307
+#: src/xml/xmli18n-tmp.h:6548
+#, fuzzy
+msgid "Epson PX G5600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6549
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4308
+#: src/xml/xmli18n-tmp.h:6550
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4309
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4310
+#: src/xml/xmli18n-tmp.h:6552
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:6553
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:6554
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4313
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:6556
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4315
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:6559
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:6560
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:6561
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:6562
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:6563
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:6564
 msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:6565
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4324
+#: src/xml/xmli18n-tmp.h:6566
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:6567
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4326
+#: src/xml/xmli18n-tmp.h:6568
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4327
+#: src/xml/xmli18n-tmp.h:6569
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:6570
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:6571
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Brother HL-1430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:6576
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Brother HL-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4337
+#: src/xml/xmli18n-tmp.h:6579
 msgid "Brother HL-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:6580
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:6581
 msgid "Brother HL-1670N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:6582
 msgid "Brother HL-1850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:6583
 msgid "Brother HL-1870N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:6584
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:6585
 msgid "Brother HL-2460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:6586
 msgid "Brother HL-2460N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:6587
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4346
+#: src/xml/xmli18n-tmp.h:6588
 msgid "Brother HL-5030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:6589
 msgid "Brother HL-5040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:6590
 msgid "Brother HL-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:6591
 msgid "Brother HL-5070N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4350
+#: src/xml/xmli18n-tmp.h:6592
 msgid "Brother HL-5140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4351
+#: src/xml/xmli18n-tmp.h:6593
 msgid "Brother HL-5150D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:6594
 msgid "Brother HL-5170DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:6595
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4354
+#: src/xml/xmli18n-tmp.h:6596
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:6597
 msgid "Brother HL-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:6598
 msgid "Brother HL-7050N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4357
+#: src/xml/xmli18n-tmp.h:6599
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4358
+#: src/xml/xmli18n-tmp.h:6600
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:6601
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:6602
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:6603
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:6604
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:6605
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:6606
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:6607
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:6608
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:6609
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:6610
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:6611
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:6612
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:6613
 msgid "DEC 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:6614
 msgid "DEC LN17"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4373
+#: src/xml/xmli18n-tmp.h:6615
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4374
+#: src/xml/xmli18n-tmp.h:6616
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:6617
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4376
+#: src/xml/xmli18n-tmp.h:6618
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:6619
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:6620
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:6621
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:6622
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:6623
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:6624
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:6625
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4384
+#: src/xml/xmli18n-tmp.h:6626
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4385
+#: src/xml/xmli18n-tmp.h:6627
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4386
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4387
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:6630
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4389
+#: src/xml/xmli18n-tmp.h:6631
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4392
+#: src/xml/xmli18n-tmp.h:6634
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:6635
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:6636
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:6637
 msgid "Epson EPL-N2050PS+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4397
+#: src/xml/xmli18n-tmp.h:6639
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:6640
 #, fuzzy
 msgid "Epson EPL-N2500PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4400
+#: src/xml/xmli18n-tmp.h:6642
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:6643
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4403
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:6646
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:6647
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
 
-#: src/xml/xmli18n-tmp.h:4406
+#: src/xml/xmli18n-tmp.h:6648
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
 
-#: src/xml/xmli18n-tmp.h:4407
+#: src/xml/xmli18n-tmp.h:6649
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
 
-#: src/xml/xmli18n-tmp.h:4408
+#: src/xml/xmli18n-tmp.h:6650
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
 
-#: src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:6651
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
 
-#: src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:6652
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
 
-#: src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:6653
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
 
-#: src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:6654
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
 
-#: src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:6656
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
 
-#: src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:6657
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4416
+#: src/xml/xmli18n-tmp.h:6658
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:6659
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:6660
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:6661
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4420
-msgid "Gestetner 3532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4421
-msgid "Gestetner 4235g"
+#: src/xml/xmli18n-tmp.h:6662
+msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:6663
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4423
-msgid "Gestetner 4532"
+#: src/xml/xmli18n-tmp.h:6664
+msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4424
-msgid "Gestetner 4245g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:6665
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:6666
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:6668
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:6669
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:6670
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4431
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:6672
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:6673
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:6674
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:6675
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4436
+#: src/xml/xmli18n-tmp.h:6676
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4437
-msgid "Gestetner DSm635"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4438
-msgid "Gestetner DSm635G"
+#: src/xml/xmli18n-tmp.h:6677
+msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4439
-msgid "Gestetner DSm645"
+#: src/xml/xmli18n-tmp.h:6678
+msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4440
-msgid "Gestetner DS645G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:6679
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:6680
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4443
+#: src/xml/xmli18n-tmp.h:6681
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:6682
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:6683
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4446
-msgid "Gestetner DSm735"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4447
-msgid "Gestetner DSm735G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4448
-msgid "Gestetner DSm745"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4449
-msgid "Gestetner DSm745G"
+#: src/xml/xmli18n-tmp.h:6684
+msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4450
-msgid "Gestetner MP1100"
+#: src/xml/xmli18n-tmp.h:6685
+msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4451
-msgid "Gestetner DSm7110"
+#: src/xml/xmli18n-tmp.h:6686
+msgid "Gestetner MP1100/DSm7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4452
-msgid "Gestetner MP1350"
+#: src/xml/xmli18n-tmp.h:6687
+msgid "Gestetner MP1350/DSm7135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4453
-msgid "Gestetner DSm7135"
+#: src/xml/xmli18n-tmp.h:6688
+msgid "Gestetner MP1600/DSm716"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4454
-msgid "Gestetner MP1600"
+#: src/xml/xmli18n-tmp.h:6689
+msgid "Gestetner MP2000/DSm721d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4455
-msgid "Gestetner DSm716"
+#: src/xml/xmli18n-tmp.h:6690
+msgid "Gestetner MP2500/DSm625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4456
-msgid "Gestetner MP2000"
+#: src/xml/xmli18n-tmp.h:6691
+msgid "Gestetner MP3500/DSm735e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4457
-msgid "Gestetner DSm721d"
+#: src/xml/xmli18n-tmp.h:6692
+msgid "Gestetner MP4500/DSm745e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4458
-msgid "Gestetner MP2500"
+#: src/xml/xmli18n-tmp.h:6693
+msgid "Gestetner MP5500/DSm755"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4459
-msgid "Gestetner DSm625"
+#: src/xml/xmli18n-tmp.h:6694
+msgid "Gestetner MP6500/DSm765"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4460
-msgid "Gestetner MP3500"
+#: src/xml/xmli18n-tmp.h:6695
+msgid "Gestetner MP7500/DSm775"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4461
-msgid "Gestetner DSm735e"
+#: src/xml/xmli18n-tmp.h:6696
+msgid "Gestetner MP9000/DSm790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4462
-msgid "Gestetner MP4500"
+#: src/xml/xmli18n-tmp.h:6697
+msgid "Gestetner MP 161/DSm416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4463
-msgid "Gestetner DSm745e"
+#: src/xml/xmli18n-tmp.h:6698
+msgid "Gestetner MP 2510/DSm725e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4464
-msgid "Gestetner MP5500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4465
-msgid "Gestetner DSm755"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4466
-msgid "Gestetner MP6500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4467
-msgid "Gestetner DSm765"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4468
-msgid "Gestetner MP7500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4469
-msgid "Gestetner DSm775"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4470
-msgid "Gestetner MP9000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4471
-msgid "Gestetner DSm790"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4472
-msgid "Gestetner MP 161"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4473
-msgid "Gestetner DSm416"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4474
-msgid "Gestetner MP 2510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4475
-msgid "Gestetner DSm725e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:6699
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:6700
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4478
-msgid "Gestetner MP 3010"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4479
-msgid "Gestetner DSm730e"
+#: src/xml/xmli18n-tmp.h:6701
+msgid "Gestetner MP 3010/DSm730e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4480
+#: src/xml/xmli18n-tmp.h:6702
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:6703
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:6704
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:6705
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Gestetner MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:6707
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:6708
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:6709
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:6710
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4489
+#: src/xml/xmli18n-tmp.h:6711
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:6712
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:6713
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4492
+#: src/xml/xmli18n-tmp.h:6714
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:6715
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:6716
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4495
+#: src/xml/xmli18n-tmp.h:6717
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4496
+#: src/xml/xmli18n-tmp.h:6718
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4497
+#: src/xml/xmli18n-tmp.h:6719
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:6720
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:6721
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:6722
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:6723
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:6724
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:6725
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:6726
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:6727
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4506
+#: src/xml/xmli18n-tmp.h:6728
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:6729
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4508
+#: src/xml/xmli18n-tmp.h:6730
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4509
+#: src/xml/xmli18n-tmp.h:6731
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4510
+#: src/xml/xmli18n-tmp.h:6732
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:6733
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:6734
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:6735
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:6736
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:6737
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:6738
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:6739
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4518
+#: src/xml/xmli18n-tmp.h:6740
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:6741
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:6742
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:6743
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:6744
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4523
+#: src/xml/xmli18n-tmp.h:6745
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:6746
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:6747
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:6748
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:6749
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4528
+#: src/xml/xmli18n-tmp.h:6750
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4529
+#: src/xml/xmli18n-tmp.h:6751
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4530
+#: src/xml/xmli18n-tmp.h:6752
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:6753
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4532
+#: src/xml/xmli18n-tmp.h:6754
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:6755
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:6756
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:6757
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:6758
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:6759
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:6760
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4539
+#: src/xml/xmli18n-tmp.h:6761
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4540
+#: src/xml/xmli18n-tmp.h:6762
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4541
+#: src/xml/xmli18n-tmp.h:6763
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4542
+#: src/xml/xmli18n-tmp.h:6764
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4543
+#: src/xml/xmli18n-tmp.h:6765
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:6766
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:6767
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4546
+#: src/xml/xmli18n-tmp.h:6768
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:6769
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:6770
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:6771
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:6772
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:6773
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4552
+#: src/xml/xmli18n-tmp.h:6774
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:6775
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:6776
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:6777
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:6778
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:6779
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:6780
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:6781
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:6782
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:6783
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:6784
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:6785
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:6786
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:6787
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:6788
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4567
+#: src/xml/xmli18n-tmp.h:6789
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4568
+#: src/xml/xmli18n-tmp.h:6790
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:6791
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4570
+#: src/xml/xmli18n-tmp.h:6792
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4571
+#: src/xml/xmli18n-tmp.h:6793
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:6794
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:6795
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:6796
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:6797
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:6798
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:6799
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:6800
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:6801
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:6802
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:6803
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4582
+#: src/xml/xmli18n-tmp.h:6804
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4583
+#: src/xml/xmli18n-tmp.h:6805
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4584
+#: src/xml/xmli18n-tmp.h:6806
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4585
+#: src/xml/xmli18n-tmp.h:6807
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:6808
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:6809
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:6810
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:6811
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:6812
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:6813
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:6814
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4593
+#: src/xml/xmli18n-tmp.h:6815
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4594
+#: src/xml/xmli18n-tmp.h:6816
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:6817
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:6818
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4597
+#: src/xml/xmli18n-tmp.h:6819
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:6820
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:6821
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:6822
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:6823
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4602
+#: src/xml/xmli18n-tmp.h:6824
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:6825
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:6826
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:6827
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:6828
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4607
+#: src/xml/xmli18n-tmp.h:6829
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:6830
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4609
+#: src/xml/xmli18n-tmp.h:6831
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4610
+#: src/xml/xmli18n-tmp.h:6832
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:6833
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:6834
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4613
+#: src/xml/xmli18n-tmp.h:6835
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:6836
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:6837
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:6838
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:6839
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:6840
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:6841
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:6842
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:6843
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:6844
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:6845
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4624
+#: src/xml/xmli18n-tmp.h:6846
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4625
+#: src/xml/xmli18n-tmp.h:6847
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:6848
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4627
+#: src/xml/xmli18n-tmp.h:6849
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4628
+#: src/xml/xmli18n-tmp.h:6850
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:6851
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:6852
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:6853
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:6854
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:6855
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:6856
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:6857
 msgid "HP LaserJet 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4636
+#: src/xml/xmli18n-tmp.h:6858
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4637
+#: src/xml/xmli18n-tmp.h:6859
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4638
+#: src/xml/xmli18n-tmp.h:6860
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:6861
 msgid "HP LaserJet 1320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4640
+#: src/xml/xmli18n-tmp.h:6862
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:6863
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:6864
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:6865
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4644
+#: src/xml/xmli18n-tmp.h:6866
 msgid "HP LaserJet 2410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:6867
 msgid "HP LaserJet 2420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:6868
 msgid "HP LaserJet 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4647
+#: src/xml/xmli18n-tmp.h:6869
 msgid "HP LaserJet 3015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4648
+#: src/xml/xmli18n-tmp.h:6870
 msgid "HP LaserJet 3020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:6871
 msgid "HP LaserJet 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4650
+#: src/xml/xmli18n-tmp.h:6872
 msgid "HP LaserJet 3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:6873
 msgid "HP LaserJet 3052"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:6874
 msgid "HP LaserJet 3055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:6875
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:6876
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:6877
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:6878
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:6879
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:6880
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:6881
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4660
+#: src/xml/xmli18n-tmp.h:6882
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:6883
 msgid "HP LaserJet 3380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:6884
 msgid "HP LaserJet 3390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4663
+#: src/xml/xmli18n-tmp.h:6885
 msgid "HP LaserJet 3392"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:6886
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:6887
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:6888
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4667
+#: src/xml/xmli18n-tmp.h:6889
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:6890
 msgid "HP LaserJet 4240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:6891
 msgid "HP LaserJet 4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:6892
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4671
+#: src/xml/xmli18n-tmp.h:6893
 msgid "HP LaserJet 4345 mfp"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:6894
 msgid "HP LaserJet 4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:6895
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:6896
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:6897
 msgid "HP LaserJet 5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:6898
 msgid "HP LaserJet 5200L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:6899
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:6900
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:6901
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4680
+#: src/xml/xmli18n-tmp.h:6902
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:6903
 msgid "HP LaserJet 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4682
+#: src/xml/xmli18n-tmp.h:6904
 msgid "HP LaserJet 9040 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4683
+#: src/xml/xmli18n-tmp.h:6905
 msgid "HP LaserJet 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4684
+#: src/xml/xmli18n-tmp.h:6906
 msgid "HP LaserJet 9050 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:6907
 msgid "HP LaserJet M3027 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:6908
 msgid "HP LaserJet M3035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:6909
 msgid "HP LaserJet M4345 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:6910
 msgid "HP LaserJet M5025 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:6911
 msgid "HP LaserJet M5035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:6912
 msgid "HP LaserJet P2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:6913
 msgid "HP LaserJet P2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:6914
 msgid "HP LaserJet P3004"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:6915
 msgid "HP LaserJet P3005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:6916
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4695
+#: src/xml/xmli18n-tmp.h:6917
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:6918
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:6919
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:6920
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:6921
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4700
+#: src/xml/xmli18n-tmp.h:6922
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:6923
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:6924
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4703
+#: src/xml/xmli18n-tmp.h:6925
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:6926
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:6927
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4706
+#: src/xml/xmli18n-tmp.h:6928
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4707
+#: src/xml/xmli18n-tmp.h:6929
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:6930
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:6931
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4710
+#: src/xml/xmli18n-tmp.h:6932
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:6933
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:6934
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:6935
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:6936
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:6937
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:6938
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:6939
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4718
+#: src/xml/xmli18n-tmp.h:6940
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:6941
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:6942
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4721
+#: src/xml/xmli18n-tmp.h:6943
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:6944
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:6945
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:6946
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4725
+#: src/xml/xmli18n-tmp.h:6947
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:6948
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:6949
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4728
+#: src/xml/xmli18n-tmp.h:6950
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4729
+#: src/xml/xmli18n-tmp.h:6951
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:6952
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:6953
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4732
+#: src/xml/xmli18n-tmp.h:6954
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:6955
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:6956
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:6957
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:6958
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:6959
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:6960
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4739
+#: src/xml/xmli18n-tmp.h:6961
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4740
+#: src/xml/xmli18n-tmp.h:6962
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4741
+#: src/xml/xmli18n-tmp.h:6963
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4742
+#: src/xml/xmli18n-tmp.h:6964
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:6965
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:6966
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4745
+#: src/xml/xmli18n-tmp.h:6967
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:6968
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:6969
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:6970
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4749
+#: src/xml/xmli18n-tmp.h:6971
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:6972
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:6973
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4752
+#: src/xml/xmli18n-tmp.h:6974
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:6975
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:6976
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4755
+#: src/xml/xmli18n-tmp.h:6977
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:6978
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:6979
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:6980
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4759
+#: src/xml/xmli18n-tmp.h:6981
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4760
+#: src/xml/xmli18n-tmp.h:6982
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:6983
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4762
+#: src/xml/xmli18n-tmp.h:6984
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:6985
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:6986
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4765
+#: src/xml/xmli18n-tmp.h:6987
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:6988
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:6989
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "¥×¥ê¥ó¥¿Ì¾:"
 
-#: src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:6991
 msgid "IBM 4019"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:6992
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:6993
 msgid "IBM 4312"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4772
+#: src/xml/xmli18n-tmp.h:6994
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:6995
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4774
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4775
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4776
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:6999
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:7000
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:7002
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:7003
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:7004
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:7005
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:7006
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:7007
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:7008
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:7009
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:7010
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:7011
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4790
+#: src/xml/xmli18n-tmp.h:7012
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:7013
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:7014
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:7015
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4794
+#: src/xml/xmli18n-tmp.h:7016
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:7017
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:7018
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4797
+#: src/xml/xmli18n-tmp.h:7019
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:7020
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:7021
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:7022
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:7023
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:7025
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:7026
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:7027
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:7028
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4807
+#: src/xml/xmli18n-tmp.h:7029
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4808
+#: src/xml/xmli18n-tmp.h:7030
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:7031
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:7032
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:7034
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:7035
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:7037
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:7039
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:7040
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4819
+#: src/xml/xmli18n-tmp.h:7041
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:7042
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:7043
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:7044
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:7045
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:7046
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:7047
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:7048
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:7049
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:7050
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:7051
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4830
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:7057
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4837
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4840
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4842
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4852
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4853
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4854
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4855
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4866
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4867
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4873
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4874
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4883
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4886
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4888
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4890
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4894
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4896
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4903
-msgid "Lanier MP 2500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4904
-msgid "Lanier LD125"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4905
-msgid "Lanier MP 1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4906
-msgid "Lanier LD1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4907
-msgid "Lanier MP 1350"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4908
-msgid "Lanier LD1135"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4909
-msgid "Lanier MP 1600"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4910
-msgid "Lanier LD316"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4911
-msgid "Lanier MP 161"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4912
-msgid "Lanier LD016"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4913
-msgid "Lanier MP 2000"
+#: src/xml/xmli18n-tmp.h:7125
+msgid "Lanier MP2500/LD125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4914
-msgid "Lanier LD320d"
+#: src/xml/xmli18n-tmp.h:7126
+msgid "Lanier MP 1100/LD1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4915
-msgid "Lanier MP 2510"
+#: src/xml/xmli18n-tmp.h:7127
+msgid "Lanier MP 1350/LD1135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4916
-msgid "Lanier LD325"
+#: src/xml/xmli18n-tmp.h:7128
+msgid "Lanier MP 1600/LD316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4917
-msgid "Lanier MP 2550B"
+#: src/xml/xmli18n-tmp.h:7129
+msgid "Lanier MP 161/LD016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4918
-msgid "Lanier LD425B"
+#: src/xml/xmli18n-tmp.h:7130
+msgid "Lanier MP 2000/LD320d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4919
-msgid "Lanier MP 2550"
+#: src/xml/xmli18n-tmp.h:7131
+msgid "Lanier MP 2510/LD325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4920
-msgid "Lanier LD425"
+#: src/xml/xmli18n-tmp.h:7132
+msgid "Lanier MP 2550B/LD425B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4921
-msgid "Lanier MP 3010"
+#: src/xml/xmli18n-tmp.h:7133
+msgid "Lanier MP 2550/LD425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4922
-msgid "Lanier LD330"
+#: src/xml/xmli18n-tmp.h:7134
+msgid "Lanier MP 3010/LD330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4923
-msgid "Lanier MP 3350B"
+#: src/xml/xmli18n-tmp.h:7135
+msgid "Lanier MP 3350B/LD433B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4924
-msgid "Lanier LD433B"
+#: src/xml/xmli18n-tmp.h:7136
+msgid "Lanier MP 3350/LD433"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4925
-msgid "Lanier MP 3350"
+#: src/xml/xmli18n-tmp.h:7137
+msgid "Lanier MP 3500/LD335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4926
-msgid "Lanier LD433"
+#: src/xml/xmli18n-tmp.h:7138
+msgid "Lanier MP 4000B/LD040B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4927
-msgid "Lanier MP 3500"
+#: src/xml/xmli18n-tmp.h:7139
+msgid "Lanier MP 4000/LD040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4928
-msgid "Lanier LD335"
+#: src/xml/xmli18n-tmp.h:7140
+msgid "Lanier MP 4500/LD345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4929
-msgid "Lanier MP 4000B"
+#: src/xml/xmli18n-tmp.h:7141
+msgid "Lanier MP 5000B/LD050B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4930
-msgid "Lanier LD040B"
+#: src/xml/xmli18n-tmp.h:7142
+msgid "Lanier MP 5000/LD050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4931
-msgid "Lanier MP 4000"
+#: src/xml/xmli18n-tmp.h:7143
+msgid "Lanier MP 5500/LD255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4932
-msgid "Lanier LD040"
+#: src/xml/xmli18n-tmp.h:7144
+msgid "Lanier MP 6500/LD265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4933
-msgid "Lanier MP 4500"
+#: src/xml/xmli18n-tmp.h:7145
+msgid "Lanier MP 7500/LD275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4934
-msgid "Lanier LD345"
+#: src/xml/xmli18n-tmp.h:7146
+msgid "Lanier MP 9000/LD190"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4935
-msgid "Lanier MP 5000B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4936
-msgid "Lanier LD050B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4937
-msgid "Lanier MP 5000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4938
-msgid "Lanier LD050"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4939
-msgid "Lanier MP 5500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4940
-msgid "Lanier LD255"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4941
-msgid "Lanier MP 6500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4942
-msgid "Lanier LD265"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4943
-msgid "Lanier MP 7500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4944
-msgid "Lanier LD275"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4945
-msgid "Lanier MP 9000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4946
-msgid "Lanier LD190"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:7148
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4950
+#: src/xml/xmli18n-tmp.h:7150
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:7151
 msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4952
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4953
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:7155
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4960
+#: src/xml/xmli18n-tmp.h:7160
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:7161
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:7162
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4963
+#: src/xml/xmli18n-tmp.h:7163
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:7164
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:7165
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4966
-msgid "NRG 10515"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4967
-msgid "NRG 10518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4968
-msgid "NRG 10512"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4969
-msgid "NRG 2205"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4970
-msgid "NRG 2238"
+#: src/xml/xmli18n-tmp.h:7166
+msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4971
-msgid "NRG 2212"
+#: src/xml/xmli18n-tmp.h:7167
+msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4972
-msgid "NRG 2705"
+#: src/xml/xmli18n-tmp.h:7168
+msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4973
-msgid "NRG 2738"
+#: src/xml/xmli18n-tmp.h:7169
+msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4974
-msgid "NRG 2712"
+#: src/xml/xmli18n-tmp.h:7170
+msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4975
-msgid "NRG 3205"
+#: src/xml/xmli18n-tmp.h:7171
+msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4976
-msgid "NRG 3238"
+#: src/xml/xmli18n-tmp.h:7172
+msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4977
-msgid "NRG 3212"
+#: src/xml/xmli18n-tmp.h:7173
+msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4978
-msgid "NRG 3525"
+#: src/xml/xmli18n-tmp.h:7174
+msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4979
-msgid "NRG 3508"
+#: src/xml/xmli18n-tmp.h:7175
+msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4980
-msgid "NRG 3502"
+#: src/xml/xmli18n-tmp.h:7176
+msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4981
-msgid "NRG 3545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4982
-msgid "NRG 3518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4983
-msgid "NRG 3532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4984
-msgid "NRG 4525"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4985
-msgid "NRG 4508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4986
-msgid "NRG 4502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4987
-msgid "NRG 4545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4988
-msgid "NRG 4518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4989
-msgid "NRG 4532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4990
-msgid "NRG 6002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4991
-msgid "NRG 6005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4992
-msgid "NRG 6008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4993
-msgid "NRG 7502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4994
-msgid "NRG 7505"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4995
-msgid "NRG 7508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4996
-msgid "NRG 9005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4997
-msgid "NRG 9008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4998
-msgid "NRG 9002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:7177
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:7178
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5001
+#: src/xml/xmli18n-tmp.h:7179
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:7180
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:7181
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:7182
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:7183
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5006
+#: src/xml/xmli18n-tmp.h:7184
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:7185
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:7186
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5009
+#: src/xml/xmli18n-tmp.h:7187
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:7188
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:7189
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:7190
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:7191
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:7192
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5015
+#: src/xml/xmli18n-tmp.h:7193
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5016
+#: src/xml/xmli18n-tmp.h:7194
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5017
+#: src/xml/xmli18n-tmp.h:7195
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:7196
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:7197
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:7198
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:7199
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:7200
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:7201
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:7202
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5025
+#: src/xml/xmli18n-tmp.h:7203
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:7204
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:7205
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5028
+#: src/xml/xmli18n-tmp.h:7206
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:7207
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:7208
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:7209
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:7210
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5033
+#: src/xml/xmli18n-tmp.h:7211
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:7212
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:7213
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:7214
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:7215
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:7216
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:7217
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5040
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5051
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5053
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:7234
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:7235
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5060
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5062
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5063
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:7242
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:7243
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:7244
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:7245
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:7246
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:7247
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:7248
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:7249
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5072
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5074
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5075
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5076
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:7255
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:7258
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5081
+#: src/xml/xmli18n-tmp.h:7259
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:7263
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5086
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5088
+#: src/xml/xmli18n-tmp.h:7266
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:7267
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5090
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5091
+#: src/xml/xmli18n-tmp.h:7269
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:7270
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5093
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5099
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5103
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5104
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:7284
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5107
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5108
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5110
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5118
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5120
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5126
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5127
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5131
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5133
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5134
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5138
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5146
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5147
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5150
-msgid "Savin 2535"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5151
-msgid "Savin 2235"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5152
-msgid "Savin 2545"
+#: src/xml/xmli18n-tmp.h:7328
+msgid "Savin 2535/2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5153
-msgid "Savin 2245"
+#: src/xml/xmli18n-tmp.h:7329
+msgid "Savin 2545/2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5154
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Savin 2560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5155
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5158
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5160
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5163
-msgid "Savin 4035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5164
-msgid "Savin 4135g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5165
-msgid "Savin 4035e"
+#: src/xml/xmli18n-tmp.h:7339
+msgid "Savin 4035/4135g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5166
-msgid "Savin 4135eG"
+#: src/xml/xmli18n-tmp.h:7340
+msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5167
-msgid "Savin 4045"
+#: src/xml/xmli18n-tmp.h:7341
+msgid "Savin 4045/4145g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5168
-msgid "Savin 4145g"
+#: src/xml/xmli18n-tmp.h:7342
+msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5169
-msgid "Savin 4045e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5170
-msgid "Savin 4145eG"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5171
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Savin 4060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5173
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5174
+#: src/xml/xmli18n-tmp.h:7346
 msgid "Savin 4090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:7348
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5177
+#: src/xml/xmli18n-tmp.h:7349
 msgid "Savin 8020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:7353
 msgid "Savin 8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5183
-msgid "Savin 8035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5184
-msgid "Savin 8035g"
+#: src/xml/xmli18n-tmp.h:7355
+msgid "Savin 8035/8035g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5186
-msgid "Savin 8045"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5187
-msgid "Savin 8045g"
+#: src/xml/xmli18n-tmp.h:7357
+msgid "Savin 8045/8045g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5190
+#: src/xml/xmli18n-tmp.h:7360
 msgid "Savin 8065"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5192
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Savin 8090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5194
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:7370
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5201
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:7373
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:7374
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5205
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5206
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:7379
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5211
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò"
 
-#: src/xml/xmli18n-tmp.h:5212
+#: src/xml/xmli18n-tmp.h:7382
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5213
+#: src/xml/xmli18n-tmp.h:7383
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5216
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5221
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5224
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5225
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5227
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5230
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:7404
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5236
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:7409
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:7410
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5244
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5247
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5249
+#: src/xml/xmli18n-tmp.h:7419
+msgid "Canon SELPHY-CP-520"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Canon SELPHY-CP-720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5252
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Canon SELPHY-CP-730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Canon SELPHY-CP-740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Canon SELPHY-CP-750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Canon SELPHY ES1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Canon SELPHY ES2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Canon SELPHY ES20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5258
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5259
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:7434
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:7438
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5268
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Dai Nippon Printing DS40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Dai Nippon Printing DS80"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5269
+#: src/xml/xmli18n-tmp.h:7442
 msgid "RAW DATA 8 bit"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Epson Stylus Offixe TX300F"
+#~ msgstr "Stylus C20sx"
+
 #~ msgid "ISOLatin1"
 #~ msgstr "ISO ¥é¥Æ¥ó£±"
 
diff --git a/po/nb.gmo b/po/nb.gmo
index de8f2a5..901e226 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index b58a7ae..7aa4948 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: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-21 22:25-0500\n"
+"POT-Creation-Date: 2009-07-26 19:14-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"
@@ -17,7 +17,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2109 src/main/print-pcl.c:1779
+#: src/main/print-escp2.c:2314 src/main/print-pcl.c:1779
 #, fuzzy
 msgid "Default"
 msgstr "Sett til standardverdier"
@@ -94,15 +94,15 @@ msgstr "Tetthet:"
 
 #: src/main/dither-main.c:91 src/main/print-canon.c:300
 #: src/main/print-canon.c:308 src/main/print-canon.c:316
-#: src/main/print-canon.c:324 src/main/print-escp2.c:439
-#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
-#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-canon.c:324 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: 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-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:1769
-#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
-#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1935
+#: src/main/print-olympus.c:1943 src/main/print-olympus.c:1951
+#: src/main/print-olympus.c:1959 src/main/print-pcl.c:1324
 #: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
 #: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
@@ -153,7 +153,7 @@ msgid "Dither algorithm"
 msgstr "Dither-algoritme"
 
 #: src/main/print-canon.c:199 src/main/print-escp2.c:165
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1866
 #: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
@@ -171,8 +171,8 @@ msgstr "Størrelse"
 #: src/main/print-escp2.c:254 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:1704 src/main/print-olympus.c:1710
-#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-olympus.c:1866 src/main/print-olympus.c:1872
+#: src/main/print-olympus.c:1878 src/main/print-olympus.c:1884
 #: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
 #: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
 #: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
@@ -182,32 +182,32 @@ msgid "Basic Printer Setup"
 msgstr "Innstillinger for parametere"
 
 #: src/main/print-canon.c:200 src/main/print-escp2.c:166
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1867
 #: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Bredde på papiret du skal skrive ut på"
 
 #: src/main/print-canon.c:205 src/main/print-escp2.c:171
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1259 src/cups/genppd.c:1339 src/cups/genppd.c:2001
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1872
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1372 src/cups/genppd.c:2035
 msgid "Media Type"
 msgstr "Medietype"
 
 #: src/main/print-canon.c:206 src/main/print-escp2.c:172
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1873
 #: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
 #: src/main/print-canon.c:211 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
-#: src/main/print-pcl.c:1265 src/cups/genppd.c:1368 src/cups/genppd.c:2020
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1878
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1401 src/cups/genppd.c:2054
 msgid "Media Source"
 msgstr "Mediekilde"
 
 #: src/main/print-canon.c:212 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1879
 #: src/main/print-pcl.c:1266
 msgid "Source (input slot) of the media"
 msgstr ""
@@ -244,8 +244,8 @@ msgstr ""
 #: src/main/print-canon.c:235 src/main/print-canon.c:241
 #: src/main/print-canon.c:253 src/main/print-escp2.c:207
 #: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1906
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
@@ -260,25 +260,25 @@ msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:247 src/main/print-escp2.c:219
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
-#: src/main/print-pcl.c:1277 src/cups/genppd.c:1446 src/cups/genppd.c:2056
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1884
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1479 src/cups/genppd.c:2090
 msgid "Resolution"
 msgstr "Oppløsning"
 
 #: src/main/print-canon.c:248 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1723
+#: src/main/print-olympus.c:1885
 msgid "Resolution and quality of the print"
 msgstr "Oppløsning og kvalitet på utskriften"
 
 #: src/main/print-canon.c:253 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Blekktype"
 
 #: src/main/print-canon.c:254 src/main/print-escp2.c:231
 #: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
+#: src/main/print-olympus.c:1891 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Type blekk i skriveren"
@@ -296,17 +296,18 @@ msgstr ""
 #: 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-escp2.c:320 src/main/print-escp2.c:767
-#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
-#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
-#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
-#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:893 src/main/print-escp2.c:901
+#: src/main/print-escp2.c:909 src/main/print-escp2.c:925
+#: src/main/print-escp2.c:933 src/main/print-escp2.c:941
+#: src/main/print-escp2.c:949 src/main/print-escp2.c:957
+#: src/main/print-escp2.c:965 src/main/print-escp2.c:973
 #: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:265 src/main/print-escp2.c:326
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-canon.c:265 src/main/print-escp2.c:332
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1912
 #: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
@@ -314,16 +315,16 @@ msgstr "Raskt heltall"
 
 #: src/main/print-canon.c:265 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:326
-#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-color.c:208 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1912 src/main/print-pcl.c:1295
 #: src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Vanlig papir"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:327
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-canon.c:266 src/main/print-escp2.c:333
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1913
 #: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
@@ -351,52 +352,52 @@ msgstr ""
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:300 src/main/print-escp2.c:439
+#: src/main/print-canon.c:300 src/main/print-escp2.c:445
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Tetthet:"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:301 src/main/print-escp2.c:446
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 msgid "Adjust the cyan density"
 msgstr ""
 
-#: src/main/print-canon.c:308 src/main/print-escp2.c:447
+#: src/main/print-canon.c:308 src/main/print-escp2.c:453
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:309 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 msgid "Adjust the magenta density"
 msgstr ""
 
-#: src/main/print-canon.c:316 src/main/print-escp2.c:455
+#: src/main/print-canon.c:316 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Tetthet:"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:317 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 msgid "Adjust the yellow density"
 msgstr ""
 
-#: src/main/print-canon.c:324 src/main/print-escp2.c:463
+#: src/main/print-canon.c:324 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 #, fuzzy
 msgid "Black Density"
 msgstr "Tetthet:"
 
-#: src/main/print-canon.c:325 src/main/print-escp2.c:464
+#: src/main/print-canon.c:325 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 msgid "Adjust the black density"
 msgstr ""
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:333
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:541 src/main/print-escp2.c:542
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 #, fuzzy
@@ -404,29 +405,36 @@ msgid "Light Cyan Transition"
 msgstr "Lys cyan"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:340
-#: src/main/print-canon.c:348 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
-#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
-#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
-#: src/main/print-pcl.c:1364
+#: src/main/print-canon.c:348 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:541
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:557
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:573
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:589
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:605
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:621
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:637
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:653
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:669
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:685
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:701
+#: src/main/print-escp2.c:709 src/main/print-escp2.c:717
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:733
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:749
+#: src/main/print-escp2.c:757 src/main/print-escp2.c:765
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:781
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:797
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:813
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:829
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:845
+#: src/main/print-escp2.c:853 src/main/print-escp2.c:861
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:340 src/main/print-canon.c:341
-#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
+#: src/main/print-escp2.c:573 src/main/print-escp2.c:574
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #, fuzzy
@@ -438,14 +446,14 @@ msgstr "Lys magenta"
 msgid "Light Yellow Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-canon.c:368 src/main/print-escp2.c:2283
-#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3609
-#: src/xml/xmli18n-tmp.h:3614 src/xml/xmli18n-tmp.h:3620
-#: src/xml/xmli18n-tmp.h:3627
+#: src/main/print-canon.c:368 src/main/print-escp2.c:2488
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5851 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5864
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:369 src/main/print-escp2.c:2285
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2490
 #: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
@@ -454,67 +462,68 @@ msgstr ""
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:646 src/main/print-escp2.c:2005
-#: src/xml/xmli18n-tmp.h:3676
+#: src/main/print-canon.c:646 src/main/print-escp2.c:2210
+#: src/xml/xmli18n-tmp.h:5913
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:648 src/main/print-escp2.c:2007
-#: src/xml/xmli18n-tmp.h:3677
+#: src/main/print-canon.c:648 src/main/print-escp2.c:2212
+#: src/xml/xmli18n-tmp.h:5914
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:650 src/main/print-escp2.c:2009
-#: src/xml/xmli18n-tmp.h:3678
+#: src/main/print-canon.c:650 src/main/print-escp2.c:2214
+#: src/xml/xmli18n-tmp.h:5915
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Egendefinert"
 
-#: src/main/print-canon.c:673 src/main/print-escp2.c:2034
-#: src/cups/genppd.c:1323 src/cups/genppd.c:1572 src/cups/genppd.c:1988
-#: src/cups/genppd.c:2079
+#: src/main/print-canon.c:673 src/main/print-escp2.c:2239
+#: src/cups/genppd.c:1356 src/cups/genppd.c:1605 src/cups/genppd.c:2022
+#: src/cups/genppd.c:2113
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:675 src/main/print-escp2.c:2036
+#: src/main/print-canon.c:675 src/main/print-escp2.c:2241
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Skriv ut til fil?"
 
-#: src/main/print-canon.c:790 src/main/print-escp2.c:2447
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-canon.c:790 src/main/print-escp2.c:2652
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2167
 #: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
 #: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Farger"
 
-#: src/main/print-canon.c:792 src/main/print-escp2.c:2449
+#: src/main/print-canon.c:792 src/main/print-escp2.c:2654
 #: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
 #: src/main/print-ps.c:331 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
 msgstr "Sort-hvitt"
 
-#: src/main/print-canon.c:831 src/main/print-escp2.c:2089
+#: src/main/print-canon.c:831 src/main/print-escp2.c:2294
 #: src/main/print-pcl.c:1797 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Utskriftstype:"
 
-#: src/main/print-canon.c:833 src/main/print-escp2.c:2131
-#: src/main/print-escp2.c:2229 src/main/print-escp2.c:2241
+#: src/main/print-canon.c:833 src/main/print-escp2.c:2336
+#: src/main/print-escp2.c:2434 src/main/print-escp2.c:2446
 #: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
 #: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
-#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1215
-#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1219
-#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
-#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3170
-#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3177
-#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3461
-#: src/xml/xmli18n-tmp.h:3464 src/xml/xmli18n-tmp.h:3632
-#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3648
-#: src/xml/xmli18n-tmp.h:3657 src/xml/xmli18n-tmp.h:3665
+#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1627 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3713 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3722 src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5902
 msgid "Standard"
 msgstr "Standard"
 
@@ -553,7 +562,7 @@ msgid "Pre-Dithered"
 msgstr "Skriv ut"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1268 src/cups/genppd.c:1971
+#: src/cups/genppd.c:1301 src/cups/genppd.c:2005
 msgid "Grayscale"
 msgstr "Gråtoner"
 
@@ -570,11 +579,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1299 src/cups/genppd.c:1978
+#: src/main/print-color.c:129 src/cups/genppd.c:1332 src/cups/genppd.c:2012
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1306 src/cups/genppd.c:1979
+#: src/main/print-color.c:131 src/cups/genppd.c:1339 src/cups/genppd.c:2013
 msgid "KCMY"
 msgstr ""
 
@@ -640,7 +649,7 @@ msgid "Output image type"
 msgstr "Utskriftstype:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338
 msgid "Raw Channels"
 msgstr ""
 
@@ -706,56 +715,208 @@ msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
 #: src/escputil/escputil.c:997 src/escputil/escputil.c:1017
-#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:1812
-#: src/xml/xmli18n-tmp.h:1823 src/xml/xmli18n-tmp.h:1836
-#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1863
-#: src/xml/xmli18n-tmp.h:1876 src/xml/xmli18n-tmp.h:1889
-#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1918
-#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1949
-#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1975
-#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:1999
-#: src/xml/xmli18n-tmp.h:2013 src/xml/xmli18n-tmp.h:2027
-#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2051
-#: src/xml/xmli18n-tmp.h:2064 src/xml/xmli18n-tmp.h:2076
-#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2102
-#: src/xml/xmli18n-tmp.h:2116 src/xml/xmli18n-tmp.h:2130
-#: src/xml/xmli18n-tmp.h:2143 src/xml/xmli18n-tmp.h:2156
-#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2184
-#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2210
-#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2236
-#: src/xml/xmli18n-tmp.h:2249 src/xml/xmli18n-tmp.h:2262
-#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2290
-#: src/xml/xmli18n-tmp.h:2305 src/xml/xmli18n-tmp.h:2320
-#: src/xml/xmli18n-tmp.h:2332 src/xml/xmli18n-tmp.h:2343
-#: src/xml/xmli18n-tmp.h:2356 src/xml/xmli18n-tmp.h:2369
-#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2392
-#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2415
-#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2442
-#: src/xml/xmli18n-tmp.h:2454 src/xml/xmli18n-tmp.h:2466
-#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2496
-#: src/xml/xmli18n-tmp.h:2509 src/xml/xmli18n-tmp.h:2522
-#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
-#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2574
-#: src/xml/xmli18n-tmp.h:2586 src/xml/xmli18n-tmp.h:2598
-#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2623
-#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2653
-#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2683
-#: src/xml/xmli18n-tmp.h:2697 src/xml/xmli18n-tmp.h:2715
-#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2745
-#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
-#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2803
-#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2828
-#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2854
-#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2881
-#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2915
-#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2943
-#: src/xml/xmli18n-tmp.h:2959 src/xml/xmli18n-tmp.h:2976
-#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:3004
-#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3032
-#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3062
-#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3093
-#: src/xml/xmli18n-tmp.h:3107 src/xml/xmli18n-tmp.h:3125
-#: src/xml/xmli18n-tmp.h:3141
+#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2387
+#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2413
+#: src/xml/xmli18n-tmp.h:2426 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2499
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2551
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2575
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2708
+#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2786
+#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2814
+#: src/xml/xmli18n-tmp.h:2829 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2893
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2966
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3005 src/xml/xmli18n-tmp.h:3020
+#: src/xml/xmli18n-tmp.h:3033 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3061 src/xml/xmli18n-tmp.h:3073
+#: src/xml/xmli18n-tmp.h:3085 src/xml/xmli18n-tmp.h:3098
+#: src/xml/xmli18n-tmp.h:3110 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3377
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3616
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3648
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3766 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3775 src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:3794 src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:3805 src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3869 src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:3880 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3902 src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:3913 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:3948 src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:3970 src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:3983 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4023 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4064 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4075 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4088 src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:4103 src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:4118 src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:4143 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:4203 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4275 src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4309 src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4356 src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4421
+#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4449
+#: src/xml/xmli18n-tmp.h:4456 src/xml/xmli18n-tmp.h:4462
+#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4485 src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:4551 src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:4694 src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4717 src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:4818 src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:4829 src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4885 src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4935
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:5041 src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:5052 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:5121 src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5165
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5182 src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:5193 src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:5271 src/xml/xmli18n-tmp.h:5299
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5327 src/xml/xmli18n-tmp.h:5331
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5347
+#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5367 src/xml/xmli18n-tmp.h:5371
+#: src/xml/xmli18n-tmp.h:5383 src/xml/xmli18n-tmp.h:5388
+#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5440
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5461 src/xml/xmli18n-tmp.h:5468
+#: src/xml/xmli18n-tmp.h:5476 src/xml/xmli18n-tmp.h:5486
+#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5514
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5525
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5543
+#: src/xml/xmli18n-tmp.h:5550 src/xml/xmli18n-tmp.h:5556
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5574 src/xml/xmli18n-tmp.h:5582
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5592
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5625
+#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5649
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5662
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5690
+#: src/xml/xmli18n-tmp.h:5694 src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5731
+#: src/xml/xmli18n-tmp.h:5738 src/xml/xmli18n-tmp.h:5742
+#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5759
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5770
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5807
+#: src/xml/xmli18n-tmp.h:5811 src/xml/xmli18n-tmp.h:5817
+#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5828
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5843
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -765,56 +926,208 @@ msgstr ""
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
 #: src/escputil/escputil.c:998 src/escputil/escputil.c:1018
-#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:1813
-#: src/xml/xmli18n-tmp.h:1824 src/xml/xmli18n-tmp.h:1837
-#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1864
-#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1890
-#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1919
-#: src/xml/xmli18n-tmp.h:1935 src/xml/xmli18n-tmp.h:1950
-#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1976
-#: src/xml/xmli18n-tmp.h:1988 src/xml/xmli18n-tmp.h:2000
-#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2028
-#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2052
-#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2077
-#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2103
-#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2131
-#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2157
-#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2185
-#: src/xml/xmli18n-tmp.h:2198 src/xml/xmli18n-tmp.h:2211
-#: src/xml/xmli18n-tmp.h:2224 src/xml/xmli18n-tmp.h:2237
-#: src/xml/xmli18n-tmp.h:2250 src/xml/xmli18n-tmp.h:2263
-#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2291
-#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2321
-#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2344
-#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2370
-#: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2393
-#: src/xml/xmli18n-tmp.h:2405 src/xml/xmli18n-tmp.h:2416
-#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2443
-#: src/xml/xmli18n-tmp.h:2455 src/xml/xmli18n-tmp.h:2467
-#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2497
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2523
-#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2575
-#: src/xml/xmli18n-tmp.h:2587 src/xml/xmli18n-tmp.h:2599
-#: src/xml/xmli18n-tmp.h:2611 src/xml/xmli18n-tmp.h:2624
-#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
-#: src/xml/xmli18n-tmp.h:2670 src/xml/xmli18n-tmp.h:2684
-#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2714
-#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2747
-#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2780
-#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
-#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2829
-#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2855
-#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2882
-#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2914
-#: src/xml/xmli18n-tmp.h:2931 src/xml/xmli18n-tmp.h:2944
-#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2975
-#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:3005
-#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3033
-#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3060
-#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3094
-#: src/xml/xmli18n-tmp.h:3108 src/xml/xmli18n-tmp.h:3124
-#: src/xml/xmli18n-tmp.h:3140
+#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2361
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2388
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2414
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2459 src/xml/xmli18n-tmp.h:2474
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2512 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2552
+#: src/xml/xmli18n-tmp.h:2564 src/xml/xmli18n-tmp.h:2576
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2787
+#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2815
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2868
+#: src/xml/xmli18n-tmp.h:2881 src/xml/xmli18n-tmp.h:2894
+#: src/xml/xmli18n-tmp.h:2905 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:2967
+#: src/xml/xmli18n-tmp.h:2979 src/xml/xmli18n-tmp.h:2991
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3062 src/xml/xmli18n-tmp.h:3074
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3099
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3135 src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:3163 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3353
+#: src/xml/xmli18n-tmp.h:3365 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
+#: src/xml/xmli18n-tmp.h:3420 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3542 src/xml/xmli18n-tmp.h:3556
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3600 src/xml/xmli18n-tmp.h:3617
+#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3647
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3751 src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:3784 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3795 src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:3806 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3837 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3903 src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3939 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3960 src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:3972 src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:3984 src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:3999 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:4039 src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:4104 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:4170 src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4194 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:4230 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:4276 src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4311 src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4338 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:4401 src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:4427 src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:4442 src/xml/xmli18n-tmp.h:4451
+#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4464
+#: src/xml/xmli18n-tmp.h:4470 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4486 src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:4511 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:4809 src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4909 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:5007 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5018 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5111 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5123 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5148 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:5240 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5250 src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:5261 src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5301
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5313
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5349
+#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5401
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5441
+#: src/xml/xmli18n-tmp.h:5453 src/xml/xmli18n-tmp.h:5458
+#: src/xml/xmli18n-tmp.h:5463 src/xml/xmli18n-tmp.h:5470
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5496 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5527
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5552 src/xml/xmli18n-tmp.h:5558
+#: src/xml/xmli18n-tmp.h:5564 src/xml/xmli18n-tmp.h:5568
+#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5593
+#: src/xml/xmli18n-tmp.h:5598 src/xml/xmli18n-tmp.h:5616
+#: src/xml/xmli18n-tmp.h:5620 src/xml/xmli18n-tmp.h:5626
+#: src/xml/xmli18n-tmp.h:5631 src/xml/xmli18n-tmp.h:5651
+#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
+#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5674
+#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5720
+#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5733
+#: src/xml/xmli18n-tmp.h:5739 src/xml/xmli18n-tmp.h:5743
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5818
+#: src/xml/xmli18n-tmp.h:5823 src/xml/xmli18n-tmp.h:5829
+#: src/xml/xmli18n-tmp.h:5833 src/xml/xmli18n-tmp.h:5839
+#: src/xml/xmli18n-tmp.h:5844
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -824,56 +1137,208 @@ msgstr ""
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
 #: src/escputil/escputil.c:999 src/escputil/escputil.c:1019
-#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:1814
-#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
-#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1865
-#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1891
-#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1920
-#: src/xml/xmli18n-tmp.h:1936 src/xml/xmli18n-tmp.h:1951
-#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1977
-#: src/xml/xmli18n-tmp.h:1989 src/xml/xmli18n-tmp.h:2001
-#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2029
-#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2053
-#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2078
-#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2104
-#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
-#: src/xml/xmli18n-tmp.h:2145 src/xml/xmli18n-tmp.h:2158
-#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2186
-#: src/xml/xmli18n-tmp.h:2199 src/xml/xmli18n-tmp.h:2212
-#: src/xml/xmli18n-tmp.h:2225 src/xml/xmli18n-tmp.h:2238
-#: src/xml/xmli18n-tmp.h:2251 src/xml/xmli18n-tmp.h:2264
-#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2292
-#: src/xml/xmli18n-tmp.h:2307 src/xml/xmli18n-tmp.h:2322
-#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
-#: src/xml/xmli18n-tmp.h:2358 src/xml/xmli18n-tmp.h:2371
-#: src/xml/xmli18n-tmp.h:2382 src/xml/xmli18n-tmp.h:2394
-#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2417
-#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2444
-#: src/xml/xmli18n-tmp.h:2456 src/xml/xmli18n-tmp.h:2468
-#: src/xml/xmli18n-tmp.h:2483 src/xml/xmli18n-tmp.h:2498
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2524
-#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2551
-#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2576
-#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
-#: src/xml/xmli18n-tmp.h:2612 src/xml/xmli18n-tmp.h:2625
-#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2651
-#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2685
-#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2713
-#: src/xml/xmli18n-tmp.h:2734 src/xml/xmli18n-tmp.h:2749
-#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2779
-#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2805
-#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2830
-#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2856
-#: src/xml/xmli18n-tmp.h:2871 src/xml/xmli18n-tmp.h:2883
-#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2910
-#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2945
-#: src/xml/xmli18n-tmp.h:2960 src/xml/xmli18n-tmp.h:2974
-#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3006
-#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3034
-#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3061
-#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3095
-#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3120
-#: src/xml/xmli18n-tmp.h:3136
+#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2389
+#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2444
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2475
+#: src/xml/xmli18n-tmp.h:2488 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2513 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2565 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2602
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2762
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2788
+#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2816
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2846
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2906 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3022
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3048
+#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3075
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3124
+#: src/xml/xmli18n-tmp.h:3136 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3175
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3315 src/xml/xmli18n-tmp.h:3329
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3433
+#: src/xml/xmli18n-tmp.h:3455 src/xml/xmli18n-tmp.h:3468
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3497
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3601 src/xml/xmli18n-tmp.h:3618
+#: src/xml/xmli18n-tmp.h:3632 src/xml/xmli18n-tmp.h:3643
+#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3747 src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3834 src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:3844 src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:3867 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:3900 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3910 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3935 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:3967 src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:3979 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4005 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4062 src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4110 src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:4124 src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4167 src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:4272 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:4321 src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:4334 src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4367 src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4471
+#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4505 src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4549 src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:4562 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4580 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4602 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:4678 src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:4691 src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4770 src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4893 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4904 src/xml/xmli18n-tmp.h:4911
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:4971 src/xml/xmli18n-tmp.h:4978
+#: src/xml/xmli18n-tmp.h:5004 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5050 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5071 src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:5097 src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:5142 src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:5169 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5184
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5257 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5318
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5358
+#: src/xml/xmli18n-tmp.h:5364 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5385
+#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5438
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5454
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5465
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5511
+#: src/xml/xmli18n-tmp.h:5516 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5547 src/xml/xmli18n-tmp.h:5554
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5584 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5617 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5632
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5687
+#: src/xml/xmli18n-tmp.h:5692 src/xml/xmli18n-tmp.h:5698
+#: src/xml/xmli18n-tmp.h:5705 src/xml/xmli18n-tmp.h:5713
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5729
+#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
+#: src/xml/xmli18n-tmp.h:5744 src/xml/xmli18n-tmp.h:5756
+#: src/xml/xmli18n-tmp.h:5761 src/xml/xmli18n-tmp.h:5767
+#: src/xml/xmli18n-tmp.h:5774 src/xml/xmli18n-tmp.h:5782
+#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5792
+#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5803
+#: src/xml/xmli18n-tmp.h:5809 src/xml/xmli18n-tmp.h:5813
+#: src/xml/xmli18n-tmp.h:5819 src/xml/xmli18n-tmp.h:5824
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5845
 msgid "Yellow"
 msgstr "Gul"
 
@@ -883,9 +1348,17 @@ msgstr ""
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
 #: src/escputil/escputil.c:1006 src/escputil/escputil.c:1025
-#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2700
-#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2795
-#: src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:4041 src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:4056 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4091 src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:4155 src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5155
 msgid "Red"
 msgstr ""
 
@@ -903,8 +1376,13 @@ msgstr ""
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
 #: src/escputil/escputil.c:1007 src/escputil/escputil.c:1026
-#: src/xml/xmli18n-tmp.h:2657 src/xml/xmli18n-tmp.h:2701
-#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4051 src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:4084 src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:5156
 msgid "Blue"
 msgstr ""
 
@@ -915,53 +1393,183 @@ msgstr ""
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
 #: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1016 src/escputil/escputil.c:1285
-#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
-#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
-#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1875
-#: src/xml/xmli18n-tmp.h:1888 src/xml/xmli18n-tmp.h:1901
-#: src/xml/xmli18n-tmp.h:1917 src/xml/xmli18n-tmp.h:1933
-#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1961
-#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1986
-#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2012
-#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2038
-#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2063
-#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2090
-#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2115
-#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2142
-#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2169
-#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
-#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
-#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2248
-#: src/xml/xmli18n-tmp.h:2261 src/xml/xmli18n-tmp.h:2274
-#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2304
-#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2331
-#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
-#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
-#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2403
-#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2420
-#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2441
-#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2465
-#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2495
-#: src/xml/xmli18n-tmp.h:2508 src/xml/xmli18n-tmp.h:2521
-#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
-#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2573
-#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2597
-#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2622
-#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2672
-#: src/xml/xmli18n-tmp.h:2682 src/xml/xmli18n-tmp.h:2731
-#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2764
-#: src/xml/xmli18n-tmp.h:2781 src/xml/xmli18n-tmp.h:2794
-#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2815
-#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2839
-#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2868
-#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2894
-#: src/xml/xmli18n-tmp.h:2911 src/xml/xmli18n-tmp.h:2929
-#: src/xml/xmli18n-tmp.h:2942 src/xml/xmli18n-tmp.h:2977
-#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:3003
-#: src/xml/xmli18n-tmp.h:3017 src/xml/xmli18n-tmp.h:3031
-#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3079
-#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3110
-#: src/xml/xmli18n-tmp.h:3121 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2372
+#: src/xml/xmli18n-tmp.h:2386 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2457
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2510
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2536
+#: src/xml/xmli18n-tmp.h:2550 src/xml/xmli18n-tmp.h:2562
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2599 src/xml/xmli18n-tmp.h:2614
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2639
+#: src/xml/xmli18n-tmp.h:2653 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2965
+#: src/xml/xmli18n-tmp.h:2977 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3019
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3060 src/xml/xmli18n-tmp.h:3072
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3133 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3196
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3526
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3680 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3755 src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:3804 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3819 src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:3831 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3846 src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3873 src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:3924 src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:3943 src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:4022 src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4059 src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:4142 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4164 src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:4179 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:4255 src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4289 src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:4308 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4413 src/xml/xmli18n-tmp.h:4420
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4455
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4507 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:4565 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:4604 src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:4702 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:4733 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:4786 src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4920 src/xml/xmli18n-tmp.h:4926
+#: src/xml/xmli18n-tmp.h:4934 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:4973 src/xml/xmli18n-tmp.h:4981
+#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:4993
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:5047 src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5151
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5186
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5223 src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5270
+#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5284
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5320
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5337
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5375
+#: src/xml/xmli18n-tmp.h:5378 src/xml/xmli18n-tmp.h:5380
+#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5435
+#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5447
+#: src/xml/xmli18n-tmp.h:5449 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5474
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5492
+#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5571
+#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5590
+#: src/xml/xmli18n-tmp.h:5596 src/xml/xmli18n-tmp.h:5602
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5614
+#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5629
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5655
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5680 src/xml/xmli18n-tmp.h:5682
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5700
+#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5716
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5749
+#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5769 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5794
+#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5806
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5836
+#: src/xml/xmli18n-tmp.h:5842
 msgid "Black"
 msgstr "Sort"
 
@@ -969,7 +1577,7 @@ msgstr "Sort"
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1769
+#: src/main/print-color.c:322 src/main/print-olympus.c:1935
 msgid "Cyan Balance"
 msgstr ""
 
@@ -983,7 +1591,7 @@ msgstr "Gråtoner"
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1777
+#: src/main/print-color.c:330 src/main/print-olympus.c:1943
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
@@ -992,7 +1600,7 @@ msgstr "Magenta"
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1785
+#: src/main/print-color.c:338 src/main/print-olympus.c:1951
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Gul"
@@ -1020,11 +1628,11 @@ msgstr "Blekktype"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
-#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
-#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
-#: src/main/print-escp2.c:759
+#: src/main/print-escp2.c:344 src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356 src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368 src/main/print-escp2.c:374
+#: src/main/print-escp2.c:869 src/main/print-escp2.c:877
+#: src/main/print-escp2.c:885
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Utskriftstype:"
@@ -1033,27 +1641,27 @@ msgstr "Utskriftstype:"
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:743
+#: src/main/print-color.c:365 src/main/print-escp2.c:869
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:744
+#: src/main/print-color.c:366 src/main/print-escp2.c:870
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:751
+#: src/main/print-color.c:373 src/main/print-escp2.c:877
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:752
+#: src/main/print-color.c:374 src/main/print-escp2.c:878
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:759
+#: src/main/print-color.c:381 src/main/print-escp2.c:885
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:760
+#: src/main/print-color.c:382 src/main/print-escp2.c:886
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -1324,11 +1932,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1906
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1907
 msgid "Print without borders"
 msgstr ""
 
@@ -1341,7 +1949,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:266 src/main/print-escp2.c:267
-#: src/cups/genppd.c:1567 src/cups/genppd.c:2078
+#: src/cups/genppd.c:1600 src/cups/genppd.c:2112
 #, fuzzy
 msgid "Output Order"
 msgstr "Utskriftstype:"
@@ -1386,370 +1994,486 @@ msgstr ""
 
 #: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 #, fuzzy
+msgid "Raw Channel Names"
+msgstr "Avbryt"
+
+#: src/main/print-escp2.c:326 src/main/print-escp2.c:327
+#, fuzzy
 msgid "Channel Names"
 msgstr "Avbryt"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:339
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:344
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Cyan"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:345
 msgid "Adjust the cyan map"
 msgstr ""
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Magenta"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:351
 msgid "Adjust the magenta map"
 msgstr ""
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Gul"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:357
 msgid "Adjust the yellow map"
 msgstr ""
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362
 #, fuzzy
 msgid "Blue Map"
 msgstr "Sort-hvitt"
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:363
 msgid "Adjust the blue map"
 msgstr ""
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368
 #, fuzzy
 msgid "Orange Map"
 msgstr "Cyan"
 
-#: src/main/print-escp2.c:363
+#: src/main/print-escp2.c:369
 msgid "Adjust the orange map"
 msgstr ""
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:374
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:369
+#: src/main/print-escp2.c:375
 msgid "Adjust the red map"
 msgstr ""
 
-#: src/main/print-escp2.c:471
+#: src/main/print-escp2.c:477
 #, fuzzy
 msgid "Red Density"
 msgstr "Tetthet:"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:478
 msgid "Adjust the red density"
 msgstr ""
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:485
 #, fuzzy
 msgid "Blue Density"
 msgstr "Tetthet:"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:486
 msgid "Adjust the blue density"
 msgstr ""
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:493
 #, fuzzy
 msgid "Orange Density"
 msgstr "Tetthet:"
 
-#: src/main/print-escp2.c:488
+#: src/main/print-escp2.c:494
 msgid "Adjust the orange density"
 msgstr ""
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:501
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Glanset film"
 
-#: src/main/print-escp2.c:496
+#: src/main/print-escp2.c:502
 msgid "Adjust the gloss level"
 msgstr ""
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:509
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:504
+#: src/main/print-escp2.c:510
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:517
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:512
+#: src/main/print-escp2.c:518
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:525
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:520
+#: src/main/print-escp2.c:526
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:534
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:550
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "Tetthet:"
 
-#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
+#: src/main/print-escp2.c:557 src/main/print-escp2.c:558
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "Lys magenta"
 
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:566
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "Magenta"
 
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:582
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "Gul"
 
-#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
+#: src/main/print-escp2.c:589 src/main/print-escp2.c:590
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:598
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "Tetthet:"
 
-#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
+#: src/main/print-escp2.c:605 src/main/print-escp2.c:606
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:630
 #, fuzzy
 msgid "Gray Value"
 msgstr "Gråtoner"
 
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
-#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:614
+#: src/main/print-escp2.c:637 src/main/print-escp2.c:638
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
+#: src/main/print-escp2.c:621 src/main/print-escp2.c:622
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:646
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "Gråtoner"
 
-#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
+#: src/main/print-escp2.c:653 src/main/print-escp2.c:654
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:726
 #, fuzzy
 msgid "Light Gray Value"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
-#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:662
+#: src/main/print-escp2.c:733 src/main/print-escp2.c:734
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
-#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
+#: src/main/print-escp2.c:669 src/main/print-escp2.c:670
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:742
 #, fuzzy
 msgid "Light Gray Density Scale"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:678
 #, fuzzy
 msgid "Dark Gray Value"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
+#: src/main/print-escp2.c:685 src/main/print-escp2.c:686
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:694
 #, fuzzy
 msgid "Dark Gray Density Scale"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:701
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "Gråtoner"
 
-#: src/main/print-escp2.c:696
+#: src/main/print-escp2.c:702
 #, fuzzy
 msgid "Medium Gray Value"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:709
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:704
+#: src/main/print-escp2.c:710
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:717
 #, fuzzy
 msgid "Mid Gray Density Scale"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:712
+#: src/main/print-escp2.c:718
 #, fuzzy
 msgid "Medium Gray Density Scale"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:767
+#: src/main/print-escp2.c:749
+#, fuzzy
+msgid "Hextone Gray 5 Value"
+msgstr "Gråtoner"
+
+#: src/main/print-escp2.c:750
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:757
+#, fuzzy
+msgid "Hextone Gray 5 Transition"
+msgstr "Lys cyan"
+
+#: src/main/print-escp2.c:758
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr "Lys cyan"
+
+#: src/main/print-escp2.c:765
+#, fuzzy
+msgid "Hextone Gray 5 Density Scale"
+msgstr "Gråtoner"
+
+#: src/main/print-escp2.c:766
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr "Lys cyan"
+
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:774
+#, fuzzy
+msgid "Hextone Gray 4 Value"
+msgstr "Gråtoner"
+
+#: src/main/print-escp2.c:781 src/main/print-escp2.c:782
+#, fuzzy
+msgid "Hextone Gray 4 Transition"
+msgstr "Lys cyan"
+
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:790
+#, fuzzy
+msgid "Hextone Gray 4 Density Scale"
+msgstr "Gråtoner"
+
+#: src/main/print-escp2.c:797 src/main/print-escp2.c:798
+#, fuzzy
+msgid "Hextone Gray 3 Value"
+msgstr "Gråtoner"
+
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:806
+#, fuzzy
+msgid "Hextone Gray 3 Transition"
+msgstr "Lys cyan"
+
+#: src/main/print-escp2.c:813 src/main/print-escp2.c:814
+#, fuzzy
+msgid "Hextone Gray 3 Density Scale"
+msgstr "Gråtoner"
+
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:822
+#, fuzzy
+msgid "Hextone Gray 2 Value"
+msgstr "Gråtoner"
+
+#: src/main/print-escp2.c:829 src/main/print-escp2.c:830
+#, fuzzy
+msgid "Hextone Gray 2 Transition"
+msgstr "Lys cyan"
+
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:838
+#, fuzzy
+msgid "Hextone Gray 2 Density Scale"
+msgstr "Gråtoner"
+
+#: src/main/print-escp2.c:845
+#, fuzzy
+msgid "Hextone Gray 1 Value"
+msgstr "Gråtoner"
+
+#: src/main/print-escp2.c:846
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:853
+#, fuzzy
+msgid "Hextone Gray 1 Transition"
+msgstr "Lys cyan"
+
+#: src/main/print-escp2.c:854
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr "Lys magenta"
+
+#: src/main/print-escp2.c:861
+#, fuzzy
+msgid "Hextone Gray 1 Density Scale"
+msgstr "Gråtoner"
+
+#: src/main/print-escp2.c:862
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr "Magenta"
+
+#: src/main/print-escp2.c:893
 msgid "Drying Time Per Page"
 msgstr ""
 
-#: src/main/print-escp2.c:768
+#: src/main/print-escp2.c:894
 msgid "Set drying time per page"
 msgstr ""
 
-#: src/main/print-escp2.c:775
+#: src/main/print-escp2.c:901
 msgid "Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:776
+#: src/main/print-escp2.c:902
 msgid "Set drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:783
+#: src/main/print-escp2.c:909
 msgid "Minimum Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:784
+#: src/main/print-escp2.c:910
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:799
+#: src/main/print-escp2.c:925
+msgid "Quality Enhancement"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Enhance print quality by additional passes"
+msgstr ""
+
+#: src/main/print-escp2.c:933
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "Størrelse"
 
-#: src/main/print-escp2.c:800
+#: src/main/print-escp2.c:934
 #, fuzzy
 msgid "Set printer paper thickness"
 msgstr "Sett til standardverdier"
 
-#: src/main/print-escp2.c:807
+#: src/main/print-escp2.c:941
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Tetthet:"
 
-#: src/main/print-escp2.c:808
+#: src/main/print-escp2.c:942
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:815
+#: src/main/print-escp2.c:949
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:816
+#: src/main/print-escp2.c:950
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:823
+#: src/main/print-escp2.c:957
 #, fuzzy
 msgid "Print Method"
 msgstr "Raskt heltall"
 
-#: src/main/print-escp2.c:824
+#: src/main/print-escp2.c:958
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:831
+#: src/main/print-escp2.c:965
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Vanlig papir"
 
-#: src/main/print-escp2.c:832
+#: src/main/print-escp2.c:966
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:839
+#: src/main/print-escp2.c:973
 msgid "Feed Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:840
-#, c-format
+#: src/main/print-escp2.c:975
+#, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:1992
+#: src/main/print-escp2.c:2197
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Utskriftstype:"
 
-#: src/main/print-escp2.c:1994
+#: src/main/print-escp2.c:2199
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2208 src/cups/genppd.c:1484 src/cups/genppd.c:2059
+#: src/main/print-escp2.c:2413 src/cups/genppd.c:1517 src/cups/genppd.c:2093
 #, fuzzy
 msgid "Automatic"
 msgstr "Størrelse"
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2415
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2417
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:2243
+#: src/main/print-escp2.c:2448
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2450
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2452
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2454
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2456
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2287
+#: src/main/print-escp2.c:2492
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:2858
+#: src/main/print-escp2.c:3100
 #, 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:4107 src/main/print-olympus.c:2472
+#: src/main/print-escp2.c:4355 src/main/print-olympus.c:2641
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1803,361 +2527,378 @@ msgid "test print"
 msgstr "testutskrift"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3205
-#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3217
-#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3233
-#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3255
-#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3276
-#: src/xml/xmli18n-tmp.h:3288 src/xml/xmli18n-tmp.h:3295
-#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3315
-#: src/xml/xmli18n-tmp.h:3327 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3368
-#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3380
-#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
-#: src/xml/xmli18n-tmp.h:3412 src/xml/xmli18n-tmp.h:3424
-#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3444
-#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3472
-#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3496
-#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3521
-#: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3544
-#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3556
-#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3581
-#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3598
-#: src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3754 src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:3809 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3863 src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:4058 src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:4163 src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:4227 src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:4335 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4467 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4594 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:4879 src/xml/xmli18n-tmp.h:4946
+#: src/xml/xmli18n-tmp.h:5000 src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:5243 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5365 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5512 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5667 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5784 src/xml/xmli18n-tmp.h:5805
+#: src/xml/xmli18n-tmp.h:5826
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3206
-#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3218
-#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3234
-#: src/xml/xmli18n-tmp.h:3244 src/xml/xmli18n-tmp.h:3251
-#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3268
-#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3289
-#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3306
-#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
-#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3354
-#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3377
-#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3389
-#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3413
-#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3435
-#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3455
-#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3485
-#: src/xml/xmli18n-tmp.h:3497 src/xml/xmli18n-tmp.h:3508
-#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3537
-#: src/xml/xmli18n-tmp.h:3545 src/xml/xmli18n-tmp.h:3549
-#: src/xml/xmli18n-tmp.h:3557 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3593
-#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3605
+#: src/xml/xmli18n-tmp.h:3759 src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3868 src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:4002 src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:4107 src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4472
+#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4817 src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5181 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5315 src/xml/xmli18n-tmp.h:5370
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5672
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5831
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3241
-#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3265
-#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3286
-#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
-#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3351
-#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3374
-#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3398
-#: src/xml/xmli18n-tmp.h:3410 src/xml/xmli18n-tmp.h:3422
-#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3452
-#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3470
-#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3494
-#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3519
-#: src/xml/xmli18n-tmp.h:3534 src/xml/xmli18n-tmp.h:3542
-#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3741 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4086 src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4933
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5421
+#: src/xml/xmli18n-tmp.h:5499 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5723
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3242
-#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3266
-#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3287
-#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3326
-#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3352
-#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3375
-#: src/xml/xmli18n-tmp.h:3387 src/xml/xmli18n-tmp.h:3399
-#: src/xml/xmli18n-tmp.h:3411 src/xml/xmli18n-tmp.h:3423
-#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3453
-#: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3483
-#: src/xml/xmli18n-tmp.h:3495 src/xml/xmli18n-tmp.h:3506
-#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3535
-#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3566
-#: src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3748 src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:3989 src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:4094 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4267 src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4940
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5661
+#: src/xml/xmli18n-tmp.h:5730
 msgid "Five Color Photo Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
-#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
-#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
-#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
-#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
-#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
-#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
-#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
-#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:849
-#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:963
-#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1077
-#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1170
-#: src/xml/xmli18n-tmp.h:1220 src/xml/xmli18n-tmp.h:1277
-#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1376
-#: src/xml/xmli18n-tmp.h:1439 src/xml/xmli18n-tmp.h:1502
-#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1619
-#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1739
-#: src/xml/xmli18n-tmp.h:1773
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1050
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1240
+#: src/xml/xmli18n-tmp.h:1335 src/xml/xmli18n-tmp.h:1449
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1580
+#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1862
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2200 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2297
 msgid "Plain Paper"
 msgstr "Vanlig papir"
 
-#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
-#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
-#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
-#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
-#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
-#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
-#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
-#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
-#: src/xml/xmli18n-tmp.h:819 src/xml/xmli18n-tmp.h:858
-#: src/xml/xmli18n-tmp.h:915 src/xml/xmli18n-tmp.h:972
-#: src/xml/xmli18n-tmp.h:1029 src/xml/xmli18n-tmp.h:1086
-#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1176
-#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1286
-#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1385
-#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1508
-#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1628
-#: src/xml/xmli18n-tmp.h:1685 src/xml/xmli18n-tmp.h:1743
-#: src/xml/xmli18n-tmp.h:1779
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:101 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:365 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1160 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1740
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1871
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2136
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2267
+#: src/xml/xmli18n-tmp.h:2303
 msgid "Glossy Film"
 msgstr "Glanset film"
 
-#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
-#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
-#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
-#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
-#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
-#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
-#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
-#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
-#: src/xml/xmli18n-tmp.h:821 src/xml/xmli18n-tmp.h:861
-#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:975
-#: src/xml/xmli18n-tmp.h:1032 src/xml/xmli18n-tmp.h:1089
-#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1178
-#: src/xml/xmli18n-tmp.h:1232 src/xml/xmli18n-tmp.h:1289
-#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1388
-#: src/xml/xmli18n-tmp.h:1451 src/xml/xmli18n-tmp.h:1511
-#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1631
-#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1745
-#: src/xml/xmli18n-tmp.h:1781
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:845 src/xml/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:965 src/xml/xmli18n-tmp.h:1022
+#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1359
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1550
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1745 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2305
 msgid "Transparencies"
 msgstr "Gjennomsiktighet"
 
-#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
-#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
-#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
-#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
-#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
-#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
-#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
-#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
-#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:823
-#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:921
-#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:1035
-#: src/xml/xmli18n-tmp.h:1092 src/xml/xmli18n-tmp.h:1142
-#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1235
-#: src/xml/xmli18n-tmp.h:1292 src/xml/xmli18n-tmp.h:1344
-#: src/xml/xmli18n-tmp.h:1391 src/xml/xmli18n-tmp.h:1454
-#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1577
-#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1691
-#: src/xml/xmli18n-tmp.h:1747 src/xml/xmli18n-tmp.h:1783
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:55 src/xml/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:151 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1024
+#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2215
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2307
 msgid "Envelopes"
 msgstr "Konvolutter"
 
-#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
-#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
-#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
-#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
-#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
-#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
-#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
-#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
-#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:827
-#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:927
-#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:1041
-#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1146
-#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1241
-#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1348
-#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1460
-#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1583
-#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1697
-#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1787
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:1028
+#: src/xml/xmli18n-tmp.h:1085 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1275 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1556
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1665
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1834
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2076
+#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2311
 msgid "Matte Paper"
 msgstr "Matt papir"
 
-#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
-#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
-#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
-#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
-#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
-#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
-#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
-#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
-#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:831
-#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:933
-#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:1047
-#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1150
-#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1247
-#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1352
-#: src/xml/xmli18n-tmp.h:1403 src/xml/xmli18n-tmp.h:1466
-#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1589
-#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1703
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1791
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:167 src/xml/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:569
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1032
+#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1285 src/xml/xmli18n-tmp.h:1389
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1675
+#: src/xml/xmli18n-tmp.h:1770 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1889 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2012 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2227
+#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2315
 msgid "Inkjet Paper"
 msgstr "Papir for blekkskriver"
 
-#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
-#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
-#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
-#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
-#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
-#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
-#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
-#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
-#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:833
-#: src/xml/xmli18n-tmp.h:879 src/xml/xmli18n-tmp.h:936
-#: src/xml/xmli18n-tmp.h:993 src/xml/xmli18n-tmp.h:1050
-#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1152
-#: src/xml/xmli18n-tmp.h:1190 src/xml/xmli18n-tmp.h:1250
-#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1354
-#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1469
-#: src/xml/xmli18n-tmp.h:1529 src/xml/xmli18n-tmp.h:1592
-#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1706
-#: src/xml/xmli18n-tmp.h:1757 src/xml/xmli18n-tmp.h:1793
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:425 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:512 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1034
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1499 src/xml/xmli18n-tmp.h:1562
+#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1775 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1955
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2088
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2317
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papir med fotokvalitet for blekkskriver"
 
-#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
-#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
-#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
-#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
-#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
-#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
-#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
-#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
-#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:835
-#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:939
-#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:1053
-#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1154
-#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1253
-#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1356
-#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1472
-#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1595
-#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1709
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1795
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1036
+#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1200
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1504 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1842
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2233
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2319
 msgid "Photo Paper"
 msgstr "Fotopapir"
 
-#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
-#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
-#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
-#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
-#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
-#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
-#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
-#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
-#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:837
-#: src/xml/xmli18n-tmp.h:885 src/xml/xmli18n-tmp.h:942
-#: src/xml/xmli18n-tmp.h:999 src/xml/xmli18n-tmp.h:1056
-#: src/xml/xmli18n-tmp.h:1113 src/xml/xmli18n-tmp.h:1156
-#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1212
-#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1256
-#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1358
-#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1475
-#: src/xml/xmli18n-tmp.h:1535 src/xml/xmli18n-tmp.h:1598
-#: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1712
-#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1797
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:179 src/xml/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:518 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:869 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1038
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1407
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1566
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1622
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1844
+#: src/xml/xmli18n-tmp.h:1898 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2321
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
-#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
-#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
-#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
-#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
-#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
-#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
-#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
-#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:841
-#: src/xml/xmli18n-tmp.h:891 src/xml/xmli18n-tmp.h:948
-#: src/xml/xmli18n-tmp.h:1005 src/xml/xmli18n-tmp.h:1062
-#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1160
-#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1262
-#: src/xml/xmli18n-tmp.h:1319 src/xml/xmli18n-tmp.h:1362
-#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1481
-#: src/xml/xmli18n-tmp.h:1541 src/xml/xmli18n-tmp.h:1604
-#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1718
-#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1801
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1042
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1419
+#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1570
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2027 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2242
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2325
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
-#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
-#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
-#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
-#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
-#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
-#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
-#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
-#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:843
-#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:951
-#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1065
-#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1162
-#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1265
-#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1368
-#: src/xml/xmli18n-tmp.h:1427 src/xml/xmli18n-tmp.h:1490
-#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1607
-#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1727
-#: src/xml/xmli18n-tmp.h:1767 src/xml/xmli18n-tmp.h:1803
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:91 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:191 src/xml/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:439 src/xml/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:787 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1044
+#: src/xml/xmli18n-tmp.h:1125 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1315 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1854
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2327
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
-#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
-#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
-#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
-#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
-#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
-#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
-#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:897
-#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:1011
-#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1125
-#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1206
-#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1325
-#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1430
-#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1553
-#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1667
-#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1805
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1130
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1320
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1616
+#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1856 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2329
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
-#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
-#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
-#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
-#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
-#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
-#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
-#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
-#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:847
-#: src/xml/xmli18n-tmp.h:903 src/xml/xmli18n-tmp.h:960
-#: src/xml/xmli18n-tmp.h:1017 src/xml/xmli18n-tmp.h:1074
-#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1168
-#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1214
-#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1274
-#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1374
-#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1499
-#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1616
-#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1736
-#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1809
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:129
+#: src/xml/xmli18n-tmp.h:203 src/xml/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:542 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1048
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1443
+#: src/xml/xmli18n-tmp.h:1539 src/xml/xmli18n-tmp.h:1578
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1720
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1985
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2333
 msgid "Other"
 msgstr "Annet"
 
@@ -2173,55 +2914,59 @@ msgstr "Manuell med pause"
 msgid "Manual without Pause"
 msgstr "Manuell uten pause"
 
-#: src/main/print-olympus.c:279
+#: src/main/print-olympus.c:281
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:280 src/cups/genppd.c:1685 src/cups/genppd.c:1713
-#: src/cups/genppd.c:1745 src/cups/genppd.c:1800 src/cups/genppd.c:1846
-#: src/cups/genppd.c:2147 src/cups/genppd.c:2160 src/cups/genppd.c:2183
-#: src/cups/genppd.c:2204 src/cups/genppd.c:2221
+#: src/main/print-olympus.c:282 src/cups/genppd.c:1718 src/cups/genppd.c:1746
+#: src/cups/genppd.c:1778 src/cups/genppd.c:1833 src/cups/genppd.c:1879
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2194 src/cups/genppd.c:2217
+#: src/cups/genppd.c:2238 src/cups/genppd.c:2255
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
-#: src/main/print-olympus.c:1132
+#: src/main/print-olympus.c:998 src/main/print-olympus.c:1061
+#: src/main/print-olympus.c:1165
 #, fuzzy
 msgid "Glossy"
 msgstr "Glanset film"
 
-#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
-#: src/main/print-olympus.c:1133
+#: src/main/print-olympus.c:999 src/main/print-olympus.c:1062
+#: src/main/print-olympus.c:1166
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
+#: src/main/print-olympus.c:1063 src/main/print-olympus.c:1167
 #, fuzzy
 msgid "Matte"
 msgstr "Matt papir"
 
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
+#. TRANSLATORS: 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.
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1901
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1770
+#: src/main/print-olympus.c:1936
 msgid "Adjust the cyan balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1778
+#: src/main/print-olympus.c:1944
 msgid "Adjust the magenta balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1952
 msgid "Adjust the yellow balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1793
+#: src/main/print-olympus.c:1959
 #, fuzzy
 msgid "Black Balance"
 msgstr "Sort-hvitt"
 
-#: src/main/print-olympus.c:1794
+#: src/main/print-olympus.c:1960
 msgid "Adjust the black balance"
 msgstr ""
 
@@ -2253,7 +2998,7 @@ msgstr ""
 msgid "Quick-dry Transparency"
 msgstr ""
 
-#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3687
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:5925
 msgid "Manual"
 msgstr "Manuell"
 
@@ -2338,24 +3083,24 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:278 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3638
-#: src/xml/xmli18n-tmp.h:3647 src/xml/xmli18n-tmp.h:3656
-#: src/xml/xmli18n-tmp.h:3664
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5875
+#: src/xml/xmli18n-tmp.h:5884 src/xml/xmli18n-tmp.h:5893
+#: src/xml/xmli18n-tmp.h:5901
 msgid "Draft"
 msgstr ""
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:3633 src/xml/xmli18n-tmp.h:3641
-#: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3658
-#: src/xml/xmli18n-tmp.h:3666
+#: src/xml/xmli18n-tmp.h:5870 src/xml/xmli18n-tmp.h:5878
+#: src/xml/xmli18n-tmp.h:5886 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5903
 #, fuzzy
 msgid "High"
 msgstr "Høyde:"
 
 #: src/main/print-pcl.c:282 src/main/print-pcl.c:283
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3634
-#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3650
-#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3667
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5896 src/xml/xmli18n-tmp.h:5904
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografi"
@@ -2391,15 +3136,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3671
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:5908
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3708
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:5946
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3823
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6061
 msgid "Custom"
 msgstr "Egendefinert"
 
@@ -2407,35 +3152,44 @@ msgstr "Egendefinert"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3629
-#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3654
+#: src/main/print-weave.c:1511
+msgid "Fatal error!"
+msgstr ""
+
+#: src/main/print-weave.c:1547
+msgid ""
+"Please report the above information to gimp-print-devel@lists.sourceforge.net"
+msgstr ""
+
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:5866
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5891
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3630
-#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3655
-#: src/xml/xmli18n-tmp.h:3663
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5900
 msgid "Economy"
 msgstr ""
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3635
-#: src/xml/xmli18n-tmp.h:3642 src/xml/xmli18n-tmp.h:3651
-#: src/xml/xmli18n-tmp.h:3660 src/xml/xmli18n-tmp.h:3668
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:5872
+#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3636
-#: src/xml/xmli18n-tmp.h:3643 src/xml/xmli18n-tmp.h:3652
-#: src/xml/xmli18n-tmp.h:3661 src/xml/xmli18n-tmp.h:3669
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:5873
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5889
+#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5906
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Stylus Photo"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1326 src/cups/genppd.c:1989
-#: src/xml/xmli18n-tmp.h:3637 src/xml/xmli18n-tmp.h:3644
-#: src/xml/xmli18n-tmp.h:3653 src/xml/xmli18n-tmp.h:3662
-#: src/xml/xmli18n-tmp.h:3670
+#: src/main/generic-options.c:41 src/cups/genppd.c:1359 src/cups/genppd.c:2023
+#: src/xml/xmli18n-tmp.h:5874 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5899
+#: src/xml/xmli18n-tmp.h:5907
 msgid "Best"
 msgstr ""
 
@@ -3178,81 +3932,81 @@ msgstr ""
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:960
+#: src/cups/genppd.c:993
 msgid "English"
 msgstr "Norwegian"
 
-#: src/cups/genppd.c:1159 src/cups/genppd.c:1175 src/cups/genppd.c:1934
-#: src/cups/genppd.c:1935
+#: src/cups/genppd.c:1192 src/cups/genppd.c:1208 src/cups/genppd.c:1968
+#: src/cups/genppd.c:1969
 #, fuzzy
 msgid "Media Size"
 msgstr "Mediestørrelse:"
 
-#: src/cups/genppd.c:1248 src/cups/genppd.c:1970
+#: src/cups/genppd.c:1281 src/cups/genppd.c:2004
 #, fuzzy
 msgid "Color Model"
 msgstr "Farger"
 
-#: src/cups/genppd.c:1275 src/cups/genppd.c:1972
+#: src/cups/genppd.c:1308 src/cups/genppd.c:2006
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "Gråtoner"
 
-#: src/cups/genppd.c:1285 src/cups/genppd.c:1976
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2010
 #, fuzzy
 msgid "RGB Color"
 msgstr "Farger"
 
-#: src/cups/genppd.c:1292 src/cups/genppd.c:1977
+#: src/cups/genppd.c:1325 src/cups/genppd.c:2011
 msgid "CMY Color"
 msgstr "CMY-farge"
 
-#: src/cups/genppd.c:1317 src/cups/genppd.c:1987
+#: src/cups/genppd.c:1350 src/cups/genppd.c:2021
 msgid "Color Precision"
 msgstr ""
 
-#: src/cups/genppd.c:1573 src/cups/genppd.c:2080
+#: src/cups/genppd.c:1606 src/cups/genppd.c:2114
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:1590 src/cups/genppd.c:2096
+#: src/cups/genppd.c:1623 src/cups/genppd.c:2130
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:1615 src/cups/genppd.c:2113
+#: src/cups/genppd.c:1648 src/cups/genppd.c:2147
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1620 src/cups/genppd.c:2114
+#: src/cups/genppd.c:1653 src/cups/genppd.c:2148
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1621 src/cups/genppd.c:2115
+#: src/cups/genppd.c:1654 src/cups/genppd.c:2149
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1622 src/cups/genppd.c:2116
+#: src/cups/genppd.c:1655 src/cups/genppd.c:2150
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1716 src/cups/genppd.c:2162
+#: src/cups/genppd.c:1749 src/cups/genppd.c:2196
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1718 src/cups/genppd.c:2164
+#: src/cups/genppd.c:1751 src/cups/genppd.c:2198
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1757 src/cups/genppd.c:1820 src/cups/genppd.c:1864
-#: src/cups/genppd.c:2185 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+#: src/cups/genppd.c:1790 src/cups/genppd.c:1853 src/cups/genppd.c:1897
+#: src/cups/genppd.c:2219 src/cups/genppd.c:2249 src/cups/genppd.c:2266
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1762 src/cups/genppd.c:2189
+#: src/cups/genppd.c:1795 src/cups/genppd.c:2223
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/cups/genppd.c:1805 src/cups/genppd.c:2209
+#: src/cups/genppd.c:1838 src/cups/genppd.c:2243
 #, c-format
 msgid "%.1f mm"
 msgstr ""
@@ -3476,51 +4230,61 @@ msgstr ""
 "Kan ikke finne skrivertype.\n"
 "Vennligst bruk -m for å spesifisere din skrivermodell.\n"
 
-#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:383
-#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
-#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
-#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
-#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
-#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
-#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
-#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
-#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
-#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
-#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
-#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
-#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
-#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
-#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
-#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
-#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
-#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
-#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
-#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
-#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
-#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
-#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
-#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
-#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
-#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
-#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
-#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
-#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
-#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
-#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1503
-#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1509
-#: src/xml/xmli18n-tmp.h:1512 src/xml/xmli18n-tmp.h:1515
-#: src/xml/xmli18n-tmp.h:1518 src/xml/xmli18n-tmp.h:1521
-#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1527
-#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
-#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
-#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
-#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
-#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
-#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:2655
-#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2717
-#: src/xml/xmli18n-tmp.h:3045 src/xml/xmli18n-tmp.h:3252
-#: src/xml/xmli18n-tmp.h:3273 src/xml/xmli18n-tmp.h:3363
-#: src/xml/xmli18n-tmp.h:3531
+#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2001
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2010 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2025
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:4085 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4612 src/xml/xmli18n-tmp.h:5481
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotopapir"
@@ -3532,131 +4296,303 @@ msgid "Unknown"
 msgstr ""
 
 #: src/escputil/escputil.c:1000 src/escputil/escputil.c:1289
-#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1921
-#: src/xml/xmli18n-tmp.h:1937 src/xml/xmli18n-tmp.h:2002
-#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2079
-#: src/xml/xmli18n-tmp.h:2105 src/xml/xmli18n-tmp.h:2119
-#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2173
-#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
-#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
-#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2293
-#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2346
-#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2418
-#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2445
-#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2469
-#: src/xml/xmli18n-tmp.h:2484 src/xml/xmli18n-tmp.h:2512
-#: src/xml/xmli18n-tmp.h:2525 src/xml/xmli18n-tmp.h:2564
-#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2626
-#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2746
-#: src/xml/xmli18n-tmp.h:2762 src/xml/xmli18n-tmp.h:2843
-#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2895
-#: src/xml/xmli18n-tmp.h:2912 src/xml/xmli18n-tmp.h:2946
-#: src/xml/xmli18n-tmp.h:3001 src/xml/xmli18n-tmp.h:3015
-#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3122
-#: src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2461 src/xml/xmli18n-tmp.h:2526
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2683 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2711 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3101 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3661
+#: src/xml/xmli18n-tmp.h:3678 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3750 src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:3782 src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:3932 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3964 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4388 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:4639 src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:4875 src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4936
+#: src/xml/xmli18n-tmp.h:4942 src/xml/xmli18n-tmp.h:4968
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5339 src/xml/xmli18n-tmp.h:5348
+#: src/xml/xmli18n-tmp.h:5355 src/xml/xmli18n-tmp.h:5361
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5417
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5430
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5477 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5502
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5536 src/xml/xmli18n-tmp.h:5544
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5557
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5657 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5719
+#: src/xml/xmli18n-tmp.h:5726 src/xml/xmli18n-tmp.h:5732
+#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5779
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Lys cyan"
 
 #: src/escputil/escputil.c:1001 src/escputil/escputil.c:1290
-#: src/xml/xmli18n-tmp.h:1906 src/xml/xmli18n-tmp.h:1922
-#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:2003
-#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2080
-#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2120
-#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2174
-#: src/xml/xmli18n-tmp.h:2188 src/xml/xmli18n-tmp.h:2201
-#: src/xml/xmli18n-tmp.h:2214 src/xml/xmli18n-tmp.h:2227
-#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2294
-#: src/xml/xmli18n-tmp.h:2309 src/xml/xmli18n-tmp.h:2347
-#: src/xml/xmli18n-tmp.h:2360 src/xml/xmli18n-tmp.h:2419
-#: src/xml/xmli18n-tmp.h:2432 src/xml/xmli18n-tmp.h:2446
-#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2470
-#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2513
-#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2565
-#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2627
-#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2748
-#: src/xml/xmli18n-tmp.h:2761 src/xml/xmli18n-tmp.h:2844
-#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2896
-#: src/xml/xmli18n-tmp.h:2913 src/xml/xmli18n-tmp.h:2947
-#: src/xml/xmli18n-tmp.h:3000 src/xml/xmli18n-tmp.h:3014
-#: src/xml/xmli18n-tmp.h:3028 src/xml/xmli18n-tmp.h:3123
-#: src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2446
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2527
+#: src/xml/xmli18n-tmp.h:2541 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2644
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2698
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2751
+#: src/xml/xmli18n-tmp.h:2803 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2956 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2994
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3381
+#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3662
+#: src/xml/xmli18n-tmp.h:3746 src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:3778 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3934 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3966 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:4265 src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:4390 src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:4428 src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4452
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4465
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4512 src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4586 src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:4641 src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4903
+#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4970
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:5044 src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5168
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5241 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5334
+#: src/xml/xmli18n-tmp.h:5341 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5363
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5419
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5471
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5504
+#: src/xml/xmli18n-tmp.h:5510 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5652
+#: src/xml/xmli18n-tmp.h:5659 src/xml/xmli18n-tmp.h:5665
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5721
+#: src/xml/xmli18n-tmp.h:5728 src/xml/xmli18n-tmp.h:5734
+#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5781
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Lys magenta"
 
-#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2433
-#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:3002
-#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3030
+#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3679 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4409 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:4566 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4605 src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4664 src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5376 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5450
+#: src/xml/xmli18n-tmp.h:5475 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5533 src/xml/xmli18n-tmp.h:5542
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5678 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5717
+#: src/xml/xmli18n-tmp.h:5747 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5777
 #, fuzzy
 msgid "Light Black"
 msgstr "Sort"
 
-#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:384
-#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
-#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
-#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
-#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
-#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
-#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
-#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
-#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
-#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
-#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
-#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
-#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
-#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
-#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
-#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
-#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
-#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
-#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
-#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
-#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
-#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
-#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
-#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
-#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
-#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
-#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
-#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
-#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
-#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
-#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1504
-#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1510
-#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1516
-#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1522
-#: src/xml/xmli18n-tmp.h:1525 src/xml/xmli18n-tmp.h:1528
-#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1534
-#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1540
-#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1546
-#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1552
-#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1558
-#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:2654
-#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2716
-#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3264
-#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3371
-#: src/xml/xmli18n-tmp.h:3539
+#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:508 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:532 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:538 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:562 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:568 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
+#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
+#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
+#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
+#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
+#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
+#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
+#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
+#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
+#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
+#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
+#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2011 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2026
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2032
+#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2038
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:4044 src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:5530
 #, fuzzy
 msgid "Matte Black"
 msgstr "Matt papir"
 
-#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:2658
-#: src/xml/xmli18n-tmp.h:2702 src/xml/xmli18n-tmp.h:2720
-#: src/xml/xmli18n-tmp.h:3048
+#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3995 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4006 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4020 src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:4106 src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4148
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Glanset film"
 
-#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:2760
-#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3013
-#: src/xml/xmli18n-tmp.h:3027
+#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3676
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4616 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5534 src/xml/xmli18n-tmp.h:5573
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Sort"
 
 #: src/escputil/escputil.c:1010 src/escputil/escputil.c:1029
-#: src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:4099 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4189
 #, fuzzy
 msgid "Orange"
 msgstr "Størrelse"
@@ -4212,8280 +5148,8410 @@ msgstr "Skriver ut..."
 #: src/xml/xmli18n-tmp.h:68 src/xml/xmli18n-tmp.h:70 src/xml/xmli18n-tmp.h:72
 #: src/xml/xmli18n-tmp.h:74 src/xml/xmli18n-tmp.h:76 src/xml/xmli18n-tmp.h:78
 #: src/xml/xmli18n-tmp.h:80 src/xml/xmli18n-tmp.h:82 src/xml/xmli18n-tmp.h:84
-#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:92
-#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
-#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
-#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
-#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
-#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
-#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
-#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
-#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
-#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
-#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
-#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
-#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
-#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
-#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
-#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
-#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
-#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
-#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
-#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
-#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
-#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
-#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
-#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
-#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
-#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
-#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
-#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
-#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
-#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
-#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
-#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
-#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
-#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
-#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
-#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
-#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
-#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
-#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
-#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
-#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
-#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
-#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
-#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
-#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
-#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
-#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
-#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
-#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
-#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
-#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
-#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
-#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
-#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
-#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
-#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
-#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
-#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
-#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
-#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
-#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
-#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
-#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
-#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
-#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
-#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
-#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
-#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
-#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
-#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
-#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
-#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
-#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
-#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
-#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
-#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
-#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
-#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
-#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
-#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
-#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
-#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
-#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
-#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
-#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
-#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
-#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
-#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
-#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
-#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
-#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
-#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
-#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
-#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
-#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
-#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
-#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:92 src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:102 src/xml/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:106 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:114 src/xml/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:118 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:126 src/xml/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:130 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:136 src/xml/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:144 src/xml/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:168 src/xml/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:192 src/xml/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:216 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:232 src/xml/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:240 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:256 src/xml/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:264 src/xml/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:304 src/xml/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:312 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:320 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:328 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:336 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:344 src/xml/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:352 src/xml/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:384 src/xml/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:408 src/xml/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:412 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:432 src/xml/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:444 src/xml/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:448 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:468 src/xml/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:484 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:642 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:698 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:714 src/xml/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:722 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:738 src/xml/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:746 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:764 src/xml/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:780 src/xml/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:804 src/xml/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:814
 #: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:818
 #: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:822
 #: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:826
 #: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:830
-#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:834
-#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:838
-#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:842
-#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:846
-#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:850
-#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
-#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
-#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
-#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
-#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
-#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
-#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
-#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:898
-#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
-#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
-#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
-#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
-#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
-#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
-#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
-#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
-#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
-#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
-#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
-#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
-#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
-#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
-#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
-#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
-#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
-#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
-#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
-#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1018
-#: src/xml/xmli18n-tmp.h:1021 src/xml/xmli18n-tmp.h:1024
-#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1030
-#: src/xml/xmli18n-tmp.h:1033 src/xml/xmli18n-tmp.h:1036
-#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1042
-#: src/xml/xmli18n-tmp.h:1045 src/xml/xmli18n-tmp.h:1048
-#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1054
-#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1060
-#: src/xml/xmli18n-tmp.h:1063 src/xml/xmli18n-tmp.h:1066
-#: src/xml/xmli18n-tmp.h:1069 src/xml/xmli18n-tmp.h:1072
-#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1078
-#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1084
-#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1090
-#: src/xml/xmli18n-tmp.h:1093 src/xml/xmli18n-tmp.h:1096
-#: src/xml/xmli18n-tmp.h:1099 src/xml/xmli18n-tmp.h:1102
-#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1108
-#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1114
-#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1120
-#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1126
-#: src/xml/xmli18n-tmp.h:1129 src/xml/xmli18n-tmp.h:1132
-#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
-#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
-#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
-#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
-#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
-#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
-#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
-#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
-#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
-#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
-#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
-#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
-#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
-#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1189
-#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1193
-#: src/xml/xmli18n-tmp.h:1195 src/xml/xmli18n-tmp.h:1197
-#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1201
-#: src/xml/xmli18n-tmp.h:1203 src/xml/xmli18n-tmp.h:1205
-#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1209
-#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1221
-#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
-#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
-#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
-#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
-#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
-#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
-#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
-#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
-#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
-#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
-#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
-#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
-#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
-#: src/xml/xmli18n-tmp.h:1302 src/xml/xmli18n-tmp.h:1305
-#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1311
-#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1317
-#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1323
-#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1329
-#: src/xml/xmli18n-tmp.h:1332 src/xml/xmli18n-tmp.h:1335
-#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
-#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1343
-#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1347
-#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1351
-#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1355
-#: src/xml/xmli18n-tmp.h:1357 src/xml/xmli18n-tmp.h:1359
-#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1363
-#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1367
-#: src/xml/xmli18n-tmp.h:1369 src/xml/xmli18n-tmp.h:1371
-#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1375
-#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1566
-#: src/xml/xmli18n-tmp.h:1569 src/xml/xmli18n-tmp.h:1572
-#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1578
-#: src/xml/xmli18n-tmp.h:1581 src/xml/xmli18n-tmp.h:1584
-#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1590
-#: src/xml/xmli18n-tmp.h:1593 src/xml/xmli18n-tmp.h:1596
-#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1602
-#: src/xml/xmli18n-tmp.h:1605 src/xml/xmli18n-tmp.h:1608
-#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1614
-#: src/xml/xmli18n-tmp.h:1617 src/xml/xmli18n-tmp.h:1620
-#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1626
-#: src/xml/xmli18n-tmp.h:1629 src/xml/xmli18n-tmp.h:1632
-#: src/xml/xmli18n-tmp.h:1635 src/xml/xmli18n-tmp.h:1638
-#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1644
-#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
-#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
-#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
-#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
-#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
-#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
-#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
-#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
-#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
-#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
-#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
-#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
-#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
-#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
-#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:1778
-#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1782
-#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1786
-#: src/xml/xmli18n-tmp.h:1788 src/xml/xmli18n-tmp.h:1790
-#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1794
-#: src/xml/xmli18n-tmp.h:1796 src/xml/xmli18n-tmp.h:1798
-#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1802
-#: src/xml/xmli18n-tmp.h:1804 src/xml/xmli18n-tmp.h:1806
-#: src/xml/xmli18n-tmp.h:1808 src/xml/xmli18n-tmp.h:1810
-#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3204
-#: src/xml/xmli18n-tmp.h:3210 src/xml/xmli18n-tmp.h:3216
-#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3232
-#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3250
-#: src/xml/xmli18n-tmp.h:3294 src/xml/xmli18n-tmp.h:3302
-#: src/xml/xmli18n-tmp.h:3304 src/xml/xmli18n-tmp.h:3312
-#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3379
-#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
-#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3421
-#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3441
-#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3469
-#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3555
-#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3597
-#: src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:1017
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1025
+#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1035 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1047 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1056
+#: src/xml/xmli18n-tmp.h:1061 src/xml/xmli18n-tmp.h:1066
+#: src/xml/xmli18n-tmp.h:1071 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1086
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1096
+#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1116
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1126
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1136
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1161 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1181 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1206
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1216
+#: src/xml/xmli18n-tmp.h:1221 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1236
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1246
+#: src/xml/xmli18n-tmp.h:1251 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1261 src/xml/xmli18n-tmp.h:1266
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1281 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1291 src/xml/xmli18n-tmp.h:1296
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1311 src/xml/xmli18n-tmp.h:1316
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1326
+#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1336
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1378 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1414 src/xml/xmli18n-tmp.h:1420
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1432
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1450 src/xml/xmli18n-tmp.h:1455
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1465
+#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1480 src/xml/xmli18n-tmp.h:1485
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1540 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1551 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1583 src/xml/xmli18n-tmp.h:1585
+#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1603 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1607 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1646
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1666
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1676
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1716
+#: src/xml/xmli18n-tmp.h:1721 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1736
+#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1835
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1843
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1851
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:2049
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2057
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2065
+#: src/xml/xmli18n-tmp.h:2069 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2113
+#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2129
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2137
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2153
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2161
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2185
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2264
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2272
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2276
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2282 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2286 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2296
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2300
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2308
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2314 src/xml/xmli18n-tmp.h:2316
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2324
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:3787 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3895 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:4223 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5579
+#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5825
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Bright White Paper"
 msgstr "Matt papir"
 
-#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
-#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
-#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
-#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
-#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
-#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
-#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
-#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:817
-#: src/xml/xmli18n-tmp.h:855 src/xml/xmli18n-tmp.h:912
-#: src/xml/xmli18n-tmp.h:969 src/xml/xmli18n-tmp.h:1026
-#: src/xml/xmli18n-tmp.h:1083 src/xml/xmli18n-tmp.h:1136
-#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1226
-#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1338
-#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1445
-#: src/xml/xmli18n-tmp.h:1505 src/xml/xmli18n-tmp.h:1568
-#: src/xml/xmli18n-tmp.h:1625 src/xml/xmli18n-tmp.h:1682
-#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1777
-#: src/xml/xmli18n-tmp.h:3675
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:139 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:959 src/xml/xmli18n-tmp.h:1018
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1155
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1546
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1931
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:5912
 msgid "Postcard"
 msgstr "Postkort"
 
-#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
-#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
-#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
-#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
-#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
-#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
-#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
-#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:825
-#: src/xml/xmli18n-tmp.h:867 src/xml/xmli18n-tmp.h:924
-#: src/xml/xmli18n-tmp.h:981 src/xml/xmli18n-tmp.h:1038
-#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1144
-#: src/xml/xmli18n-tmp.h:1182 src/xml/xmli18n-tmp.h:1238
-#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1346
-#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1457
-#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1580
-#: src/xml/xmli18n-tmp.h:1637 src/xml/xmli18n-tmp.h:1694
-#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1785
+#: src/xml/xmli18n-tmp.h:13 src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:155 src/xml/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:415 src/xml/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:851 src/xml/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1026
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1175
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1554
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1832
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2309
 msgid "Back Light Film"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
-#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
-#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
-#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
-#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
-#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
-#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
-#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:829
-#: src/xml/xmli18n-tmp.h:873 src/xml/xmli18n-tmp.h:930
-#: src/xml/xmli18n-tmp.h:987 src/xml/xmli18n-tmp.h:1044
-#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1148
-#: src/xml/xmli18n-tmp.h:1186 src/xml/xmli18n-tmp.h:1244
-#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1350
-#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1463
-#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1586
-#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1700
-#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1789
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:419 src/xml/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:857 src/xml/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1030
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1383
+#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1558
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2313
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Matt papir"
 
-#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
-#: src/xml/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:421
 msgid "Premium Presentation Paper Matte"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:431
 #, fuzzy
-msgid "Premium Glossy Photo Paper 170 wt"
+msgid "Ultra Glossy Photo Paper"
 msgstr "Glanset fotopapir"
 
-#: src/xml/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1210
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1413
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1568
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1695
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1964
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2176 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2287 src/xml/xmli18n-tmp.h:2323
 #, fuzzy
-msgid "Premium Glossy Photo Paper 250 wt"
+msgid "Premium Semigloss Photo Paper"
 msgstr "Glanset fotopapir"
 
-#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
-#: src/xml/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:437
 #, fuzzy
-msgid "Ultra Glossy Photo Paper"
+msgid "Ultra Premium Photo Paper Luster"
 msgstr "Glanset fotopapir"
 
-#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
-#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
-#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
-#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
-#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
-#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
-#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
-#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:839
-#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:945
-#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1059
-#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1158
-#: src/xml/xmli18n-tmp.h:1196 src/xml/xmli18n-tmp.h:1259
-#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1360
-#: src/xml/xmli18n-tmp.h:1415 src/xml/xmli18n-tmp.h:1478
-#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1601
-#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1715
-#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:37
+msgid "CD or DVD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:93 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1230
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1437
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2331
 #, fuzzy
-msgid "Premium Semigloss Photo Paper"
-msgstr "Glanset fotopapir"
+msgid "ColorLife Paper"
+msgstr "Vanlig papir"
 
-#: src/xml/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:73
 #, fuzzy
-msgid "Premium Semigloss Photo Paper 170 wt"
+msgid "Premium Glossy Photo Paper 170 wt"
 msgstr "Glanset fotopapir"
 
-#: src/xml/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:75
 #, fuzzy
-msgid "Premium Semigloss Photo Paper 250 wt"
+msgid "Premium Glossy Photo Paper 250 wt"
 msgstr "Glanset fotopapir"
 
-#: src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:81
 #, fuzzy
-msgid "Premium Luster Photo Paper 250 wt"
+msgid "Premium Semigloss Photo Paper 170 wt"
 msgstr "Glanset fotopapir"
 
-#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
-#: src/xml/xmli18n-tmp.h:334
+#: src/xml/xmli18n-tmp.h:83
 #, fuzzy
-msgid "Ultra Premium Photo Paper Luster"
+msgid "Premium Semigloss Photo Paper 250 wt"
 msgstr "Glanset fotopapir"
 
-#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
-#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
-#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
-#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
-#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
-#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
-#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
-#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:845
-#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:957
-#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1071
-#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1166
-#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1271
-#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1372
-#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1496
-#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1613
-#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1733
-#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1807
+#: src/xml/xmli18n-tmp.h:87
 #, fuzzy
-msgid "ColorLife Paper"
-msgstr "Vanlig papir"
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr "Glanset fotopapir"
 
-#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
-#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
-#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
-#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
-#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
-#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
-#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
-#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
-#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
-#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
-#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
-#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
-#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
-#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
-#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
-#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
-#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
-#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
-#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
-#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
-#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
-#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
-#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
-#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
-#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
-#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
-#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
-#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
-#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
-#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
-#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
-#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
-#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
-#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
-#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
-#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
-#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
-#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
-#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
-#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
-#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
-#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
-#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
-#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
-#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
-#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
-#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:851
-#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:857
-#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:863
-#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:869
-#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:875
-#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:881
-#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:887
-#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:893
-#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:899
-#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:905
-#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:911
-#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:917
-#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:923
-#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:929
-#: src/xml/xmli18n-tmp.h:932 src/xml/xmli18n-tmp.h:935
-#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:941
-#: src/xml/xmli18n-tmp.h:944 src/xml/xmli18n-tmp.h:947
-#: src/xml/xmli18n-tmp.h:950 src/xml/xmli18n-tmp.h:953
-#: src/xml/xmli18n-tmp.h:956 src/xml/xmli18n-tmp.h:959
-#: src/xml/xmli18n-tmp.h:962 src/xml/xmli18n-tmp.h:965
-#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:971
-#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:977
-#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:983
-#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:989
-#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:995
-#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1001
-#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1007
-#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1013
-#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1019
-#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1025
-#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1031
-#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1037
-#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1043
-#: src/xml/xmli18n-tmp.h:1046 src/xml/xmli18n-tmp.h:1049
-#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1055
-#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1061
-#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1067
-#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1073
-#: src/xml/xmli18n-tmp.h:1076 src/xml/xmli18n-tmp.h:1079
-#: src/xml/xmli18n-tmp.h:1082 src/xml/xmli18n-tmp.h:1085
-#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1091
-#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1097
-#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1103
-#: src/xml/xmli18n-tmp.h:1106 src/xml/xmli18n-tmp.h:1109
-#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1115
-#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1121
-#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1127
-#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1133
-#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1225
-#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1231
-#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1237
-#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1243
-#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1249
-#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1255
-#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1261
-#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1267
-#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1273
-#: src/xml/xmli18n-tmp.h:1276 src/xml/xmli18n-tmp.h:1279
-#: src/xml/xmli18n-tmp.h:1282 src/xml/xmli18n-tmp.h:1285
-#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1291
-#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1297
-#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1303
-#: src/xml/xmli18n-tmp.h:1306 src/xml/xmli18n-tmp.h:1309
-#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1315
-#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1321
-#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1327
-#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1333
-#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1567
-#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1573
-#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1579
-#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1585
-#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1591
-#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1597
-#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1603
-#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1609
-#: src/xml/xmli18n-tmp.h:1612 src/xml/xmli18n-tmp.h:1615
-#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1621
-#: src/xml/xmli18n-tmp.h:1624 src/xml/xmli18n-tmp.h:1627
-#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1633
-#: src/xml/xmli18n-tmp.h:1636 src/xml/xmli18n-tmp.h:1639
-#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1645
-#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1651
-#: src/xml/xmli18n-tmp.h:1654 src/xml/xmli18n-tmp.h:1657
-#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1663
-#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1669
-#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1675
-#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3223
-#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3231
-#: src/xml/xmli18n-tmp.h:3238 src/xml/xmli18n-tmp.h:3239
-#: src/xml/xmli18n-tmp.h:3300 src/xml/xmli18n-tmp.h:3301
-#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3311
-#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3396
-#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3408
-#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3420
-#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3432
-#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3440
-#: src/xml/xmli18n-tmp.h:3479 src/xml/xmli18n-tmp.h:3480
-#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3492
-#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3554
-#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:133 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:149 src/xml/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:173 src/xml/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:197 src/xml/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:205 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:221 src/xml/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:229 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:245 src/xml/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:253 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:261 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:269 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:277 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:285 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:293 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:301 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:309 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:317 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:325 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:333 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:341 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:349 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:357 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:619 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:643 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:667 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:691 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:707 src/xml/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:715 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:731 src/xml/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:739 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:755 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1062
+#: src/xml/xmli18n-tmp.h:1067 src/xml/xmli18n-tmp.h:1072
+#: src/xml/xmli18n-tmp.h:1077 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1092
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1102
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1112
+#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1122
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1132
+#: src/xml/xmli18n-tmp.h:1137 src/xml/xmli18n-tmp.h:1142
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1157 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1177 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1192
+#: src/xml/xmli18n-tmp.h:1197 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1212
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1222
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1242
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1252
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1272
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1287 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1297 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1327 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1385 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1445 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1461
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1516 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1647
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1657
+#: src/xml/xmli18n-tmp.h:1662 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1677
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1687
+#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1742 src/xml/xmli18n-tmp.h:1747
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1767
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1807
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2090 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2098 src/xml/xmli18n-tmp.h:2102
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2118
+#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2126
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2162 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2190
+#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:3884 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:4779 src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:4845 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4919
+#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4980
+#: src/xml/xmli18n-tmp.h:4986 src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5209 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5276
+#: src/xml/xmli18n-tmp.h:5277 src/xml/xmli18n-tmp.h:5283
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5607 src/xml/xmli18n-tmp.h:5633
+#: src/xml/xmli18n-tmp.h:5634 src/xml/xmli18n-tmp.h:5640
 msgid "Quadtone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
-#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
-#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
-#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
-#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:852
-#: src/xml/xmli18n-tmp.h:909 src/xml/xmli18n-tmp.h:966
-#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1080
-#: src/xml/xmli18n-tmp.h:1172 src/xml/xmli18n-tmp.h:1223
-#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1336
-#: src/xml/xmli18n-tmp.h:1379 src/xml/xmli18n-tmp.h:1442
-#: src/xml/xmli18n-tmp.h:1565 src/xml/xmli18n-tmp.h:1622
-#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1775
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:142 src/xml/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:150 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:174 src/xml/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:198 src/xml/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:214 src/xml/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:222 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:238 src/xml/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:246 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:262 src/xml/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:302 src/xml/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:310 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:318 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:326 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:334 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:342 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:350 src/xml/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:636 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:660 src/xml/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:708 src/xml/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:716 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:732 src/xml/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:756 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1103
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1123
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1158 src/xml/xmli18n-tmp.h:1163
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1183
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1193
+#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1213
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1223
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1238 src/xml/xmli18n-tmp.h:1243
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1253
+#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1283
+#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1313
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1333
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1362 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1374 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1462
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1472
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1487 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1502
+#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:1532
+#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1542
+#: src/xml/xmli18n-tmp.h:1633 src/xml/xmli18n-tmp.h:1638
+#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1648
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1658
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1713 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1728
+#: src/xml/xmli18n-tmp.h:1733 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1768
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2071
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2095
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2115 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2123 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2139 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2183
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2191
+#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2199
+msgid "MISQuadtone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1150 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2299
 #, fuzzy
 msgid "Plain Paper Fast Load"
 msgstr "Vanlig papir"
 
-#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
-#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
-#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1364
-#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1484
-#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1970 src/xml/xmli18n-tmp.h:2030
+#: src/xml/xmli18n-tmp.h:2245
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Matt papir"
 
-#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
-#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
-#: src/xml/xmli18n-tmp.h:1202 src/xml/xmli18n-tmp.h:1366
-#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1487
-#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:881 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2248
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
-#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
-#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
-#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
-#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
-#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
-#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
-#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
-#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
-#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
-#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1377
-#: src/xml/xmli18n-tmp.h:1380 src/xml/xmli18n-tmp.h:1383
-#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1389
-#: src/xml/xmli18n-tmp.h:1392 src/xml/xmli18n-tmp.h:1395
-#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1401
-#: src/xml/xmli18n-tmp.h:1404 src/xml/xmli18n-tmp.h:1407
-#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1413
-#: src/xml/xmli18n-tmp.h:1416 src/xml/xmli18n-tmp.h:1419
-#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1425
-#: src/xml/xmli18n-tmp.h:1428 src/xml/xmli18n-tmp.h:1431
-#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1437
-#: src/xml/xmli18n-tmp.h:1440 src/xml/xmli18n-tmp.h:1443
-#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1449
-#: src/xml/xmli18n-tmp.h:1452 src/xml/xmli18n-tmp.h:1455
-#: src/xml/xmli18n-tmp.h:1458 src/xml/xmli18n-tmp.h:1461
-#: src/xml/xmli18n-tmp.h:1464 src/xml/xmli18n-tmp.h:1467
-#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1473
-#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1479
-#: src/xml/xmli18n-tmp.h:1482 src/xml/xmli18n-tmp.h:1485
-#: src/xml/xmli18n-tmp.h:1488 src/xml/xmli18n-tmp.h:1491
-#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1497
-#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1677
-#: src/xml/xmli18n-tmp.h:1680 src/xml/xmli18n-tmp.h:1683
-#: src/xml/xmli18n-tmp.h:1686 src/xml/xmli18n-tmp.h:1689
-#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1695
-#: src/xml/xmli18n-tmp.h:1698 src/xml/xmli18n-tmp.h:1701
-#: src/xml/xmli18n-tmp.h:1704 src/xml/xmli18n-tmp.h:1707
-#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1713
-#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1719
-#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1725
-#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1731
-#: src/xml/xmli18n-tmp.h:1734 src/xml/xmli18n-tmp.h:1737
-#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3503
-#: src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:1863
+#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1881
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1893
+#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1905
+#: src/xml/xmli18n-tmp.h:1908 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1923
+#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:1950 src/xml/xmli18n-tmp.h:1953
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1968 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1983
+#: src/xml/xmli18n-tmp.h:1986 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2204 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2255
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5645
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
-#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
-#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
-#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
-#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
-#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
-#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
-#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
-#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
-#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
-#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1378
-#: src/xml/xmli18n-tmp.h:1381 src/xml/xmli18n-tmp.h:1384
-#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1390
-#: src/xml/xmli18n-tmp.h:1393 src/xml/xmli18n-tmp.h:1396
-#: src/xml/xmli18n-tmp.h:1399 src/xml/xmli18n-tmp.h:1402
-#: src/xml/xmli18n-tmp.h:1405 src/xml/xmli18n-tmp.h:1408
-#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1414
-#: src/xml/xmli18n-tmp.h:1417 src/xml/xmli18n-tmp.h:1420
-#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1426
-#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1432
-#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1438
-#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1444
-#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1450
-#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1456
-#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1462
-#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1468
-#: src/xml/xmli18n-tmp.h:1471 src/xml/xmli18n-tmp.h:1474
-#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1480
-#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1486
-#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1492
-#: src/xml/xmli18n-tmp.h:1495 src/xml/xmli18n-tmp.h:1498
-#: src/xml/xmli18n-tmp.h:1501 src/xml/xmli18n-tmp.h:1678
-#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1684
-#: src/xml/xmli18n-tmp.h:1687 src/xml/xmli18n-tmp.h:1690
-#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1696
-#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1702
-#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1708
-#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1714
-#: src/xml/xmli18n-tmp.h:1717 src/xml/xmli18n-tmp.h:1720
-#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1726
-#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1732
-#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1738
-#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3517
-#: src/xml/xmli18n-tmp.h:3577
+#: src/xml/xmli18n-tmp.h:835 src/xml/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:841 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1879 src/xml/xmli18n-tmp.h:1882
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1894
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1909 src/xml/xmli18n-tmp.h:1912
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1924
+#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1954
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1969 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1984
+#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2208
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2229 src/xml/xmli18n-tmp.h:2232
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2238
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2244
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2253 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2259 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5714
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1826
-#: src/xml/xmli18n-tmp.h:1839 src/xml/xmli18n-tmp.h:1852
-#: src/xml/xmli18n-tmp.h:1907 src/xml/xmli18n-tmp.h:1923
-#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1952
-#: src/xml/xmli18n-tmp.h:1965 src/xml/xmli18n-tmp.h:2054
-#: src/xml/xmli18n-tmp.h:2081 src/xml/xmli18n-tmp.h:2146
-#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
-#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
-#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2348
-#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2407
-#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2899
-#: src/xml/xmli18n-tmp.h:2916 src/xml/xmli18n-tmp.h:3142
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1139
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1154 src/xml/xmli18n-tmp.h:1159
+#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1179
+#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1199
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1214 src/xml/xmli18n-tmp.h:1219
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1229
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1244 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1259
+#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1274 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1289
+#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1309
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1329
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1423
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1429
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1447
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1634
+#: src/xml/xmli18n-tmp.h:1639 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1664
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1764
+#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1784
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1799 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1819
+msgid "MIS Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1463 src/xml/xmli18n-tmp.h:1468
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1478
+#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1508
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1533 src/xml/xmli18n-tmp.h:1538
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4858 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:5289
+msgid "Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2489 src/xml/xmli18n-tmp.h:2578
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2713 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2752
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2885 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:3051 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3665
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1828
-#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1853
-#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1879
-#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
-#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1940
-#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1966
-#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2055
-#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2133
-#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2175
-#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
-#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
-#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2336
-#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
-#: src/xml/xmli18n-tmp.h:2408 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2699
+#: src/xml/xmli18n-tmp.h:2714 src/xml/xmli18n-tmp.h:2727
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2886
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:3052
 msgid "180 DPI Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1830
-#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1854
-#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1880
-#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
-#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1941
-#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1967
-#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
-#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2134
-#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2176
-#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
-#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
-#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2337
-#: src/xml/xmli18n-tmp.h:2350 src/xml/xmli18n-tmp.h:2363
-#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
-#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2434
-#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2459
-#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2529
-#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2601
-#: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2703
-#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2735
-#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2768
-#: src/xml/xmli18n-tmp.h:2872 src/xml/xmli18n-tmp.h:2884
-#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2917
-#: src/xml/xmli18n-tmp.h:2961 src/xml/xmli18n-tmp.h:3007
-#: src/xml/xmli18n-tmp.h:3021 src/xml/xmli18n-tmp.h:3035
-#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3126
-#: src/xml/xmli18n-tmp.h:3143
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2404
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2658
+#: src/xml/xmli18n-tmp.h:2672 src/xml/xmli18n-tmp.h:2700
+#: src/xml/xmli18n-tmp.h:2715 src/xml/xmli18n-tmp.h:2728
+#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2754
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2919 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3053
+#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3125
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3292
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3530
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3649
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3684
 #, fuzzy
 msgid "360 x 180 DPI Draft"
 msgstr "150x150 DPI"
 
-#: src/xml/xmli18n-tmp.h:1818 src/xml/xmli18n-tmp.h:1831
-#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1855
-#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1881
-#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
-#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1942
-#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1968
-#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2135
-#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2392 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2418 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2479 src/xml/xmli18n-tmp.h:2492
+#: src/xml/xmli18n-tmp.h:2581 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2862 src/xml/xmli18n-tmp.h:2934
 msgid "360 DPI High Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1819 src/xml/xmli18n-tmp.h:1832
-#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1856
-#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1882
-#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
-#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1943
-#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1969
-#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1992
-#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2020
-#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
-#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
-#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2096
-#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2123
-#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2149
-#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2177
-#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2205
-#: src/xml/xmli18n-tmp.h:2218 src/xml/xmli18n-tmp.h:2231
-#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2254
-#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
-#: src/xml/xmli18n-tmp.h:2297 src/xml/xmli18n-tmp.h:2312
-#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2339
-#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
-#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2385
-#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2411
-#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2435
-#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2460
-#: src/xml/xmli18n-tmp.h:2473 src/xml/xmli18n-tmp.h:2488
-#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2516
-#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2541
-#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2591
-#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
-#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2645
-#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2675
-#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2704
-#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2736
-#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2769
-#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2808
-#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2833
-#: src/xml/xmli18n-tmp.h:2847 src/xml/xmli18n-tmp.h:2861
-#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2885
-#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2918
-#: src/xml/xmli18n-tmp.h:2935 src/xml/xmli18n-tmp.h:2950
-#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2987
-#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3022
-#: src/xml/xmli18n-tmp.h:3036 src/xml/xmli18n-tmp.h:3050
-#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3081
-#: src/xml/xmli18n-tmp.h:3098 src/xml/xmli18n-tmp.h:3113
-#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2369 src/xml/xmli18n-tmp.h:2380
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2406
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2493
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2544
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
+#: src/xml/xmli18n-tmp.h:2582 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2729
+#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2806
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2836
+#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
+#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3012
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3040
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3184 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3424 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3485 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3573
+#: src/xml/xmli18n-tmp.h:3587 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3650 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3685
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
 
-#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1833
-#: src/xml/xmli18n-tmp.h:1846 src/xml/xmli18n-tmp.h:1857
-#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1883
-#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1912
-#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1944
-#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1970
-#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1993
-#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2021
-#: src/xml/xmli18n-tmp.h:2033 src/xml/xmli18n-tmp.h:2045
-#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
-#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2097
-#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2124
-#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2150
-#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2178
-#: src/xml/xmli18n-tmp.h:2193 src/xml/xmli18n-tmp.h:2206
-#: src/xml/xmli18n-tmp.h:2219 src/xml/xmli18n-tmp.h:2232
-#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2255
-#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
-#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2313
-#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2340
-#: src/xml/xmli18n-tmp.h:2352 src/xml/xmli18n-tmp.h:2365
-#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2386
-#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2412
-#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2436
-#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2461
-#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2489
-#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2517
-#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2542
-#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2567
-#: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2592
-#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2616
-#: src/xml/xmli18n-tmp.h:2631 src/xml/xmli18n-tmp.h:2646
-#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2676
-#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2705
-#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2737
-#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2770
-#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2809
-#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2834
-#: src/xml/xmli18n-tmp.h:2848 src/xml/xmli18n-tmp.h:2862
-#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2886
-#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2919
-#: src/xml/xmli18n-tmp.h:2936 src/xml/xmli18n-tmp.h:2951
-#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2988
-#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3023
-#: src/xml/xmli18n-tmp.h:3037 src/xml/xmli18n-tmp.h:3051
-#: src/xml/xmli18n-tmp.h:3066 src/xml/xmli18n-tmp.h:3083
-#: src/xml/xmli18n-tmp.h:3099 src/xml/xmli18n-tmp.h:3114
-#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:2344 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2452 src/xml/xmli18n-tmp.h:2468
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2494
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2557 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:2594
+#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2648
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2674
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2807
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2837
+#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
+#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3013
+#: src/xml/xmli18n-tmp.h:3026 src/xml/xmli18n-tmp.h:3041
+#: src/xml/xmli18n-tmp.h:3055 src/xml/xmli18n-tmp.h:3066
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3140
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3170
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3229
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3333
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3358
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3385
+#: src/xml/xmli18n-tmp.h:3397 src/xml/xmli18n-tmp.h:3409
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3442
+#: src/xml/xmli18n-tmp.h:3459 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3574
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3637
+#: src/xml/xmli18n-tmp.h:3651 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3686
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "2400x600 DPI"
 
-#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1834
-#: src/xml/xmli18n-tmp.h:1847 src/xml/xmli18n-tmp.h:1858
-#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1884
-#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1913
-#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1945
-#: src/xml/xmli18n-tmp.h:1958 src/xml/xmli18n-tmp.h:1971
-#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:1994
-#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2022
-#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2046
-#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2071
-#: src/xml/xmli18n-tmp.h:2086 src/xml/xmli18n-tmp.h:2098
-#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2125
-#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2151
-#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2179
-#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2207
-#: src/xml/xmli18n-tmp.h:2220 src/xml/xmli18n-tmp.h:2233
-#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2256
-#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
-#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2314
-#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2341
-#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
-#: src/xml/xmli18n-tmp.h:2376 src/xml/xmli18n-tmp.h:2387
-#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2413
-#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2437
-#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2462
-#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2490
-#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2518
-#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2543
-#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
-#: src/xml/xmli18n-tmp.h:2580 src/xml/xmli18n-tmp.h:2593
-#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2617
-#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
-#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2677
-#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2706
-#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2738
-#: src/xml/xmli18n-tmp.h:2753 src/xml/xmli18n-tmp.h:2771
-#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2810
-#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2835
-#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
-#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2887
-#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2921
-#: src/xml/xmli18n-tmp.h:2937 src/xml/xmli18n-tmp.h:2952
-#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2990
-#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3024
-#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3052
-#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3085
-#: src/xml/xmli18n-tmp.h:3100 src/xml/xmli18n-tmp.h:3115
-#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:2345 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2469
+#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2546
+#: src/xml/xmli18n-tmp.h:2558 src/xml/xmli18n-tmp.h:2570
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2595
+#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2622
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2675
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2731
+#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2808
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2838
+#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2890
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2922 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3014
+#: src/xml/xmli18n-tmp.h:3027 src/xml/xmli18n-tmp.h:3042
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3067
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3186 src/xml/xmli18n-tmp.h:3201
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3334
+#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3359
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3444
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3475
+#: src/xml/xmli18n-tmp.h:3489 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3533 src/xml/xmli18n-tmp.h:3547
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3652 src/xml/xmli18n-tmp.h:3669
+#: src/xml/xmli18n-tmp.h:3687
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
-#: src/xml/xmli18n-tmp.h:1978 src/xml/xmli18n-tmp.h:2004
-#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2030
-#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2067
-#: src/xml/xmli18n-tmp.h:2094 src/xml/xmli18n-tmp.h:2107
-#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2161
-#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2252
-#: src/xml/xmli18n-tmp.h:2280 src/xml/xmli18n-tmp.h:2295
-#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2323
-#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
-#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2486
-#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2552
-#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2613
-#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
-#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2686
-#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2806
-#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2831
-#: src/xml/xmli18n-tmp.h:2845 src/xml/xmli18n-tmp.h:2859
-#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2948
-#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3080
-#: src/xml/xmli18n-tmp.h:3097 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2554
+#: src/xml/xmli18n-tmp.h:2566 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2804 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2834 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3076
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3382
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3586 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3634
 #, fuzzy
 msgid "360 x 120 DPI Economy"
 msgstr "600x600 DPI monokrom"
 
-#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1842
-#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2005
-#: src/xml/xmli18n-tmp.h:2019 src/xml/xmli18n-tmp.h:2031
-#: src/xml/xmli18n-tmp.h:2043 src/xml/xmli18n-tmp.h:2068
-#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
-#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2162
-#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2253
-#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2296
-#: src/xml/xmli18n-tmp.h:2311 src/xml/xmli18n-tmp.h:2324
-#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2384
-#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2487
-#: src/xml/xmli18n-tmp.h:2500 src/xml/xmli18n-tmp.h:2553
-#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2614
-#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2644
-#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2687
-#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2807
-#: src/xml/xmli18n-tmp.h:2820 src/xml/xmli18n-tmp.h:2832
-#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
-#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2949
-#: src/xml/xmli18n-tmp.h:3112
+#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2555
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2632
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3077
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3211
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3383
+#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3635
 #, fuzzy
 msgid "360 x 240 DPI Draft"
 msgstr "600x600 DPI"
 
-#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1872
-#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1898
-#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1930
-#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1959
-#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:1995
-#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2023
-#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2047
-#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2087
-#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2112
-#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2139
-#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2166
-#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2328
-#: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2388
-#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2557
-#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2922
-#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2991
-#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3086
+#: src/xml/xmli18n-tmp.h:2383 src/xml/xmli18n-tmp.h:2396
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2422
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2470 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2507 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2704 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:3057 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3118 src/xml/xmli18n-tmp.h:3445
+#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3514
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3609
 msgid "720 DPI High Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1873
-#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1899
-#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1931
-#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1984
-#: src/xml/xmli18n-tmp.h:1996 src/xml/xmli18n-tmp.h:2010
-#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2036
-#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2061
-#: src/xml/xmli18n-tmp.h:2073 src/xml/xmli18n-tmp.h:2088
-#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2127
-#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2153
-#: src/xml/xmli18n-tmp.h:2167 src/xml/xmli18n-tmp.h:2181
-#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2208
-#: src/xml/xmli18n-tmp.h:2221 src/xml/xmli18n-tmp.h:2234
-#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2257
-#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2285
-#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2315
-#: src/xml/xmli18n-tmp.h:2329 src/xml/xmli18n-tmp.h:2354
-#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2389
-#: src/xml/xmli18n-tmp.h:2399 src/xml/xmli18n-tmp.h:2425
-#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2451
-#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
-#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2504
-#: src/xml/xmli18n-tmp.h:2519 src/xml/xmli18n-tmp.h:2534
-#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2558
-#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2605
-#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2633
-#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2663
-#: src/xml/xmli18n-tmp.h:2678 src/xml/xmli18n-tmp.h:2691
-#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2725
-#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2754
-#: src/xml/xmli18n-tmp.h:2772 src/xml/xmli18n-tmp.h:2787
-#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2811
-#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2836
-#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
-#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2888
-#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2923
-#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2953
-#: src/xml/xmli18n-tmp.h:2968 src/xml/xmli18n-tmp.h:2978
-#: src/xml/xmli18n-tmp.h:2992 src/xml/xmli18n-tmp.h:3011
-#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3039
-#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
-#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3101
-#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3130
-#: src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:2384 src/xml/xmli18n-tmp.h:2397
+#: src/xml/xmli18n-tmp.h:2410 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2548 src/xml/xmli18n-tmp.h:2560
+#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2691 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2794 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2839
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2923 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3105
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3129
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3231 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3311
+#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3335
+#: src/xml/xmli18n-tmp.h:3348 src/xml/xmli18n-tmp.h:3360
+#: src/xml/xmli18n-tmp.h:3372 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3427 src/xml/xmli18n-tmp.h:3446
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3576 src/xml/xmli18n-tmp.h:3593
+#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3688
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "150x150 DPI"
 
-#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1874
-#: src/xml/xmli18n-tmp.h:1887 src/xml/xmli18n-tmp.h:1900
-#: src/xml/xmli18n-tmp.h:1916 src/xml/xmli18n-tmp.h:1932
-#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1985
-#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2011
-#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2037
-#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2062
-#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2089
-#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2128
-#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2154
-#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2182
-#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2258
-#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
-#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2316
-#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2390
-#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2559
-#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2634
-#: src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2385 src/xml/xmli18n-tmp.h:2398
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2535
+#: src/xml/xmli18n-tmp.h:2549 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2782
+#: src/xml/xmli18n-tmp.h:2795 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3388
 msgid "1440 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1960
-#: src/xml/xmli18n-tmp.h:2100 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2902
 msgid "720 DPI Highest Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2259
-#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
-#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2317
-#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2477
-#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2505
-#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2606
-#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2635
-#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2740
-#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2866
-#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2796 src/xml/xmli18n-tmp.h:2811
+#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3216 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3412
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "150x150 DPI"
 
-#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2260
-#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
-#: src/xml/xmli18n-tmp.h:2303 src/xml/xmli18n-tmp.h:2318
-#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2771 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2812
+#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:3160 src/xml/xmli18n-tmp.h:3390
 msgid "2880 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2439
-#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2493
-#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2546
-#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2582
-#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2620
-#: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2664
-#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
-#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2726
-#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2755
-#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2789
-#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2812
-#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2878
-#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
-#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2939
-#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2969
-#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2994
-#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
-#: src/xml/xmli18n-tmp.h:3088 src/xml/xmli18n-tmp.h:3102
-#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3131
-#: src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2963
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3070
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3106
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3297 src/xml/xmli18n-tmp.h:3313
+#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
+#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3401
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3492
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3577 src/xml/xmli18n-tmp.h:3594
+#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3671 src/xml/xmli18n-tmp.h:3689
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "150x150 DPI"
 
-#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2426
-#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2452
-#: src/xml/xmli18n-tmp.h:2464 src/xml/xmli18n-tmp.h:2479
-#: src/xml/xmli18n-tmp.h:2494 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2547
-#: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2583
-#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2621
-#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2665
-#: src/xml/xmli18n-tmp.h:2680 src/xml/xmli18n-tmp.h:2694
-#: src/xml/xmli18n-tmp.h:2709 src/xml/xmli18n-tmp.h:2727
-#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2756
-#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2790
-#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2813
-#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2837
-#: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2879
-#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
-#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2940
-#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2970
-#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2995
-#: src/xml/xmli18n-tmp.h:3012 src/xml/xmli18n-tmp.h:3026
-#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3055
-#: src/xml/xmli18n-tmp.h:3072 src/xml/xmli18n-tmp.h:3089
-#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3118
-#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3071
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3107
+#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3251
+#: src/xml/xmli18n-tmp.h:3266 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3298 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3324 src/xml/xmli18n-tmp.h:3337
+#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3374 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3463
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3535 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3563 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3612
+#: src/xml/xmli18n-tmp.h:3626 src/xml/xmli18n-tmp.h:3641
+#: src/xml/xmli18n-tmp.h:3655 src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:3690
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "150x150 DPI"
 
-#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:4374
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Gul"
 
-#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2584
-#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2711
-#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2743
-#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2776
-#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2908
-#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2972
-#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3057
-#: src/xml/xmli18n-tmp.h:3074 src/xml/xmli18n-tmp.h:3091
-#: src/xml/xmli18n-tmp.h:3105 src/xml/xmli18n-tmp.h:3134
-#: src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3108
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3267
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3495
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3614
+#: src/xml/xmli18n-tmp.h:3628 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3692
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "1200 DPI"
 
-#: src/xml/xmli18n-tmp.h:2666 src/xml/xmli18n-tmp.h:2681
-#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2728
-#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2775
-#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2814
-#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2838
-#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2926
-#: src/xml/xmli18n-tmp.h:2941 src/xml/xmli18n-tmp.h:2971
-#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
-#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
-#: src/xml/xmli18n-tmp.h:3090 src/xml/xmli18n-tmp.h:3104
-#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3133
-#: src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3190 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3234 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3325 src/xml/xmli18n-tmp.h:3338
+#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3362
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3505
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3613
+#: src/xml/xmli18n-tmp.h:3627 src/xml/xmli18n-tmp.h:3642
+#: src/xml/xmli18n-tmp.h:3656 src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:3691
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "150x150 DPI"
 
-#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2712
-#: src/xml/xmli18n-tmp.h:2730 src/xml/xmli18n-tmp.h:2759
-#: src/xml/xmli18n-tmp.h:2777 src/xml/xmli18n-tmp.h:2909
-#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2973
-#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3058
-#: src/xml/xmli18n-tmp.h:3075 src/xml/xmli18n-tmp.h:3092
-#: src/xml/xmli18n-tmp.h:3106 src/xml/xmli18n-tmp.h:3135
-#: src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3301 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3496
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3615
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "1200 DPI"
 
-#: src/xml/xmli18n-tmp.h:2798 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3502
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "150x150 DPI"
 
-#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2965
-#: src/xml/xmli18n-tmp.h:2989 src/xml/xmli18n-tmp.h:3067
-#: src/xml/xmli18n-tmp.h:3084
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:3607
 #, fuzzy
 msgid "720 x 360 DPI Enhanced"
 msgstr "2400x600 DPI"
 
-#: src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:3479
 #, fuzzy
 msgid "Black 1"
 msgstr "Sort"
 
-#: src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3480
 #, fuzzy
 msgid "Black 2"
 msgstr "Sort"
 
-#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3065
-#: src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3605
 #, fuzzy
 msgid "360 DPI Enhanced"
 msgstr "2400x600 DPI"
 
-#: src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3516
 #, fuzzy
 msgid "1440 x 720 DPI High Quality"
 msgstr "150x150 DPI"
 
-#: src/xml/xmli18n-tmp.h:3153
-msgid "Lower Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3677
+#, fuzzy
+msgid "Vivid Light Magenta"
+msgstr "Lys magenta"
 
-#: src/xml/xmli18n-tmp.h:3154
-msgid "Upper Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3682
+#, fuzzy
+msgid "Vivid Magenta"
+msgstr "Magenta"
+
+#: src/xml/xmli18n-tmp.h:3694
+#, fuzzy
+msgid "Main Tray"
+msgstr "Skuff"
+
+#: src/xml/xmli18n-tmp.h:3695
+#, fuzzy
+msgid "Photo Tray"
+msgstr "Fotografi"
 
-#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3160
-#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3176
-#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3186
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3725 src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:3732
 #, fuzzy
 msgid "Print to CD"
 msgstr "Skriv ut til fil?"
 
-#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3181
-#: src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:3730
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Skuff"
 
-#: src/xml/xmli18n-tmp.h:3157 src/xml/xmli18n-tmp.h:3182
-#: src/xml/xmli18n-tmp.h:3185
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:3731
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3159 src/xml/xmli18n-tmp.h:3164
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3705
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manuell"
 
-#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3709
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3710
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3171
-#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3180
-#: src/xml/xmli18n-tmp.h:3193
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3716 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3739
 msgid "Roll Feed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3714 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3723
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Manuell"
 
-#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3715 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3724
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Manuell"
 
-#: src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3733
 #, fuzzy
 msgid "Photo Board"
 msgstr "Fotopapir"
 
-#: src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3734
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3735
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3190
+#: src/xml/xmli18n-tmp.h:3736
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Autovelg"
 
-#: src/xml/xmli18n-tmp.h:3191
+#: src/xml/xmli18n-tmp.h:3737
 msgid "Manual Selection"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3199 src/xml/xmli18n-tmp.h:3207
-#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3219
-#: src/xml/xmli18n-tmp.h:3227 src/xml/xmli18n-tmp.h:3235
-#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3257
-#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3278
-#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3297
-#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3317
-#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3342
-#: src/xml/xmli18n-tmp.h:3356 src/xml/xmli18n-tmp.h:3382
-#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
-#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3426
-#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3446
-#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3474
-#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3498
-#: src/xml/xmli18n-tmp.h:3510 src/xml/xmli18n-tmp.h:3524
-#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3558
-#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:3584
-#: src/xml/xmli18n-tmp.h:3594 src/xml/xmli18n-tmp.h:3600
-#: src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3763 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3872 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:4067 src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4172 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4236 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:4754 src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5102 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5679 src/xml/xmli18n-tmp.h:5748
+#: src/xml/xmli18n-tmp.h:5793 src/xml/xmli18n-tmp.h:5814
+#: src/xml/xmli18n-tmp.h:5835
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3208
-#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3220
-#: src/xml/xmli18n-tmp.h:3228 src/xml/xmli18n-tmp.h:3236
-#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3259
-#: src/xml/xmli18n-tmp.h:3270 src/xml/xmli18n-tmp.h:3280
-#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3298
-#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3318
-#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3344
-#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3383
-#: src/xml/xmli18n-tmp.h:3391 src/xml/xmli18n-tmp.h:3403
-#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3427
-#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3447
-#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3475
-#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3499
-#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3526
-#: src/xml/xmli18n-tmp.h:3551 src/xml/xmli18n-tmp.h:3559
-#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3586
-#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3601
-#: src/xml/xmli18n-tmp.h:3607
+#: src/xml/xmli18n-tmp.h:3765 src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4484 src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:4756 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5321
+#: src/xml/xmli18n-tmp.h:5382 src/xml/xmli18n-tmp.h:5451
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5795 src/xml/xmli18n-tmp.h:5816
+#: src/xml/xmli18n-tmp.h:5837
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
-#: src/xml/xmli18n-tmp.h:3215 src/xml/xmli18n-tmp.h:3221
-#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3237
-#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3271
-#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3299
-#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3319
-#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3345
-#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3384
-#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
-#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3428
-#: src/xml/xmli18n-tmp.h:3438 src/xml/xmli18n-tmp.h:3448
-#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3463
-#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3476
-#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3500
-#: src/xml/xmli18n-tmp.h:3513 src/xml/xmli18n-tmp.h:3527
-#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3560
-#: src/xml/xmli18n-tmp.h:3573 src/xml/xmli18n-tmp.h:3587
-#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3602
-#: src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:3824 src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5325
+#: src/xml/xmli18n-tmp.h:5386 src/xml/xmli18n-tmp.h:5455
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5757
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5841
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Farge"
 
-#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3248
-#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
-#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3360
-#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
-#: src/xml/xmli18n-tmp.h:3417 src/xml/xmli18n-tmp.h:3429
-#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3459
-#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3501 src/xml/xmli18n-tmp.h:3514
-#: src/xml/xmli18n-tmp.h:3528 src/xml/xmli18n-tmp.h:3574
-#: src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4424 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:5066 src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:5196 src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5391
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5762
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3249
-#: src/xml/xmli18n-tmp.h:3272 src/xml/xmli18n-tmp.h:3293
-#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3333
-#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3361
-#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
-#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3430
-#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3460
-#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3478
-#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3502
-#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3529
-#: src/xml/xmli18n-tmp.h:3575 src/xml/xmli18n-tmp.h:3589
+#: src/xml/xmli18n-tmp.h:3780 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:4078 src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:4430 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4972
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5150 src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5336
+#: src/xml/xmli18n-tmp.h:5397 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5768
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Farge"
 
-#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3919 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:4781 src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:4795 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4921
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:4996
+#: src/xml/xmli18n-tmp.h:5023 src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:5226 src/xml/xmli18n-tmp.h:5279
+#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5603 src/xml/xmli18n-tmp.h:5609
+#: src/xml/xmli18n-tmp.h:5636 src/xml/xmli18n-tmp.h:5642
+#, fuzzy
+msgid "Gray 3"
+msgstr "Skuff 3"
+
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4782 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4796 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4916 src/xml/xmli18n-tmp.h:4922
+#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4983
+#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5286 src/xml/xmli18n-tmp.h:5294
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5643
+#, fuzzy
+msgid "Gray 2"
+msgstr "Skuff 2"
+
+#: src/xml/xmli18n-tmp.h:3855 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:4856 src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:4931 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4998
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:5214 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5611
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5644
+#, fuzzy
+msgid "Gray 1"
+msgstr "Skuff 1"
+
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4985 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5606 src/xml/xmli18n-tmp.h:5639
+msgid "MIS Quadtone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4114
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3260 src/xml/xmli18n-tmp.h:3281
+#: src/xml/xmli18n-tmp.h:4016 src/xml/xmli18n-tmp.h:4121
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3282
+#: src/xml/xmli18n-tmp.h:4021 src/xml/xmli18n-tmp.h:4126
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Farge"
 
-#: src/xml/xmli18n-tmp.h:3262 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4132
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Farge"
 
-#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:4035 src/xml/xmli18n-tmp.h:4140
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:4141
+#, fuzzy
+msgid "MatteBlack"
+msgstr "Matt papir"
+
+#: src/xml/xmli18n-tmp.h:4224
 #, fuzzy
 msgid "Default Black"
 msgstr "Sett til standardverdier"
 
-#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
-#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3365
-#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3504
-#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3533
-#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3564
-#: src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4446 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4573 src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:5344
+#: src/xml/xmli18n-tmp.h:5413 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5715
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:4315
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3348
-#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3516
-#: src/xml/xmli18n-tmp.h:3530 src/xml/xmli18n-tmp.h:3576
-#: src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:4368 src/xml/xmli18n-tmp.h:4437
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:5404
+#: src/xml/xmli18n-tmp.h:5473 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5775
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3355
-#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3523
-#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5745
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Gråtoner"
 
-#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3357
-#: src/xml/xmli18n-tmp.h:3511 src/xml/xmli18n-tmp.h:3525
-#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:4412 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5448
+#: src/xml/xmli18n-tmp.h:5681 src/xml/xmli18n-tmp.h:5750
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Farge"
 
-#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3372
-#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3540
+#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5531
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3378
-#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:4652 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5570
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Farge"
 
-#: src/xml/xmli18n-tmp.h:3462 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:5288
+msgid "MIS Six Tone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:4994
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5291
+#, fuzzy
+msgid "Gray 5"
+msgstr "Skuff 1"
+
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:4928 src/xml/xmli18n-tmp.h:4995
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5292
+#, fuzzy
+msgid "Gray 4"
+msgstr "Skuff 4"
+
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5145
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Farge"
 
-#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3615
-#: src/xml/xmli18n-tmp.h:3621
+#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5852
+#: src/xml/xmli18n-tmp.h:5858
 #, fuzzy
 msgid "Interleave"
 msgstr "Skrivernavn:"
 
-#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3616
-#: src/xml/xmli18n-tmp.h:3622
+#: src/xml/xmli18n-tmp.h:5848 src/xml/xmli18n-tmp.h:5853
+#: src/xml/xmli18n-tmp.h:5859
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3612 src/xml/xmli18n-tmp.h:3617
-#: src/xml/xmli18n-tmp.h:3623
+#: src/xml/xmli18n-tmp.h:5849 src/xml/xmli18n-tmp.h:5854
+#: src/xml/xmli18n-tmp.h:5860
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3613 src/xml/xmli18n-tmp.h:3618
-#: src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5855
+#: src/xml/xmli18n-tmp.h:5861
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:5862
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Skrivernavn:"
 
-#: src/xml/xmli18n-tmp.h:3626
+#: src/xml/xmli18n-tmp.h:5863
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Lysstyrke:"
 
-#: src/xml/xmli18n-tmp.h:3628
+#: src/xml/xmli18n-tmp.h:5865
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:5909
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:5910
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:3674
+#: src/xml/xmli18n-tmp.h:5911
 msgid "Executive"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3679
+#: src/xml/xmli18n-tmp.h:5916
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:3680
+#: src/xml/xmli18n-tmp.h:5917
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:5918
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:3682
+#: src/xml/xmli18n-tmp.h:5919
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Fotopapir"
 
-#: src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:5920
+#, fuzzy
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr "Fotopapir"
+
+#: src/xml/xmli18n-tmp.h:5921
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:3684
+#: src/xml/xmli18n-tmp.h:5922
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:3685
+#: src/xml/xmli18n-tmp.h:5923
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:3686
+#: src/xml/xmli18n-tmp.h:5924
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:3688
+#: src/xml/xmli18n-tmp.h:5926
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:3689
+#: src/xml/xmli18n-tmp.h:5927
 msgid "Super B 13x19"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3690
+#: src/xml/xmli18n-tmp.h:5928
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3691
+#: src/xml/xmli18n-tmp.h:5929
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:3692
+#: src/xml/xmli18n-tmp.h:5930
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:3693
+#: src/xml/xmli18n-tmp.h:5931
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:3694
+#: src/xml/xmli18n-tmp.h:5932
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:3695
+#: src/xml/xmli18n-tmp.h:5933
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:3696
+#: src/xml/xmli18n-tmp.h:5934
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:3697
+#: src/xml/xmli18n-tmp.h:5935
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:3698
+#: src/xml/xmli18n-tmp.h:5936
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:3699
+#: src/xml/xmli18n-tmp.h:5937
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3700
+#: src/xml/xmli18n-tmp.h:5938
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:5939
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:3702
+#: src/xml/xmli18n-tmp.h:5940
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:3703
+#: src/xml/xmli18n-tmp.h:5941
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:5942
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:3705
+#: src/xml/xmli18n-tmp.h:5943
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:3706
+#: src/xml/xmli18n-tmp.h:5944
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:3707
+#: src/xml/xmli18n-tmp.h:5945
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:3709
+#: src/xml/xmli18n-tmp.h:5947
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:3710
+#: src/xml/xmli18n-tmp.h:5948
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:5949
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:5950
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:3713
+#: src/xml/xmli18n-tmp.h:5951
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:3714
+#: src/xml/xmli18n-tmp.h:5952
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:3715
+#: src/xml/xmli18n-tmp.h:5953
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:3716
+#: src/xml/xmli18n-tmp.h:5954
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:5955
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:5956
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:5957
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:5958
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:5959
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:3722
+#: src/xml/xmli18n-tmp.h:5960
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:3723
+#: src/xml/xmli18n-tmp.h:5961
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:3724
+#: src/xml/xmli18n-tmp.h:5962
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:3725
+#: src/xml/xmli18n-tmp.h:5963
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:3726
+#: src/xml/xmli18n-tmp.h:5964
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:5965
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:5966
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:5967
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:3730
+#: src/xml/xmli18n-tmp.h:5968
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:3731
+#: src/xml/xmli18n-tmp.h:5969
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:3732
+#: src/xml/xmli18n-tmp.h:5970
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:3733
+#: src/xml/xmli18n-tmp.h:5971
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:3734
+#: src/xml/xmli18n-tmp.h:5972
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:3735
+#: src/xml/xmli18n-tmp.h:5973
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:3736
+#: src/xml/xmli18n-tmp.h:5974
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:3737
+#: src/xml/xmli18n-tmp.h:5975
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5976
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3739
+#: src/xml/xmli18n-tmp.h:5977
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:5978
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:3741
+#: src/xml/xmli18n-tmp.h:5979
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:5980
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:3743
+#: src/xml/xmli18n-tmp.h:5981
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:5982
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:5983
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:3746
+#: src/xml/xmli18n-tmp.h:5984
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:3747
+#: src/xml/xmli18n-tmp.h:5985
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:3748
+#: src/xml/xmli18n-tmp.h:5986
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:5987
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:3750
+#: src/xml/xmli18n-tmp.h:5988
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:3751
+#: src/xml/xmli18n-tmp.h:5989
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:5990
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:5991
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:3754
+#: src/xml/xmli18n-tmp.h:5992
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:3755
+#: src/xml/xmli18n-tmp.h:5993
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:3756
+#: src/xml/xmli18n-tmp.h:5994
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:5995
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:3758
+#: src/xml/xmli18n-tmp.h:5996
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:3759
+#: src/xml/xmli18n-tmp.h:5997
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:5998
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:3761
+#: src/xml/xmli18n-tmp.h:5999
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:6000
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:3763
+#: src/xml/xmli18n-tmp.h:6001
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:6002
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:3765
+#: src/xml/xmli18n-tmp.h:6003
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:3766
+#: src/xml/xmli18n-tmp.h:6004
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:6005
 #, fuzzy
 msgid "DL landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:3768
+#: src/xml/xmli18n-tmp.h:6006
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:3769
+#: src/xml/xmli18n-tmp.h:6007
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:3770
+#: src/xml/xmli18n-tmp.h:6008
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:6009
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:3772
+#: src/xml/xmli18n-tmp.h:6010
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:6011
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:3774
+#: src/xml/xmli18n-tmp.h:6012
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:3775
+#: src/xml/xmli18n-tmp.h:6013
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:6014
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:6015
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Landskap"
 
-#: src/xml/xmli18n-tmp.h:3778
+#: src/xml/xmli18n-tmp.h:6016
 msgid "ArchA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3779
+#: src/xml/xmli18n-tmp.h:6017
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3780
+#: src/xml/xmli18n-tmp.h:6018
 msgid "ArchB"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:6019
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3782
+#: src/xml/xmli18n-tmp.h:6020
 msgid "ArchC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:6021
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3784
+#: src/xml/xmli18n-tmp.h:6022
 msgid "ArchD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:6023
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:6024
 msgid "ArchE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3787
+#: src/xml/xmli18n-tmp.h:6025
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:6026
 msgid "American foolscap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3789
+#: src/xml/xmli18n-tmp.h:6027
 msgid "European foolscap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:6028
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:6029
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3792
+#: src/xml/xmli18n-tmp.h:6030
 msgid "Demy Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:6031
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3794
+#: src/xml/xmli18n-tmp.h:6032
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3795
+#: src/xml/xmli18n-tmp.h:6033
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:6034
 msgid "Demy Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:6035
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:6036
 msgid "Small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:6037
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:6038
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:6039
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3802
+#: src/xml/xmli18n-tmp.h:6040
 msgid "Hagaki Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:6041
 msgid "Oufuku Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3804
+#: src/xml/xmli18n-tmp.h:6042
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3805
+#: src/xml/xmli18n-tmp.h:6043
 msgid "Japanese long envelope #3 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3806
+#: src/xml/xmli18n-tmp.h:6044
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:6045
 msgid "Japanese long envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:6046
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3809
+#: src/xml/xmli18n-tmp.h:6047
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:6048
 msgid "Commercial 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:6049
 msgid "Commercial 10 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:6050
 msgid "A2 Invitation"
 msgstr "A2 invitasjon"
 
-#: src/xml/xmli18n-tmp.h:3813
+#: src/xml/xmli18n-tmp.h:6051
 #, fuzzy
 msgid "Monarch Envelope"
 msgstr "Konvolutt"
 
-#: src/xml/xmli18n-tmp.h:3814
+#: src/xml/xmli18n-tmp.h:6052
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Konvolutt"
 
-#: src/xml/xmli18n-tmp.h:3815
+#: src/xml/xmli18n-tmp.h:6053
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3816
+#: src/xml/xmli18n-tmp.h:6054
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:6055
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3818
+#: src/xml/xmli18n-tmp.h:6056
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3819
+#: src/xml/xmli18n-tmp.h:6057
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Postkort"
 
-#: src/xml/xmli18n-tmp.h:3820
+#: src/xml/xmli18n-tmp.h:6058
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:6059
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:6060
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3824
+#: src/xml/xmli18n-tmp.h:6062
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:6063
 msgid "4 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3826
+#: src/xml/xmli18n-tmp.h:6064
 msgid "5 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3827
+#: src/xml/xmli18n-tmp.h:6065
 msgid "210 mm Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:6066
 msgid "13 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3829
+#: src/xml/xmli18n-tmp.h:6067
 msgid "17 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:6068
 msgid "22 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3831
+#: src/xml/xmli18n-tmp.h:6069
 msgid "24 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:6070
 msgid "36 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:6071
 msgid "44 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3834
+#: src/xml/xmli18n-tmp.h:6072
 msgid "60 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:6073
 msgid "64 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3836
+#: src/xml/xmli18n-tmp.h:6074
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3837
+#: src/xml/xmli18n-tmp.h:6075
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:6076
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:6077
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:6078
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:6079
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:6080
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:6081
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3844
+#: src/xml/xmli18n-tmp.h:6082
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:6083
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3846
+#: src/xml/xmli18n-tmp.h:6084
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3847
+#: src/xml/xmli18n-tmp.h:6085
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3848
+#: src/xml/xmli18n-tmp.h:6086
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:6087
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3850
+#: src/xml/xmli18n-tmp.h:6088
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:6089
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:6090
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3853
+#: src/xml/xmli18n-tmp.h:6091
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3854
+#: src/xml/xmli18n-tmp.h:6092
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3855
+#: src/xml/xmli18n-tmp.h:6093
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3856
+#: src/xml/xmli18n-tmp.h:6094
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3857
+#: src/xml/xmli18n-tmp.h:6095
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3858
+#: src/xml/xmli18n-tmp.h:6096
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:6097
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:6098
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:6099
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:6100
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3863
+#: src/xml/xmli18n-tmp.h:6101
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:6102
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:6103
 msgid "Canon S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:6104
 msgid "Canon S200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3867
+#: src/xml/xmli18n-tmp.h:6105
 msgid "Canon S300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3868
+#: src/xml/xmli18n-tmp.h:6106
 msgid "Canon S400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3869
+#: src/xml/xmli18n-tmp.h:6107
 msgid "Canon S450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3870
+#: src/xml/xmli18n-tmp.h:6108
 msgid "Canon S500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:6109
 msgid "Canon S600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3872
+#: src/xml/xmli18n-tmp.h:6110
 msgid "Canon S630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3873
+#: src/xml/xmli18n-tmp.h:6111
 msgid "Canon S800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3874
+#: src/xml/xmli18n-tmp.h:6112
 msgid "Canon S4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:6113
 msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:6114
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3877
+#: src/xml/xmli18n-tmp.h:6115
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3878
+#: src/xml/xmli18n-tmp.h:6116
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:6117
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3880
+#: src/xml/xmli18n-tmp.h:6118
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3881
+#: src/xml/xmli18n-tmp.h:6119
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:6120
 #, fuzzy
 msgid "Canon PIXMA iP4500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:6121
 #, fuzzy
 msgid "Canon PIXMA iP4600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3884
+#: src/xml/xmli18n-tmp.h:6122
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3885
+#: src/xml/xmli18n-tmp.h:6123
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3886
+#: src/xml/xmli18n-tmp.h:6124
 #, fuzzy
 msgid "Canon PIXMA iP5300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3887
+#: src/xml/xmli18n-tmp.h:6125
 #, fuzzy
 msgid "Canon PIXMA iP6000D"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3888
+#: src/xml/xmli18n-tmp.h:6126
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:6127
 #, fuzzy
 msgid "Canon PIXMA iP8500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:6128
+#, fuzzy
+msgid "Canon PIXMA iX4000"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6129
 #, fuzzy
 msgid "Canon PIXMA iX5000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:6130
 #, fuzzy
 msgid "Canon PIXMA Pro9500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:6131
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:6132
 #, fuzzy
 msgid "Canon PIXMA MP160"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:6133
 #, fuzzy
 msgid "Canon PIXMA MP170"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3895
+#: src/xml/xmli18n-tmp.h:6134
 #, fuzzy
 msgid "Canon PIXMA MP180"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:6135
 #, fuzzy
 msgid "Canon PIXMA MP220"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3897
+#: src/xml/xmli18n-tmp.h:6136
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:6137
 #, fuzzy
 msgid "Canon PIXMA MP520"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:6138
 #, fuzzy
 msgid "Canon PIXMA MP610"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3900
+#: src/xml/xmli18n-tmp.h:6139
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:6140
 #, fuzzy
 msgid "Canon PIXMA MP710"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3902
+#: src/xml/xmli18n-tmp.h:6141
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3903
+#: src/xml/xmli18n-tmp.h:6142
 #, fuzzy
 msgid "Canon PIXMA MP740"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:6143
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:6144
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:6145
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:6146
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:6147
 #, fuzzy
 msgid "Canon PIXMA MP790"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:6148
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3910
+#: src/xml/xmli18n-tmp.h:6149
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:6150
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3912
+#: src/xml/xmli18n-tmp.h:6151
 #, fuzzy
 msgid "Canon i80"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3913
+#: src/xml/xmli18n-tmp.h:6152
 msgid "Canon i560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3914
+#: src/xml/xmli18n-tmp.h:6153
 msgid "Canon i850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:6154
 msgid "Canon i860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3916
+#: src/xml/xmli18n-tmp.h:6155
 msgid "Canon i865"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:6156
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:6157
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3919
+#: src/xml/xmli18n-tmp.h:6158
 #, fuzzy
 msgid "Epson B-300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3920
+#: src/xml/xmli18n-tmp.h:6159
 #, fuzzy
 msgid "Epson B-308"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3921
+#: src/xml/xmli18n-tmp.h:6160
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3922
+#: src/xml/xmli18n-tmp.h:6161
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3923
+#: src/xml/xmli18n-tmp.h:6162
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:3924
+#: src/xml/xmli18n-tmp.h:6163
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:6164
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:6165
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:6166
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:6167
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:6168
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:6169
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:6170
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3932
+#: src/xml/xmli18n-tmp.h:6171
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:6172
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3934
+#: src/xml/xmli18n-tmp.h:6173
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3935
+#: src/xml/xmli18n-tmp.h:6174
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:6175
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3937
+#: src/xml/xmli18n-tmp.h:6176
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:6177
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3939
+#: src/xml/xmli18n-tmp.h:6178
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:6179
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:6180
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3942
+#: src/xml/xmli18n-tmp.h:6181
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3943
+#: src/xml/xmli18n-tmp.h:6182
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:6183
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:6184
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3946
+#: src/xml/xmli18n-tmp.h:6185
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3947
+#: src/xml/xmli18n-tmp.h:6186
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3948
+#: src/xml/xmli18n-tmp.h:6187
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3949
+#: src/xml/xmli18n-tmp.h:6188
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:6189
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3951
+#: src/xml/xmli18n-tmp.h:6190
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:6191
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3953
+#: src/xml/xmli18n-tmp.h:6192
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:6193
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:6194
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3956
+#: src/xml/xmli18n-tmp.h:6195
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3957
+#: src/xml/xmli18n-tmp.h:6196
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3958
+#: src/xml/xmli18n-tmp.h:6197
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3959
+#: src/xml/xmli18n-tmp.h:6198
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3960
+#: src/xml/xmli18n-tmp.h:6199
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:6200
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:6201
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:6202
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:3964
+#: src/xml/xmli18n-tmp.h:6203
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:6204
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3966
+#: src/xml/xmli18n-tmp.h:6205
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3967
+#: src/xml/xmli18n-tmp.h:6206
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:6207
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:6208
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3970
+#: src/xml/xmli18n-tmp.h:6209
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:6210
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:3972
+#: src/xml/xmli18n-tmp.h:6211
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:6212
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:6213
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:3975
+#: src/xml/xmli18n-tmp.h:6214
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:6215
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:6216
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:6217
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:3979
+#: src/xml/xmli18n-tmp.h:6218
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:6219
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:3981
+#: src/xml/xmli18n-tmp.h:6220
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:3982
+#: src/xml/xmli18n-tmp.h:6221
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:3983
+#: src/xml/xmli18n-tmp.h:6222
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:3984
+#: src/xml/xmli18n-tmp.h:6223
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 770"
 
-#: src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:6224
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:6225
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:3987
+#: src/xml/xmli18n-tmp.h:6226
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:6227
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:3989
+#: src/xml/xmli18n-tmp.h:6228
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:6229
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:6230
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:3992
+#: src/xml/xmli18n-tmp.h:6231
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:3993
+#: src/xml/xmli18n-tmp.h:6232
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:6233
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:3995
+#: src/xml/xmli18n-tmp.h:6234
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:6235
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:6236
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3998
+#: src/xml/xmli18n-tmp.h:6237
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3999
+#: src/xml/xmli18n-tmp.h:6238
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:6239
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:6240
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:4002
+#: src/xml/xmli18n-tmp.h:6241
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:6242
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:6243
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4005
+#: src/xml/xmli18n-tmp.h:6244
 #, fuzzy
-msgid "Epson Stylus Offixe TX300F"
+msgid "Epson Stylus Office TX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4006
+#: src/xml/xmli18n-tmp.h:6245
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:6246
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:4008
+#: src/xml/xmli18n-tmp.h:6247
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4009
+#: src/xml/xmli18n-tmp.h:6248
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:6249
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:6250
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:6251
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4013
+#: src/xml/xmli18n-tmp.h:6252
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4014
+#: src/xml/xmli18n-tmp.h:6253
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:6254
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:4016
+#: src/xml/xmli18n-tmp.h:6255
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:6256
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:6257
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4019
+#: src/xml/xmli18n-tmp.h:6258
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4020
+#: src/xml/xmli18n-tmp.h:6259
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4021
+#: src/xml/xmli18n-tmp.h:6260
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:4022
+#: src/xml/xmli18n-tmp.h:6261
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:4023
+#: src/xml/xmli18n-tmp.h:6262
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:4024
+#: src/xml/xmli18n-tmp.h:6263
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:6264
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:6265
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4027
+#: src/xml/xmli18n-tmp.h:6266
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:6267
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:6268
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:6269
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:4031
+#: src/xml/xmli18n-tmp.h:6270
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:6271
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4033
+#: src/xml/xmli18n-tmp.h:6272
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4034
+#: src/xml/xmli18n-tmp.h:6273
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4035
+#: src/xml/xmli18n-tmp.h:6274
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:6275
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4037
+#: src/xml/xmli18n-tmp.h:6276
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:4038
+#: src/xml/xmli18n-tmp.h:6277
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4039
+#: src/xml/xmli18n-tmp.h:6278
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:6279
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4041
+#: src/xml/xmli18n-tmp.h:6280
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:6281
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:6282
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4044
+#: src/xml/xmli18n-tmp.h:6283
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:6284
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:6285
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:6286
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:6287
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4049
+#: src/xml/xmli18n-tmp.h:6288
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:6289
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4051
+#: src/xml/xmli18n-tmp.h:6290
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:6291
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4053
+#: src/xml/xmli18n-tmp.h:6292
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4054
+#: src/xml/xmli18n-tmp.h:6293
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:6294
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4056
+#: src/xml/xmli18n-tmp.h:6295
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:6296
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4058
+#: src/xml/xmli18n-tmp.h:6297
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4059
+#: src/xml/xmli18n-tmp.h:6298
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:6299
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:6300
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4062
+#: src/xml/xmli18n-tmp.h:6301
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:6302
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4064
+#: src/xml/xmli18n-tmp.h:6303
+#, fuzzy
+msgid "Epson Stylus Photo R2880"
+msgstr "Stylus Photo 1280"
+
+#: src/xml/xmli18n-tmp.h:6304
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4065
+#: src/xml/xmli18n-tmp.h:6305
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:6306
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4067
+#: src/xml/xmli18n-tmp.h:6307
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:6308
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4069
+#: src/xml/xmli18n-tmp.h:6309
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:6310
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:6311
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4072
+#: src/xml/xmli18n-tmp.h:6312
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:6313
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4074
+#: src/xml/xmli18n-tmp.h:6314
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4075
+#: src/xml/xmli18n-tmp.h:6315
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4076
+#: src/xml/xmli18n-tmp.h:6316
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:6317
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4078
+#: src/xml/xmli18n-tmp.h:6318
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:6319
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:6320
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:6321
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4082
+#: src/xml/xmli18n-tmp.h:6322
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:6323
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4084
+#: src/xml/xmli18n-tmp.h:6324
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4085
+#: src/xml/xmli18n-tmp.h:6325
 #, fuzzy
-msgid "Epson Stylus Photo TX800W"
+msgid "Epson Stylus Photo TX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4086
+#: src/xml/xmli18n-tmp.h:6326
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:4087
+#: src/xml/xmli18n-tmp.h:6327
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:4088
+#: src/xml/xmli18n-tmp.h:6328
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4089
+#: src/xml/xmli18n-tmp.h:6329
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:6330
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4091
+#: src/xml/xmli18n-tmp.h:6331
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:6332
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4093
+#: src/xml/xmli18n-tmp.h:6333
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4094
+#: src/xml/xmli18n-tmp.h:6334
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:6335
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:6336
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4097
+#: src/xml/xmli18n-tmp.h:6337
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:6338
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4099
+#: src/xml/xmli18n-tmp.h:6339
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:6340
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:6341
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:6342
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:6343
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:6344
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:6345
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:6346
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:6347
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:6348
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:6349
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4110
+#: src/xml/xmli18n-tmp.h:6350
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:6351
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:6352
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4113
+#: src/xml/xmli18n-tmp.h:6353
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:6354
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:6355
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4116
+#: src/xml/xmli18n-tmp.h:6356
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:6357
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4118
+#: src/xml/xmli18n-tmp.h:6358
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4119
+#: src/xml/xmli18n-tmp.h:6359
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:6360
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4121
+#: src/xml/xmli18n-tmp.h:6361
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:6362
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:6363
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4124
+#: src/xml/xmli18n-tmp.h:6364
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:6365
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4126
+#: src/xml/xmli18n-tmp.h:6366
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4127
+#: src/xml/xmli18n-tmp.h:6367
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4128
+#: src/xml/xmli18n-tmp.h:6368
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4129
+#: src/xml/xmli18n-tmp.h:6369
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:6370
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:6371
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:6372
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:6373
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:6374
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:6375
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:6376
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:6377
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:6378
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:6379
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:6380
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:6381
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:6382
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:6383
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4144
+#: src/xml/xmli18n-tmp.h:6384
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:6385
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:6386
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:6387
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:6388
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:6389
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:6390
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:6391
+#, fuzzy
+msgid "Epson Stylus DX4000"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:6392
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:6393
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:6394
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4154
+#: src/xml/xmli18n-tmp.h:6395
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:6396
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:6397
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:6398
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:6399
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:6400
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:6401
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:6402
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:6403
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:6404
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:6405
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:6406
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:6407
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:6408
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:6409
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:6410
 #, fuzzy
-msgid "Epson Stylus PX700FW"
+msgid "Epson Stylus PX700W"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:6411
 #, fuzzy
 msgid "Epson Stylus PX800FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:6412
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:4172
+#: src/xml/xmli18n-tmp.h:6413
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:6414
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4174
+#: src/xml/xmli18n-tmp.h:6415
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:6416
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:6417
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4177
+#: src/xml/xmli18n-tmp.h:6418
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4178
+#: src/xml/xmli18n-tmp.h:6419
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:4179
+#: src/xml/xmli18n-tmp.h:6420
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4180
+#: src/xml/xmli18n-tmp.h:6421
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4181
+#: src/xml/xmli18n-tmp.h:6422
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:6423
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:6424
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:6425
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:6426
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:6427
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4187
+#: src/xml/xmli18n-tmp.h:6428
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4188
+#: src/xml/xmli18n-tmp.h:6429
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:6430
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:6431
 #, fuzzy
 msgid "Epson PictureMate Dash"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:6432
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4192
+#: src/xml/xmli18n-tmp.h:6433
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:6434
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:6435
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:6436
 #, fuzzy
 msgid "Epson PictureMate 100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4196
+#: src/xml/xmli18n-tmp.h:6437
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:6438
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:6439
 #, fuzzy
 msgid "Epson PictureMate 215"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4199
+#: src/xml/xmli18n-tmp.h:6440
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:6441
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:6442
 #, fuzzy
 msgid "Epson PictureMate 260"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:6443
 #, fuzzy
 msgid "Epson PictureMate 270"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:6444
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4204
+#: src/xml/xmli18n-tmp.h:6445
 #, fuzzy
 msgid "Epson PictureMate 290"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:6446
 #, fuzzy
 msgid "Epson PictureMate 500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:6447
 #, fuzzy
 msgid "Epson PictureMate 2005"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4207
+#: src/xml/xmli18n-tmp.h:6448
 #, fuzzy
 msgid "Epson WorkForce 30"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:6449
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:6450
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:6451
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:6452
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4212
+#: src/xml/xmli18n-tmp.h:6453
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:6454
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:6455
 msgid "Epson E 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4215
+#: src/xml/xmli18n-tmp.h:6456
 msgid "Epson E 150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4216
+#: src/xml/xmli18n-tmp.h:6457
 msgid "Epson E 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:6458
 #, fuzzy
 msgid "Epson E 300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:6459
 #, fuzzy
 msgid "Epson E 500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4219
+#: src/xml/xmli18n-tmp.h:6460
 #, fuzzy
 msgid "Epson E 520"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:6461
 #, fuzzy
 msgid "Epson E 700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:6462
 #, fuzzy
 msgid "Epson E 720"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:6463
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:6464
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4224
+#: src/xml/xmli18n-tmp.h:6465
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:6466
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:6467
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:6468
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4228
+#: src/xml/xmli18n-tmp.h:6469
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4229
+#: src/xml/xmli18n-tmp.h:6470
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:6471
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:6472
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:6473
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:6474
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:6475
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:6476
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:6477
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:6478
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4238
+#: src/xml/xmli18n-tmp.h:6479
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:6480
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:6481
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:6482
 #, fuzzy
 msgid "Epson PM 670C"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4242
+#: src/xml/xmli18n-tmp.h:6483
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4243
+#: src/xml/xmli18n-tmp.h:6484
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:6485
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:6486
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4246
+#: src/xml/xmli18n-tmp.h:6487
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:6488
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:6490
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4251
+#: src/xml/xmli18n-tmp.h:6492
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4253
+#: src/xml/xmli18n-tmp.h:6494
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4254
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:6496
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:6497
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:6498
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:6499
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4259
+#: src/xml/xmli18n-tmp.h:6500
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4260
+#: src/xml/xmli18n-tmp.h:6501
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:6502
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4262
+#: src/xml/xmli18n-tmp.h:6503
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4263
+#: src/xml/xmli18n-tmp.h:6504
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4264
+#: src/xml/xmli18n-tmp.h:6505
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4265
+#: src/xml/xmli18n-tmp.h:6506
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:6507
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:6508
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:6509
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:6510
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:6511
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:6512
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:6513
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:6514
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4274
+#: src/xml/xmli18n-tmp.h:6515
 #, fuzzy
 msgid "Epson PM A900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4275
+#: src/xml/xmli18n-tmp.h:6516
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4276
+#: src/xml/xmli18n-tmp.h:6517
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:6518
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:6519
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:6520
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:6521
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:6522
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:6523
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:6524
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:6525
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4285
+#: src/xml/xmli18n-tmp.h:6526
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4286
+#: src/xml/xmli18n-tmp.h:6527
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:6528
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:6529
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:6530
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:6531
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:6532
 #, fuzzy
 msgid "Epson PX A650"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4292
+#: src/xml/xmli18n-tmp.h:6533
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:6534
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:6535
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4295
+#: src/xml/xmli18n-tmp.h:6536
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4296
+#: src/xml/xmli18n-tmp.h:6537
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4297
+#: src/xml/xmli18n-tmp.h:6538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:6539
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4299
+#: src/xml/xmli18n-tmp.h:6540
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:6541
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:6542
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:6543
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:6544
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4305
+#: src/xml/xmli18n-tmp.h:6546
 #, fuzzy
 msgid "Epson PX V780"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:6547
 #, fuzzy
 msgid "Epson PX 5500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4307
+#: src/xml/xmli18n-tmp.h:6548
+#, fuzzy
+msgid "Epson PX G5600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6549
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4308
+#: src/xml/xmli18n-tmp.h:6550
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4309
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4310
+#: src/xml/xmli18n-tmp.h:6552
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:6553
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:6554
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4313
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:6556
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4315
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:6559
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:6560
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:6561
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:6562
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:6563
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:6564
 msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:6565
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4324
+#: src/xml/xmli18n-tmp.h:6566
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:6567
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4326
+#: src/xml/xmli18n-tmp.h:6568
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4327
+#: src/xml/xmli18n-tmp.h:6569
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:6570
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:6571
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Brother HL-1430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:6576
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Brother HL-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4337
+#: src/xml/xmli18n-tmp.h:6579
 msgid "Brother HL-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:6580
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:6581
 msgid "Brother HL-1670N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:6582
 msgid "Brother HL-1850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:6583
 msgid "Brother HL-1870N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:6584
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:6585
 msgid "Brother HL-2460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:6586
 msgid "Brother HL-2460N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:6587
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4346
+#: src/xml/xmli18n-tmp.h:6588
 msgid "Brother HL-5030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:6589
 msgid "Brother HL-5040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:6590
 msgid "Brother HL-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:6591
 msgid "Brother HL-5070N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4350
+#: src/xml/xmli18n-tmp.h:6592
 msgid "Brother HL-5140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4351
+#: src/xml/xmli18n-tmp.h:6593
 msgid "Brother HL-5150D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:6594
 msgid "Brother HL-5170DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:6595
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4354
+#: src/xml/xmli18n-tmp.h:6596
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:6597
 msgid "Brother HL-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:6598
 msgid "Brother HL-7050N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4357
+#: src/xml/xmli18n-tmp.h:6599
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4358
+#: src/xml/xmli18n-tmp.h:6600
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:6601
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:6602
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:6603
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:6604
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:6605
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:6606
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:6607
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:6608
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:6609
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:6610
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:6611
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:6612
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:6613
 msgid "DEC 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:6614
 msgid "DEC LN17"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4373
+#: src/xml/xmli18n-tmp.h:6615
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4374
+#: src/xml/xmli18n-tmp.h:6616
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:6617
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4376
+#: src/xml/xmli18n-tmp.h:6618
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:6619
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:6620
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:6621
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:6622
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:6623
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:6624
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:6625
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4384
+#: src/xml/xmli18n-tmp.h:6626
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4385
+#: src/xml/xmli18n-tmp.h:6627
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4386
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4387
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:6630
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4389
+#: src/xml/xmli18n-tmp.h:6631
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4392
+#: src/xml/xmli18n-tmp.h:6634
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:6635
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:6636
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:6637
 #, fuzzy
 msgid "Epson EPL-N2050PS+"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4397
+#: src/xml/xmli18n-tmp.h:6639
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:6640
 #, fuzzy
 msgid "Epson EPL-N2500PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4400
+#: src/xml/xmli18n-tmp.h:6642
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:6643
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4403
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:6646
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:6647
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definer ny skriver"
 
-#: src/xml/xmli18n-tmp.h:4406
+#: src/xml/xmli18n-tmp.h:6648
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Definer ny skriver"
 
-#: src/xml/xmli18n-tmp.h:4407
+#: src/xml/xmli18n-tmp.h:6649
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definer ny skriver"
 
-#: src/xml/xmli18n-tmp.h:4408
+#: src/xml/xmli18n-tmp.h:6650
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Definer ny skriver"
 
-#: src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:6651
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definer ny skriver"
 
-#: src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:6652
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Definer ny skriver"
 
-#: src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:6653
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definer ny skriver"
 
-#: src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:6654
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Definer ny skriver"
 
-#: src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:6656
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Definer ny skriver"
 
-#: src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:6657
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4416
+#: src/xml/xmli18n-tmp.h:6658
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:6659
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:6660
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:6661
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4420
-msgid "Gestetner 3532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4421
-msgid "Gestetner 4235g"
+#: src/xml/xmli18n-tmp.h:6662
+msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:6663
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4423
-msgid "Gestetner 4532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4424
-msgid "Gestetner 4245g"
+#: src/xml/xmli18n-tmp.h:6664
+msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:6665
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:6666
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:6668
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:6669
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:6670
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4431
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:6672
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:6673
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:6674
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:6675
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4436
+#: src/xml/xmli18n-tmp.h:6676
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4437
-msgid "Gestetner DSm635"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4438
-msgid "Gestetner DSm635G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4439
-msgid "Gestetner DSm645"
+#: src/xml/xmli18n-tmp.h:6677
+msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4440
-msgid "Gestetner DS645G"
+#: src/xml/xmli18n-tmp.h:6678
+msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:6679
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:6680
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4443
+#: src/xml/xmli18n-tmp.h:6681
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:6682
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:6683
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4446
-msgid "Gestetner DSm735"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4447
-msgid "Gestetner DSm735G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4448
-msgid "Gestetner DSm745"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4449
-msgid "Gestetner DSm745G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4450
-msgid "Gestetner MP1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4451
-msgid "Gestetner DSm7110"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4452
-msgid "Gestetner MP1350"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4453
-msgid "Gestetner DSm7135"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4454
-msgid "Gestetner MP1600"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4455
-msgid "Gestetner DSm716"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4456
-msgid "Gestetner MP2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4457
-msgid "Gestetner DSm721d"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4458
-msgid "Gestetner MP2500"
+#: src/xml/xmli18n-tmp.h:6684
+msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4459
-msgid "Gestetner DSm625"
+#: src/xml/xmli18n-tmp.h:6685
+msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4460
-msgid "Gestetner MP3500"
+#: src/xml/xmli18n-tmp.h:6686
+msgid "Gestetner MP1100/DSm7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4461
-msgid "Gestetner DSm735e"
+#: src/xml/xmli18n-tmp.h:6687
+msgid "Gestetner MP1350/DSm7135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4462
-msgid "Gestetner MP4500"
+#: src/xml/xmli18n-tmp.h:6688
+msgid "Gestetner MP1600/DSm716"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4463
-msgid "Gestetner DSm745e"
+#: src/xml/xmli18n-tmp.h:6689
+msgid "Gestetner MP2000/DSm721d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4464
-msgid "Gestetner MP5500"
+#: src/xml/xmli18n-tmp.h:6690
+msgid "Gestetner MP2500/DSm625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4465
-msgid "Gestetner DSm755"
+#: src/xml/xmli18n-tmp.h:6691
+msgid "Gestetner MP3500/DSm735e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4466
-msgid "Gestetner MP6500"
+#: src/xml/xmli18n-tmp.h:6692
+msgid "Gestetner MP4500/DSm745e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4467
-msgid "Gestetner DSm765"
+#: src/xml/xmli18n-tmp.h:6693
+msgid "Gestetner MP5500/DSm755"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4468
-msgid "Gestetner MP7500"
+#: src/xml/xmli18n-tmp.h:6694
+msgid "Gestetner MP6500/DSm765"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4469
-msgid "Gestetner DSm775"
+#: src/xml/xmli18n-tmp.h:6695
+msgid "Gestetner MP7500/DSm775"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4470
-msgid "Gestetner MP9000"
+#: src/xml/xmli18n-tmp.h:6696
+msgid "Gestetner MP9000/DSm790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4471
-msgid "Gestetner DSm790"
+#: src/xml/xmli18n-tmp.h:6697
+msgid "Gestetner MP 161/DSm416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4472
-msgid "Gestetner MP 161"
+#: src/xml/xmli18n-tmp.h:6698
+msgid "Gestetner MP 2510/DSm725e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4473
-msgid "Gestetner DSm416"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4474
-msgid "Gestetner MP 2510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4475
-msgid "Gestetner DSm725e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:6699
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:6700
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4478
-msgid "Gestetner MP 3010"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4479
-msgid "Gestetner DSm730e"
+#: src/xml/xmli18n-tmp.h:6701
+msgid "Gestetner MP 3010/DSm730e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4480
+#: src/xml/xmli18n-tmp.h:6702
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:6703
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:6704
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:6705
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Gestetner MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:6707
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:6708
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:6709
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:6710
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4489
+#: src/xml/xmli18n-tmp.h:6711
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:6712
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:6713
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4492
+#: src/xml/xmli18n-tmp.h:6714
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:6715
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:6716
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4495
+#: src/xml/xmli18n-tmp.h:6717
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4496
+#: src/xml/xmli18n-tmp.h:6718
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4497
+#: src/xml/xmli18n-tmp.h:6719
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:6720
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:6721
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:6722
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:6723
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:6724
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:6725
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:6726
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:6727
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4506
+#: src/xml/xmli18n-tmp.h:6728
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:6729
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4508
+#: src/xml/xmli18n-tmp.h:6730
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4509
+#: src/xml/xmli18n-tmp.h:6731
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4510
+#: src/xml/xmli18n-tmp.h:6732
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:6733
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:6734
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:6735
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:6736
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:6737
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:6738
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:6739
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4518
+#: src/xml/xmli18n-tmp.h:6740
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:6741
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:6742
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:6743
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:6744
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4523
+#: src/xml/xmli18n-tmp.h:6745
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:6746
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:6747
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:6748
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:6749
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4528
+#: src/xml/xmli18n-tmp.h:6750
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4529
+#: src/xml/xmli18n-tmp.h:6751
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4530
+#: src/xml/xmli18n-tmp.h:6752
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:6753
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4532
+#: src/xml/xmli18n-tmp.h:6754
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:6755
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:6756
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:6757
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:6758
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:6759
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:6760
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4539
+#: src/xml/xmli18n-tmp.h:6761
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4540
+#: src/xml/xmli18n-tmp.h:6762
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4541
+#: src/xml/xmli18n-tmp.h:6763
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4542
+#: src/xml/xmli18n-tmp.h:6764
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4543
+#: src/xml/xmli18n-tmp.h:6765
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:6766
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:6767
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4546
+#: src/xml/xmli18n-tmp.h:6768
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:6769
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:6770
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:6771
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:6772
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:6773
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4552
+#: src/xml/xmli18n-tmp.h:6774
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:6775
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:6776
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:6777
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:6778
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:6779
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:6780
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:6781
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:6782
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:6783
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:6784
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:6785
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:6786
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:6787
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:6788
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4567
+#: src/xml/xmli18n-tmp.h:6789
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4568
+#: src/xml/xmli18n-tmp.h:6790
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:6791
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4570
+#: src/xml/xmli18n-tmp.h:6792
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4571
+#: src/xml/xmli18n-tmp.h:6793
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:6794
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:6795
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:6796
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:6797
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:6798
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:6799
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:6800
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:6801
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:6802
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:6803
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4582
+#: src/xml/xmli18n-tmp.h:6804
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4583
+#: src/xml/xmli18n-tmp.h:6805
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4584
+#: src/xml/xmli18n-tmp.h:6806
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4585
+#: src/xml/xmli18n-tmp.h:6807
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:6808
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:6809
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:6810
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:6811
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:6812
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:6813
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:6814
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4593
+#: src/xml/xmli18n-tmp.h:6815
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4594
+#: src/xml/xmli18n-tmp.h:6816
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:6817
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:6818
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4597
+#: src/xml/xmli18n-tmp.h:6819
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:6820
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:6821
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:6822
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:6823
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4602
+#: src/xml/xmli18n-tmp.h:6824
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:6825
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:6826
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:6827
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:6828
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4607
+#: src/xml/xmli18n-tmp.h:6829
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:6830
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4609
+#: src/xml/xmli18n-tmp.h:6831
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4610
+#: src/xml/xmli18n-tmp.h:6832
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:6833
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:6834
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4613
+#: src/xml/xmli18n-tmp.h:6835
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:6836
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:6837
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:6838
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:6839
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:6840
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:6841
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:6842
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:6843
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:6844
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:6845
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4624
+#: src/xml/xmli18n-tmp.h:6846
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4625
+#: src/xml/xmli18n-tmp.h:6847
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:6848
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4627
+#: src/xml/xmli18n-tmp.h:6849
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4628
+#: src/xml/xmli18n-tmp.h:6850
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:6851
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:6852
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:6853
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:6854
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:6855
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:6856
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:6857
 msgid "HP LaserJet 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4636
+#: src/xml/xmli18n-tmp.h:6858
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4637
+#: src/xml/xmli18n-tmp.h:6859
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4638
+#: src/xml/xmli18n-tmp.h:6860
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:6861
 msgid "HP LaserJet 1320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4640
+#: src/xml/xmli18n-tmp.h:6862
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:6863
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:6864
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:6865
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4644
+#: src/xml/xmli18n-tmp.h:6866
 msgid "HP LaserJet 2410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:6867
 msgid "HP LaserJet 2420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:6868
 msgid "HP LaserJet 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4647
+#: src/xml/xmli18n-tmp.h:6869
 msgid "HP LaserJet 3015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4648
+#: src/xml/xmli18n-tmp.h:6870
 msgid "HP LaserJet 3020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:6871
 msgid "HP LaserJet 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4650
+#: src/xml/xmli18n-tmp.h:6872
 msgid "HP LaserJet 3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:6873
 msgid "HP LaserJet 3052"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:6874
 msgid "HP LaserJet 3055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:6875
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:6876
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:6877
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:6878
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:6879
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:6880
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:6881
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4660
+#: src/xml/xmli18n-tmp.h:6882
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:6883
 msgid "HP LaserJet 3380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:6884
 msgid "HP LaserJet 3390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4663
+#: src/xml/xmli18n-tmp.h:6885
 msgid "HP LaserJet 3392"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:6886
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:6887
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:6888
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4667
+#: src/xml/xmli18n-tmp.h:6889
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:6890
 msgid "HP LaserJet 4240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:6891
 msgid "HP LaserJet 4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:6892
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4671
+#: src/xml/xmli18n-tmp.h:6893
 msgid "HP LaserJet 4345 mfp"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:6894
 msgid "HP LaserJet 4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:6895
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:6896
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:6897
 msgid "HP LaserJet 5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:6898
 msgid "HP LaserJet 5200L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:6899
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:6900
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:6901
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4680
+#: src/xml/xmli18n-tmp.h:6902
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:6903
 msgid "HP LaserJet 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4682
+#: src/xml/xmli18n-tmp.h:6904
 msgid "HP LaserJet 9040 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4683
+#: src/xml/xmli18n-tmp.h:6905
 msgid "HP LaserJet 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4684
+#: src/xml/xmli18n-tmp.h:6906
 msgid "HP LaserJet 9050 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:6907
 msgid "HP LaserJet M3027 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:6908
 msgid "HP LaserJet M3035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:6909
 msgid "HP LaserJet M4345 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:6910
 msgid "HP LaserJet M5025 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:6911
 msgid "HP LaserJet M5035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:6912
 msgid "HP LaserJet P2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:6913
 msgid "HP LaserJet P2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:6914
 msgid "HP LaserJet P3004"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:6915
 msgid "HP LaserJet P3005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:6916
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4695
+#: src/xml/xmli18n-tmp.h:6917
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:6918
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:6919
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:6920
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:6921
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4700
+#: src/xml/xmli18n-tmp.h:6922
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:6923
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:6924
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4703
+#: src/xml/xmli18n-tmp.h:6925
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:6926
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:6927
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4706
+#: src/xml/xmli18n-tmp.h:6928
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4707
+#: src/xml/xmli18n-tmp.h:6929
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:6930
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:6931
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4710
+#: src/xml/xmli18n-tmp.h:6932
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:6933
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:6934
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:6935
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:6936
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:6937
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:6938
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:6939
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4718
+#: src/xml/xmli18n-tmp.h:6940
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:6941
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:6942
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4721
+#: src/xml/xmli18n-tmp.h:6943
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:6944
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:6945
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:6946
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4725
+#: src/xml/xmli18n-tmp.h:6947
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:6948
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:6949
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4728
+#: src/xml/xmli18n-tmp.h:6950
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4729
+#: src/xml/xmli18n-tmp.h:6951
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:6952
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:6953
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4732
+#: src/xml/xmli18n-tmp.h:6954
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:6955
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:6956
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:6957
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:6958
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:6959
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:6960
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4739
+#: src/xml/xmli18n-tmp.h:6961
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4740
+#: src/xml/xmli18n-tmp.h:6962
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4741
+#: src/xml/xmli18n-tmp.h:6963
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4742
+#: src/xml/xmli18n-tmp.h:6964
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:6965
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:6966
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4745
+#: src/xml/xmli18n-tmp.h:6967
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:6968
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:6969
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:6970
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4749
+#: src/xml/xmli18n-tmp.h:6971
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:6972
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:6973
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4752
+#: src/xml/xmli18n-tmp.h:6974
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:6975
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:6976
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4755
+#: src/xml/xmli18n-tmp.h:6977
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:6978
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:6979
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:6980
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4759
+#: src/xml/xmli18n-tmp.h:6981
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4760
+#: src/xml/xmli18n-tmp.h:6982
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:6983
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4762
+#: src/xml/xmli18n-tmp.h:6984
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:6985
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:6986
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4765
+#: src/xml/xmli18n-tmp.h:6987
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:6988
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:6989
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Skrivernavn:"
 
-#: src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:6991
 msgid "IBM 4019"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:6992
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:6993
 msgid "IBM 4312"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4772
+#: src/xml/xmli18n-tmp.h:6994
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:6995
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4774
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4775
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4776
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:6999
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:7000
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:7002
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:7003
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:7004
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:7005
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:7006
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:7007
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:7008
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:7009
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:7010
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:7011
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4790
+#: src/xml/xmli18n-tmp.h:7012
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:7013
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:7014
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:7015
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4794
+#: src/xml/xmli18n-tmp.h:7016
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:7017
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:7018
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4797
+#: src/xml/xmli18n-tmp.h:7019
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:7020
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:7021
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:7022
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:7023
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:7025
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:7026
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:7027
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:7028
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4807
+#: src/xml/xmli18n-tmp.h:7029
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4808
+#: src/xml/xmli18n-tmp.h:7030
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:7031
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:7032
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:7034
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:7035
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:7037
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:7039
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:7040
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4819
+#: src/xml/xmli18n-tmp.h:7041
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:7042
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:7043
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:7044
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:7045
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:7046
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:7047
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:7048
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:7049
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:7050
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:7051
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4830
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:7057
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4837
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4840
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4842
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4852
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4853
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4854
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4855
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4866
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4867
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4873
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4874
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4883
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4886
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4888
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4890
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4894
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4896
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4903
-msgid "Lanier MP 2500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4904
-msgid "Lanier LD125"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4905
-msgid "Lanier MP 1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4906
-msgid "Lanier LD1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4907
-msgid "Lanier MP 1350"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4908
-msgid "Lanier LD1135"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4909
-msgid "Lanier MP 1600"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4910
-msgid "Lanier LD316"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4911
-msgid "Lanier MP 161"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4912
-msgid "Lanier LD016"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4913
-msgid "Lanier MP 2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4914
-msgid "Lanier LD320d"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4915
-msgid "Lanier MP 2510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4916
-msgid "Lanier LD325"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4917
-msgid "Lanier MP 2550B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4918
-msgid "Lanier LD425B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4919
-msgid "Lanier MP 2550"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4920
-msgid "Lanier LD425"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4921
-msgid "Lanier MP 3010"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4922
-msgid "Lanier LD330"
+#: src/xml/xmli18n-tmp.h:7125
+msgid "Lanier MP2500/LD125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4923
-msgid "Lanier MP 3350B"
+#: src/xml/xmli18n-tmp.h:7126
+msgid "Lanier MP 1100/LD1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4924
-msgid "Lanier LD433B"
+#: src/xml/xmli18n-tmp.h:7127
+msgid "Lanier MP 1350/LD1135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4925
-msgid "Lanier MP 3350"
+#: src/xml/xmli18n-tmp.h:7128
+msgid "Lanier MP 1600/LD316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4926
-msgid "Lanier LD433"
+#: src/xml/xmli18n-tmp.h:7129
+msgid "Lanier MP 161/LD016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4927
-msgid "Lanier MP 3500"
+#: src/xml/xmli18n-tmp.h:7130
+msgid "Lanier MP 2000/LD320d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4928
-msgid "Lanier LD335"
+#: src/xml/xmli18n-tmp.h:7131
+msgid "Lanier MP 2510/LD325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4929
-msgid "Lanier MP 4000B"
+#: src/xml/xmli18n-tmp.h:7132
+msgid "Lanier MP 2550B/LD425B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4930
-msgid "Lanier LD040B"
+#: src/xml/xmli18n-tmp.h:7133
+msgid "Lanier MP 2550/LD425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4931
-msgid "Lanier MP 4000"
+#: src/xml/xmli18n-tmp.h:7134
+msgid "Lanier MP 3010/LD330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4932
-msgid "Lanier LD040"
+#: src/xml/xmli18n-tmp.h:7135
+msgid "Lanier MP 3350B/LD433B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4933
-msgid "Lanier MP 4500"
+#: src/xml/xmli18n-tmp.h:7136
+msgid "Lanier MP 3350/LD433"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4934
-msgid "Lanier LD345"
+#: src/xml/xmli18n-tmp.h:7137
+msgid "Lanier MP 3500/LD335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4935
-msgid "Lanier MP 5000B"
+#: src/xml/xmli18n-tmp.h:7138
+msgid "Lanier MP 4000B/LD040B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4936
-msgid "Lanier LD050B"
+#: src/xml/xmli18n-tmp.h:7139
+msgid "Lanier MP 4000/LD040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4937
-msgid "Lanier MP 5000"
+#: src/xml/xmli18n-tmp.h:7140
+msgid "Lanier MP 4500/LD345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4938
-msgid "Lanier LD050"
+#: src/xml/xmli18n-tmp.h:7141
+msgid "Lanier MP 5000B/LD050B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4939
-msgid "Lanier MP 5500"
+#: src/xml/xmli18n-tmp.h:7142
+msgid "Lanier MP 5000/LD050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4940
-msgid "Lanier LD255"
+#: src/xml/xmli18n-tmp.h:7143
+msgid "Lanier MP 5500/LD255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4941
-msgid "Lanier MP 6500"
+#: src/xml/xmli18n-tmp.h:7144
+msgid "Lanier MP 6500/LD265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4942
-msgid "Lanier LD265"
+#: src/xml/xmli18n-tmp.h:7145
+msgid "Lanier MP 7500/LD275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4943
-msgid "Lanier MP 7500"
+#: src/xml/xmli18n-tmp.h:7146
+msgid "Lanier MP 9000/LD190"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4944
-msgid "Lanier LD275"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4945
-msgid "Lanier MP 9000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4946
-msgid "Lanier LD190"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:7148
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4950
+#: src/xml/xmli18n-tmp.h:7150
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:7151
 msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4952
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4953
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:7155
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4960
+#: src/xml/xmli18n-tmp.h:7160
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:7161
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:7162
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4963
+#: src/xml/xmli18n-tmp.h:7163
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:7164
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:7165
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4966
-msgid "NRG 10515"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4967
-msgid "NRG 10518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4968
-msgid "NRG 10512"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4969
-msgid "NRG 2205"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4970
-msgid "NRG 2238"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4971
-msgid "NRG 2212"
+#: src/xml/xmli18n-tmp.h:7166
+msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4972
-msgid "NRG 2705"
+#: src/xml/xmli18n-tmp.h:7167
+msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4973
-msgid "NRG 2738"
+#: src/xml/xmli18n-tmp.h:7168
+msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4974
-msgid "NRG 2712"
+#: src/xml/xmli18n-tmp.h:7169
+msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4975
-msgid "NRG 3205"
+#: src/xml/xmli18n-tmp.h:7170
+msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4976
-msgid "NRG 3238"
+#: src/xml/xmli18n-tmp.h:7171
+msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4977
-msgid "NRG 3212"
+#: src/xml/xmli18n-tmp.h:7172
+msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4978
-msgid "NRG 3525"
+#: src/xml/xmli18n-tmp.h:7173
+msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4979
-msgid "NRG 3508"
+#: src/xml/xmli18n-tmp.h:7174
+msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4980
-msgid "NRG 3502"
+#: src/xml/xmli18n-tmp.h:7175
+msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4981
-msgid "NRG 3545"
+#: src/xml/xmli18n-tmp.h:7176
+msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4982
-msgid "NRG 3518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4983
-msgid "NRG 3532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4984
-msgid "NRG 4525"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4985
-msgid "NRG 4508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4986
-msgid "NRG 4502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4987
-msgid "NRG 4545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4988
-msgid "NRG 4518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4989
-msgid "NRG 4532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4990
-msgid "NRG 6002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4991
-msgid "NRG 6005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4992
-msgid "NRG 6008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4993
-msgid "NRG 7502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4994
-msgid "NRG 7505"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4995
-msgid "NRG 7508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4996
-msgid "NRG 9005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4997
-msgid "NRG 9008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4998
-msgid "NRG 9002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:7177
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:7178
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5001
+#: src/xml/xmli18n-tmp.h:7179
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:7180
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:7181
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:7182
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:7183
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5006
+#: src/xml/xmli18n-tmp.h:7184
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:7185
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:7186
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5009
+#: src/xml/xmli18n-tmp.h:7187
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:7188
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:7189
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:7190
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:7191
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:7192
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5015
+#: src/xml/xmli18n-tmp.h:7193
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5016
+#: src/xml/xmli18n-tmp.h:7194
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5017
+#: src/xml/xmli18n-tmp.h:7195
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:7196
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:7197
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:7198
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:7199
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:7200
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:7201
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:7202
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5025
+#: src/xml/xmli18n-tmp.h:7203
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:7204
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:7205
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5028
+#: src/xml/xmli18n-tmp.h:7206
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:7207
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:7208
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:7209
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:7210
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5033
+#: src/xml/xmli18n-tmp.h:7211
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:7212
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:7213
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:7214
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:7215
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:7216
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:7217
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5040
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5051
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5053
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:7234
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:7235
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5060
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5062
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5063
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:7242
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:7243
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:7244
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:7245
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:7246
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:7247
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:7248
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:7249
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5072
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5074
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5075
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5076
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:7255
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:7258
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5081
+#: src/xml/xmli18n-tmp.h:7259
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:7263
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5086
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5088
+#: src/xml/xmli18n-tmp.h:7266
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:7267
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5090
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5091
+#: src/xml/xmli18n-tmp.h:7269
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:7270
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5093
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5099
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5103
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5104
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:7284
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5107
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5108
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5110
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5118
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5120
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5126
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5127
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5131
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5133
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5134
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5138
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5146
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5147
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5150
-msgid "Savin 2535"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5151
-msgid "Savin 2235"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5152
-msgid "Savin 2545"
+#: src/xml/xmli18n-tmp.h:7328
+msgid "Savin 2535/2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5153
-msgid "Savin 2245"
+#: src/xml/xmli18n-tmp.h:7329
+msgid "Savin 2545/2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5154
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Savin 2560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5155
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5158
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5160
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5163
-msgid "Savin 4035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5164
-msgid "Savin 4135g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5165
-msgid "Savin 4035e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5166
-msgid "Savin 4135eG"
+#: src/xml/xmli18n-tmp.h:7339
+msgid "Savin 4035/4135g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5167
-msgid "Savin 4045"
+#: src/xml/xmli18n-tmp.h:7340
+msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5168
-msgid "Savin 4145g"
+#: src/xml/xmli18n-tmp.h:7341
+msgid "Savin 4045/4145g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5169
-msgid "Savin 4045e"
+#: src/xml/xmli18n-tmp.h:7342
+msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5170
-msgid "Savin 4145eG"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5171
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Savin 4060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5173
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5174
+#: src/xml/xmli18n-tmp.h:7346
 msgid "Savin 4090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:7348
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5177
+#: src/xml/xmli18n-tmp.h:7349
 msgid "Savin 8020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:7353
 msgid "Savin 8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5183
-msgid "Savin 8035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5184
-msgid "Savin 8035g"
+#: src/xml/xmli18n-tmp.h:7355
+msgid "Savin 8035/8035g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5186
-msgid "Savin 8045"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5187
-msgid "Savin 8045g"
+#: src/xml/xmli18n-tmp.h:7357
+msgid "Savin 8045/8045g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5190
+#: src/xml/xmli18n-tmp.h:7360
 msgid "Savin 8065"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5192
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Savin 8090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5194
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:7370
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5201
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:7373
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:7374
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5205
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5206
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:7379
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5211
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Sett opp skriver"
 
-#: src/xml/xmli18n-tmp.h:5212
+#: src/xml/xmli18n-tmp.h:7382
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5213
+#: src/xml/xmli18n-tmp.h:7383
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5216
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5221
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5224
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5225
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5227
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5230
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:7404
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5236
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:7409
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:7410
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5244
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5247
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5249
+#: src/xml/xmli18n-tmp.h:7419
+#, fuzzy
+msgid "Canon SELPHY-CP-520"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Canon SELPHY-CP-720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5252
+#: src/xml/xmli18n-tmp.h:7423
 #, fuzzy
 msgid "Canon SELPHY-CP-730"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Canon SELPHY-CP-740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:7425
 #, fuzzy
 msgid "Canon SELPHY-CP-750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Canon SELPHY ES1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Canon SELPHY ES2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Canon SELPHY ES20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5258
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5259
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:7434
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:7438
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5268
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Dai Nippon Printing DS40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Dai Nippon Printing DS80"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5269
+#: src/xml/xmli18n-tmp.h:7442
 msgid "RAW DATA 8 bit"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Epson Stylus Offixe TX300F"
+#~ msgstr "Stylus C20sx"
+
 #~ msgid "ISOLatin1"
 #~ msgstr "ISOLatin1"
 
diff --git a/po/nl.gmo b/po/nl.gmo
index 94712a4..105ba74 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index 7014df2..1cf5b5f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,29 +1,29 @@
-# translation of gutenprint-5.2.0-rc1.po to Dutch
+# translation of gutenprint-5.2.3.99.1.nl.po to Dutch
 # Dutch translations for gutenprint.
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gutenprint package.
 #
 # Vincent van Adrighem <vincent@dirck.mine.nu>, 2002.
 # Benno Schulenberg <benno@vertaalt.nl>, 2008.
-# Freek de Kruijf <f.de.kruijf@hetnet.nl>, 2006, 2007, 2008.
+# Freek de Kruijf <f.de.kruijf@hetnet.nl>, 2006, 2007, 2008, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gutenprint-5.2.0-rc1\n"
+"Project-Id-Version: gutenprint 5.2.3.99.1\n"
 "Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-21 22:25-0500\n"
-"PO-Revision-Date: 2008-10-09 20:51+0200\n"
+"POT-Creation-Date: 2009-07-26 19:14-0400\n"
+"PO-Revision-Date: 2009-06-14 23:06+0200\n"
 "Last-Translator: Freek de Kruijf <f.de.kruijf@hetnet.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2109 src/main/print-pcl.c:1779
+#: src/main/print-escp2.c:2314 src/main/print-pcl.c:1779
 msgid "Default"
 msgstr "Standaard"
 
@@ -96,15 +96,15 @@ msgstr "Dichtheid"
 
 #: src/main/dither-main.c:91 src/main/print-canon.c:300
 #: src/main/print-canon.c:308 src/main/print-canon.c:316
-#: src/main/print-canon.c:324 src/main/print-escp2.c:439
-#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
-#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-canon.c:324 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: 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-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:1769
-#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
-#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1935
+#: src/main/print-olympus.c:1943 src/main/print-olympus.c:1951
+#: src/main/print-olympus.c:1959 src/main/print-pcl.c:1324
 #: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
 #: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
@@ -165,7 +165,7 @@ msgid "Dither algorithm"
 msgstr "Ruis-algoritme"
 
 #: src/main/print-canon.c:199 src/main/print-escp2.c:165
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1866
 #: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Paginagrootte"
@@ -182,8 +182,8 @@ msgstr "Paginagrootte"
 #: src/main/print-escp2.c:254 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:1704 src/main/print-olympus.c:1710
-#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-olympus.c:1866 src/main/print-olympus.c:1872
+#: src/main/print-olympus.c:1878 src/main/print-olympus.c:1884
 #: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
 #: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
 #: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
@@ -192,31 +192,31 @@ msgid "Basic Printer Setup"
 msgstr "Printerinstellingen"
 
 #: src/main/print-canon.c:200 src/main/print-escp2.c:166
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1867
 #: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr "Grootte van het papier waarop geprint wordt"
 
 #: src/main/print-canon.c:205 src/main/print-escp2.c:171
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1259 src/cups/genppd.c:1339 src/cups/genppd.c:2001
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1872
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1372 src/cups/genppd.c:2035
 msgid "Media Type"
 msgstr "Type medium"
 
 #: src/main/print-canon.c:206 src/main/print-escp2.c:172
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1873
 #: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Type medium (blanco papier, fotopapier, etc.)"
 
 #: src/main/print-canon.c:211 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
-#: src/main/print-pcl.c:1265 src/cups/genppd.c:1368 src/cups/genppd.c:2020
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1878
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1401 src/cups/genppd.c:2054
 msgid "Media Source"
 msgstr "Bronmedium"
 
 #: src/main/print-canon.c:212 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1879
 #: src/main/print-pcl.c:1266
 msgid "Source (input slot) of the media"
 msgstr "Bronmedium (invoerpoort)"
@@ -252,8 +252,8 @@ msgstr "Horizontale fijnafstelling van CD"
 #: src/main/print-canon.c:235 src/main/print-canon.c:241
 #: src/main/print-canon.c:253 src/main/print-escp2.c:207
 #: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1906
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr "Geavanceerde instelling van de printer"
@@ -268,25 +268,25 @@ msgid "CD Vertical Fine Adjustment"
 msgstr "Verticale fijnafstelling van CD"
 
 #: src/main/print-canon.c:247 src/main/print-escp2.c:219
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
-#: src/main/print-pcl.c:1277 src/cups/genppd.c:1446 src/cups/genppd.c:2056
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1884
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1479 src/cups/genppd.c:2090
 msgid "Resolution"
 msgstr "Resolutie"
 
 #: src/main/print-canon.c:248 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1723
+#: src/main/print-olympus.c:1885
 msgid "Resolution and quality of the print"
 msgstr "Resolutie en kwaliteit van de afdruk"
 
 #: src/main/print-canon.c:253 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Type inkt"
 
 #: src/main/print-canon.c:254 src/main/print-escp2.c:231
 #: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
+#: src/main/print-olympus.c:1891 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Type inkt van de printer"
@@ -304,32 +304,33 @@ msgstr "Inktkanalen"
 #: 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-escp2.c:320 src/main/print-escp2.c:767
-#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
-#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
-#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
-#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:893 src/main/print-escp2.c:901
+#: src/main/print-escp2.c:909 src/main/print-escp2.c:925
+#: src/main/print-escp2.c:933 src/main/print-escp2.c:941
+#: src/main/print-escp2.c:949 src/main/print-escp2.c:957
+#: src/main/print-escp2.c:965 src/main/print-escp2.c:973
 #: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr "Geavanceerde functionaliteit van de printer"
 
-#: src/main/print-canon.c:265 src/main/print-escp2.c:326
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-canon.c:265 src/main/print-escp2.c:332
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1912
 #: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Wijze van printen"
 
 #: src/main/print-canon.c:265 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:326
-#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-color.c:208 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1912 src/main/print-pcl.c:1295
 #: src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr "Hoofdparameters"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:327
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-canon.c:266 src/main/print-escp2.c:333
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1913
 #: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Manier van printen"
@@ -357,77 +358,84 @@ msgstr "Printkwaliteit"
 msgid "Basic Output Adjustment"
 msgstr "Basis uitvoeraanpassing"
 
-#: src/main/print-canon.c:300 src/main/print-escp2.c:439
+#: src/main/print-canon.c:300 src/main/print-escp2.c:445
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 msgid "Cyan Density"
 msgstr "Hoeveelheid cyaan"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:301 src/main/print-escp2.c:446
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 msgid "Adjust the cyan density"
 msgstr "Pas de hoeveelheid cyaan aan"
 
-#: src/main/print-canon.c:308 src/main/print-escp2.c:447
+#: src/main/print-canon.c:308 src/main/print-escp2.c:453
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 msgid "Magenta Density"
 msgstr "Hoeveelheid magenta"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:309 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 msgid "Adjust the magenta density"
 msgstr "Pas de hoeveelheid magenta aan"
 
-#: src/main/print-canon.c:316 src/main/print-escp2.c:455
+#: src/main/print-canon.c:316 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 msgid "Yellow Density"
 msgstr "Hoeveelheid geel"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:317 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 msgid "Adjust the yellow density"
 msgstr "Pas de hoeveelheid geel aan"
 
-#: src/main/print-canon.c:324 src/main/print-escp2.c:463
+#: src/main/print-canon.c:324 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 msgid "Black Density"
 msgstr "Hoeveelheid zwart"
 
-#: src/main/print-canon.c:325 src/main/print-escp2.c:464
+#: src/main/print-canon.c:325 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 msgid "Adjust the black density"
 msgstr "Pas de hoeveelheid zwart aan"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:333
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:541 src/main/print-escp2.c:542
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 msgid "Light Cyan Transition"
 msgstr "Lichtcyaan-overgang"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:340
-#: src/main/print-canon.c:348 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
-#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
-#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
-#: src/main/print-pcl.c:1364
+#: src/main/print-canon.c:348 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:541
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:557
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:573
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:589
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:605
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:621
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:637
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:653
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:669
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:685
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:701
+#: src/main/print-escp2.c:709 src/main/print-escp2.c:717
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:733
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:749
+#: src/main/print-escp2.c:757 src/main/print-escp2.c:765
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:781
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:797
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:813
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:829
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:845
+#: src/main/print-escp2.c:853 src/main/print-escp2.c:861
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr "Geavanceerde aanpassing van de inkt"
 
 #: src/main/print-canon.c:340 src/main/print-canon.c:341
-#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
+#: src/main/print-escp2.c:573 src/main/print-escp2.c:574
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 msgid "Light Magenta Transition"
@@ -437,14 +445,14 @@ msgstr "Lichtmagenta-overgang"
 msgid "Light Yellow Transition"
 msgstr "Lichtgeel-overgang"
 
-#: src/main/print-canon.c:368 src/main/print-escp2.c:2283
-#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3609
-#: src/xml/xmli18n-tmp.h:3614 src/xml/xmli18n-tmp.h:3620
-#: src/xml/xmli18n-tmp.h:3627
+#: src/main/print-canon.c:368 src/main/print-escp2.c:2488
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5851 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5864
 msgid "Off"
 msgstr "Uit"
 
-#: src/main/print-canon.c:369 src/main/print-escp2.c:2285
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2490
 #: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr "Lange zijde (standaard)"
@@ -453,63 +461,64 @@ msgstr "Lange zijde (standaard)"
 msgid "Short Edge (Flip)"
 msgstr "Korte zijde (omslaan)"
 
-#: src/main/print-canon.c:646 src/main/print-escp2.c:2005
-#: src/xml/xmli18n-tmp.h:3676
+#: src/main/print-canon.c:646 src/main/print-escp2.c:2210
+#: src/xml/xmli18n-tmp.h:5913
 msgid "CD - 5 inch"
 msgstr "CD - 5 inch"
 
-#: src/main/print-canon.c:648 src/main/print-escp2.c:2007
-#: src/xml/xmli18n-tmp.h:3677
+#: src/main/print-canon.c:648 src/main/print-escp2.c:2212
+#: src/xml/xmli18n-tmp.h:5914
 msgid "CD - 3 inch"
 msgstr "CD - 3 inch"
 
-#: src/main/print-canon.c:650 src/main/print-escp2.c:2009
-#: src/xml/xmli18n-tmp.h:3678
+#: src/main/print-canon.c:650 src/main/print-escp2.c:2214
+#: src/xml/xmli18n-tmp.h:5915
 msgid "CD - Custom"
 msgstr "CD - handmatig"
 
-#: src/main/print-canon.c:673 src/main/print-escp2.c:2034
-#: src/cups/genppd.c:1323 src/cups/genppd.c:1572 src/cups/genppd.c:1988
-#: src/cups/genppd.c:2079
+#: src/main/print-canon.c:673 src/main/print-escp2.c:2239
+#: src/cups/genppd.c:1356 src/cups/genppd.c:1605 src/cups/genppd.c:2022
+#: src/cups/genppd.c:2113
 msgid "Normal"
 msgstr "Normaal"
 
-#: src/main/print-canon.c:675 src/main/print-escp2.c:2036
+#: src/main/print-canon.c:675 src/main/print-escp2.c:2241
 msgid "Print To Hub"
 msgstr "Afdrukken naar tussenstation"
 
-#: src/main/print-canon.c:790 src/main/print-escp2.c:2447
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-canon.c:790 src/main/print-escp2.c:2652
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2167
 #: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
 #: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Kleur"
 
-#: src/main/print-canon.c:792 src/main/print-escp2.c:2449
+#: src/main/print-canon.c:792 src/main/print-escp2.c:2654
 #: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
 #: src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "Zwart en wit"
 
-#: src/main/print-canon.c:831 src/main/print-escp2.c:2089
+#: src/main/print-canon.c:831 src/main/print-escp2.c:2294
 #: src/main/print-pcl.c:1797 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr "Handmatige controle"
 
-#: src/main/print-canon.c:833 src/main/print-escp2.c:2131
-#: src/main/print-escp2.c:2229 src/main/print-escp2.c:2241
+#: src/main/print-canon.c:833 src/main/print-escp2.c:2336
+#: src/main/print-escp2.c:2434 src/main/print-escp2.c:2446
 #: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
 #: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
-#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1215
-#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1219
-#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
-#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3170
-#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3177
-#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3461
-#: src/xml/xmli18n-tmp.h:3464 src/xml/xmli18n-tmp.h:3632
-#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3648
-#: src/xml/xmli18n-tmp.h:3657 src/xml/xmli18n-tmp.h:3665
+#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1627 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3713 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3722 src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5902
 msgid "Standard"
 msgstr "Standaard"
 
@@ -546,7 +555,7 @@ msgid "Pre-Dithered"
 msgstr "Voorbehandeld met ruis-algoritme"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1268 src/cups/genppd.c:1971
+#: src/cups/genppd.c:1301 src/cups/genppd.c:2005
 msgid "Grayscale"
 msgstr "Grijsschaal"
 
@@ -562,11 +571,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1299 src/cups/genppd.c:1978
+#: src/main/print-color.c:129 src/cups/genppd.c:1332 src/cups/genppd.c:2012
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1306 src/cups/genppd.c:1979
+#: src/main/print-color.c:131 src/cups/genppd.c:1339 src/cups/genppd.c:2013
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -626,7 +635,7 @@ msgid "Output image type"
 msgstr "Beeldtype van de uitvoer"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338
 msgid "Raw Channels"
 msgstr "Raw-kanalen"
 
@@ -688,56 +697,208 @@ msgstr "De gammawaarde die verondersteld wordt door de applicatie"
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
 #: src/escputil/escputil.c:997 src/escputil/escputil.c:1017
-#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:1812
-#: src/xml/xmli18n-tmp.h:1823 src/xml/xmli18n-tmp.h:1836
-#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1863
-#: src/xml/xmli18n-tmp.h:1876 src/xml/xmli18n-tmp.h:1889
-#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1918
-#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1949
-#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1975
-#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:1999
-#: src/xml/xmli18n-tmp.h:2013 src/xml/xmli18n-tmp.h:2027
-#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2051
-#: src/xml/xmli18n-tmp.h:2064 src/xml/xmli18n-tmp.h:2076
-#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2102
-#: src/xml/xmli18n-tmp.h:2116 src/xml/xmli18n-tmp.h:2130
-#: src/xml/xmli18n-tmp.h:2143 src/xml/xmli18n-tmp.h:2156
-#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2184
-#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2210
-#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2236
-#: src/xml/xmli18n-tmp.h:2249 src/xml/xmli18n-tmp.h:2262
-#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2290
-#: src/xml/xmli18n-tmp.h:2305 src/xml/xmli18n-tmp.h:2320
-#: src/xml/xmli18n-tmp.h:2332 src/xml/xmli18n-tmp.h:2343
-#: src/xml/xmli18n-tmp.h:2356 src/xml/xmli18n-tmp.h:2369
-#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2392
-#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2415
-#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2442
-#: src/xml/xmli18n-tmp.h:2454 src/xml/xmli18n-tmp.h:2466
-#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2496
-#: src/xml/xmli18n-tmp.h:2509 src/xml/xmli18n-tmp.h:2522
-#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
-#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2574
-#: src/xml/xmli18n-tmp.h:2586 src/xml/xmli18n-tmp.h:2598
-#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2623
-#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2653
-#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2683
-#: src/xml/xmli18n-tmp.h:2697 src/xml/xmli18n-tmp.h:2715
-#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2745
-#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
-#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2803
-#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2828
-#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2854
-#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2881
-#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2915
-#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2943
-#: src/xml/xmli18n-tmp.h:2959 src/xml/xmli18n-tmp.h:2976
-#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:3004
-#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3032
-#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3062
-#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3093
-#: src/xml/xmli18n-tmp.h:3107 src/xml/xmli18n-tmp.h:3125
-#: src/xml/xmli18n-tmp.h:3141
+#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2387
+#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2413
+#: src/xml/xmli18n-tmp.h:2426 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2499
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2551
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2575
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2708
+#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2786
+#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2814
+#: src/xml/xmli18n-tmp.h:2829 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2893
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2966
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3005 src/xml/xmli18n-tmp.h:3020
+#: src/xml/xmli18n-tmp.h:3033 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3061 src/xml/xmli18n-tmp.h:3073
+#: src/xml/xmli18n-tmp.h:3085 src/xml/xmli18n-tmp.h:3098
+#: src/xml/xmli18n-tmp.h:3110 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3377
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3616
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3648
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3766 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3775 src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:3794 src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:3805 src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3869 src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:3880 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3902 src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:3913 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:3948 src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:3970 src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:3983 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4023 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4064 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4075 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4088 src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:4103 src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:4118 src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:4143 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:4203 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4275 src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4309 src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4356 src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4421
+#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4449
+#: src/xml/xmli18n-tmp.h:4456 src/xml/xmli18n-tmp.h:4462
+#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4485 src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:4551 src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:4694 src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4717 src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:4818 src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:4829 src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4885 src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4935
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:5041 src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:5052 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:5121 src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5165
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5182 src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:5193 src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:5271 src/xml/xmli18n-tmp.h:5299
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5327 src/xml/xmli18n-tmp.h:5331
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5347
+#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5367 src/xml/xmli18n-tmp.h:5371
+#: src/xml/xmli18n-tmp.h:5383 src/xml/xmli18n-tmp.h:5388
+#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5440
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5461 src/xml/xmli18n-tmp.h:5468
+#: src/xml/xmli18n-tmp.h:5476 src/xml/xmli18n-tmp.h:5486
+#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5514
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5525
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5543
+#: src/xml/xmli18n-tmp.h:5550 src/xml/xmli18n-tmp.h:5556
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5574 src/xml/xmli18n-tmp.h:5582
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5592
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5625
+#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5649
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5662
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5690
+#: src/xml/xmli18n-tmp.h:5694 src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5731
+#: src/xml/xmli18n-tmp.h:5738 src/xml/xmli18n-tmp.h:5742
+#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5759
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5770
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5807
+#: src/xml/xmli18n-tmp.h:5811 src/xml/xmli18n-tmp.h:5817
+#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5828
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5843
 msgid "Cyan"
 msgstr "Cyaan"
 
@@ -747,56 +908,208 @@ msgstr "Pas de hoeveelheid cyaan aan"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
 #: src/escputil/escputil.c:998 src/escputil/escputil.c:1018
-#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:1813
-#: src/xml/xmli18n-tmp.h:1824 src/xml/xmli18n-tmp.h:1837
-#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1864
-#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1890
-#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1919
-#: src/xml/xmli18n-tmp.h:1935 src/xml/xmli18n-tmp.h:1950
-#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1976
-#: src/xml/xmli18n-tmp.h:1988 src/xml/xmli18n-tmp.h:2000
-#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2028
-#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2052
-#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2077
-#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2103
-#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2131
-#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2157
-#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2185
-#: src/xml/xmli18n-tmp.h:2198 src/xml/xmli18n-tmp.h:2211
-#: src/xml/xmli18n-tmp.h:2224 src/xml/xmli18n-tmp.h:2237
-#: src/xml/xmli18n-tmp.h:2250 src/xml/xmli18n-tmp.h:2263
-#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2291
-#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2321
-#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2344
-#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2370
-#: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2393
-#: src/xml/xmli18n-tmp.h:2405 src/xml/xmli18n-tmp.h:2416
-#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2443
-#: src/xml/xmli18n-tmp.h:2455 src/xml/xmli18n-tmp.h:2467
-#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2497
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2523
-#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2575
-#: src/xml/xmli18n-tmp.h:2587 src/xml/xmli18n-tmp.h:2599
-#: src/xml/xmli18n-tmp.h:2611 src/xml/xmli18n-tmp.h:2624
-#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
-#: src/xml/xmli18n-tmp.h:2670 src/xml/xmli18n-tmp.h:2684
-#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2714
-#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2747
-#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2780
-#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
-#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2829
-#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2855
-#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2882
-#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2914
-#: src/xml/xmli18n-tmp.h:2931 src/xml/xmli18n-tmp.h:2944
-#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2975
-#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:3005
-#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3033
-#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3060
-#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3094
-#: src/xml/xmli18n-tmp.h:3108 src/xml/xmli18n-tmp.h:3124
-#: src/xml/xmli18n-tmp.h:3140
+#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2361
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2388
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2414
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2459 src/xml/xmli18n-tmp.h:2474
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2512 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2552
+#: src/xml/xmli18n-tmp.h:2564 src/xml/xmli18n-tmp.h:2576
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2787
+#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2815
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2868
+#: src/xml/xmli18n-tmp.h:2881 src/xml/xmli18n-tmp.h:2894
+#: src/xml/xmli18n-tmp.h:2905 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:2967
+#: src/xml/xmli18n-tmp.h:2979 src/xml/xmli18n-tmp.h:2991
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3062 src/xml/xmli18n-tmp.h:3074
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3099
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3135 src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:3163 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3353
+#: src/xml/xmli18n-tmp.h:3365 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
+#: src/xml/xmli18n-tmp.h:3420 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3542 src/xml/xmli18n-tmp.h:3556
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3600 src/xml/xmli18n-tmp.h:3617
+#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3647
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3751 src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:3784 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3795 src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:3806 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3837 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3903 src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3939 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3960 src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:3972 src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:3984 src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:3999 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:4039 src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:4104 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:4170 src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4194 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:4230 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:4276 src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4311 src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4338 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:4401 src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:4427 src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:4442 src/xml/xmli18n-tmp.h:4451
+#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4464
+#: src/xml/xmli18n-tmp.h:4470 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4486 src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:4511 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:4809 src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4909 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:5007 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5018 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5111 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5123 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5148 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:5240 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5250 src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:5261 src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5301
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5313
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5349
+#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5401
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5441
+#: src/xml/xmli18n-tmp.h:5453 src/xml/xmli18n-tmp.h:5458
+#: src/xml/xmli18n-tmp.h:5463 src/xml/xmli18n-tmp.h:5470
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5496 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5527
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5552 src/xml/xmli18n-tmp.h:5558
+#: src/xml/xmli18n-tmp.h:5564 src/xml/xmli18n-tmp.h:5568
+#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5593
+#: src/xml/xmli18n-tmp.h:5598 src/xml/xmli18n-tmp.h:5616
+#: src/xml/xmli18n-tmp.h:5620 src/xml/xmli18n-tmp.h:5626
+#: src/xml/xmli18n-tmp.h:5631 src/xml/xmli18n-tmp.h:5651
+#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
+#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5674
+#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5720
+#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5733
+#: src/xml/xmli18n-tmp.h:5739 src/xml/xmli18n-tmp.h:5743
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5818
+#: src/xml/xmli18n-tmp.h:5823 src/xml/xmli18n-tmp.h:5829
+#: src/xml/xmli18n-tmp.h:5833 src/xml/xmli18n-tmp.h:5839
+#: src/xml/xmli18n-tmp.h:5844
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -806,56 +1119,208 @@ msgstr "Pas de hoeveelheid magenta aan"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
 #: src/escputil/escputil.c:999 src/escputil/escputil.c:1019
-#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:1814
-#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
-#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1865
-#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1891
-#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1920
-#: src/xml/xmli18n-tmp.h:1936 src/xml/xmli18n-tmp.h:1951
-#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1977
-#: src/xml/xmli18n-tmp.h:1989 src/xml/xmli18n-tmp.h:2001
-#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2029
-#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2053
-#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2078
-#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2104
-#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
-#: src/xml/xmli18n-tmp.h:2145 src/xml/xmli18n-tmp.h:2158
-#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2186
-#: src/xml/xmli18n-tmp.h:2199 src/xml/xmli18n-tmp.h:2212
-#: src/xml/xmli18n-tmp.h:2225 src/xml/xmli18n-tmp.h:2238
-#: src/xml/xmli18n-tmp.h:2251 src/xml/xmli18n-tmp.h:2264
-#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2292
-#: src/xml/xmli18n-tmp.h:2307 src/xml/xmli18n-tmp.h:2322
-#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
-#: src/xml/xmli18n-tmp.h:2358 src/xml/xmli18n-tmp.h:2371
-#: src/xml/xmli18n-tmp.h:2382 src/xml/xmli18n-tmp.h:2394
-#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2417
-#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2444
-#: src/xml/xmli18n-tmp.h:2456 src/xml/xmli18n-tmp.h:2468
-#: src/xml/xmli18n-tmp.h:2483 src/xml/xmli18n-tmp.h:2498
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2524
-#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2551
-#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2576
-#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
-#: src/xml/xmli18n-tmp.h:2612 src/xml/xmli18n-tmp.h:2625
-#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2651
-#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2685
-#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2713
-#: src/xml/xmli18n-tmp.h:2734 src/xml/xmli18n-tmp.h:2749
-#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2779
-#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2805
-#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2830
-#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2856
-#: src/xml/xmli18n-tmp.h:2871 src/xml/xmli18n-tmp.h:2883
-#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2910
-#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2945
-#: src/xml/xmli18n-tmp.h:2960 src/xml/xmli18n-tmp.h:2974
-#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3006
-#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3034
-#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3061
-#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3095
-#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3120
-#: src/xml/xmli18n-tmp.h:3136
+#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2389
+#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2444
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2475
+#: src/xml/xmli18n-tmp.h:2488 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2513 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2565 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2602
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2762
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2788
+#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2816
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2846
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2906 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3022
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3048
+#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3075
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3124
+#: src/xml/xmli18n-tmp.h:3136 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3175
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3315 src/xml/xmli18n-tmp.h:3329
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3433
+#: src/xml/xmli18n-tmp.h:3455 src/xml/xmli18n-tmp.h:3468
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3497
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3601 src/xml/xmli18n-tmp.h:3618
+#: src/xml/xmli18n-tmp.h:3632 src/xml/xmli18n-tmp.h:3643
+#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3747 src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3834 src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:3844 src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:3867 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:3900 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3910 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3935 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:3967 src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:3979 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4005 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4062 src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4110 src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:4124 src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4167 src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:4272 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:4321 src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:4334 src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4367 src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4471
+#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4505 src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4549 src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:4562 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4580 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4602 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:4678 src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:4691 src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4770 src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4893 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4904 src/xml/xmli18n-tmp.h:4911
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:4971 src/xml/xmli18n-tmp.h:4978
+#: src/xml/xmli18n-tmp.h:5004 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5050 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5071 src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:5097 src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:5142 src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:5169 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5184
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5257 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5318
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5358
+#: src/xml/xmli18n-tmp.h:5364 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5385
+#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5438
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5454
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5465
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5511
+#: src/xml/xmli18n-tmp.h:5516 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5547 src/xml/xmli18n-tmp.h:5554
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5584 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5617 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5632
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5687
+#: src/xml/xmli18n-tmp.h:5692 src/xml/xmli18n-tmp.h:5698
+#: src/xml/xmli18n-tmp.h:5705 src/xml/xmli18n-tmp.h:5713
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5729
+#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
+#: src/xml/xmli18n-tmp.h:5744 src/xml/xmli18n-tmp.h:5756
+#: src/xml/xmli18n-tmp.h:5761 src/xml/xmli18n-tmp.h:5767
+#: src/xml/xmli18n-tmp.h:5774 src/xml/xmli18n-tmp.h:5782
+#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5792
+#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5803
+#: src/xml/xmli18n-tmp.h:5809 src/xml/xmli18n-tmp.h:5813
+#: src/xml/xmli18n-tmp.h:5819 src/xml/xmli18n-tmp.h:5824
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5845
 msgid "Yellow"
 msgstr "Geel"
 
@@ -865,9 +1330,17 @@ msgstr "Pas de hoeveelheid geel aan"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
 #: src/escputil/escputil.c:1006 src/escputil/escputil.c:1025
-#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2700
-#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2795
-#: src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:4041 src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:4056 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4091 src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:4155 src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5155
 msgid "Red"
 msgstr "Rood"
 
@@ -885,8 +1358,13 @@ msgstr "Pas de hoeveelheid groen aan"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
 #: src/escputil/escputil.c:1007 src/escputil/escputil.c:1026
-#: src/xml/xmli18n-tmp.h:2657 src/xml/xmli18n-tmp.h:2701
-#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4051 src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:4084 src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:5156
 msgid "Blue"
 msgstr "Blauw"
 
@@ -897,53 +1375,183 @@ msgstr "Pas de hoeveelheid blauw aan"
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
 #: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1016 src/escputil/escputil.c:1285
-#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
-#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
-#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1875
-#: src/xml/xmli18n-tmp.h:1888 src/xml/xmli18n-tmp.h:1901
-#: src/xml/xmli18n-tmp.h:1917 src/xml/xmli18n-tmp.h:1933
-#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1961
-#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1986
-#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2012
-#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2038
-#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2063
-#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2090
-#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2115
-#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2142
-#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2169
-#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
-#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
-#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2248
-#: src/xml/xmli18n-tmp.h:2261 src/xml/xmli18n-tmp.h:2274
-#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2304
-#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2331
-#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
-#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
-#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2403
-#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2420
-#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2441
-#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2465
-#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2495
-#: src/xml/xmli18n-tmp.h:2508 src/xml/xmli18n-tmp.h:2521
-#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
-#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2573
-#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2597
-#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2622
-#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2672
-#: src/xml/xmli18n-tmp.h:2682 src/xml/xmli18n-tmp.h:2731
-#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2764
-#: src/xml/xmli18n-tmp.h:2781 src/xml/xmli18n-tmp.h:2794
-#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2815
-#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2839
-#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2868
-#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2894
-#: src/xml/xmli18n-tmp.h:2911 src/xml/xmli18n-tmp.h:2929
-#: src/xml/xmli18n-tmp.h:2942 src/xml/xmli18n-tmp.h:2977
-#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:3003
-#: src/xml/xmli18n-tmp.h:3017 src/xml/xmli18n-tmp.h:3031
-#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3079
-#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3110
-#: src/xml/xmli18n-tmp.h:3121 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2372
+#: src/xml/xmli18n-tmp.h:2386 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2457
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2510
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2536
+#: src/xml/xmli18n-tmp.h:2550 src/xml/xmli18n-tmp.h:2562
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2599 src/xml/xmli18n-tmp.h:2614
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2639
+#: src/xml/xmli18n-tmp.h:2653 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2965
+#: src/xml/xmli18n-tmp.h:2977 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3019
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3060 src/xml/xmli18n-tmp.h:3072
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3133 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3196
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3526
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3680 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3755 src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:3804 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3819 src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:3831 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3846 src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3873 src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:3924 src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:3943 src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:4022 src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4059 src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:4142 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4164 src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:4179 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:4255 src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4289 src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:4308 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4413 src/xml/xmli18n-tmp.h:4420
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4455
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4507 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:4565 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:4604 src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:4702 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:4733 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:4786 src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4920 src/xml/xmli18n-tmp.h:4926
+#: src/xml/xmli18n-tmp.h:4934 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:4973 src/xml/xmli18n-tmp.h:4981
+#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:4993
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:5047 src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5151
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5186
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5223 src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5270
+#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5284
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5320
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5337
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5375
+#: src/xml/xmli18n-tmp.h:5378 src/xml/xmli18n-tmp.h:5380
+#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5435
+#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5447
+#: src/xml/xmli18n-tmp.h:5449 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5474
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5492
+#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5571
+#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5590
+#: src/xml/xmli18n-tmp.h:5596 src/xml/xmli18n-tmp.h:5602
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5614
+#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5629
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5655
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5680 src/xml/xmli18n-tmp.h:5682
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5700
+#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5716
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5749
+#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5769 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5794
+#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5806
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5836
+#: src/xml/xmli18n-tmp.h:5842
 msgid "Black"
 msgstr "Zwart"
 
@@ -951,7 +1559,7 @@ msgstr "Zwart"
 msgid "Adjust the black gamma"
 msgstr "Pas de hoeveelheid zwart aan"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1769
+#: src/main/print-color.c:322 src/main/print-olympus.c:1935
 msgid "Cyan Balance"
 msgstr "Cyaanwaarde"
 
@@ -964,7 +1572,7 @@ msgstr "Grijswaarde"
 msgid "Adjust the cyan gray balance"
 msgstr "Pas de cyaan-grijsbalans aan"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1777
+#: src/main/print-color.c:330 src/main/print-olympus.c:1943
 msgid "Magenta Balance"
 msgstr "Magentawaarde"
 
@@ -972,7 +1580,7 @@ msgstr "Magentawaarde"
 msgid "Adjust the magenta gray balance"
 msgstr "Pas de magenta-grijsbalans aan"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1785
+#: src/main/print-color.c:338 src/main/print-olympus.c:1951
 msgid "Yellow Balance"
 msgstr "Geelwaarde"
 
@@ -1000,11 +1608,11 @@ msgstr "Inktgrenswaarde"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
-#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
-#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
-#: src/main/print-escp2.c:759
+#: src/main/print-escp2.c:344 src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356 src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368 src/main/print-escp2.c:374
+#: src/main/print-escp2.c:869 src/main/print-escp2.c:877
+#: src/main/print-escp2.c:885
 msgid "Advanced Output Control"
 msgstr "Geavanceerde controle van uitvoer"
 
@@ -1012,27 +1620,27 @@ msgstr "Geavanceerde controle van uitvoer"
 msgid "Limit the total ink printed to the page"
 msgstr "Beperk de totale hoeveelheid inkt naar de pagina"
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:743
+#: src/main/print-color.c:365 src/main/print-escp2.c:869
 msgid "GCR Transition"
 msgstr "GCR-overgang"
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:744
+#: src/main/print-color.c:366 src/main/print-escp2.c:870
 msgid "Adjust the gray component transition rate"
 msgstr "De grijscomponent-overgangssnelheid aanpassen"
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:751
+#: src/main/print-color.c:373 src/main/print-escp2.c:877
 msgid "GCR Lower Bound"
 msgstr "GCR-ondergrens"
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:752
+#: src/main/print-color.c:374 src/main/print-escp2.c:878
 msgid "Lower bound of gray component reduction"
 msgstr "Ondergrens van grijscomponent-vermindering"
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:759
+#: src/main/print-color.c:381 src/main/print-escp2.c:885
 msgid "GCR Upper Bound"
 msgstr "GCR-bovengrens"
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:760
+#: src/main/print-color.c:382 src/main/print-escp2.c:886
 msgid "Upper bound of gray component reduction"
 msgstr "Bovengrens van grijscomponent-vermindering"
 
@@ -1287,11 +1895,11 @@ msgstr ""
 "Richting van het afdrukken (unidirectioneel geeft hogere kwaliteit, echter "
 "langzamer)"
 
-#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1906
 msgid "Borderless"
 msgstr "Zonder randen"
 
-#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1907
 msgid "Print without borders"
 msgstr "Afdrukken zonder randen"
 
@@ -1304,7 +1912,7 @@ msgid "Interleave pattern to use"
 msgstr "Te gebruiken interleave patroon"
 
 #: src/main/print-escp2.c:266 src/main/print-escp2.c:267
-#: src/cups/genppd.c:1567 src/cups/genppd.c:2078
+#: src/cups/genppd.c:1600 src/cups/genppd.c:2112
 msgid "Output Order"
 msgstr "Volgorde van uitvoer"
 
@@ -1345,334 +1953,431 @@ msgid "Has multiple choices of ink cartridges"
 msgstr "Heeft meervoudige keuzes in inktcartridges"
 
 #: src/main/print-escp2.c:320 src/main/print-escp2.c:321
+msgid "Raw Channel Names"
+msgstr "Raw-kanaalnamen"
+
+#: src/main/print-escp2.c:326 src/main/print-escp2.c:327
+#, fuzzy
 msgid "Channel Names"
-msgstr "Kanaalnamen"
+msgstr "Raw-kanaalnamen"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:339
 msgid "Raw Channel Count"
 msgstr "Aantal raw-kanalen"
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:344
 msgid "Cyan Map"
 msgstr "Cyaankaart"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:345
 msgid "Adjust the cyan map"
 msgstr "Pas de cyaankaart aan"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350
 msgid "Magenta Map"
 msgstr "Magentakaart"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:351
 msgid "Adjust the magenta map"
 msgstr "Pas de magentakaart aan"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356
 msgid "Yellow Map"
 msgstr "Geelkaart"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:357
 msgid "Adjust the yellow map"
 msgstr "Pas de geelkaart aan"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362
 msgid "Blue Map"
 msgstr "Blauwkaart"
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:363
 msgid "Adjust the blue map"
 msgstr "Pas de blauwkaart aan"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368
 msgid "Orange Map"
 msgstr "Oranjekaart"
 
-#: src/main/print-escp2.c:363
+#: src/main/print-escp2.c:369
 msgid "Adjust the orange map"
 msgstr "Pas de oranjekaart aan"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:374
 msgid "Red Map"
 msgstr "Roodkaart"
 
-#: src/main/print-escp2.c:369
+#: src/main/print-escp2.c:375
 msgid "Adjust the red map"
 msgstr "Pas de roodkaart aan"
 
-#: src/main/print-escp2.c:471
+#: src/main/print-escp2.c:477
 msgid "Red Density"
 msgstr "Hoeveelheid rood"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:478
 msgid "Adjust the red density"
 msgstr "Pas de hoeveelheid rood aan"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:485
 msgid "Blue Density"
 msgstr "Hoeveelheid blauw"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:486
 msgid "Adjust the blue density"
 msgstr "Pas de hoeveelheid blauw aan"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:493
 msgid "Orange Density"
 msgstr "Hoeveelheid oranje"
 
-#: src/main/print-escp2.c:488
+#: src/main/print-escp2.c:494
 msgid "Adjust the orange density"
 msgstr "Pas de hoeveelheid oranje aan"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:501
 msgid "Gloss Level"
 msgstr "Glansniveau"
 
-#: src/main/print-escp2.c:496
+#: src/main/print-escp2.c:502
 msgid "Adjust the gloss level"
 msgstr "Pas het glansniveau aan"
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:509
 msgid "Drop Size Small"
 msgstr "Kleine druppelgrootte"
 
-#: src/main/print-escp2.c:504
+#: src/main/print-escp2.c:510
 msgid "Drop Size 1 (small)"
 msgstr "Druppelgrootte 1 (klein)"
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:517
 msgid "Drop Size Medium"
 msgstr "Middelgrootte druppelgrootte"
 
-#: src/main/print-escp2.c:512
+#: src/main/print-escp2.c:518
 msgid "Drop Size 2 (medium)"
 msgstr "Druppelgrootte 2 (middel)"
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:525
 msgid "Drop Size Large"
 msgstr "Grote drupplegrootte"
 
-#: src/main/print-escp2.c:520
+#: src/main/print-escp2.c:526
 msgid "Drop Size 3 (large)"
 msgstr "Druppelgrootte 3 (groot)"
 
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:534
 msgid "Light Cyan Value"
 msgstr "Lichtcyaanwaarde"
 
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:550
 msgid "Light Cyan Density Scale"
 msgstr "Cyaanschaal"
 
-#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
+#: src/main/print-escp2.c:557 src/main/print-escp2.c:558
 msgid "Light Magenta Value"
 msgstr "Lichtmagentawaarde"
 
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:566
 msgid "Light Magenta Density Scale"
 msgstr "Magentaschaal"
 
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:582
 msgid "Dark Yellow Value"
 msgstr "Donkergeelwaarde"
 
-#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
+#: src/main/print-escp2.c:589 src/main/print-escp2.c:590
 msgid "Dark Yellow Transition"
 msgstr "Donkergeel overgang"
 
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:598
 msgid "Dark Yellow Density Scale"
 msgstr "Geelschaal"
 
-#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
+#: src/main/print-escp2.c:605 src/main/print-escp2.c:606
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:630
 msgid "Gray Value"
 msgstr "Grijswaarde"
 
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
-#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:614
+#: src/main/print-escp2.c:637 src/main/print-escp2.c:638
 msgid "Gray Transition"
 msgstr "Grijs overgang"
 
-#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
+#: src/main/print-escp2.c:621 src/main/print-escp2.c:622
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:646
 msgid "Gray Density Scale"
 msgstr "Grijsschaal"
 
-#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
+#: src/main/print-escp2.c:653 src/main/print-escp2.c:654
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:726
 msgid "Light Gray Value"
 msgstr "Lichtgrijswaarde"
 
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
-#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:662
+#: src/main/print-escp2.c:733 src/main/print-escp2.c:734
 msgid "Light Gray Transition"
 msgstr "Lichtgrijs overgang"
 
-#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
-#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
+#: src/main/print-escp2.c:669 src/main/print-escp2.c:670
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:742
 msgid "Light Gray Density Scale"
 msgstr "Lichtgrijsschaal"
 
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:678
 msgid "Dark Gray Value"
 msgstr "Donkergrijswaarde"
 
-#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
+#: src/main/print-escp2.c:685 src/main/print-escp2.c:686
 msgid "Dark Gray Transition"
 msgstr "Donkergrijs overgang"
 
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:694
 msgid "Dark Gray Density Scale"
 msgstr "Donkergrijsschaal"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:701
 msgid "Mid Gray Value"
 msgstr "Middelgrijswaarde"
 
-#: src/main/print-escp2.c:696
+#: src/main/print-escp2.c:702
 msgid "Medium Gray Value"
 msgstr "Middelgrijswaarde"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:709
 msgid "Mid Gray Transition"
 msgstr "Middelgrijs overgang"
 
-#: src/main/print-escp2.c:704
+#: src/main/print-escp2.c:710
 msgid "Medium Gray Transition"
 msgstr "Middelgrijs overgang"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:717
 msgid "Mid Gray Density Scale"
 msgstr "Middelgrijsschaal"
 
-#: src/main/print-escp2.c:712
+#: src/main/print-escp2.c:718
 msgid "Medium Gray Density Scale"
 msgstr "Middelgrijsschaal"
 
-#: src/main/print-escp2.c:767
+#: src/main/print-escp2.c:749
+msgid "Hextone Gray 5 Value"
+msgstr "Hextoongrijs-5-waarde"
+
+#: src/main/print-escp2.c:750
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr "Hextoongrijs-5-waarde (donkerst)"
+
+#: src/main/print-escp2.c:757
+msgid "Hextone Gray 5 Transition"
+msgstr "Hextoongrijs-5-overgang"
+
+#: src/main/print-escp2.c:758
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr "Hextoongrijs-5-overgang (donkerst)"
+
+#: src/main/print-escp2.c:765
+msgid "Hextone Gray 5 Density Scale"
+msgstr "Hextoongrijs-5-schaal"
+
+#: src/main/print-escp2.c:766
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr "Hextoongrijs-5-schaal (donkerst)"
+
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:774
+msgid "Hextone Gray 4 Value"
+msgstr "Hextoongrijs-4-waarde"
+
+#: src/main/print-escp2.c:781 src/main/print-escp2.c:782
+msgid "Hextone Gray 4 Transition"
+msgstr "Hextoongrijs-4-overgang"
+
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:790
+msgid "Hextone Gray 4 Density Scale"
+msgstr "Hextoongrijs-4-schaal"
+
+#: src/main/print-escp2.c:797 src/main/print-escp2.c:798
+msgid "Hextone Gray 3 Value"
+msgstr "Hextoongrijs-3-waarde"
+
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:806
+msgid "Hextone Gray 3 Transition"
+msgstr "Hextoongrijs-3-overgang"
+
+#: src/main/print-escp2.c:813 src/main/print-escp2.c:814
+msgid "Hextone Gray 3 Density Scale"
+msgstr "Hextoongrijs-3-schaal"
+
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:822
+msgid "Hextone Gray 2 Value"
+msgstr "Hextoongrijs-2-waarde"
+
+#: src/main/print-escp2.c:829 src/main/print-escp2.c:830
+msgid "Hextone Gray 2 Transition"
+msgstr "Hextoongrijs-2-overgang"
+
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:838
+msgid "Hextone Gray 2 Density Scale"
+msgstr "Hextoongrijs-2-schaal"
+
+#: src/main/print-escp2.c:845
+msgid "Hextone Gray 1 Value"
+msgstr "Hextoongrijs-1-waarde"
+
+#: src/main/print-escp2.c:846
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr "Hextoongrijs-1-waarde (lichtst)"
+
+#: src/main/print-escp2.c:853
+msgid "Hextone Gray 1 Transition"
+msgstr "Hextoongrijs-1-overgang"
+
+#: src/main/print-escp2.c:854
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr "Hextoongrijs-1-overgang (lichtst)"
+
+#: src/main/print-escp2.c:861
+msgid "Hextone Gray 1 Density Scale"
+msgstr "Hextoongrijs-1-schaal"
+
+#: src/main/print-escp2.c:862
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr "Hextoongrijs-1-schaal (lichtst)"
+
+#: src/main/print-escp2.c:893
 msgid "Drying Time Per Page"
 msgstr "Droogtijd per pagina"
 
-#: src/main/print-escp2.c:768
+#: src/main/print-escp2.c:894
 msgid "Set drying time per page"
 msgstr "Stel droogtijd per pagina in"
 
-#: src/main/print-escp2.c:775
+#: src/main/print-escp2.c:901
 msgid "Drying Time Per Scan"
 msgstr "Droogtijd per scan"
 
-#: src/main/print-escp2.c:776
+#: src/main/print-escp2.c:902
 msgid "Set drying time per scan"
 msgstr "Stel droogtijd per scan in"
 
-#: src/main/print-escp2.c:783
+#: src/main/print-escp2.c:909
 msgid "Minimum Drying Time Per Scan"
 msgstr "Minimale droogtijd per scan"
 
-#: src/main/print-escp2.c:784
+#: src/main/print-escp2.c:910
 msgid "Set minimum drying time per scan"
 msgstr "Stel minimale droogtijd per scan in"
 
-#: src/main/print-escp2.c:799
+#: src/main/print-escp2.c:925
+msgid "Quality Enhancement"
+msgstr "Kwaliteitsverbetering"
+
+#: src/main/print-escp2.c:926
+msgid "Enhance print quality by additional passes"
+msgstr "Verbeter de kwaliteit door meerdere doorgangen"
+
+#: src/main/print-escp2.c:933
 msgid "Paper Thickness"
 msgstr "Papierdikte"
 
-#: src/main/print-escp2.c:800
+#: src/main/print-escp2.c:934
 msgid "Set printer paper thickness"
 msgstr "Stel de papierdikte van de printer in"
 
-#: src/main/print-escp2.c:807
+#: src/main/print-escp2.c:941
 msgid "Vacuum Intensity"
 msgstr "Zuigkracht"
 
-#: src/main/print-escp2.c:808
+#: src/main/print-escp2.c:942
 msgid "Set vacuum intensity (printer-specific)"
 msgstr "Stel zuigkracht in"
 
-#: src/main/print-escp2.c:815
+#: src/main/print-escp2.c:949
 msgid "Feed Sequence"
 msgstr "Invoer-volgorde"
 
-#: src/main/print-escp2.c:816
+#: src/main/print-escp2.c:950
 msgid "Set paper feed sequence (printer-specific)"
 msgstr "Stel de invoer-volgorde in (printerspecifiek)"
 
-#: src/main/print-escp2.c:823
+#: src/main/print-escp2.c:957
 msgid "Print Method"
 msgstr "Wijze van printen"
 
-#: src/main/print-escp2.c:824
+#: src/main/print-escp2.c:958
 msgid "Set print method (printer-specific)"
 msgstr "Stel de wijze van printen in (printerspecifiek)"
 
-#: src/main/print-escp2.c:831
+#: src/main/print-escp2.c:965
 msgid "Platen Gap"
 msgstr "Kophoogte"
 
-#: src/main/print-escp2.c:832
+#: src/main/print-escp2.c:966
 msgid "Set platen gap (printer-specific)"
 msgstr "Stel kophoogte in (printerspecifiek)"
 
-#: src/main/print-escp2.c:839
+#: src/main/print-escp2.c:973
 msgid "Feed Adjustment"
 msgstr "Invoerafstelling"
 
-#: src/main/print-escp2.c:840
-#, c-format
+#: src/main/print-escp2.c:975
+#, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr "Stel de invoerafstelling in (0,01% units)"
 
-#: src/main/print-escp2.c:1992
+#: src/main/print-escp2.c:2197
 msgid "Full Manual Control"
 msgstr "Volledig handmatige controle"
 
-#: src/main/print-escp2.c:1994
+#: src/main/print-escp2.c:2199
 msgid "Automatic Setting Control"
 msgstr "Automatische controle op instellingen"
 
-#: src/main/print-escp2.c:2208 src/cups/genppd.c:1484 src/cups/genppd.c:2059
+#: src/main/print-escp2.c:2413 src/cups/genppd.c:1517 src/cups/genppd.c:2093
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2415
 msgid "Bidirectional"
 msgstr "Bidirectioneel"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2417
 msgid "Unidirectional"
 msgstr "Unidirectioneel"
 
-#: src/main/print-escp2.c:2243
+#: src/main/print-escp2.c:2448
 msgid "Alternate Fill"
 msgstr "Afwisselend opvullen"
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2450
 msgid "Ascending Fill"
 msgstr "Oplopend vullen"
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2452
 msgid "Descending Fill"
 msgstr "Aflopend vullen"
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2454
 msgid "Ascending Double"
 msgstr "Dubbel oplopend"
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2456
 msgid "Nearest Neighbor Avoidance"
 msgstr "Vermijden van naaste buur"
 
-#: src/main/print-escp2.c:2287
+#: src/main/print-escp2.c:2492
 msgid "Short Edge(Flip)"
 msgstr "Korte zijde (omslaan)"
 
-#: src/main/print-escp2.c:2858
+#: src/main/print-escp2.c:3100
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Deze printer ondersteunt geen 'raw' printuitvoer op de diepte %d\n"
 
-#: src/main/print-escp2.c:4107 src/main/print-olympus.c:2472
+#: src/main/print-escp2.c:4355 src/main/print-olympus.c:2641
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr "Print opties niet geverifiëerd; kan niet printen.\n"
@@ -1726,361 +2431,378 @@ msgid "test print"
 msgstr "Test afdruk"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3205
-#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3217
-#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3233
-#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3255
-#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3276
-#: src/xml/xmli18n-tmp.h:3288 src/xml/xmli18n-tmp.h:3295
-#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3315
-#: src/xml/xmli18n-tmp.h:3327 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3368
-#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3380
-#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
-#: src/xml/xmli18n-tmp.h:3412 src/xml/xmli18n-tmp.h:3424
-#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3444
-#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3472
-#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3496
-#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3521
-#: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3544
-#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3556
-#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3581
-#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3598
-#: src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3754 src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:3809 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3863 src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:4058 src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:4163 src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:4227 src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:4335 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4467 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4594 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:4879 src/xml/xmli18n-tmp.h:4946
+#: src/xml/xmli18n-tmp.h:5000 src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:5243 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5365 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5512 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5667 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5784 src/xml/xmli18n-tmp.h:5805
+#: src/xml/xmli18n-tmp.h:5826
 msgid "Four Color Standard"
 msgstr "Vierkleuren standaard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3206
-#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3218
-#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3234
-#: src/xml/xmli18n-tmp.h:3244 src/xml/xmli18n-tmp.h:3251
-#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3268
-#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3289
-#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3306
-#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
-#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3354
-#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3377
-#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3389
-#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3413
-#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3435
-#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3455
-#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3485
-#: src/xml/xmli18n-tmp.h:3497 src/xml/xmli18n-tmp.h:3508
-#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3537
-#: src/xml/xmli18n-tmp.h:3545 src/xml/xmli18n-tmp.h:3549
-#: src/xml/xmli18n-tmp.h:3557 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3593
-#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3605
+#: src/xml/xmli18n-tmp.h:3759 src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3868 src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:4002 src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:4107 src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4472
+#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4817 src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5181 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5315 src/xml/xmli18n-tmp.h:5370
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5672
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5831
 msgid "Three Color Composite"
 msgstr "Driekleuren composiet"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3241
-#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3265
-#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3286
-#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
-#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3351
-#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3374
-#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3398
-#: src/xml/xmli18n-tmp.h:3410 src/xml/xmli18n-tmp.h:3422
-#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3452
-#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3470
-#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3494
-#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3519
-#: src/xml/xmli18n-tmp.h:3534 src/xml/xmli18n-tmp.h:3542
-#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3741 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4086 src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4933
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5421
+#: src/xml/xmli18n-tmp.h:5499 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5723
 msgid "Six Color Photo"
 msgstr "Zeskleuren foto"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3242
-#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3266
-#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3287
-#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3326
-#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3352
-#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3375
-#: src/xml/xmli18n-tmp.h:3387 src/xml/xmli18n-tmp.h:3399
-#: src/xml/xmli18n-tmp.h:3411 src/xml/xmli18n-tmp.h:3423
-#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3453
-#: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3483
-#: src/xml/xmli18n-tmp.h:3495 src/xml/xmli18n-tmp.h:3506
-#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3535
-#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3566
-#: src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3748 src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:3989 src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:4094 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4267 src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4940
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5661
+#: src/xml/xmli18n-tmp.h:5730
 msgid "Five Color Photo Composite"
 msgstr "Vijfkleuren foto composiet"
 
 #: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
-#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
-#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
-#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
-#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
-#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
-#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
-#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
-#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:849
-#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:963
-#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1077
-#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1170
-#: src/xml/xmli18n-tmp.h:1220 src/xml/xmli18n-tmp.h:1277
-#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1376
-#: src/xml/xmli18n-tmp.h:1439 src/xml/xmli18n-tmp.h:1502
-#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1619
-#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1739
-#: src/xml/xmli18n-tmp.h:1773
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1050
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1240
+#: src/xml/xmli18n-tmp.h:1335 src/xml/xmli18n-tmp.h:1449
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1580
+#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1862
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2200 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2297
 msgid "Plain Paper"
 msgstr "Blanco papier"
 
-#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
-#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
-#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
-#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
-#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
-#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
-#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
-#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
-#: src/xml/xmli18n-tmp.h:819 src/xml/xmli18n-tmp.h:858
-#: src/xml/xmli18n-tmp.h:915 src/xml/xmli18n-tmp.h:972
-#: src/xml/xmli18n-tmp.h:1029 src/xml/xmli18n-tmp.h:1086
-#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1176
-#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1286
-#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1385
-#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1508
-#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1628
-#: src/xml/xmli18n-tmp.h:1685 src/xml/xmli18n-tmp.h:1743
-#: src/xml/xmli18n-tmp.h:1779
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:101 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:365 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1160 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1740
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1871
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2136
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2267
+#: src/xml/xmli18n-tmp.h:2303
 msgid "Glossy Film"
 msgstr "Glanzende laag"
 
-#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
-#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
-#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
-#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
-#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
-#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
-#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
-#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
-#: src/xml/xmli18n-tmp.h:821 src/xml/xmli18n-tmp.h:861
-#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:975
-#: src/xml/xmli18n-tmp.h:1032 src/xml/xmli18n-tmp.h:1089
-#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1178
-#: src/xml/xmli18n-tmp.h:1232 src/xml/xmli18n-tmp.h:1289
-#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1388
-#: src/xml/xmli18n-tmp.h:1451 src/xml/xmli18n-tmp.h:1511
-#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1631
-#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1745
-#: src/xml/xmli18n-tmp.h:1781
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:845 src/xml/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:965 src/xml/xmli18n-tmp.h:1022
+#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1359
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1550
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1745 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2305
 msgid "Transparencies"
 msgstr "Transparanten"
 
-#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
-#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
-#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
-#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
-#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
-#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
-#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
-#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
-#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:823
-#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:921
-#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:1035
-#: src/xml/xmli18n-tmp.h:1092 src/xml/xmli18n-tmp.h:1142
-#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1235
-#: src/xml/xmli18n-tmp.h:1292 src/xml/xmli18n-tmp.h:1344
-#: src/xml/xmli18n-tmp.h:1391 src/xml/xmli18n-tmp.h:1454
-#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1577
-#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1691
-#: src/xml/xmli18n-tmp.h:1747 src/xml/xmli18n-tmp.h:1783
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:55 src/xml/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:151 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1024
+#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2215
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2307
 msgid "Envelopes"
 msgstr "Enveloppen"
 
-#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
-#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
-#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
-#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
-#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
-#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
-#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
-#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
-#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:827
-#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:927
-#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:1041
-#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1146
-#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1241
-#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1348
-#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1460
-#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1583
-#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1697
-#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1787
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:1028
+#: src/xml/xmli18n-tmp.h:1085 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1275 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1556
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1665
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1834
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2076
+#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2311
 msgid "Matte Paper"
 msgstr "Mat papier"
 
-#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
-#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
-#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
-#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
-#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
-#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
-#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
-#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
-#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:831
-#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:933
-#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:1047
-#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1150
-#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1247
-#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1352
-#: src/xml/xmli18n-tmp.h:1403 src/xml/xmli18n-tmp.h:1466
-#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1589
-#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1703
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1791
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:167 src/xml/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:569
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1032
+#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1285 src/xml/xmli18n-tmp.h:1389
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1675
+#: src/xml/xmli18n-tmp.h:1770 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1889 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2012 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2227
+#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2315
 msgid "Inkjet Paper"
 msgstr "Inkjet-papier"
 
-#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
-#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
-#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
-#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
-#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
-#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
-#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
-#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
-#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:833
-#: src/xml/xmli18n-tmp.h:879 src/xml/xmli18n-tmp.h:936
-#: src/xml/xmli18n-tmp.h:993 src/xml/xmli18n-tmp.h:1050
-#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1152
-#: src/xml/xmli18n-tmp.h:1190 src/xml/xmli18n-tmp.h:1250
-#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1354
-#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1469
-#: src/xml/xmli18n-tmp.h:1529 src/xml/xmli18n-tmp.h:1592
-#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1706
-#: src/xml/xmli18n-tmp.h:1757 src/xml/xmli18n-tmp.h:1793
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:425 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:512 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1034
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1499 src/xml/xmli18n-tmp.h:1562
+#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1775 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1955
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2088
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2317
 msgid "Photo Quality Inkjet Paper"
 msgstr "Fotokwaliteit Inkjet-papier"
 
-#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
-#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
-#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
-#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
-#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
-#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
-#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
-#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
-#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:835
-#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:939
-#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:1053
-#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1154
-#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1253
-#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1356
-#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1472
-#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1595
-#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1709
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1795
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1036
+#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1200
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1504 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1842
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2233
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2319
 msgid "Photo Paper"
 msgstr "Fotopapier"
 
-#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
-#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
-#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
-#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
-#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
-#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
-#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
-#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
-#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:837
-#: src/xml/xmli18n-tmp.h:885 src/xml/xmli18n-tmp.h:942
-#: src/xml/xmli18n-tmp.h:999 src/xml/xmli18n-tmp.h:1056
-#: src/xml/xmli18n-tmp.h:1113 src/xml/xmli18n-tmp.h:1156
-#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1212
-#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1256
-#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1358
-#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1475
-#: src/xml/xmli18n-tmp.h:1535 src/xml/xmli18n-tmp.h:1598
-#: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1712
-#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1797
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:179 src/xml/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:518 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:869 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1038
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1407
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1566
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1622
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1844
+#: src/xml/xmli18n-tmp.h:1898 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2321
 msgid "Premium Glossy Photo Paper"
 msgstr "Premium glanzend fotopapier"
 
-#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
-#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
-#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
-#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
-#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
-#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
-#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
-#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
-#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:841
-#: src/xml/xmli18n-tmp.h:891 src/xml/xmli18n-tmp.h:948
-#: src/xml/xmli18n-tmp.h:1005 src/xml/xmli18n-tmp.h:1062
-#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1160
-#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1262
-#: src/xml/xmli18n-tmp.h:1319 src/xml/xmli18n-tmp.h:1362
-#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1481
-#: src/xml/xmli18n-tmp.h:1541 src/xml/xmli18n-tmp.h:1604
-#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1718
-#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1801
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1042
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1419
+#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1570
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2027 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2242
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2325
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Luster Photo Papier"
 
-#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
-#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
-#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
-#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
-#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
-#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
-#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
-#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
-#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:843
-#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:951
-#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1065
-#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1162
-#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1265
-#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1368
-#: src/xml/xmli18n-tmp.h:1427 src/xml/xmli18n-tmp.h:1490
-#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1607
-#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1727
-#: src/xml/xmli18n-tmp.h:1767 src/xml/xmli18n-tmp.h:1803
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:91 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:191 src/xml/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:439 src/xml/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:787 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1044
+#: src/xml/xmli18n-tmp.h:1125 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1315 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1854
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2327
 msgid "Photo Quality Glossy Paper"
 msgstr "Fotokwaliteit glanzend papier"
 
-#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
-#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
-#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
-#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
-#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
-#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
-#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
-#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:897
-#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:1011
-#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1125
-#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1206
-#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1325
-#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1430
-#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1553
-#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1667
-#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1805
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1130
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1320
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1616
+#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1856 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2329
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Paper"
 
-#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
-#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
-#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
-#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
-#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
-#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
-#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
-#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
-#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:847
-#: src/xml/xmli18n-tmp.h:903 src/xml/xmli18n-tmp.h:960
-#: src/xml/xmli18n-tmp.h:1017 src/xml/xmli18n-tmp.h:1074
-#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1168
-#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1214
-#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1274
-#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1374
-#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1499
-#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1616
-#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1736
-#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1809
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:129
+#: src/xml/xmli18n-tmp.h:203 src/xml/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:542 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1048
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1443
+#: src/xml/xmli18n-tmp.h:1539 src/xml/xmli18n-tmp.h:1578
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1720
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1985
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2333
 msgid "Other"
 msgstr "Overige"
 
@@ -2096,52 +2818,56 @@ msgstr "Handmatig met pauze"
 msgid "Manual without Pause"
 msgstr "Handmatig zonder pauze"
 
-#: src/main/print-olympus.c:279
+#: src/main/print-olympus.c:281
 msgid "Coated"
 msgstr "Gecoat"
 
-#: src/main/print-olympus.c:280 src/cups/genppd.c:1685 src/cups/genppd.c:1713
-#: src/cups/genppd.c:1745 src/cups/genppd.c:1800 src/cups/genppd.c:1846
-#: src/cups/genppd.c:2147 src/cups/genppd.c:2160 src/cups/genppd.c:2183
-#: src/cups/genppd.c:2204 src/cups/genppd.c:2221
+#: src/main/print-olympus.c:282 src/cups/genppd.c:1718 src/cups/genppd.c:1746
+#: src/cups/genppd.c:1778 src/cups/genppd.c:1833 src/cups/genppd.c:1879
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2194 src/cups/genppd.c:2217
+#: src/cups/genppd.c:2238 src/cups/genppd.c:2255
 msgid "None"
 msgstr "Geen"
 
-#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
-#: src/main/print-olympus.c:1132
+#: src/main/print-olympus.c:998 src/main/print-olympus.c:1061
+#: src/main/print-olympus.c:1165
 msgid "Glossy"
 msgstr "Glanzend"
 
-#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
-#: src/main/print-olympus.c:1133
+#: src/main/print-olympus.c:999 src/main/print-olympus.c:1062
+#: src/main/print-olympus.c:1166
 msgid "Texture"
 msgstr "Oppervlaktestructuur"
 
-#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
+#: src/main/print-olympus.c:1063 src/main/print-olympus.c:1167
 msgid "Matte"
 msgstr "Mat"
 
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
+#. TRANSLATORS: 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.
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1901
 msgid "Laminate Pattern"
 msgstr "Laagjespatroon"
 
-#: src/main/print-olympus.c:1770
+#: src/main/print-olympus.c:1936
 msgid "Adjust the cyan balance"
 msgstr "Pas de cyaanbalans aan"
 
-#: src/main/print-olympus.c:1778
+#: src/main/print-olympus.c:1944
 msgid "Adjust the magenta balance"
 msgstr "Pas de magentabalans aan"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1952
 msgid "Adjust the yellow balance"
 msgstr "Pas de geelbalans aan"
 
-#: src/main/print-olympus.c:1793
+#: src/main/print-olympus.c:1959
 msgid "Black Balance"
 msgstr "Zwartbalans"
 
-#: src/main/print-olympus.c:1794
+#: src/main/print-olympus.c:1960
 msgid "Adjust the black balance"
 msgstr "Pas de zwartbalans aan"
 
@@ -2173,7 +2899,7 @@ msgstr "Sneldrogend foto"
 msgid "Quick-dry Transparency"
 msgstr "Sneldrogende transparant"
 
-#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3687
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:5925
 msgid "Manual"
 msgstr "Handmatig"
 
@@ -2258,23 +2984,23 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:278 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3638
-#: src/xml/xmli18n-tmp.h:3647 src/xml/xmli18n-tmp.h:3656
-#: src/xml/xmli18n-tmp.h:3664
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5875
+#: src/xml/xmli18n-tmp.h:5884 src/xml/xmli18n-tmp.h:5893
+#: src/xml/xmli18n-tmp.h:5901
 msgid "Draft"
 msgstr "Proefdruk"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:3633 src/xml/xmli18n-tmp.h:3641
-#: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3658
-#: src/xml/xmli18n-tmp.h:3666
+#: src/xml/xmli18n-tmp.h:5870 src/xml/xmli18n-tmp.h:5878
+#: src/xml/xmli18n-tmp.h:5886 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5903
 msgid "High"
 msgstr "Hoog"
 
 #: src/main/print-pcl.c:282 src/main/print-pcl.c:283
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3634
-#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3650
-#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3667
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5896 src/xml/xmli18n-tmp.h:5904
 msgid "Photo"
 msgstr "Foto"
 
@@ -2306,15 +3032,15 @@ msgstr "Modelnaam in PPD-bestand"
 msgid "None; please provide a PPD file"
 msgstr "Geen; gaarne een PPD-bestand aanleveren"
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3671
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:5908
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3708
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:5946
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3823
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6061
 msgid "Custom"
 msgstr "Gebruiker"
 
@@ -2323,33 +3049,44 @@ msgid "Image dimensions must match paper dimensions"
 msgstr ""
 "Afmeting van afbeelding moet overeenkomen met de afmetingen van het papier"
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3629
-#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3654
+#: src/main/print-weave.c:1511
+msgid "Fatal error!"
+msgstr "Fatale fout!"
+
+#: src/main/print-weave.c:1547
+msgid ""
+"Please report the above information to gimp-print-devel@lists.sourceforge.net"
+msgstr ""
+"Gaarne de bovenstaande informatie rapporteren aan gimp-print-devel@lists."
+"sourceforge.net"
+
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:5866
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5891
 msgid "Fast Economy"
 msgstr "Snel en zuinig"
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3630
-#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3655
-#: src/xml/xmli18n-tmp.h:3663
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5900
 msgid "Economy"
 msgstr "Zuinig"
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3635
-#: src/xml/xmli18n-tmp.h:3642 src/xml/xmli18n-tmp.h:3651
-#: src/xml/xmli18n-tmp.h:3660 src/xml/xmli18n-tmp.h:3668
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:5872
+#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
 msgid "Super Photo"
 msgstr "Super Photo"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3636
-#: src/xml/xmli18n-tmp.h:3643 src/xml/xmli18n-tmp.h:3652
-#: src/xml/xmli18n-tmp.h:3661 src/xml/xmli18n-tmp.h:3669
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:5873
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5889
+#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5906
 msgid "Ultra Photo"
 msgstr "Ultra Photo"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1326 src/cups/genppd.c:1989
-#: src/xml/xmli18n-tmp.h:3637 src/xml/xmli18n-tmp.h:3644
-#: src/xml/xmli18n-tmp.h:3653 src/xml/xmli18n-tmp.h:3662
-#: src/xml/xmli18n-tmp.h:3670
+#: src/main/generic-options.c:41 src/cups/genppd.c:1359 src/cups/genppd.c:2023
+#: src/xml/xmli18n-tmp.h:5874 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5899
+#: src/xml/xmli18n-tmp.h:5907
 msgid "Best"
 msgstr "Het best"
 
@@ -3074,80 +3811,80 @@ msgstr "Extra 5"
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:960
+#: src/cups/genppd.c:993
 msgid "English"
 msgstr "Engels"
 
-#: src/cups/genppd.c:1159 src/cups/genppd.c:1175 src/cups/genppd.c:1934
-#: src/cups/genppd.c:1935
+#: src/cups/genppd.c:1192 src/cups/genppd.c:1208 src/cups/genppd.c:1968
+#: src/cups/genppd.c:1969
 msgid "Media Size"
 msgstr "Afmetingen van het medium"
 
-#: src/cups/genppd.c:1248 src/cups/genppd.c:1970
+#: src/cups/genppd.c:1281 src/cups/genppd.c:2004
 msgid "Color Model"
 msgstr "Kleurmodel"
 
-#: src/cups/genppd.c:1275 src/cups/genppd.c:1972
+#: src/cups/genppd.c:1308 src/cups/genppd.c:2006
 msgid "Inverted Grayscale"
 msgstr "Omgekeerde grijsschaal"
 
-#: src/cups/genppd.c:1285 src/cups/genppd.c:1976
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2010
 msgid "RGB Color"
 msgstr "RGB-kleur"
 
-#: src/cups/genppd.c:1292 src/cups/genppd.c:1977
+#: src/cups/genppd.c:1325 src/cups/genppd.c:2011
 msgid "CMY Color"
 msgstr "CMY-kleur"
 
-#: src/cups/genppd.c:1317 src/cups/genppd.c:1987
+#: src/cups/genppd.c:1350 src/cups/genppd.c:2021
 msgid "Color Precision"
 msgstr "Kleurprecisie"
 
-#: src/cups/genppd.c:1573 src/cups/genppd.c:2080
+#: src/cups/genppd.c:1606 src/cups/genppd.c:2114
 msgid "Reverse"
 msgstr "Omkeren"
 
-#: src/cups/genppd.c:1590 src/cups/genppd.c:2096
+#: src/cups/genppd.c:1623 src/cups/genppd.c:2130
 msgid "2-Sided Printing"
 msgstr "Dubbelzijdig printen"
 
-#: src/cups/genppd.c:1615 src/cups/genppd.c:2113
+#: src/cups/genppd.c:1648 src/cups/genppd.c:2147
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr "Verklein de pagina als dat nodig is om op de pagina te blijven"
 
-#: src/cups/genppd.c:1620 src/cups/genppd.c:2114
+#: src/cups/genppd.c:1653 src/cups/genppd.c:2148
 msgid "Shrink (print the whole page)"
 msgstr "Verkleinen (de gehele pagina afdrukken)"
 
-#: src/cups/genppd.c:1621 src/cups/genppd.c:2115
+#: src/cups/genppd.c:1654 src/cups/genppd.c:2149
 msgid "Crop (preserve dimensions)"
 msgstr "Afsnijden (behoud de afmetingen)"
 
-#: src/cups/genppd.c:1622 src/cups/genppd.c:2116
+#: src/cups/genppd.c:1655 src/cups/genppd.c:2150
 msgid "Expand (use maximum page area)"
 msgstr "Vergroot (gebruik de gehele pagina)"
 
-#: src/cups/genppd.c:1716 src/cups/genppd.c:2162
+#: src/cups/genppd.c:1749 src/cups/genppd.c:2196
 msgid "No"
 msgstr "Nee"
 
-#: src/cups/genppd.c:1718 src/cups/genppd.c:2164
+#: src/cups/genppd.c:1751 src/cups/genppd.c:2198
 msgid "Yes"
 msgstr "Ja"
 
-#: src/cups/genppd.c:1757 src/cups/genppd.c:1820 src/cups/genppd.c:1864
-#: src/cups/genppd.c:2185 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+#: src/cups/genppd.c:1790 src/cups/genppd.c:1853 src/cups/genppd.c:1897
+#: src/cups/genppd.c:2219 src/cups/genppd.c:2249 src/cups/genppd.c:2266
 msgid "Value"
 msgstr "Waarde"
 
-#: src/cups/genppd.c:1762 src/cups/genppd.c:2189
+#: src/cups/genppd.c:1795 src/cups/genppd.c:2223
 msgid "Fine Adjustment"
 msgstr "Fijnafstelling"
 
-#: src/cups/genppd.c:1805 src/cups/genppd.c:2209
+#: src/cups/genppd.c:1838 src/cups/genppd.c:2243
 #, c-format
 msgid "%.1f mm"
-msgstr ""
+msgstr "%.1f mm"
 
 #: src/escputil/escputil.c:70
 msgid "Escputil version "
@@ -3475,51 +4212,61 @@ msgstr ""
 "Kan printer type niet vaststellen.\n"
 "Gebruik -m om uw printermodel te specificeren.\n"
 
-#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:383
-#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
-#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
-#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
-#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
-#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
-#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
-#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
-#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
-#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
-#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
-#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
-#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
-#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
-#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
-#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
-#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
-#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
-#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
-#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
-#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
-#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
-#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
-#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
-#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
-#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
-#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
-#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
-#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
-#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
-#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1503
-#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1509
-#: src/xml/xmli18n-tmp.h:1512 src/xml/xmli18n-tmp.h:1515
-#: src/xml/xmli18n-tmp.h:1518 src/xml/xmli18n-tmp.h:1521
-#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1527
-#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
-#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
-#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
-#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
-#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
-#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:2655
-#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2717
-#: src/xml/xmli18n-tmp.h:3045 src/xml/xmli18n-tmp.h:3252
-#: src/xml/xmli18n-tmp.h:3273 src/xml/xmli18n-tmp.h:3363
-#: src/xml/xmli18n-tmp.h:3531
+#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2001
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2010 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2025
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:4085 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4612 src/xml/xmli18n-tmp.h:5481
 msgid "Photo Black"
 msgstr "Fotozwart"
 
@@ -3530,125 +4277,297 @@ msgid "Unknown"
 msgstr "Onbekend"
 
 #: src/escputil/escputil.c:1000 src/escputil/escputil.c:1289
-#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1921
-#: src/xml/xmli18n-tmp.h:1937 src/xml/xmli18n-tmp.h:2002
-#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2079
-#: src/xml/xmli18n-tmp.h:2105 src/xml/xmli18n-tmp.h:2119
-#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2173
-#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
-#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
-#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2293
-#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2346
-#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2418
-#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2445
-#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2469
-#: src/xml/xmli18n-tmp.h:2484 src/xml/xmli18n-tmp.h:2512
-#: src/xml/xmli18n-tmp.h:2525 src/xml/xmli18n-tmp.h:2564
-#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2626
-#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2746
-#: src/xml/xmli18n-tmp.h:2762 src/xml/xmli18n-tmp.h:2843
-#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2895
-#: src/xml/xmli18n-tmp.h:2912 src/xml/xmli18n-tmp.h:2946
-#: src/xml/xmli18n-tmp.h:3001 src/xml/xmli18n-tmp.h:3015
-#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3122
-#: src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2461 src/xml/xmli18n-tmp.h:2526
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2683 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2711 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3101 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3661
+#: src/xml/xmli18n-tmp.h:3678 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3750 src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:3782 src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:3932 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3964 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4388 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:4639 src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:4875 src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4936
+#: src/xml/xmli18n-tmp.h:4942 src/xml/xmli18n-tmp.h:4968
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5339 src/xml/xmli18n-tmp.h:5348
+#: src/xml/xmli18n-tmp.h:5355 src/xml/xmli18n-tmp.h:5361
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5417
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5430
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5477 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5502
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5536 src/xml/xmli18n-tmp.h:5544
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5557
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5657 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5719
+#: src/xml/xmli18n-tmp.h:5726 src/xml/xmli18n-tmp.h:5732
+#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5779
 msgid "Light Cyan"
 msgstr "Lichtcyaan"
 
 #: src/escputil/escputil.c:1001 src/escputil/escputil.c:1290
-#: src/xml/xmli18n-tmp.h:1906 src/xml/xmli18n-tmp.h:1922
-#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:2003
-#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2080
-#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2120
-#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2174
-#: src/xml/xmli18n-tmp.h:2188 src/xml/xmli18n-tmp.h:2201
-#: src/xml/xmli18n-tmp.h:2214 src/xml/xmli18n-tmp.h:2227
-#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2294
-#: src/xml/xmli18n-tmp.h:2309 src/xml/xmli18n-tmp.h:2347
-#: src/xml/xmli18n-tmp.h:2360 src/xml/xmli18n-tmp.h:2419
-#: src/xml/xmli18n-tmp.h:2432 src/xml/xmli18n-tmp.h:2446
-#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2470
-#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2513
-#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2565
-#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2627
-#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2748
-#: src/xml/xmli18n-tmp.h:2761 src/xml/xmli18n-tmp.h:2844
-#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2896
-#: src/xml/xmli18n-tmp.h:2913 src/xml/xmli18n-tmp.h:2947
-#: src/xml/xmli18n-tmp.h:3000 src/xml/xmli18n-tmp.h:3014
-#: src/xml/xmli18n-tmp.h:3028 src/xml/xmli18n-tmp.h:3123
-#: src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2446
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2527
+#: src/xml/xmli18n-tmp.h:2541 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2644
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2698
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2751
+#: src/xml/xmli18n-tmp.h:2803 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2956 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2994
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3381
+#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3662
+#: src/xml/xmli18n-tmp.h:3746 src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:3778 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3934 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3966 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:4265 src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:4390 src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:4428 src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4452
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4465
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4512 src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4586 src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:4641 src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4903
+#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4970
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:5044 src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5168
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5241 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5334
+#: src/xml/xmli18n-tmp.h:5341 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5363
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5419
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5471
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5504
+#: src/xml/xmli18n-tmp.h:5510 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5652
+#: src/xml/xmli18n-tmp.h:5659 src/xml/xmli18n-tmp.h:5665
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5721
+#: src/xml/xmli18n-tmp.h:5728 src/xml/xmli18n-tmp.h:5734
+#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5781
 msgid "Light Magenta"
 msgstr "Lichtmagenta"
 
-#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2433
-#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:3002
-#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3030
+#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3679 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4409 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:4566 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4605 src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4664 src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5376 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5450
+#: src/xml/xmli18n-tmp.h:5475 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5533 src/xml/xmli18n-tmp.h:5542
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5678 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5717
+#: src/xml/xmli18n-tmp.h:5747 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5777
 msgid "Light Black"
 msgstr "Grijs"
 
-#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:384
-#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
-#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
-#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
-#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
-#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
-#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
-#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
-#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
-#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
-#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
-#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
-#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
-#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
-#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
-#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
-#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
-#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
-#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
-#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
-#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
-#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
-#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
-#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
-#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
-#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
-#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
-#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
-#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
-#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
-#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1504
-#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1510
-#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1516
-#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1522
-#: src/xml/xmli18n-tmp.h:1525 src/xml/xmli18n-tmp.h:1528
-#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1534
-#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1540
-#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1546
-#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1552
-#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1558
-#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:2654
-#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2716
-#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3264
-#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3371
-#: src/xml/xmli18n-tmp.h:3539
+#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:508 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:532 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:538 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:562 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:568 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
+#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
+#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
+#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
+#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
+#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
+#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
+#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
+#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
+#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
+#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
+#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2011 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2026
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2032
+#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2038
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:4044 src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:5530
 msgid "Matte Black"
 msgstr "Matzwart"
 
-#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:2658
-#: src/xml/xmli18n-tmp.h:2702 src/xml/xmli18n-tmp.h:2720
-#: src/xml/xmli18n-tmp.h:3048
+#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3995 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4006 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4020 src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:4106 src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Gloss Optimizer"
 msgstr "Glansverbeteraar"
 
-#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:2760
-#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3013
-#: src/xml/xmli18n-tmp.h:3027
+#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3676
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4616 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5534 src/xml/xmli18n-tmp.h:5573
 msgid "Light Light Black"
 msgstr "Lichtgrijs"
 
 #: src/escputil/escputil.c:1010 src/escputil/escputil.c:1029
-#: src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:4099 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4189
 msgid "Orange"
 msgstr "Oranje"
 
@@ -4316,7879 +5235,7919 @@ msgstr "Bezig met afdrukken..."
 #: src/xml/xmli18n-tmp.h:68 src/xml/xmli18n-tmp.h:70 src/xml/xmli18n-tmp.h:72
 #: src/xml/xmli18n-tmp.h:74 src/xml/xmli18n-tmp.h:76 src/xml/xmli18n-tmp.h:78
 #: src/xml/xmli18n-tmp.h:80 src/xml/xmli18n-tmp.h:82 src/xml/xmli18n-tmp.h:84
-#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:92
-#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
-#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
-#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
-#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
-#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
-#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
-#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
-#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
-#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
-#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
-#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
-#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
-#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
-#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
-#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
-#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
-#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
-#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
-#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
-#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
-#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
-#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
-#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
-#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
-#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
-#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
-#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
-#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
-#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
-#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
-#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
-#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
-#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
-#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
-#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
-#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
-#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
-#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
-#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
-#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
-#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
-#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
-#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
-#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
-#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
-#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
-#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
-#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
-#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
-#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
-#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
-#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
-#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
-#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
-#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
-#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
-#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
-#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
-#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
-#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
-#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
-#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
-#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
-#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
-#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
-#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
-#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
-#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
-#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
-#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
-#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
-#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
-#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
-#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
-#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
-#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
-#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
-#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
-#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
-#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
-#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
-#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
-#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
-#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
-#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
-#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
-#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
-#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
-#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
-#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
-#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
-#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
-#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
-#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
-#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
-#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:92 src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:102 src/xml/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:106 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:114 src/xml/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:118 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:126 src/xml/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:130 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:136 src/xml/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:144 src/xml/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:168 src/xml/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:192 src/xml/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:216 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:232 src/xml/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:240 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:256 src/xml/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:264 src/xml/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:304 src/xml/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:312 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:320 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:328 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:336 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:344 src/xml/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:352 src/xml/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:384 src/xml/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:408 src/xml/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:412 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:432 src/xml/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:444 src/xml/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:448 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:468 src/xml/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:484 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:642 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:698 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:714 src/xml/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:722 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:738 src/xml/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:746 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:764 src/xml/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:780 src/xml/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:804 src/xml/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:814
 #: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:818
 #: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:822
 #: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:826
 #: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:830
-#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:834
-#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:838
-#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:842
-#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:846
-#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:850
-#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
-#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
-#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
-#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
-#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
-#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
-#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
-#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:898
-#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
-#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
-#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
-#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
-#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
-#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
-#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
-#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
-#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
-#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
-#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
-#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
-#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
-#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
-#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
-#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
-#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
-#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
-#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
-#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1018
-#: src/xml/xmli18n-tmp.h:1021 src/xml/xmli18n-tmp.h:1024
-#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1030
-#: src/xml/xmli18n-tmp.h:1033 src/xml/xmli18n-tmp.h:1036
-#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1042
-#: src/xml/xmli18n-tmp.h:1045 src/xml/xmli18n-tmp.h:1048
-#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1054
-#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1060
-#: src/xml/xmli18n-tmp.h:1063 src/xml/xmli18n-tmp.h:1066
-#: src/xml/xmli18n-tmp.h:1069 src/xml/xmli18n-tmp.h:1072
-#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1078
-#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1084
-#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1090
-#: src/xml/xmli18n-tmp.h:1093 src/xml/xmli18n-tmp.h:1096
-#: src/xml/xmli18n-tmp.h:1099 src/xml/xmli18n-tmp.h:1102
-#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1108
-#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1114
-#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1120
-#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1126
-#: src/xml/xmli18n-tmp.h:1129 src/xml/xmli18n-tmp.h:1132
-#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
-#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
-#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
-#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
-#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
-#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
-#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
-#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
-#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
-#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
-#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
-#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
-#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
-#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1189
-#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1193
-#: src/xml/xmli18n-tmp.h:1195 src/xml/xmli18n-tmp.h:1197
-#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1201
-#: src/xml/xmli18n-tmp.h:1203 src/xml/xmli18n-tmp.h:1205
-#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1209
-#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1221
-#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
-#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
-#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
-#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
-#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
-#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
-#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
-#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
-#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
-#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
-#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
-#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
-#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
-#: src/xml/xmli18n-tmp.h:1302 src/xml/xmli18n-tmp.h:1305
-#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1311
-#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1317
-#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1323
-#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1329
-#: src/xml/xmli18n-tmp.h:1332 src/xml/xmli18n-tmp.h:1335
-#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
-#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1343
-#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1347
-#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1351
-#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1355
-#: src/xml/xmli18n-tmp.h:1357 src/xml/xmli18n-tmp.h:1359
-#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1363
-#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1367
-#: src/xml/xmli18n-tmp.h:1369 src/xml/xmli18n-tmp.h:1371
-#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1375
-#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1566
-#: src/xml/xmli18n-tmp.h:1569 src/xml/xmli18n-tmp.h:1572
-#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1578
-#: src/xml/xmli18n-tmp.h:1581 src/xml/xmli18n-tmp.h:1584
-#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1590
-#: src/xml/xmli18n-tmp.h:1593 src/xml/xmli18n-tmp.h:1596
-#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1602
-#: src/xml/xmli18n-tmp.h:1605 src/xml/xmli18n-tmp.h:1608
-#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1614
-#: src/xml/xmli18n-tmp.h:1617 src/xml/xmli18n-tmp.h:1620
-#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1626
-#: src/xml/xmli18n-tmp.h:1629 src/xml/xmli18n-tmp.h:1632
-#: src/xml/xmli18n-tmp.h:1635 src/xml/xmli18n-tmp.h:1638
-#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1644
-#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
-#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
-#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
-#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
-#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
-#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
-#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
-#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
-#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
-#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
-#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
-#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
-#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
-#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
-#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:1778
-#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1782
-#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1786
-#: src/xml/xmli18n-tmp.h:1788 src/xml/xmli18n-tmp.h:1790
-#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1794
-#: src/xml/xmli18n-tmp.h:1796 src/xml/xmli18n-tmp.h:1798
-#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1802
-#: src/xml/xmli18n-tmp.h:1804 src/xml/xmli18n-tmp.h:1806
-#: src/xml/xmli18n-tmp.h:1808 src/xml/xmli18n-tmp.h:1810
-#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3204
-#: src/xml/xmli18n-tmp.h:3210 src/xml/xmli18n-tmp.h:3216
-#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3232
-#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3250
-#: src/xml/xmli18n-tmp.h:3294 src/xml/xmli18n-tmp.h:3302
-#: src/xml/xmli18n-tmp.h:3304 src/xml/xmli18n-tmp.h:3312
-#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3379
-#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
-#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3421
-#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3441
-#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3469
-#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3555
-#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3597
-#: src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:1017
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1025
+#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1035 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1047 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1056
+#: src/xml/xmli18n-tmp.h:1061 src/xml/xmli18n-tmp.h:1066
+#: src/xml/xmli18n-tmp.h:1071 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1086
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1096
+#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1116
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1126
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1136
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1161 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1181 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1206
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1216
+#: src/xml/xmli18n-tmp.h:1221 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1236
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1246
+#: src/xml/xmli18n-tmp.h:1251 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1261 src/xml/xmli18n-tmp.h:1266
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1281 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1291 src/xml/xmli18n-tmp.h:1296
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1311 src/xml/xmli18n-tmp.h:1316
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1326
+#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1336
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1378 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1414 src/xml/xmli18n-tmp.h:1420
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1432
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1450 src/xml/xmli18n-tmp.h:1455
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1465
+#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1480 src/xml/xmli18n-tmp.h:1485
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1540 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1551 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1583 src/xml/xmli18n-tmp.h:1585
+#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1603 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1607 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1646
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1666
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1676
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1716
+#: src/xml/xmli18n-tmp.h:1721 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1736
+#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1835
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1843
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1851
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:2049
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2057
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2065
+#: src/xml/xmli18n-tmp.h:2069 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2113
+#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2129
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2137
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2153
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2161
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2185
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2264
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2272
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2276
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2282 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2286 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2296
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2300
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2308
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2314 src/xml/xmli18n-tmp.h:2316
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2324
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:3787 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3895 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:4223 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5579
+#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5825
 msgid "EPSON Standard Inks"
 msgstr "EPSON standaard inkt"
 
-#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:405
 msgid "Bright White Paper"
 msgstr "Helder wit papier"
 
-#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
-#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
-#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
-#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
-#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
-#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
-#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
-#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:817
-#: src/xml/xmli18n-tmp.h:855 src/xml/xmli18n-tmp.h:912
-#: src/xml/xmli18n-tmp.h:969 src/xml/xmli18n-tmp.h:1026
-#: src/xml/xmli18n-tmp.h:1083 src/xml/xmli18n-tmp.h:1136
-#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1226
-#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1338
-#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1445
-#: src/xml/xmli18n-tmp.h:1505 src/xml/xmli18n-tmp.h:1568
-#: src/xml/xmli18n-tmp.h:1625 src/xml/xmli18n-tmp.h:1682
-#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1777
-#: src/xml/xmli18n-tmp.h:3675
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:139 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:959 src/xml/xmli18n-tmp.h:1018
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1155
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1546
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1931
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:5912
 msgid "Postcard"
 msgstr "Briefkaart"
 
-#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
-#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
-#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
-#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
-#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
-#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
-#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
-#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:825
-#: src/xml/xmli18n-tmp.h:867 src/xml/xmli18n-tmp.h:924
-#: src/xml/xmli18n-tmp.h:981 src/xml/xmli18n-tmp.h:1038
-#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1144
-#: src/xml/xmli18n-tmp.h:1182 src/xml/xmli18n-tmp.h:1238
-#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1346
-#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1457
-#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1580
-#: src/xml/xmli18n-tmp.h:1637 src/xml/xmli18n-tmp.h:1694
-#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1785
+#: src/xml/xmli18n-tmp.h:13 src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:155 src/xml/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:415 src/xml/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:851 src/xml/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1026
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1175
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1554
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1832
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2309
 msgid "Back Light Film"
 msgstr "Backlight film"
 
-#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
-#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
-#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
-#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
-#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
-#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
-#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
-#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:829
-#: src/xml/xmli18n-tmp.h:873 src/xml/xmli18n-tmp.h:930
-#: src/xml/xmli18n-tmp.h:987 src/xml/xmli18n-tmp.h:1044
-#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1148
-#: src/xml/xmli18n-tmp.h:1186 src/xml/xmli18n-tmp.h:1244
-#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1350
-#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1463
-#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1586
-#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1700
-#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1789
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:419 src/xml/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:857 src/xml/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1030
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1383
+#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1558
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2313
 msgid "Matte Paper Heavyweight"
 msgstr "Zwaar mat papier"
 
-#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
-#: src/xml/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:421
 msgid "Premium Presentation Paper Matte"
 msgstr "Mat premium presentatiepapier"
 
-#: src/xml/xmli18n-tmp.h:27
-msgid "Premium Glossy Photo Paper 170 wt"
-msgstr "Premium glanzend fotopapier 170 wt"
-
-#: src/xml/xmli18n-tmp.h:29
-msgid "Premium Glossy Photo Paper 250 wt"
-msgstr "Premium glanzend fotopapier 250 wt"
-
-#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
-#: src/xml/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:431
 msgid "Ultra Glossy Photo Paper"
 msgstr "Extra glanzend fotopapier"
 
-#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
-#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
-#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
-#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
-#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
-#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
-#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
-#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:839
-#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:945
-#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1059
-#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1158
-#: src/xml/xmli18n-tmp.h:1196 src/xml/xmli18n-tmp.h:1259
-#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1360
-#: src/xml/xmli18n-tmp.h:1415 src/xml/xmli18n-tmp.h:1478
-#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1601
-#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1715
-#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1210
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1413
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1568
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1695
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1964
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2176 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2287 src/xml/xmli18n-tmp.h:2323
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premium halfglanzend fotopapier"
 
-#: src/xml/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:437
+msgid "Ultra Premium Photo Paper Luster"
+msgstr "Ultra Premium Photo Paper Luster"
+
+#: src/xml/xmli18n-tmp.h:37
+msgid "CD or DVD"
+msgstr "Cd of dvd"
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:93 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1230
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1437
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2331
+msgid "ColorLife Paper"
+msgstr "ColorLife papier"
+
+#: src/xml/xmli18n-tmp.h:73
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Premium glanzend fotopapier 170 wt"
+
+#: src/xml/xmli18n-tmp.h:75
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "Premium glanzend fotopapier 250 wt"
+
+#: src/xml/xmli18n-tmp.h:81
 msgid "Premium Semigloss Photo Paper 170 wt"
 msgstr "Premium halfglanzend fotopapier 170 wt"
 
-#: src/xml/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:83
 msgid "Premium Semigloss Photo Paper 250 wt"
 msgstr "Premium halfglanzend fotopapier 250 wt"
 
-#: src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:87
 msgid "Premium Luster Photo Paper 250 wt"
 msgstr "Premium luster fotopapier 250 wt"
 
-#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
-#: src/xml/xmli18n-tmp.h:334
-msgid "Ultra Premium Photo Paper Luster"
-msgstr "Ultra Premium Photo Paper Luster"
-
-#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
-#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
-#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
-#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
-#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
-#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
-#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
-#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:845
-#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:957
-#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1071
-#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1166
-#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1271
-#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1372
-#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1496
-#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1613
-#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1733
-#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1807
-msgid "ColorLife Paper"
-msgstr "ColorLife papier"
-
-#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
-#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
-#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
-#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
-#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
-#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
-#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
-#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
-#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
-#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
-#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
-#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
-#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
-#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
-#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
-#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
-#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
-#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
-#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
-#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
-#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
-#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
-#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
-#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
-#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
-#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
-#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
-#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
-#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
-#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
-#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
-#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
-#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
-#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
-#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
-#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
-#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
-#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
-#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
-#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
-#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
-#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
-#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
-#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
-#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
-#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
-#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:851
-#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:857
-#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:863
-#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:869
-#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:875
-#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:881
-#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:887
-#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:893
-#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:899
-#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:905
-#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:911
-#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:917
-#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:923
-#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:929
-#: src/xml/xmli18n-tmp.h:932 src/xml/xmli18n-tmp.h:935
-#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:941
-#: src/xml/xmli18n-tmp.h:944 src/xml/xmli18n-tmp.h:947
-#: src/xml/xmli18n-tmp.h:950 src/xml/xmli18n-tmp.h:953
-#: src/xml/xmli18n-tmp.h:956 src/xml/xmli18n-tmp.h:959
-#: src/xml/xmli18n-tmp.h:962 src/xml/xmli18n-tmp.h:965
-#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:971
-#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:977
-#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:983
-#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:989
-#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:995
-#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1001
-#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1007
-#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1013
-#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1019
-#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1025
-#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1031
-#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1037
-#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1043
-#: src/xml/xmli18n-tmp.h:1046 src/xml/xmli18n-tmp.h:1049
-#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1055
-#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1061
-#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1067
-#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1073
-#: src/xml/xmli18n-tmp.h:1076 src/xml/xmli18n-tmp.h:1079
-#: src/xml/xmli18n-tmp.h:1082 src/xml/xmli18n-tmp.h:1085
-#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1091
-#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1097
-#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1103
-#: src/xml/xmli18n-tmp.h:1106 src/xml/xmli18n-tmp.h:1109
-#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1115
-#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1121
-#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1127
-#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1133
-#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1225
-#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1231
-#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1237
-#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1243
-#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1249
-#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1255
-#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1261
-#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1267
-#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1273
-#: src/xml/xmli18n-tmp.h:1276 src/xml/xmli18n-tmp.h:1279
-#: src/xml/xmli18n-tmp.h:1282 src/xml/xmli18n-tmp.h:1285
-#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1291
-#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1297
-#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1303
-#: src/xml/xmli18n-tmp.h:1306 src/xml/xmli18n-tmp.h:1309
-#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1315
-#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1321
-#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1327
-#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1333
-#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1567
-#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1573
-#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1579
-#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1585
-#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1591
-#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1597
-#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1603
-#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1609
-#: src/xml/xmli18n-tmp.h:1612 src/xml/xmli18n-tmp.h:1615
-#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1621
-#: src/xml/xmli18n-tmp.h:1624 src/xml/xmli18n-tmp.h:1627
-#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1633
-#: src/xml/xmli18n-tmp.h:1636 src/xml/xmli18n-tmp.h:1639
-#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1645
-#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1651
-#: src/xml/xmli18n-tmp.h:1654 src/xml/xmli18n-tmp.h:1657
-#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1663
-#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1669
-#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1675
-#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3223
-#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3231
-#: src/xml/xmli18n-tmp.h:3238 src/xml/xmli18n-tmp.h:3239
-#: src/xml/xmli18n-tmp.h:3300 src/xml/xmli18n-tmp.h:3301
-#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3311
-#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3396
-#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3408
-#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3420
-#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3432
-#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3440
-#: src/xml/xmli18n-tmp.h:3479 src/xml/xmli18n-tmp.h:3480
-#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3492
-#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3554
-#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:133 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:149 src/xml/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:173 src/xml/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:197 src/xml/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:205 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:221 src/xml/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:229 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:245 src/xml/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:253 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:261 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:269 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:277 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:285 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:293 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:301 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:309 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:317 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:325 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:333 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:341 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:349 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:357 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:619 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:643 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:667 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:691 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:707 src/xml/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:715 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:731 src/xml/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:739 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:755 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1062
+#: src/xml/xmli18n-tmp.h:1067 src/xml/xmli18n-tmp.h:1072
+#: src/xml/xmli18n-tmp.h:1077 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1092
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1102
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1112
+#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1122
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1132
+#: src/xml/xmli18n-tmp.h:1137 src/xml/xmli18n-tmp.h:1142
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1157 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1177 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1192
+#: src/xml/xmli18n-tmp.h:1197 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1212
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1222
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1242
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1252
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1272
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1287 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1297 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1327 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1385 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1445 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1461
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1516 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1647
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1657
+#: src/xml/xmli18n-tmp.h:1662 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1677
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1687
+#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1742 src/xml/xmli18n-tmp.h:1747
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1767
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1807
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2090 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2098 src/xml/xmli18n-tmp.h:2102
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2118
+#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2126
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2162 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2190
+#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:3884 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:4779 src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:4845 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4919
+#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4980
+#: src/xml/xmli18n-tmp.h:4986 src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5209 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5276
+#: src/xml/xmli18n-tmp.h:5277 src/xml/xmli18n-tmp.h:5283
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5607 src/xml/xmli18n-tmp.h:5633
+#: src/xml/xmli18n-tmp.h:5634 src/xml/xmli18n-tmp.h:5640
 msgid "Quadtone"
 msgstr "Viertonig"
 
-#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
-#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
-#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
-#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
-#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:852
-#: src/xml/xmli18n-tmp.h:909 src/xml/xmli18n-tmp.h:966
-#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1080
-#: src/xml/xmli18n-tmp.h:1172 src/xml/xmli18n-tmp.h:1223
-#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1336
-#: src/xml/xmli18n-tmp.h:1379 src/xml/xmli18n-tmp.h:1442
-#: src/xml/xmli18n-tmp.h:1565 src/xml/xmli18n-tmp.h:1622
-#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1775
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:142 src/xml/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:150 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:174 src/xml/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:198 src/xml/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:214 src/xml/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:222 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:238 src/xml/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:246 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:262 src/xml/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:302 src/xml/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:310 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:318 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:326 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:334 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:342 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:350 src/xml/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:636 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:660 src/xml/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:708 src/xml/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:716 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:732 src/xml/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:756 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1103
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1123
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1158 src/xml/xmli18n-tmp.h:1163
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1183
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1193
+#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1213
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1223
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1238 src/xml/xmli18n-tmp.h:1243
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1253
+#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1283
+#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1313
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1333
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1362 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1374 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1462
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1472
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1487 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1502
+#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:1532
+#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1542
+#: src/xml/xmli18n-tmp.h:1633 src/xml/xmli18n-tmp.h:1638
+#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1648
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1658
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1713 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1728
+#: src/xml/xmli18n-tmp.h:1733 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1768
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2071
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2095
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2115 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2123 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2139 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2183
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2191
+#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2199
+msgid "MISQuadtone"
+msgstr "MISViertonig"
+
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1150 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2299
 msgid "Plain Paper Fast Load"
 msgstr "Blanco papier snellader"
 
-#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
-#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
-#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1364
-#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1484
-#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1970 src/xml/xmli18n-tmp.h:2030
+#: src/xml/xmli18n-tmp.h:2245
 msgid "Archival Matte Paper"
 msgstr "Archief mat papier"
 
-#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
-#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
-#: src/xml/xmli18n-tmp.h:1202 src/xml/xmli18n-tmp.h:1366
-#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1487
-#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:881 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2248
 msgid "Watercolor Paper - Radiant White"
 msgstr "Waterverfpapier - stralend wit"
 
-#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
-#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
-#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
-#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
-#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
-#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
-#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
-#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
-#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
-#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
-#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1377
-#: src/xml/xmli18n-tmp.h:1380 src/xml/xmli18n-tmp.h:1383
-#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1389
-#: src/xml/xmli18n-tmp.h:1392 src/xml/xmli18n-tmp.h:1395
-#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1401
-#: src/xml/xmli18n-tmp.h:1404 src/xml/xmli18n-tmp.h:1407
-#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1413
-#: src/xml/xmli18n-tmp.h:1416 src/xml/xmli18n-tmp.h:1419
-#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1425
-#: src/xml/xmli18n-tmp.h:1428 src/xml/xmli18n-tmp.h:1431
-#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1437
-#: src/xml/xmli18n-tmp.h:1440 src/xml/xmli18n-tmp.h:1443
-#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1449
-#: src/xml/xmli18n-tmp.h:1452 src/xml/xmli18n-tmp.h:1455
-#: src/xml/xmli18n-tmp.h:1458 src/xml/xmli18n-tmp.h:1461
-#: src/xml/xmli18n-tmp.h:1464 src/xml/xmli18n-tmp.h:1467
-#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1473
-#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1479
-#: src/xml/xmli18n-tmp.h:1482 src/xml/xmli18n-tmp.h:1485
-#: src/xml/xmli18n-tmp.h:1488 src/xml/xmli18n-tmp.h:1491
-#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1497
-#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1677
-#: src/xml/xmli18n-tmp.h:1680 src/xml/xmli18n-tmp.h:1683
-#: src/xml/xmli18n-tmp.h:1686 src/xml/xmli18n-tmp.h:1689
-#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1695
-#: src/xml/xmli18n-tmp.h:1698 src/xml/xmli18n-tmp.h:1701
-#: src/xml/xmli18n-tmp.h:1704 src/xml/xmli18n-tmp.h:1707
-#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1713
-#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1719
-#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1725
-#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1731
-#: src/xml/xmli18n-tmp.h:1734 src/xml/xmli18n-tmp.h:1737
-#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3503
-#: src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:1863
+#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1881
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1893
+#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1905
+#: src/xml/xmli18n-tmp.h:1908 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1923
+#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:1950 src/xml/xmli18n-tmp.h:1953
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1968 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1983
+#: src/xml/xmli18n-tmp.h:1986 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2204 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2255
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5645
 msgid "UltraChrome Photo Black"
 msgstr "UltraChrome Photo Black"
 
-#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
-#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
-#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
-#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
-#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
-#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
-#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
-#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
-#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
-#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
-#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1378
-#: src/xml/xmli18n-tmp.h:1381 src/xml/xmli18n-tmp.h:1384
-#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1390
-#: src/xml/xmli18n-tmp.h:1393 src/xml/xmli18n-tmp.h:1396
-#: src/xml/xmli18n-tmp.h:1399 src/xml/xmli18n-tmp.h:1402
-#: src/xml/xmli18n-tmp.h:1405 src/xml/xmli18n-tmp.h:1408
-#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1414
-#: src/xml/xmli18n-tmp.h:1417 src/xml/xmli18n-tmp.h:1420
-#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1426
-#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1432
-#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1438
-#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1444
-#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1450
-#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1456
-#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1462
-#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1468
-#: src/xml/xmli18n-tmp.h:1471 src/xml/xmli18n-tmp.h:1474
-#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1480
-#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1486
-#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1492
-#: src/xml/xmli18n-tmp.h:1495 src/xml/xmli18n-tmp.h:1498
-#: src/xml/xmli18n-tmp.h:1501 src/xml/xmli18n-tmp.h:1678
-#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1684
-#: src/xml/xmli18n-tmp.h:1687 src/xml/xmli18n-tmp.h:1690
-#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1696
-#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1702
-#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1708
-#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1714
-#: src/xml/xmli18n-tmp.h:1717 src/xml/xmli18n-tmp.h:1720
-#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1726
-#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1732
-#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1738
-#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3517
-#: src/xml/xmli18n-tmp.h:3577
+#: src/xml/xmli18n-tmp.h:835 src/xml/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:841 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1879 src/xml/xmli18n-tmp.h:1882
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1894
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1909 src/xml/xmli18n-tmp.h:1912
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1924
+#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1954
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1969 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1984
+#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2208
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2229 src/xml/xmli18n-tmp.h:2232
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2238
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2244
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2253 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2259 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5714
 msgid "UltraChrome Matte Black"
 msgstr "UltraChrome Matte Black"
 
-#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1826
-#: src/xml/xmli18n-tmp.h:1839 src/xml/xmli18n-tmp.h:1852
-#: src/xml/xmli18n-tmp.h:1907 src/xml/xmli18n-tmp.h:1923
-#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1952
-#: src/xml/xmli18n-tmp.h:1965 src/xml/xmli18n-tmp.h:2054
-#: src/xml/xmli18n-tmp.h:2081 src/xml/xmli18n-tmp.h:2146
-#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
-#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
-#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2348
-#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2407
-#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2899
-#: src/xml/xmli18n-tmp.h:2916 src/xml/xmli18n-tmp.h:3142
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1139
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1154 src/xml/xmli18n-tmp.h:1159
+#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1179
+#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1199
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1214 src/xml/xmli18n-tmp.h:1219
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1229
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1244 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1259
+#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1274 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1289
+#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1309
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1329
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1423
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1429
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1447
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1634
+#: src/xml/xmli18n-tmp.h:1639 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1664
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1764
+#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1784
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1799 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1819
+msgid "MIS Hextone"
+msgstr "MIS Hextonig"
+
+#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1463 src/xml/xmli18n-tmp.h:1468
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1478
+#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1508
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1533 src/xml/xmli18n-tmp.h:1538
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4858 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:5289
+msgid "Hextone"
+msgstr "Hextonig"
+
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2489 src/xml/xmli18n-tmp.h:2578
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2713 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2752
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2885 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:3051 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3665
 msgid "360 x 90 DPI Fast Economy"
 msgstr "360 x 90 DPI Fast Economy"
 
-#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1828
-#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1853
-#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1879
-#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
-#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1940
-#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1966
-#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2055
-#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2133
-#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2175
-#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
-#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
-#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2336
-#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
-#: src/xml/xmli18n-tmp.h:2408 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2699
+#: src/xml/xmli18n-tmp.h:2714 src/xml/xmli18n-tmp.h:2727
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2886
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:3052
 msgid "180 DPI Economy"
 msgstr "180 DPI Economy"
 
-#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1830
-#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1854
-#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1880
-#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
-#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1941
-#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1967
-#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
-#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2134
-#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2176
-#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
-#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
-#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2337
-#: src/xml/xmli18n-tmp.h:2350 src/xml/xmli18n-tmp.h:2363
-#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
-#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2434
-#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2459
-#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2529
-#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2601
-#: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2703
-#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2735
-#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2768
-#: src/xml/xmli18n-tmp.h:2872 src/xml/xmli18n-tmp.h:2884
-#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2917
-#: src/xml/xmli18n-tmp.h:2961 src/xml/xmli18n-tmp.h:3007
-#: src/xml/xmli18n-tmp.h:3021 src/xml/xmli18n-tmp.h:3035
-#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3126
-#: src/xml/xmli18n-tmp.h:3143
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2404
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2658
+#: src/xml/xmli18n-tmp.h:2672 src/xml/xmli18n-tmp.h:2700
+#: src/xml/xmli18n-tmp.h:2715 src/xml/xmli18n-tmp.h:2728
+#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2754
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2919 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3053
+#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3125
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3292
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3530
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3649
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3684
 msgid "360 x 180 DPI Draft"
 msgstr "360 x 180 DPI Draft"
 
-#: src/xml/xmli18n-tmp.h:1818 src/xml/xmli18n-tmp.h:1831
-#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1855
-#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1881
-#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
-#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1942
-#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1968
-#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2135
-#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2392 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2418 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2479 src/xml/xmli18n-tmp.h:2492
+#: src/xml/xmli18n-tmp.h:2581 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2862 src/xml/xmli18n-tmp.h:2934
 msgid "360 DPI High Quality"
 msgstr "360 DPI hoge kwaliteit"
 
-#: src/xml/xmli18n-tmp.h:1819 src/xml/xmli18n-tmp.h:1832
-#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1856
-#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1882
-#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
-#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1943
-#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1969
-#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1992
-#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2020
-#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
-#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
-#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2096
-#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2123
-#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2149
-#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2177
-#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2205
-#: src/xml/xmli18n-tmp.h:2218 src/xml/xmli18n-tmp.h:2231
-#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2254
-#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
-#: src/xml/xmli18n-tmp.h:2297 src/xml/xmli18n-tmp.h:2312
-#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2339
-#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
-#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2385
-#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2411
-#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2435
-#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2460
-#: src/xml/xmli18n-tmp.h:2473 src/xml/xmli18n-tmp.h:2488
-#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2516
-#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2541
-#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2591
-#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
-#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2645
-#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2675
-#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2704
-#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2736
-#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2769
-#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2808
-#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2833
-#: src/xml/xmli18n-tmp.h:2847 src/xml/xmli18n-tmp.h:2861
-#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2885
-#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2918
-#: src/xml/xmli18n-tmp.h:2935 src/xml/xmli18n-tmp.h:2950
-#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2987
-#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3022
-#: src/xml/xmli18n-tmp.h:3036 src/xml/xmli18n-tmp.h:3050
-#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3081
-#: src/xml/xmli18n-tmp.h:3098 src/xml/xmli18n-tmp.h:3113
-#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2369 src/xml/xmli18n-tmp.h:2380
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2406
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2493
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2544
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
+#: src/xml/xmli18n-tmp.h:2582 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2729
+#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2806
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2836
+#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
+#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3012
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3040
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3184 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3424 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3485 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3573
+#: src/xml/xmli18n-tmp.h:3587 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3650 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3685
 msgid "360 DPI"
 msgstr "360 DPI"
 
-#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1833
-#: src/xml/xmli18n-tmp.h:1846 src/xml/xmli18n-tmp.h:1857
-#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1883
-#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1912
-#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1944
-#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1970
-#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1993
-#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2021
-#: src/xml/xmli18n-tmp.h:2033 src/xml/xmli18n-tmp.h:2045
-#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
-#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2097
-#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2124
-#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2150
-#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2178
-#: src/xml/xmli18n-tmp.h:2193 src/xml/xmli18n-tmp.h:2206
-#: src/xml/xmli18n-tmp.h:2219 src/xml/xmli18n-tmp.h:2232
-#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2255
-#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
-#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2313
-#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2340
-#: src/xml/xmli18n-tmp.h:2352 src/xml/xmli18n-tmp.h:2365
-#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2386
-#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2412
-#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2436
-#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2461
-#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2489
-#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2517
-#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2542
-#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2567
-#: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2592
-#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2616
-#: src/xml/xmli18n-tmp.h:2631 src/xml/xmli18n-tmp.h:2646
-#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2676
-#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2705
-#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2737
-#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2770
-#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2809
-#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2834
-#: src/xml/xmli18n-tmp.h:2848 src/xml/xmli18n-tmp.h:2862
-#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2886
-#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2919
-#: src/xml/xmli18n-tmp.h:2936 src/xml/xmli18n-tmp.h:2951
-#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2988
-#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3023
-#: src/xml/xmli18n-tmp.h:3037 src/xml/xmli18n-tmp.h:3051
-#: src/xml/xmli18n-tmp.h:3066 src/xml/xmli18n-tmp.h:3083
-#: src/xml/xmli18n-tmp.h:3099 src/xml/xmli18n-tmp.h:3114
-#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:2344 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2452 src/xml/xmli18n-tmp.h:2468
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2494
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2557 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:2594
+#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2648
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2674
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2807
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2837
+#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
+#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3013
+#: src/xml/xmli18n-tmp.h:3026 src/xml/xmli18n-tmp.h:3041
+#: src/xml/xmli18n-tmp.h:3055 src/xml/xmli18n-tmp.h:3066
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3140
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3170
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3229
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3333
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3358
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3385
+#: src/xml/xmli18n-tmp.h:3397 src/xml/xmli18n-tmp.h:3409
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3442
+#: src/xml/xmli18n-tmp.h:3459 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3574
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3637
+#: src/xml/xmli18n-tmp.h:3651 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3686
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1834
-#: src/xml/xmli18n-tmp.h:1847 src/xml/xmli18n-tmp.h:1858
-#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1884
-#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1913
-#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1945
-#: src/xml/xmli18n-tmp.h:1958 src/xml/xmli18n-tmp.h:1971
-#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:1994
-#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2022
-#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2046
-#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2071
-#: src/xml/xmli18n-tmp.h:2086 src/xml/xmli18n-tmp.h:2098
-#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2125
-#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2151
-#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2179
-#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2207
-#: src/xml/xmli18n-tmp.h:2220 src/xml/xmli18n-tmp.h:2233
-#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2256
-#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
-#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2314
-#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2341
-#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
-#: src/xml/xmli18n-tmp.h:2376 src/xml/xmli18n-tmp.h:2387
-#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2413
-#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2437
-#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2462
-#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2490
-#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2518
-#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2543
-#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
-#: src/xml/xmli18n-tmp.h:2580 src/xml/xmli18n-tmp.h:2593
-#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2617
-#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
-#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2677
-#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2706
-#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2738
-#: src/xml/xmli18n-tmp.h:2753 src/xml/xmli18n-tmp.h:2771
-#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2810
-#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2835
-#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
-#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2887
-#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2921
-#: src/xml/xmli18n-tmp.h:2937 src/xml/xmli18n-tmp.h:2952
-#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2990
-#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3024
-#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3052
-#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3085
-#: src/xml/xmli18n-tmp.h:3100 src/xml/xmli18n-tmp.h:3115
-#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:2345 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2469
+#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2546
+#: src/xml/xmli18n-tmp.h:2558 src/xml/xmli18n-tmp.h:2570
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2595
+#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2622
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2675
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2731
+#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2808
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2838
+#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2890
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2922 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3014
+#: src/xml/xmli18n-tmp.h:3027 src/xml/xmli18n-tmp.h:3042
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3067
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3186 src/xml/xmli18n-tmp.h:3201
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3334
+#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3359
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3444
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3475
+#: src/xml/xmli18n-tmp.h:3489 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3533 src/xml/xmli18n-tmp.h:3547
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3652 src/xml/xmli18n-tmp.h:3669
+#: src/xml/xmli18n-tmp.h:3687
 msgid "720 DPI"
 msgstr "720 DPI"
 
-#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
-#: src/xml/xmli18n-tmp.h:1978 src/xml/xmli18n-tmp.h:2004
-#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2030
-#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2067
-#: src/xml/xmli18n-tmp.h:2094 src/xml/xmli18n-tmp.h:2107
-#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2161
-#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2252
-#: src/xml/xmli18n-tmp.h:2280 src/xml/xmli18n-tmp.h:2295
-#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2323
-#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
-#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2486
-#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2552
-#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2613
-#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
-#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2686
-#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2806
-#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2831
-#: src/xml/xmli18n-tmp.h:2845 src/xml/xmli18n-tmp.h:2859
-#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2948
-#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3080
-#: src/xml/xmli18n-tmp.h:3097 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2554
+#: src/xml/xmli18n-tmp.h:2566 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2804 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2834 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3076
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3382
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3586 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3634
 msgid "360 x 120 DPI Economy"
 msgstr "360 x 120 DPI Economy"
 
-#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1842
-#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2005
-#: src/xml/xmli18n-tmp.h:2019 src/xml/xmli18n-tmp.h:2031
-#: src/xml/xmli18n-tmp.h:2043 src/xml/xmli18n-tmp.h:2068
-#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
-#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2162
-#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2253
-#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2296
-#: src/xml/xmli18n-tmp.h:2311 src/xml/xmli18n-tmp.h:2324
-#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2384
-#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2487
-#: src/xml/xmli18n-tmp.h:2500 src/xml/xmli18n-tmp.h:2553
-#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2614
-#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2644
-#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2687
-#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2807
-#: src/xml/xmli18n-tmp.h:2820 src/xml/xmli18n-tmp.h:2832
-#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
-#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2949
-#: src/xml/xmli18n-tmp.h:3112
+#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2555
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2632
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3077
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3211
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3383
+#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3635
 msgid "360 x 240 DPI Draft"
 msgstr "360 x 240 DPI Draft"
 
-#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1872
-#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1898
-#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1930
-#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1959
-#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:1995
-#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2023
-#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2047
-#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2087
-#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2112
-#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2139
-#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2166
-#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2328
-#: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2388
-#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2557
-#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2922
-#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2991
-#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3086
+#: src/xml/xmli18n-tmp.h:2383 src/xml/xmli18n-tmp.h:2396
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2422
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2470 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2507 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2704 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:3057 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3118 src/xml/xmli18n-tmp.h:3445
+#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3514
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3609
 msgid "720 DPI High Quality"
 msgstr "720 DPI hoge kwaliteit"
 
-#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1873
-#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1899
-#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1931
-#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1984
-#: src/xml/xmli18n-tmp.h:1996 src/xml/xmli18n-tmp.h:2010
-#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2036
-#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2061
-#: src/xml/xmli18n-tmp.h:2073 src/xml/xmli18n-tmp.h:2088
-#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2127
-#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2153
-#: src/xml/xmli18n-tmp.h:2167 src/xml/xmli18n-tmp.h:2181
-#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2208
-#: src/xml/xmli18n-tmp.h:2221 src/xml/xmli18n-tmp.h:2234
-#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2257
-#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2285
-#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2315
-#: src/xml/xmli18n-tmp.h:2329 src/xml/xmli18n-tmp.h:2354
-#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2389
-#: src/xml/xmli18n-tmp.h:2399 src/xml/xmli18n-tmp.h:2425
-#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2451
-#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
-#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2504
-#: src/xml/xmli18n-tmp.h:2519 src/xml/xmli18n-tmp.h:2534
-#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2558
-#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2605
-#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2633
-#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2663
-#: src/xml/xmli18n-tmp.h:2678 src/xml/xmli18n-tmp.h:2691
-#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2725
-#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2754
-#: src/xml/xmli18n-tmp.h:2772 src/xml/xmli18n-tmp.h:2787
-#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2811
-#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2836
-#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
-#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2888
-#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2923
-#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2953
-#: src/xml/xmli18n-tmp.h:2968 src/xml/xmli18n-tmp.h:2978
-#: src/xml/xmli18n-tmp.h:2992 src/xml/xmli18n-tmp.h:3011
-#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3039
-#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
-#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3101
-#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3130
-#: src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:2384 src/xml/xmli18n-tmp.h:2397
+#: src/xml/xmli18n-tmp.h:2410 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2548 src/xml/xmli18n-tmp.h:2560
+#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2691 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2794 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2839
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2923 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3105
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3129
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3231 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3311
+#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3335
+#: src/xml/xmli18n-tmp.h:3348 src/xml/xmli18n-tmp.h:3360
+#: src/xml/xmli18n-tmp.h:3372 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3427 src/xml/xmli18n-tmp.h:3446
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3576 src/xml/xmli18n-tmp.h:3593
+#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3688
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1874
-#: src/xml/xmli18n-tmp.h:1887 src/xml/xmli18n-tmp.h:1900
-#: src/xml/xmli18n-tmp.h:1916 src/xml/xmli18n-tmp.h:1932
-#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1985
-#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2011
-#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2037
-#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2062
-#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2089
-#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2128
-#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2154
-#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2182
-#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2258
-#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
-#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2316
-#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2390
-#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2559
-#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2634
-#: src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2385 src/xml/xmli18n-tmp.h:2398
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2535
+#: src/xml/xmli18n-tmp.h:2549 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2782
+#: src/xml/xmli18n-tmp.h:2795 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3388
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 7200 DPI hoogste kwaliteit"
 
-#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1960
-#: src/xml/xmli18n-tmp.h:2100 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2902
 msgid "720 DPI Highest Quality"
 msgstr "720 DPI hoogste kwaliteit"
 
-#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2259
-#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
-#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2317
-#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2477
-#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2505
-#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2606
-#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2635
-#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2740
-#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2866
-#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2796 src/xml/xmli18n-tmp.h:2811
+#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3216 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3412
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2260
-#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
-#: src/xml/xmli18n-tmp.h:2303 src/xml/xmli18n-tmp.h:2318
-#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2771 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2812
+#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:3160 src/xml/xmli18n-tmp.h:3390
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 x 720 DPI hoogste kwaliteit"
 
-#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2439
-#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2493
-#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2546
-#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2582
-#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2620
-#: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2664
-#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
-#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2726
-#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2755
-#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2789
-#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2812
-#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2878
-#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
-#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2939
-#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2969
-#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2994
-#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
-#: src/xml/xmli18n-tmp.h:3088 src/xml/xmli18n-tmp.h:3102
-#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3131
-#: src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2963
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3070
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3106
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3297 src/xml/xmli18n-tmp.h:3313
+#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
+#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3401
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3492
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3577 src/xml/xmli18n-tmp.h:3594
+#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3671 src/xml/xmli18n-tmp.h:3689
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2426
-#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2452
-#: src/xml/xmli18n-tmp.h:2464 src/xml/xmli18n-tmp.h:2479
-#: src/xml/xmli18n-tmp.h:2494 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2547
-#: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2583
-#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2621
-#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2665
-#: src/xml/xmli18n-tmp.h:2680 src/xml/xmli18n-tmp.h:2694
-#: src/xml/xmli18n-tmp.h:2709 src/xml/xmli18n-tmp.h:2727
-#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2756
-#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2790
-#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2813
-#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2837
-#: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2879
-#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
-#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2940
-#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2970
-#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2995
-#: src/xml/xmli18n-tmp.h:3012 src/xml/xmli18n-tmp.h:3026
-#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3055
-#: src/xml/xmli18n-tmp.h:3072 src/xml/xmli18n-tmp.h:3089
-#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3118
-#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3071
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3107
+#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3251
+#: src/xml/xmli18n-tmp.h:3266 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3298 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3324 src/xml/xmli18n-tmp.h:3337
+#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3374 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3463
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3535 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3563 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3612
+#: src/xml/xmli18n-tmp.h:3626 src/xml/xmli18n-tmp.h:3641
+#: src/xml/xmli18n-tmp.h:3655 src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:3690
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:4374
 msgid "Dark Yellow"
 msgstr "Donkergeel"
 
-#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2584
-#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2711
-#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2743
-#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2776
-#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2908
-#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2972
-#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3057
-#: src/xml/xmli18n-tmp.h:3074 src/xml/xmli18n-tmp.h:3091
-#: src/xml/xmli18n-tmp.h:3105 src/xml/xmli18n-tmp.h:3134
-#: src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3108
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3267
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3495
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3614
+#: src/xml/xmli18n-tmp.h:3628 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3692
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/xml/xmli18n-tmp.h:2666 src/xml/xmli18n-tmp.h:2681
-#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2728
-#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2775
-#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2814
-#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2838
-#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2926
-#: src/xml/xmli18n-tmp.h:2941 src/xml/xmli18n-tmp.h:2971
-#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
-#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
-#: src/xml/xmli18n-tmp.h:3090 src/xml/xmli18n-tmp.h:3104
-#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3133
-#: src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3190 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3234 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3325 src/xml/xmli18n-tmp.h:3338
+#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3362
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3505
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3613
+#: src/xml/xmli18n-tmp.h:3627 src/xml/xmli18n-tmp.h:3642
+#: src/xml/xmli18n-tmp.h:3656 src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:3691
 msgid "5760 x 1440 DPI"
 msgstr "5760 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2712
-#: src/xml/xmli18n-tmp.h:2730 src/xml/xmli18n-tmp.h:2759
-#: src/xml/xmli18n-tmp.h:2777 src/xml/xmli18n-tmp.h:2909
-#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2973
-#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3058
-#: src/xml/xmli18n-tmp.h:3075 src/xml/xmli18n-tmp.h:3092
-#: src/xml/xmli18n-tmp.h:3106 src/xml/xmli18n-tmp.h:3135
-#: src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3301 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3496
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3615
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
 msgid "5760 x 2880 DPI"
 msgstr "5760 x 2880 DPI"
 
-#: src/xml/xmli18n-tmp.h:2798 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3502
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI getransponeerd"
 
-#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2965
-#: src/xml/xmli18n-tmp.h:2989 src/xml/xmli18n-tmp.h:3067
-#: src/xml/xmli18n-tmp.h:3084
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:3607
 msgid "720 x 360 DPI Enhanced"
 msgstr "720 x 360 DPI verbeterd"
 
-#: src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:3479
 msgid "Black 1"
 msgstr "Zwart 1"
 
-#: src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3480
 msgid "Black 2"
 msgstr "Zwart 2"
 
-#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3065
-#: src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3605
 msgid "360 DPI Enhanced"
 msgstr "360 DPI verbeterd"
 
-#: src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3516
 msgid "1440 x 720 DPI High Quality"
 msgstr "1440 x 720 DPI hoogste kwaliteit"
 
-#: src/xml/xmli18n-tmp.h:3153
-#, fuzzy
-msgid "Lower Front Tray"
-msgstr "Lade aan voorzijde"
+#: src/xml/xmli18n-tmp.h:3677
+msgid "Vivid Light Magenta"
+msgstr "Levendig lichtmagenta"
 
-#: src/xml/xmli18n-tmp.h:3154
-#, fuzzy
-msgid "Upper Front Tray"
-msgstr "Lade aan voorzijde"
+#: src/xml/xmli18n-tmp.h:3682
+msgid "Vivid Magenta"
+msgstr "Levendig magenta"
+
+#: src/xml/xmli18n-tmp.h:3694
+msgid "Main Tray"
+msgstr "Hoofdlade"
+
+#: src/xml/xmli18n-tmp.h:3695
+msgid "Photo Tray"
+msgstr "Fotolade"
 
-#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3160
-#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3176
-#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3186
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3725 src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:3732
 msgid "Print to CD"
 msgstr "Afdrukken naar CD"
 
-#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3181
-#: src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:3730
 msgid "Rear Tray"
 msgstr "Lade aan achterzijde"
 
-#: src/xml/xmli18n-tmp.h:3157 src/xml/xmli18n-tmp.h:3182
-#: src/xml/xmli18n-tmp.h:3185
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:3731
 msgid "Front Tray"
 msgstr "Lade aan voorzijde"
 
-#: src/xml/xmli18n-tmp.h:3159 src/xml/xmli18n-tmp.h:3164
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3705
 msgid "Manual Feed"
 msgstr "Handmatige toevoer"
 
-#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3709
 msgid "Roll Feed (cut each page)"
 msgstr "Aanvoer vanaf rol (snij elke pagina af)"
 
-#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3710
 msgid "Roll Feed (do not cut)"
 msgstr "Aanvoer vanaf rol (niet afsnijden)"
 
-#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3171
-#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3180
-#: src/xml/xmli18n-tmp.h:3193
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3716 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3739
 msgid "Roll Feed"
 msgstr "Rolinvoer"
 
-#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3714 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3723
 msgid "Manual Sheet Guide"
 msgstr "Handmatige papiergeleider"
 
-#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3715 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3724
 msgid "Manual Feed (Front)"
 msgstr "Handmatige toevoer (voorzijde)"
 
-#: src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3733
 msgid "Photo Board"
 msgstr "Fotobord"
 
-#: src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3734
 msgid "Cut Sheet Bin 1"
 msgstr "Lade 1 voor vellen"
 
-#: src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3735
 msgid "Cut Sheet Bin 2"
 msgstr "Lade 2 voor vellen"
 
-#: src/xml/xmli18n-tmp.h:3190
+#: src/xml/xmli18n-tmp.h:3736
 msgid "Cut Sheet Autoselect"
 msgstr "Automatisch selecteren van vellen"
 
-#: src/xml/xmli18n-tmp.h:3191
+#: src/xml/xmli18n-tmp.h:3737
 msgid "Manual Selection"
 msgstr "Handmatig selecteren"
 
-#: src/xml/xmli18n-tmp.h:3199 src/xml/xmli18n-tmp.h:3207
-#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3219
-#: src/xml/xmli18n-tmp.h:3227 src/xml/xmli18n-tmp.h:3235
-#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3257
-#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3278
-#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3297
-#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3317
-#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3342
-#: src/xml/xmli18n-tmp.h:3356 src/xml/xmli18n-tmp.h:3382
-#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
-#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3426
-#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3446
-#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3474
-#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3498
-#: src/xml/xmli18n-tmp.h:3510 src/xml/xmli18n-tmp.h:3524
-#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3558
-#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:3584
-#: src/xml/xmli18n-tmp.h:3594 src/xml/xmli18n-tmp.h:3600
-#: src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3763 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3872 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:4067 src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4172 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4236 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:4754 src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5102 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5679 src/xml/xmli18n-tmp.h:5748
+#: src/xml/xmli18n-tmp.h:5793 src/xml/xmli18n-tmp.h:5814
+#: src/xml/xmli18n-tmp.h:5835
 msgid "One Color Raw"
 msgstr "Enkelkleur 'raw'"
 
-#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3208
-#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3220
-#: src/xml/xmli18n-tmp.h:3228 src/xml/xmli18n-tmp.h:3236
-#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3259
-#: src/xml/xmli18n-tmp.h:3270 src/xml/xmli18n-tmp.h:3280
-#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3298
-#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3318
-#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3344
-#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3383
-#: src/xml/xmli18n-tmp.h:3391 src/xml/xmli18n-tmp.h:3403
-#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3427
-#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3447
-#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3475
-#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3499
-#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3526
-#: src/xml/xmli18n-tmp.h:3551 src/xml/xmli18n-tmp.h:3559
-#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3586
-#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3601
-#: src/xml/xmli18n-tmp.h:3607
+#: src/xml/xmli18n-tmp.h:3765 src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4484 src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:4756 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5321
+#: src/xml/xmli18n-tmp.h:5382 src/xml/xmli18n-tmp.h:5451
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5795 src/xml/xmli18n-tmp.h:5816
+#: src/xml/xmli18n-tmp.h:5837
 msgid "Three Color Raw"
 msgstr "Driekleuren 'raw'"
 
-#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
-#: src/xml/xmli18n-tmp.h:3215 src/xml/xmli18n-tmp.h:3221
-#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3237
-#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3271
-#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3299
-#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3319
-#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3345
-#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3384
-#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
-#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3428
-#: src/xml/xmli18n-tmp.h:3438 src/xml/xmli18n-tmp.h:3448
-#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3463
-#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3476
-#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3500
-#: src/xml/xmli18n-tmp.h:3513 src/xml/xmli18n-tmp.h:3527
-#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3560
-#: src/xml/xmli18n-tmp.h:3573 src/xml/xmli18n-tmp.h:3587
-#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3602
-#: src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:3824 src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5325
+#: src/xml/xmli18n-tmp.h:5386 src/xml/xmli18n-tmp.h:5455
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5757
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5841
 msgid "Four Color Raw"
 msgstr "Vierkleuren 'raw'"
 
-#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3248
-#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
-#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3360
-#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
-#: src/xml/xmli18n-tmp.h:3417 src/xml/xmli18n-tmp.h:3429
-#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3459
-#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3501 src/xml/xmli18n-tmp.h:3514
-#: src/xml/xmli18n-tmp.h:3528 src/xml/xmli18n-tmp.h:3574
-#: src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4424 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:5066 src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:5196 src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5391
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5762
 msgid "Five Color Raw"
 msgstr "Vijfkleuren 'raw'"
 
-#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3249
-#: src/xml/xmli18n-tmp.h:3272 src/xml/xmli18n-tmp.h:3293
-#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3333
-#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3361
-#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
-#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3430
-#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3460
-#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3478
-#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3502
-#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3529
-#: src/xml/xmli18n-tmp.h:3575 src/xml/xmli18n-tmp.h:3589
+#: src/xml/xmli18n-tmp.h:3780 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:4078 src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:4430 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4972
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5150 src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5336
+#: src/xml/xmli18n-tmp.h:5397 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5768
 msgid "Six Color Raw"
 msgstr "Zeskleuren 'raw'"
 
-#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3919 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:4781 src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:4795 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4921
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:4996
+#: src/xml/xmli18n-tmp.h:5023 src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:5226 src/xml/xmli18n-tmp.h:5279
+#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5603 src/xml/xmli18n-tmp.h:5609
+#: src/xml/xmli18n-tmp.h:5636 src/xml/xmli18n-tmp.h:5642
+msgid "Gray 3"
+msgstr "Grijs 3"
+
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4782 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4796 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4916 src/xml/xmli18n-tmp.h:4922
+#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4983
+#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5286 src/xml/xmli18n-tmp.h:5294
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5643
+msgid "Gray 2"
+msgstr "Grijs 2"
+
+#: src/xml/xmli18n-tmp.h:3855 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:4856 src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:4931 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4998
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:5214 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5611
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5644
+msgid "Gray 1"
+msgstr "Grijs 1"
+
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4985 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5606 src/xml/xmli18n-tmp.h:5639
+msgid "MIS Quadtone"
+msgstr "MIS Viertonig"
+
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4114
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Enkelkleur 'raw' verbeterde glans"
 
-#: src/xml/xmli18n-tmp.h:3260 src/xml/xmli18n-tmp.h:3281
+#: src/xml/xmli18n-tmp.h:4016 src/xml/xmli18n-tmp.h:4121
 msgid "Three Color Raw Gloss"
 msgstr "Driekleuren 'raw' glanzend"
 
-#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3282
+#: src/xml/xmli18n-tmp.h:4021 src/xml/xmli18n-tmp.h:4126
 msgid "Four Color Raw Gloss"
 msgstr "Vierkleuren 'raw' glanzend"
 
-#: src/xml/xmli18n-tmp.h:3262 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4132
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Zeskleuren verbeterde glans 'raw'"
 
-#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:4035 src/xml/xmli18n-tmp.h:4140
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Zevenkleuren verbeterde glans 'raw'"
 
-#: src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:4141
+msgid "MatteBlack"
+msgstr "Matzwart"
+
+#: src/xml/xmli18n-tmp.h:4224
 msgid "Default Black"
 msgstr "Standaard zwart"
 
-#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
-#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3365
-#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3504
-#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3533
-#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3564
-#: src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4446 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4573 src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:5344
+#: src/xml/xmli18n-tmp.h:5413 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Seven Color Photo"
 msgstr "Zevenkleuren foto"
 
-#: src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:4315
 msgid "Six Color Enhanced Composite"
 msgstr "Zeskleuren verbeterde samenstelling"
 
-#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3348
-#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3516
-#: src/xml/xmli18n-tmp.h:3530 src/xml/xmli18n-tmp.h:3576
-#: src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:4368 src/xml/xmli18n-tmp.h:4437
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:5404
+#: src/xml/xmli18n-tmp.h:5473 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5775
 msgid "Seven Color Raw"
 msgstr "Zevenkleuren 'raw'"
 
-#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3355
-#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3523
-#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5745
 msgid "Two Level Grayscale"
 msgstr "Grijsschaal met twee waarden"
 
-#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3357
-#: src/xml/xmli18n-tmp.h:3511 src/xml/xmli18n-tmp.h:3525
-#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:4412 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5448
+#: src/xml/xmli18n-tmp.h:5681 src/xml/xmli18n-tmp.h:5750
 msgid "Two Color Raw"
 msgstr "Tweekleuren 'raw'"
 
-#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3372
-#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3540
+#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5531
 msgid "Eight Color Photo"
 msgstr "Achtkleuren foto"
 
-#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3378
-#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:4652 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5570
 msgid "Eight Color Raw"
 msgstr "Achtkleuren 'raw'"
 
-#: src/xml/xmli18n-tmp.h:3462 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:5288
+msgid "MIS Six Tone"
+msgstr "MIS Zestonig"
+
+#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:4994
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5291
+msgid "Gray 5"
+msgstr "Grijs 5"
+
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:4928 src/xml/xmli18n-tmp.h:4995
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5292
+msgid "Gray 4"
+msgstr "Grijs 4"
+
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5145
 msgid "Four Color Photo"
 msgstr "Vierkleuren foto"
 
-#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3615
-#: src/xml/xmli18n-tmp.h:3621
+#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5852
+#: src/xml/xmli18n-tmp.h:5858
 msgid "Interleave"
 msgstr "Interleave"
 
-#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3616
-#: src/xml/xmli18n-tmp.h:3622
+#: src/xml/xmli18n-tmp.h:5848 src/xml/xmli18n-tmp.h:5853
+#: src/xml/xmli18n-tmp.h:5859
 msgid "Full Overlap"
 msgstr "Volledige overlap"
 
-#: src/xml/xmli18n-tmp.h:3612 src/xml/xmli18n-tmp.h:3617
-#: src/xml/xmli18n-tmp.h:3623
+#: src/xml/xmli18n-tmp.h:5849 src/xml/xmli18n-tmp.h:5854
+#: src/xml/xmli18n-tmp.h:5860
 msgid "Four Pass"
 msgstr "Viermaal een doorgang"
 
-#: src/xml/xmli18n-tmp.h:3613 src/xml/xmli18n-tmp.h:3618
-#: src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5855
+#: src/xml/xmli18n-tmp.h:5861
 msgid "Full Overlap 2"
 msgstr "Volledige overlap 2"
 
-#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:5862
 msgid "Interleave 2"
 msgstr "Interleave 2"
 
-#: src/xml/xmli18n-tmp.h:3626
+#: src/xml/xmli18n-tmp.h:5863
 msgid "Eight Pass"
 msgstr "Achtmaal doorgang"
 
-#: src/xml/xmli18n-tmp.h:3628
+#: src/xml/xmli18n-tmp.h:5865
 msgid "On"
 msgstr "Aan"
 
-#: src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:5909
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:5910
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:3674
+#: src/xml/xmli18n-tmp.h:5911
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:3679
+#: src/xml/xmli18n-tmp.h:5916
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:3680
+#: src/xml/xmli18n-tmp.h:5917
 msgid "3 1/2 x5"
 msgstr "3 1/2 x5"
 
-#: src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:5918
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:3682
+#: src/xml/xmli18n-tmp.h:5919
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 fotopapier (afscheurranden)"
 
-#: src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:5920
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr "Epson L fotopapier (afscheurranden)"
+
+#: src/xml/xmli18n-tmp.h:5921
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:3684
+#: src/xml/xmli18n-tmp.h:5922
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:3685
+#: src/xml/xmli18n-tmp.h:5923
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:3686
+#: src/xml/xmli18n-tmp.h:5924
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:3688
+#: src/xml/xmli18n-tmp.h:5926
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:3689
+#: src/xml/xmli18n-tmp.h:5927
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/xml/xmli18n-tmp.h:3690
+#: src/xml/xmli18n-tmp.h:5928
 msgid "Engineering C 17x22"
 msgstr "Engineering C 17x22"
 
-#: src/xml/xmli18n-tmp.h:3691
+#: src/xml/xmli18n-tmp.h:5929
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:3692
+#: src/xml/xmli18n-tmp.h:5930
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:3693
+#: src/xml/xmli18n-tmp.h:5931
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:3694
+#: src/xml/xmli18n-tmp.h:5932
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:3695
+#: src/xml/xmli18n-tmp.h:5933
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:3696
+#: src/xml/xmli18n-tmp.h:5934
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:3697
+#: src/xml/xmli18n-tmp.h:5935
 msgid "22x30"
 msgstr "22x30"
 
-#: src/xml/xmli18n-tmp.h:3698
+#: src/xml/xmli18n-tmp.h:5936
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:3699
+#: src/xml/xmli18n-tmp.h:5937
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/xml/xmli18n-tmp.h:3700
+#: src/xml/xmli18n-tmp.h:5938
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:5939
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:3702
+#: src/xml/xmli18n-tmp.h:5940
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:3703
+#: src/xml/xmli18n-tmp.h:5941
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:5942
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:3705
+#: src/xml/xmli18n-tmp.h:5943
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:3706
+#: src/xml/xmli18n-tmp.h:5944
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:3707
+#: src/xml/xmli18n-tmp.h:5945
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:3709
+#: src/xml/xmli18n-tmp.h:5947
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:3710
+#: src/xml/xmli18n-tmp.h:5948
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:5949
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:5950
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:3713
+#: src/xml/xmli18n-tmp.h:5951
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:3714
+#: src/xml/xmli18n-tmp.h:5952
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:3715
+#: src/xml/xmli18n-tmp.h:5953
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:3716
+#: src/xml/xmli18n-tmp.h:5954
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:5955
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:5956
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:5957
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:5958
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:5959
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:3722
+#: src/xml/xmli18n-tmp.h:5960
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:3723
+#: src/xml/xmli18n-tmp.h:5961
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:3724
+#: src/xml/xmli18n-tmp.h:5962
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:3725
+#: src/xml/xmli18n-tmp.h:5963
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:3726
+#: src/xml/xmli18n-tmp.h:5964
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:5965
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:5966
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:5967
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:3730
+#: src/xml/xmli18n-tmp.h:5968
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:3731
+#: src/xml/xmli18n-tmp.h:5969
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:3732
+#: src/xml/xmli18n-tmp.h:5970
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:3733
+#: src/xml/xmli18n-tmp.h:5971
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:3734
+#: src/xml/xmli18n-tmp.h:5972
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:3735
+#: src/xml/xmli18n-tmp.h:5973
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:3736
+#: src/xml/xmli18n-tmp.h:5974
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:3737
+#: src/xml/xmli18n-tmp.h:5975
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5976
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3739
+#: src/xml/xmli18n-tmp.h:5977
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:5978
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:3741
+#: src/xml/xmli18n-tmp.h:5979
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:5980
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:3743
+#: src/xml/xmli18n-tmp.h:5981
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:5982
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:5983
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:3746
+#: src/xml/xmli18n-tmp.h:5984
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:3747
+#: src/xml/xmli18n-tmp.h:5985
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:3748
+#: src/xml/xmli18n-tmp.h:5986
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:5987
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:3750
+#: src/xml/xmli18n-tmp.h:5988
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:3751
+#: src/xml/xmli18n-tmp.h:5989
 msgid "C0 landscape"
 msgstr "C0-landschap"
 
-#: src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:5990
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:5991
 msgid "C1 landscape"
 msgstr "C1-landschap"
 
-#: src/xml/xmli18n-tmp.h:3754
+#: src/xml/xmli18n-tmp.h:5992
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:3755
+#: src/xml/xmli18n-tmp.h:5993
 msgid "C2 landscape"
 msgstr "C2-landschap"
 
-#: src/xml/xmli18n-tmp.h:3756
+#: src/xml/xmli18n-tmp.h:5994
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:5995
 msgid "C3 landscape"
 msgstr "C3-landschap"
 
-#: src/xml/xmli18n-tmp.h:3758
+#: src/xml/xmli18n-tmp.h:5996
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:3759
+#: src/xml/xmli18n-tmp.h:5997
 msgid "C4 landscape"
 msgstr "C4-landschap"
 
-#: src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:5998
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:3761
+#: src/xml/xmli18n-tmp.h:5999
 msgid "C5 landscape"
 msgstr "C5-landschap"
 
-#: src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:6000
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:3763
+#: src/xml/xmli18n-tmp.h:6001
 msgid "B6-C4 landscape"
 msgstr "B6-C4-landschap"
 
-#: src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:6002
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:3765
+#: src/xml/xmli18n-tmp.h:6003
 msgid "C6 landscape"
 msgstr "C6-landschap"
 
-#: src/xml/xmli18n-tmp.h:3766
+#: src/xml/xmli18n-tmp.h:6004
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:6005
 msgid "DL landscape"
 msgstr "DL-landschap"
 
-#: src/xml/xmli18n-tmp.h:3768
+#: src/xml/xmli18n-tmp.h:6006
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:3769
+#: src/xml/xmli18n-tmp.h:6007
 msgid "C7-6 landscape"
 msgstr "C7-6-landschap"
 
-#: src/xml/xmli18n-tmp.h:3770
+#: src/xml/xmli18n-tmp.h:6008
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:6009
 msgid "C7 landscape"
 msgstr "C7-landschap"
 
-#: src/xml/xmli18n-tmp.h:3772
+#: src/xml/xmli18n-tmp.h:6010
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:6011
 msgid "C8 landscape"
 msgstr "C8-landschap"
 
-#: src/xml/xmli18n-tmp.h:3774
+#: src/xml/xmli18n-tmp.h:6012
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:3775
+#: src/xml/xmli18n-tmp.h:6013
 msgid "C9 landscape"
 msgstr "C9-landschap"
 
-#: src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:6014
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:6015
 msgid "C10 landscape"
 msgstr "C10-landschap"
 
-#: src/xml/xmli18n-tmp.h:3778
+#: src/xml/xmli18n-tmp.h:6016
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:3779
+#: src/xml/xmli18n-tmp.h:6017
 msgid "ArchA transposed"
 msgstr "ArchA getransponeerd"
 
-#: src/xml/xmli18n-tmp.h:3780
+#: src/xml/xmli18n-tmp.h:6018
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:6019
 msgid "ArchB transposed"
 msgstr "ArchB getransponeerd"
 
-#: src/xml/xmli18n-tmp.h:3782
+#: src/xml/xmli18n-tmp.h:6020
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:6021
 msgid "ArchC transposed"
 msgstr "ArchC getransponeerd"
 
-#: src/xml/xmli18n-tmp.h:3784
+#: src/xml/xmli18n-tmp.h:6022
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:6023
 msgid "ArchD transposed"
 msgstr "ArchD getransponeerd"
 
-#: src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:6024
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:3787
+#: src/xml/xmli18n-tmp.h:6025
 msgid "ArchE transposed"
 msgstr "ArchE getransponeerd"
 
-#: src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:6026
 msgid "American foolscap"
 msgstr "American foolscap"
 
-#: src/xml/xmli18n-tmp.h:3789
+#: src/xml/xmli18n-tmp.h:6027
 msgid "European foolscap"
 msgstr "European foolscap"
 
-#: src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:6028
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:6029
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:3792
+#: src/xml/xmli18n-tmp.h:6030
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:6031
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/xml/xmli18n-tmp.h:3794
+#: src/xml/xmli18n-tmp.h:6032
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:3795
+#: src/xml/xmli18n-tmp.h:6033
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:6034
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:6035
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:6036
 msgid "Small paperback"
 msgstr "Smalle paperback"
 
-#: src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:6037
 msgid "Penguin small paperback"
 msgstr "Penguin smalle paperback"
 
-#: src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:6038
 msgid "Penguin large paperback"
 msgstr "Penguin grootte paperback"
 
-#: src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:6039
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/xml/xmli18n-tmp.h:3802
+#: src/xml/xmli18n-tmp.h:6040
 msgid "Hagaki Card"
 msgstr "Hagaki Kaart"
 
-#: src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:6041
 msgid "Oufuku Card"
 msgstr "Oufuku Kaart"
 
-#: src/xml/xmli18n-tmp.h:3804
+#: src/xml/xmli18n-tmp.h:6042
 msgid "Japanese long envelope #3"
 msgstr "Japanese lange envelop #3"
 
-#: src/xml/xmli18n-tmp.h:3805
+#: src/xml/xmli18n-tmp.h:6043
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japanse lange envelop #3 - landschap"
 
-#: src/xml/xmli18n-tmp.h:3806
+#: src/xml/xmli18n-tmp.h:6044
 msgid "Japanese long envelope #4"
 msgstr "Japanse lange envelop #4"
 
-#: src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:6045
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japanse lange envelop #4 - landschap"
 
-#: src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:6046
 msgid "Japanese Kaku envelope #4"
 msgstr "Japanse Kaku-envelop #4"
 
-#: src/xml/xmli18n-tmp.h:3809
+#: src/xml/xmli18n-tmp.h:6047
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japanse Kaku-envelop #4 - landschap"
 
-#: src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:6048
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:6049
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10 - landschap"
 
-#: src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:6050
 msgid "A2 Invitation"
 msgstr "A2 Invitation"
 
-#: src/xml/xmli18n-tmp.h:3813
+#: src/xml/xmli18n-tmp.h:6051
 msgid "Monarch Envelope"
 msgstr "Monarch envelop"
 
-#: src/xml/xmli18n-tmp.h:3814
+#: src/xml/xmli18n-tmp.h:6052
 msgid "Monarch Envelope landscape"
 msgstr "Monarch-envelop - landschap"
 
-#: src/xml/xmli18n-tmp.h:3815
+#: src/xml/xmli18n-tmp.h:6053
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/xml/xmli18n-tmp.h:3816
+#: src/xml/xmli18n-tmp.h:6054
 msgid "4x7"
 msgstr "4x7"
 
-#: src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:6055
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/xml/xmli18n-tmp.h:3818
+#: src/xml/xmli18n-tmp.h:6056
 msgid "Card"
 msgstr "Kaart"
 
-#: src/xml/xmli18n-tmp.h:3819
+#: src/xml/xmli18n-tmp.h:6057
 msgid "Wide Postcard"
 msgstr "Brede briefkaart"
 
-#: src/xml/xmli18n-tmp.h:3820
+#: src/xml/xmli18n-tmp.h:6058
 msgid "Chilean Office"
 msgstr "Chilean Office"
 
-#: src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:6059
 msgid "Chilean Double Letter"
 msgstr "Chilean Double Letter"
 
-#: src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:6060
 msgid "Chilean Double Office"
 msgstr "Chilean Double Office"
 
-#: src/xml/xmli18n-tmp.h:3824
+#: src/xml/xmli18n-tmp.h:6062
 msgid "89 mm Roll Paper"
 msgstr "89 mm papierrol"
 
-#: src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:6063
 msgid "4 Inch Roll Paper"
 msgstr "4 inch papierrol"
 
-#: src/xml/xmli18n-tmp.h:3826
+#: src/xml/xmli18n-tmp.h:6064
 msgid "5 Inch Roll Paper"
 msgstr "5 inch papierrol"
 
-#: src/xml/xmli18n-tmp.h:3827
+#: src/xml/xmli18n-tmp.h:6065
 msgid "210 mm Roll Paper"
 msgstr "210 mm papierrol"
 
-#: src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:6066
 msgid "13 Inch Roll Paper"
 msgstr "13 inch papierrol"
 
-#: src/xml/xmli18n-tmp.h:3829
+#: src/xml/xmli18n-tmp.h:6067
 msgid "17 Inch Roll Paper"
 msgstr "17 inch papierrol"
 
-#: src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:6068
 msgid "22 Inch Roll Paper"
 msgstr "22 inch papierrol"
 
-#: src/xml/xmli18n-tmp.h:3831
+#: src/xml/xmli18n-tmp.h:6069
 msgid "24 Inch Roll Paper"
 msgstr "24 inch papierrol"
 
-#: src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:6070
 msgid "36 Inch Roll Paper"
 msgstr "36 inch papierrol"
 
-#: src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:6071
 msgid "44 Inch Roll Paper"
 msgstr "44 inch papierrol"
 
-#: src/xml/xmli18n-tmp.h:3834
+#: src/xml/xmli18n-tmp.h:6072
 msgid "60 Inch Roll Paper"
 msgstr "60 inch paperrol"
 
-#: src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:6073
 msgid "64 Inch Roll Paper"
 msgstr "64 inch papierrol"
 
-#: src/xml/xmli18n-tmp.h:3836
+#: src/xml/xmli18n-tmp.h:6074
 msgid "PostScript Level 1"
 msgstr "PostScript Level 1"
 
-#: src/xml/xmli18n-tmp.h:3837
+#: src/xml/xmli18n-tmp.h:6075
 msgid "PostScript Level 2"
 msgstr "PostScript Level 2"
 
-#: src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:6076
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:6077
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:6078
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:6079
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:6080
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:6081
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/xml/xmli18n-tmp.h:3844
+#: src/xml/xmli18n-tmp.h:6082
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:6083
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/xml/xmli18n-tmp.h:3846
+#: src/xml/xmli18n-tmp.h:6084
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:3847
+#: src/xml/xmli18n-tmp.h:6085
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/xml/xmli18n-tmp.h:3848
+#: src/xml/xmli18n-tmp.h:6086
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:6087
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/xml/xmli18n-tmp.h:3850
+#: src/xml/xmli18n-tmp.h:6088
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:6089
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:6090
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/xml/xmli18n-tmp.h:3853
+#: src/xml/xmli18n-tmp.h:6091
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/xml/xmli18n-tmp.h:3854
+#: src/xml/xmli18n-tmp.h:6092
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/xml/xmli18n-tmp.h:3855
+#: src/xml/xmli18n-tmp.h:6093
 msgid "Canon BJC-5100"
 msgstr "Canon BJC-5100"
 
-#: src/xml/xmli18n-tmp.h:3856
+#: src/xml/xmli18n-tmp.h:6094
 msgid "Canon BJC-5500"
 msgstr "Canon BJC-5500"
 
-#: src/xml/xmli18n-tmp.h:3857
+#: src/xml/xmli18n-tmp.h:6095
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/xml/xmli18n-tmp.h:3858
+#: src/xml/xmli18n-tmp.h:6096
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:6097
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:6098
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:6099
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:6100
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/xml/xmli18n-tmp.h:3863
+#: src/xml/xmli18n-tmp.h:6101
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:6102
 msgid "Canon BJC-8500"
 msgstr "Canon BJC-8500"
 
-#: src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:6103
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:6104
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/xml/xmli18n-tmp.h:3867
+#: src/xml/xmli18n-tmp.h:6105
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/xml/xmli18n-tmp.h:3868
+#: src/xml/xmli18n-tmp.h:6106
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:3869
+#: src/xml/xmli18n-tmp.h:6107
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:3870
+#: src/xml/xmli18n-tmp.h:6108
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:6109
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:3872
+#: src/xml/xmli18n-tmp.h:6110
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/xml/xmli18n-tmp.h:3873
+#: src/xml/xmli18n-tmp.h:6111
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:3874
+#: src/xml/xmli18n-tmp.h:6112
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:6113
 msgid "Canon PIXMA iP2000"
 msgstr "Canon PIXMA iP2000"
 
-#: src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:6114
 msgid "Canon PIXMA iP3000"
 msgstr "Canon PIXMA iP3000"
 
-#: src/xml/xmli18n-tmp.h:3877
+#: src/xml/xmli18n-tmp.h:6115
 msgid "Canon PIXMA iP3100"
 msgstr "Canon PIXMA iP3100"
 
-#: src/xml/xmli18n-tmp.h:3878
+#: src/xml/xmli18n-tmp.h:6116
 msgid "Canon PIXMA iP4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:6117
 msgid "Canon PIXMA iP4100"
 msgstr "Canon PIXMA iP4100"
 
-#: src/xml/xmli18n-tmp.h:3880
+#: src/xml/xmli18n-tmp.h:6118
 msgid "Canon PIXMA iP4200"
 msgstr "Canon PIXMA iP4200"
 
-#: src/xml/xmli18n-tmp.h:3881
+#: src/xml/xmli18n-tmp.h:6119
 msgid "Canon PIXMA iP4300"
 msgstr "Canon PIXMA iP4300"
 
-#: src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:6120
 msgid "Canon PIXMA iP4500"
 msgstr "Canon PIXMA iP4500"
 
-#: src/xml/xmli18n-tmp.h:3883
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6121
 msgid "Canon PIXMA iP4600"
-msgstr "Canon PIXMA iP4000"
+msgstr "Canon PIXMA iP4600"
 
-#: src/xml/xmli18n-tmp.h:3884
+#: src/xml/xmli18n-tmp.h:6122
 msgid "Canon PIXMA iP5000"
 msgstr "Canon PIXMA iP5000"
 
-#: src/xml/xmli18n-tmp.h:3885
+#: src/xml/xmli18n-tmp.h:6123
 msgid "Canon PIXMA iP5200"
 msgstr "Canon PIXMA iP5200"
 
-#: src/xml/xmli18n-tmp.h:3886
+#: src/xml/xmli18n-tmp.h:6124
 msgid "Canon PIXMA iP5300"
 msgstr "Canon PIXMA iP5300"
 
-#: src/xml/xmli18n-tmp.h:3887
+#: src/xml/xmli18n-tmp.h:6125
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon PIXMA iP6000D"
 
-#: src/xml/xmli18n-tmp.h:3888
+#: src/xml/xmli18n-tmp.h:6126
 msgid "Canon PIXMA iP6700"
 msgstr "Canon PIXMA iP6700"
 
-#: src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:6127
 msgid "Canon PIXMA iP8500"
 msgstr "Canon PIXMA iP8500"
 
-#: src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:6128
+#, fuzzy
+msgid "Canon PIXMA iX4000"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6129
 msgid "Canon PIXMA iX5000"
 msgstr "Canon PIXMA iX5000"
 
-#: src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:6130
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon PIXMA Pro9500"
 
-#: src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:6131
 msgid "Canon PIXMA MP150"
 msgstr "Canon PIXMA MP150"
 
-#: src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:6132
 msgid "Canon PIXMA MP160"
 msgstr "Canon PIXMA MP160"
 
-#: src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:6133
 msgid "Canon PIXMA MP170"
 msgstr "Canon PIXMA MP170"
 
-#: src/xml/xmli18n-tmp.h:3895
+#: src/xml/xmli18n-tmp.h:6134
 msgid "Canon PIXMA MP180"
 msgstr "Canon PIXMA MP180"
 
-#: src/xml/xmli18n-tmp.h:3896
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6135
 msgid "Canon PIXMA MP220"
-msgstr "Canon PIXMA MP520"
+msgstr "Canon PIXMA MP220"
 
-#: src/xml/xmli18n-tmp.h:3897
+#: src/xml/xmli18n-tmp.h:6136
 msgid "Canon PIXMA MP500"
 msgstr "Canon PIXMA MP500"
 
-#: src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:6137
 msgid "Canon PIXMA MP520"
 msgstr "Canon PIXMA MP520"
 
-#: src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:6138
 msgid "Canon PIXMA MP610"
 msgstr "Canon PIXMA MP610"
 
-#: src/xml/xmli18n-tmp.h:3900
+#: src/xml/xmli18n-tmp.h:6139
 msgid "Canon PIXMA MP700"
 msgstr "Canon PIXMA MP700"
 
-#: src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:6140
 msgid "Canon PIXMA MP710"
 msgstr "Canon PIXMA MP710"
 
-#: src/xml/xmli18n-tmp.h:3902
+#: src/xml/xmli18n-tmp.h:6141
 msgid "Canon PIXMA MP730"
 msgstr "Canon PIXMA MP730"
 
-#: src/xml/xmli18n-tmp.h:3903
+#: src/xml/xmli18n-tmp.h:6142
 msgid "Canon PIXMA MP740"
 msgstr "Canon PIXMA MP740"
 
-#: src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:6143
 msgid "Canon PIXMA MP750"
 msgstr "Canon PIXMA MP750"
 
-#: src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:6144
 msgid "Canon PIXMA MP760"
 msgstr "Canon PIXMA MP760"
 
-#: src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:6145
 msgid "Canon PIXMA MP770"
 msgstr "Canon PIXMA MP770"
 
-#: src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:6146
 msgid "Canon PIXMA MP780"
 msgstr "Canon PIXMA MP780"
 
-#: src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:6147
 msgid "Canon PIXMA MP790"
 msgstr "Canon PIXMA MP790"
 
-#: src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:6148
 msgid "Canon PIXMA MP830"
 msgstr "Canon PIXMA MP830"
 
-#: src/xml/xmli18n-tmp.h:3910
+#: src/xml/xmli18n-tmp.h:6149
 msgid "Canon PIXUS iP3100"
 msgstr "Canon PIXUS iP3100"
 
-#: src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:6150
 msgid "Canon PIXUS iP4100"
 msgstr "Canon PIXUS iP4100"
 
-#: src/xml/xmli18n-tmp.h:3912
+#: src/xml/xmli18n-tmp.h:6151
 msgid "Canon i80"
 msgstr "Canon i80"
 
-#: src/xml/xmli18n-tmp.h:3913
+#: src/xml/xmli18n-tmp.h:6152
 msgid "Canon i560"
 msgstr "Canon i560"
 
-#: src/xml/xmli18n-tmp.h:3914
+#: src/xml/xmli18n-tmp.h:6153
 msgid "Canon i850"
 msgstr "Canon i850"
 
-#: src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:6154
 msgid "Canon i860"
 msgstr "Canon i860"
 
-#: src/xml/xmli18n-tmp.h:3916
+#: src/xml/xmli18n-tmp.h:6155
 msgid "Canon i865"
 msgstr "Canon i865"
 
-#: src/xml/xmli18n-tmp.h:3917
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6156
 msgid "Epson Artisan 700"
-msgstr "Epson E 700"
+msgstr "Epson Artisan 700"
 
-#: src/xml/xmli18n-tmp.h:3918
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6157
 msgid "Epson Artisan 800"
-msgstr "Epson Stylus C80"
+msgstr "Epson Artisan 800"
 
-#: src/xml/xmli18n-tmp.h:3919
+#: src/xml/xmli18n-tmp.h:6158
 msgid "Epson B-300"
 msgstr "Epson B-300"
 
-#: src/xml/xmli18n-tmp.h:3920
+#: src/xml/xmli18n-tmp.h:6159
 msgid "Epson B-308"
 msgstr "Epson B-308"
 
-#: src/xml/xmli18n-tmp.h:3921
+#: src/xml/xmli18n-tmp.h:6160
 msgid "Epson B-500DN"
 msgstr "Epson B-500DN"
 
-#: src/xml/xmli18n-tmp.h:3922
+#: src/xml/xmli18n-tmp.h:6161
 msgid "Epson B-508DN"
 msgstr "Epson B-508DN"
 
-#: src/xml/xmli18n-tmp.h:3923
+#: src/xml/xmli18n-tmp.h:6162
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:3924
+#: src/xml/xmli18n-tmp.h:6163
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:6164
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:6165
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:6166
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:6167
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:6168
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:6169
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:6170
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/xml/xmli18n-tmp.h:3932
+#: src/xml/xmli18n-tmp.h:6171
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:6172
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:3934
+#: src/xml/xmli18n-tmp.h:6173
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/xml/xmli18n-tmp.h:3935
+#: src/xml/xmli18n-tmp.h:6174
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:6175
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:3937
+#: src/xml/xmli18n-tmp.h:6176
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:6177
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/xml/xmli18n-tmp.h:3939
+#: src/xml/xmli18n-tmp.h:6178
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:6179
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:6180
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:3942
+#: src/xml/xmli18n-tmp.h:6181
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:3943
+#: src/xml/xmli18n-tmp.h:6182
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:6183
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:6184
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3946
+#: src/xml/xmli18n-tmp.h:6185
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:3947
+#: src/xml/xmli18n-tmp.h:6186
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:3948
+#: src/xml/xmli18n-tmp.h:6187
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/xml/xmli18n-tmp.h:3949
+#: src/xml/xmli18n-tmp.h:6188
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:6189
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/xml/xmli18n-tmp.h:3951
+#: src/xml/xmli18n-tmp.h:6190
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:6191
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/xml/xmli18n-tmp.h:3953
+#: src/xml/xmli18n-tmp.h:6192
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:6193
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C79"
 
-#: src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:6194
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3956
+#: src/xml/xmli18n-tmp.h:6195
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:3957
+#: src/xml/xmli18n-tmp.h:6196
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/xml/xmli18n-tmp.h:3958
+#: src/xml/xmli18n-tmp.h:6197
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/xml/xmli18n-tmp.h:3959
+#: src/xml/xmli18n-tmp.h:6198
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/xml/xmli18n-tmp.h:3960
+#: src/xml/xmli18n-tmp.h:6199
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:6200
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C87"
 
-#: src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:6201
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:6202
 msgid "Epson Stylus C110"
 msgstr "Epson Stylus C110"
 
-#: src/xml/xmli18n-tmp.h:3964
+#: src/xml/xmli18n-tmp.h:6203
 msgid "Epson Stylus C120"
 msgstr "Epson Stylus C120"
 
-#: src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:6204
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3966
+#: src/xml/xmli18n-tmp.h:6205
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/xml/xmli18n-tmp.h:3967
+#: src/xml/xmli18n-tmp.h:6206
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:6207
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:6208
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/xml/xmli18n-tmp.h:3970
+#: src/xml/xmli18n-tmp.h:6209
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:6210
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:3972
+#: src/xml/xmli18n-tmp.h:6211
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:6212
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:6213
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:3975
+#: src/xml/xmli18n-tmp.h:6214
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:6215
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:6216
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:6217
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:3979
+#: src/xml/xmli18n-tmp.h:6218
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:6219
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:3981
+#: src/xml/xmli18n-tmp.h:6220
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:3982
+#: src/xml/xmli18n-tmp.h:6221
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:3983
+#: src/xml/xmli18n-tmp.h:6222
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:3984
+#: src/xml/xmli18n-tmp.h:6223
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:6224
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:6225
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:3987
+#: src/xml/xmli18n-tmp.h:6226
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:6227
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:3989
+#: src/xml/xmli18n-tmp.h:6228
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:6229
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:6230
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:3992
+#: src/xml/xmli18n-tmp.h:6231
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:3993
+#: src/xml/xmli18n-tmp.h:6232
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:6233
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:3995
+#: src/xml/xmli18n-tmp.h:6234
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:3996
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6235
 msgid "Epson Stylus Office B30"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus Office B30"
 
-#: src/xml/xmli18n-tmp.h:3997
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6236
 msgid "Epson Stylus Office B33"
-msgstr "Epson Stylus C43"
+msgstr "Epson Stylus Office B33"
 
-#: src/xml/xmli18n-tmp.h:3998
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6237
 msgid "Epson Stylus Office B40W"
-msgstr "Epson Stylus C40"
+msgstr "Epson Stylus Office B40W"
 
-#: src/xml/xmli18n-tmp.h:3999
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6238
 msgid "Epson Stylus Office T30"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus Office T30"
 
-#: src/xml/xmli18n-tmp.h:4000
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6239
 msgid "Epson Stylus Office T33"
-msgstr "Epson Stylus C43"
+msgstr "Epson Stylus Office T33"
 
-#: src/xml/xmli18n-tmp.h:4001
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6240
 msgid "Epson Stylus Office T40W"
-msgstr "Epson Stylus C40"
+msgstr "Epson Stylus Office T40W"
 
-#: src/xml/xmli18n-tmp.h:4002
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6241
 msgid "Epson Stylus Office BX300F"
-msgstr "Epson Stylus CX3100"
+msgstr "Epson Stylus Office BX300F"
 
-#: src/xml/xmli18n-tmp.h:4003
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6242
 msgid "Epson Stylus Office BX600FW"
-msgstr "Epson Stylus CX3600"
+msgstr "Epson Stylus Office BX600FW"
 
-#: src/xml/xmli18n-tmp.h:4004
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6243
 msgid "Epson Stylus Office SX600FW"
-msgstr "Epson Stylus CX3600"
+msgstr "Epson Stylus Office SX600FW"
 
-#: src/xml/xmli18n-tmp.h:4005
-#, fuzzy
-msgid "Epson Stylus Offixe TX300F"
-msgstr "Epson Stylus CX3100"
+#: src/xml/xmli18n-tmp.h:6244
+msgid "Epson Stylus Office TX300F"
+msgstr "Epson Stylus Office TX300F"
 
-#: src/xml/xmli18n-tmp.h:4006
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6245
 msgid "Epson Stylus Office TX600FW"
-msgstr "Epson Stylus CX3600"
+msgstr "Epson Stylus Office TX600FW"
 
-#: src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:6246
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:4008
+#: src/xml/xmli18n-tmp.h:6247
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4009
+#: src/xml/xmli18n-tmp.h:6248
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:6249
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:6250
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:6251
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4013
+#: src/xml/xmli18n-tmp.h:6252
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4014
+#: src/xml/xmli18n-tmp.h:6253
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:6254
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:4016
+#: src/xml/xmli18n-tmp.h:6255
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:6256
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:6257
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/xml/xmli18n-tmp.h:4019
+#: src/xml/xmli18n-tmp.h:6258
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:4020
+#: src/xml/xmli18n-tmp.h:6259
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/xml/xmli18n-tmp.h:4021
+#: src/xml/xmli18n-tmp.h:6260
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:4022
+#: src/xml/xmli18n-tmp.h:6261
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:4023
+#: src/xml/xmli18n-tmp.h:6262
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:4024
+#: src/xml/xmli18n-tmp.h:6263
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:6264
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:6265
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:4027
+#: src/xml/xmli18n-tmp.h:6266
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:6267
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:6268
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:6269
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:4031
+#: src/xml/xmli18n-tmp.h:6270
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:6271
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4033
+#: src/xml/xmli18n-tmp.h:6272
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4034
+#: src/xml/xmli18n-tmp.h:6273
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4035
+#: src/xml/xmli18n-tmp.h:6274
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1400"
 
-#: src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:6275
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 1410"
 
-#: src/xml/xmli18n-tmp.h:4037
+#: src/xml/xmli18n-tmp.h:6276
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:4038
+#: src/xml/xmli18n-tmp.h:6277
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:4039
+#: src/xml/xmli18n-tmp.h:6278
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:6279
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:4041
+#: src/xml/xmli18n-tmp.h:6280
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:6281
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:6282
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R230"
 
-#: src/xml/xmli18n-tmp.h:4044
+#: src/xml/xmli18n-tmp.h:6283
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R240"
 
-#: src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:6284
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo R245"
 
-#: src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:6285
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R260"
 
-#: src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:6286
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo R265"
 
-#: src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:6287
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo R270"
 
-#: src/xml/xmli18n-tmp.h:4049
+#: src/xml/xmli18n-tmp.h:6288
 msgid "Epson Stylus Photo R280"
 msgstr "Epson Stylus Photo R280"
 
-#: src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:6289
 msgid "Epson Stylus Photo R285"
 msgstr "Epson Stylus Photo R285"
 
-#: src/xml/xmli18n-tmp.h:4051
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6290
 msgid "Epson Stylus Photo R290"
-msgstr "Epson Stylus Photo 1290"
+msgstr "Epson Stylus Photo R290"
 
-#: src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:6291
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:4053
+#: src/xml/xmli18n-tmp.h:6292
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/xml/xmli18n-tmp.h:4054
+#: src/xml/xmli18n-tmp.h:6293
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:6294
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/xml/xmli18n-tmp.h:4056
+#: src/xml/xmli18n-tmp.h:6295
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R350"
 
-#: src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:6296
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R360"
 
-#: src/xml/xmli18n-tmp.h:4058
+#: src/xml/xmli18n-tmp.h:6297
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R380"
 
-#: src/xml/xmli18n-tmp.h:4059
+#: src/xml/xmli18n-tmp.h:6298
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R390"
 
-#: src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:6299
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:6300
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:4062
+#: src/xml/xmli18n-tmp.h:6301
 msgid "Epson Stylus Photo R1900"
 msgstr "Epson Stylus Photo R1900"
 
-#: src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:6302
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:4064
+#: src/xml/xmli18n-tmp.h:6303
+msgid "Epson Stylus Photo R2880"
+msgstr "Epson Stylus Photo R2880"
+
+#: src/xml/xmli18n-tmp.h:6304
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:4065
+#: src/xml/xmli18n-tmp.h:6305
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:6306
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4067
+#: src/xml/xmli18n-tmp.h:6307
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:6308
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4069
+#: src/xml/xmli18n-tmp.h:6309
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:6310
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX560"
 
-#: src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:6311
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX580"
 
-#: src/xml/xmli18n-tmp.h:4072
+#: src/xml/xmli18n-tmp.h:6312
 msgid "Epson Stylus Photo RX585"
 msgstr "Epson Stylus Photo RX585"
 
-#: src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:6313
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX590"
 
-#: src/xml/xmli18n-tmp.h:4074
+#: src/xml/xmli18n-tmp.h:6314
 msgid "Epson Stylus Photo RX595"
 msgstr "Epson Stylus Photo RX595"
 
-#: src/xml/xmli18n-tmp.h:4075
+#: src/xml/xmli18n-tmp.h:6315
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:4076
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6316
 msgid "Epson Stylus Photo RX610"
-msgstr "Epson Stylus Photo RX510"
+msgstr "Epson Stylus Photo RX610"
 
-#: src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:6317
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/xml/xmli18n-tmp.h:4078
+#: src/xml/xmli18n-tmp.h:6318
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:6319
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX640"
 
-#: src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:6320
 msgid "Epson Stylus Photo RX680"
 msgstr "Epson Stylus Photo RX680"
 
-#: src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:6321
 msgid "Epson Stylus Photo RX685"
 msgstr "Epson Stylus Photo RX685"
 
-#: src/xml/xmli18n-tmp.h:4082
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6322
 msgid "Epson Stylus Photo RX690"
-msgstr "Epson Stylus Photo RX560"
+msgstr "Epson Stylus Photo RX690"
 
-#: src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:6323
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:4084
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6324
 msgid "Epson Stylus Photo TX700W"
-msgstr "Epson Stylus Photo RX700"
+msgstr "Epson Stylus Photo TX700W"
 
-#: src/xml/xmli18n-tmp.h:4085
-#, fuzzy
-msgid "Epson Stylus Photo TX800W"
-msgstr "Epson Stylus Photo R800"
+#: src/xml/xmli18n-tmp.h:6325
+msgid "Epson Stylus Photo TX800FW"
+msgstr "Epson Stylus Photo TX800FW"
 
-#: src/xml/xmli18n-tmp.h:4086
+#: src/xml/xmli18n-tmp.h:6326
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:4087
+#: src/xml/xmli18n-tmp.h:6327
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:4088
+#: src/xml/xmli18n-tmp.h:6328
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4089
+#: src/xml/xmli18n-tmp.h:6329
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:6330
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:4091
+#: src/xml/xmli18n-tmp.h:6331
 msgid "Epson Stylus Pro 7800"
 msgstr "Epson Stylus Pro 7800"
 
-#: src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:6332
 msgid "Epson Stylus Pro 7880"
 msgstr "Epson Stylus Pro 7880"
 
-#: src/xml/xmli18n-tmp.h:4093
+#: src/xml/xmli18n-tmp.h:6333
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4094
+#: src/xml/xmli18n-tmp.h:6334
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:6335
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:6336
 msgid "Epson Stylus Pro 9800"
 msgstr "Epson Stylus Pro 9800"
 
-#: src/xml/xmli18n-tmp.h:4097
+#: src/xml/xmli18n-tmp.h:6337
 msgid "Epson Stylus Pro 9880"
 msgstr "Epson Stylus Pro 9880"
 
-#: src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:6338
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4099
+#: src/xml/xmli18n-tmp.h:6339
 msgid "Epson Stylus Pro 11880"
 msgstr "Epson Stylus Pro 11880"
 
-#: src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:6340
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:6341
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:6342
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:6343
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:6344
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:6345
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:6346
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:6347
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:6348
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:6349
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:4110
+#: src/xml/xmli18n-tmp.h:6350
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:6351
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:6352
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4113
+#: src/xml/xmli18n-tmp.h:6353
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:6354
 msgid "Epson Stylus CX4400"
 msgstr "Epson Stylus CX4400"
 
-#: src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:6355
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/xml/xmli18n-tmp.h:4116
+#: src/xml/xmli18n-tmp.h:6356
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:6357
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/xml/xmli18n-tmp.h:4118
+#: src/xml/xmli18n-tmp.h:6358
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/xml/xmli18n-tmp.h:4119
+#: src/xml/xmli18n-tmp.h:6359
 msgid "Epson Stylus CX4900"
 msgstr "Epson Stylus CX4900"
 
-#: src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:6360
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX5000"
 
-#: src/xml/xmli18n-tmp.h:4121
+#: src/xml/xmli18n-tmp.h:6361
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX5000F"
 
-#: src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:6362
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:6363
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/xml/xmli18n-tmp.h:4124
+#: src/xml/xmli18n-tmp.h:6364
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:6365
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/xml/xmli18n-tmp.h:4126
+#: src/xml/xmli18n-tmp.h:6366
 msgid "Epson Stylus CX5500"
 msgstr "Epson Stylus CX5500"
 
-#: src/xml/xmli18n-tmp.h:4127
+#: src/xml/xmli18n-tmp.h:6367
 msgid "Epson Stylus CX5600"
 msgstr "Epson Stylus CX5600"
 
-#: src/xml/xmli18n-tmp.h:4128
+#: src/xml/xmli18n-tmp.h:6368
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/xml/xmli18n-tmp.h:4129
+#: src/xml/xmli18n-tmp.h:6369
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:6370
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX6000"
 
-#: src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:6371
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:6372
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:6373
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:6374
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:6375
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX7000F"
 
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:6376
 msgid "Epson Stylus CX7400"
 msgstr "Epson Stylus CX7400"
 
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:6377
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:6378
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:6379
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:6380
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:4141
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6381
 msgid "Epson Stylus CX9300F"
-msgstr "Epson Stylus CX3100"
+msgstr "Epson Stylus CX9300F"
 
-#: src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:6382
 msgid "Epson Stylus CX9400"
 msgstr "Epson Stylus CX9400"
 
-#: src/xml/xmli18n-tmp.h:4143
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6383
 msgid "Epson Stylus CX9400F"
-msgstr "Epson Stylus CX9400"
+msgstr "Epson Stylus CX9400F"
 
-#: src/xml/xmli18n-tmp.h:4144
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6384
 msgid "Epson Stylus CX9475F"
-msgstr "Epson Stylus C45"
+msgstr "Epson Stylus CX9475F"
 
-#: src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:6385
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:6386
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:6387
 msgid "Epson Stylus D92"
 msgstr "Epson Stylus D92"
 
-#: src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:6388
 msgid "Epson Stylus D120"
 msgstr "Epson Stylus D120"
 
-#: src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:6389
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:6390
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:6391
+msgid "Epson Stylus DX4000"
+msgstr "Epson Stylus DX4000"
+
+#: src/xml/xmli18n-tmp.h:6392
 msgid "Epson Stylus DX4050"
 msgstr "Epson Stylus DX4050"
 
-#: src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:6393
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:6394
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:4154
+#: src/xml/xmli18n-tmp.h:6395
 msgid "Epson Stylus DX4400"
 msgstr "Epson Stylus DX4400"
 
-#: src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:6396
 msgid "Epson Stylus DX4450"
 msgstr "Epson Stylus DX4450"
 
-#: src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:6397
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/xml/xmli18n-tmp.h:4157
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6398
 msgid "Epson Stylus DX4850"
-msgstr "Epson Stylus DX3850"
+msgstr "Epson Stylus DX4850"
 
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:6399
 msgid "Epson Stylus DX7000F"
 msgstr "Epson Stylus DX7000F"
 
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:6400
 msgid "Epson Stylus DX7400"
 msgstr "Epson Stylus DX7400"
 
-#: src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:6401
 msgid "Epson Stylus DX7450"
 msgstr "Epson Stylus DX7450"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:6402
 msgid "Epson Stylus DX8400"
 msgstr "Epson Stylus DX8400"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:6403
 msgid "Epson Stylus DX8450"
 msgstr "Epson Stylus DX8450"
 
-#: src/xml/xmli18n-tmp.h:4163
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6404
 msgid "Epson Stylus DX9400F"
-msgstr "Epson Stylus CX9400"
+msgstr "Epson Stylus DX9400F"
 
-#: src/xml/xmli18n-tmp.h:4164
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6405
 msgid "Epson Stylus NX100"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus NX100"
 
-#: src/xml/xmli18n-tmp.h:4165
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6406
 msgid "Epson Stylus NX105"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus NX105"
 
-#: src/xml/xmli18n-tmp.h:4166
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6407
 msgid "Epson Stylus NX200"
-msgstr "Epson Stylus CX3200"
+msgstr "Epson Stylus NX200"
 
-#: src/xml/xmli18n-tmp.h:4167
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6408
 msgid "Epson Stylus NX300"
-msgstr "Epson Stylus CX3100"
+msgstr "Epson Stylus NX300"
 
-#: src/xml/xmli18n-tmp.h:4168
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6409
 msgid "Epson Stylus NX400"
-msgstr "Epson Stylus CX4100"
+msgstr "Epson Stylus NX400"
 
-#: src/xml/xmli18n-tmp.h:4169
-#, fuzzy
-msgid "Epson Stylus PX700FW"
-msgstr "Epson Stylus CX7000F"
+#: src/xml/xmli18n-tmp.h:6410
+msgid "Epson Stylus PX700W"
+msgstr "Epson Stylus PX700W"
 
-#: src/xml/xmli18n-tmp.h:4170
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6411
 msgid "Epson Stylus PX800FW"
-msgstr "Epson Stylus CX3800"
+msgstr "Epson Stylus PX800FW"
 
-#: src/xml/xmli18n-tmp.h:4171
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6412
 msgid "Epson Stylus S20"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus S20"
 
-#: src/xml/xmli18n-tmp.h:4172
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6413
 msgid "Epson Stylus SX100"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus SX100"
 
-#: src/xml/xmli18n-tmp.h:4173
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6414
 msgid "Epson Stylus SX105"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus SX105"
 
-#: src/xml/xmli18n-tmp.h:4174
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6415
 msgid "Epson Stylus SX200"
-msgstr "Epson Stylus CX3200"
+msgstr "Epson Stylus SX200"
 
-#: src/xml/xmli18n-tmp.h:4175
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6416
 msgid "Epson Stylus SX205"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus SX205"
 
-#: src/xml/xmli18n-tmp.h:4176
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6417
 msgid "Epson Stylus SX400"
-msgstr "Epson Stylus CX4100"
+msgstr "Epson Stylus SX400"
 
-#: src/xml/xmli18n-tmp.h:4177
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6418
 msgid "Epson Stylus SX405"
-msgstr "Epson Stylus DX4050"
+msgstr "Epson Stylus SX405"
 
-#: src/xml/xmli18n-tmp.h:4178
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6419
 msgid "Epson Stylus T20"
-msgstr "Epson Stylus C20"
+msgstr "Epson Stylus T20"
 
-#: src/xml/xmli18n-tmp.h:4179
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6420
 msgid "Epson Stylus TX100"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus TX100"
 
-#: src/xml/xmli18n-tmp.h:4180
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6421
 msgid "Epson Stylus TX101"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus TX101"
 
-#: src/xml/xmli18n-tmp.h:4181
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6422
 msgid "Epson Stylus TX102"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus TX102"
 
-#: src/xml/xmli18n-tmp.h:4182
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6423
 msgid "Epson Stylus TX103"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus TX103"
 
-#: src/xml/xmli18n-tmp.h:4183
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6424
 msgid "Epson Stylus TX104"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus TX104"
 
-#: src/xml/xmli18n-tmp.h:4184
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6425
 msgid "Epson Stylus TX105"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus TX105"
 
-#: src/xml/xmli18n-tmp.h:4185
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6426
 msgid "Epson Stylus TX106"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus TX106"
 
-#: src/xml/xmli18n-tmp.h:4186
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6427
 msgid "Epson Stylus TX109"
-msgstr "Epson Stylus CX1500"
+msgstr "Epson Stylus TX109"
 
-#: src/xml/xmli18n-tmp.h:4187
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6428
 msgid "Epson Stylus TX200"
-msgstr "Epson Stylus CX3200"
+msgstr "Epson Stylus TX200"
 
-#: src/xml/xmli18n-tmp.h:4188
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6429
 msgid "Epson Stylus TX400"
-msgstr "Epson Stylus CX4100"
+msgstr "Epson Stylus TX400"
 
-#: src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:6430
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:6431
 msgid "Epson PictureMate Dash"
 msgstr "Epson PictureMate Dash"
 
-#: src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:6432
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/xml/xmli18n-tmp.h:4192
+#: src/xml/xmli18n-tmp.h:6433
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate Flash"
 
-#: src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:6434
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate Pal"
 
-#: src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:6435
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate Snap"
 
-#: src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:6436
 msgid "Epson PictureMate 100"
 msgstr "Epson PictureMate 100"
 
-#: src/xml/xmli18n-tmp.h:4196
+#: src/xml/xmli18n-tmp.h:6437
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate 200"
 
-#: src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:6438
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate 210"
 
-#: src/xml/xmli18n-tmp.h:4198
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6439
 msgid "Epson PictureMate 215"
-msgstr "Epson PictureMate 210"
+msgstr "Epson PictureMate 215"
 
-#: src/xml/xmli18n-tmp.h:4199
+#: src/xml/xmli18n-tmp.h:6440
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate 240"
 
-#: src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:6441
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate 250"
 
-#: src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:6442
 msgid "Epson PictureMate 260"
 msgstr "Epson PictureMate 260"
 
-#: src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:6443
 msgid "Epson PictureMate 270"
 msgstr "Epson PictureMate 270"
 
-#: src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate 280"
 
-#: src/xml/xmli18n-tmp.h:4204
+#: src/xml/xmli18n-tmp.h:6445
 msgid "Epson PictureMate 290"
 msgstr "Epson PictureMate 290"
 
-#: src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:6446
 msgid "Epson PictureMate 500"
 msgstr "Epson PictureMate 500"
 
-#: src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:6447
 msgid "Epson PictureMate 2005"
 msgstr "Epson PictureMate 2005"
 
-#: src/xml/xmli18n-tmp.h:4207
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6448
 msgid "Epson WorkForce 30"
-msgstr "Epson E 300"
+msgstr "Epson WorkForce 30"
 
-#: src/xml/xmli18n-tmp.h:4208
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6449
 msgid "Epson WorkForce 40"
-msgstr "Epson Stylus Color 400"
+msgstr "Epson WorkForce 40"
 
-#: src/xml/xmli18n-tmp.h:4209
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6450
 msgid "Epson WorkForce 500"
-msgstr "Epson E 500"
+msgstr "Epson WorkForce 500"
 
-#: src/xml/xmli18n-tmp.h:4210
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6451
 msgid "Epson WorkForce 600"
-msgstr "Epson Stylus Color 600"
+msgstr "Epson WorkForce 600"
 
-#: src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:6452
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/xml/xmli18n-tmp.h:4212
+#: src/xml/xmli18n-tmp.h:6453
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:6454
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:6455
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4215
+#: src/xml/xmli18n-tmp.h:6456
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:4216
+#: src/xml/xmli18n-tmp.h:6457
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:6458
 msgid "Epson E 300"
 msgstr "Epson E 300"
 
-#: src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:6459
 msgid "Epson E 500"
 msgstr "Epson E 500"
 
-#: src/xml/xmli18n-tmp.h:4219
+#: src/xml/xmli18n-tmp.h:6460
 msgid "Epson E 520"
 msgstr "Epson E 520"
 
-#: src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:6461
 msgid "Epson E 700"
 msgstr "Epson E 700"
 
-#: src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:6462
 msgid "Epson E 720"
 msgstr "Epson E 720"
 
-#: src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:6463
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:6464
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/xml/xmli18n-tmp.h:4224
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6465
 msgid "Epson EP 801A"
-msgstr "Epson PX A650"
+msgstr "Epson EP 801A"
 
-#: src/xml/xmli18n-tmp.h:4225
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6466
 msgid "Epson EP 901A"
-msgstr "Epson PX A650"
+msgstr "Epson EP 901A"
 
-#: src/xml/xmli18n-tmp.h:4226
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6467
 msgid "Epson EP 901F"
-msgstr "Epson PX A650"
+msgstr "Epson EP 901F"
 
-#: src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:6468
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:4228
+#: src/xml/xmli18n-tmp.h:6469
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4229
+#: src/xml/xmli18n-tmp.h:6470
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:6471
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:6472
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/xml/xmli18n-tmp.h:4232
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6473
 msgid "Epson ME 300"
-msgstr "Epson E 300"
+msgstr "Epson ME 300"
 
-#: src/xml/xmli18n-tmp.h:4233
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6474
 msgid "Epson ME Office 70"
-msgstr "Epson E 700"
+msgstr "Epson ME Office 70"
 
-#: src/xml/xmli18n-tmp.h:4234
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6475
 msgid "Epson ME Office 80W"
-msgstr "Epson PM 780C"
+msgstr "Epson ME Office 80W"
 
-#: src/xml/xmli18n-tmp.h:4235
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6476
 msgid "Epson ME Office 360"
-msgstr "Epson E 700"
+msgstr "Epson ME Office 360"
 
-#: src/xml/xmli18n-tmp.h:4236
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6477
 msgid "Epson ME Office 700FW"
-msgstr "Epson E 700"
+msgstr "Epson ME Office 700FW"
 
-#: src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:6478
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/xml/xmli18n-tmp.h:4238
+#: src/xml/xmli18n-tmp.h:6479
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:6480
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:6481
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:6482
 msgid "Epson PM 670C"
 msgstr "Epson PM 670C"
 
-#: src/xml/xmli18n-tmp.h:4242
+#: src/xml/xmli18n-tmp.h:6483
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:4243
+#: src/xml/xmli18n-tmp.h:6484
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:6485
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:6486
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/xml/xmli18n-tmp.h:4246
+#: src/xml/xmli18n-tmp.h:6487
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:6488
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:6490
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/xml/xmli18n-tmp.h:4251
+#: src/xml/xmli18n-tmp.h:6492
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:4253
+#: src/xml/xmli18n-tmp.h:6494
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/xml/xmli18n-tmp.h:4254
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:6496
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:6497
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:6498
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:6499
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/xml/xmli18n-tmp.h:4259
+#: src/xml/xmli18n-tmp.h:6500
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/xml/xmli18n-tmp.h:4260
+#: src/xml/xmli18n-tmp.h:6501
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:6502
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/xml/xmli18n-tmp.h:4262
+#: src/xml/xmli18n-tmp.h:6503
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/xml/xmli18n-tmp.h:4263
+#: src/xml/xmli18n-tmp.h:6504
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/xml/xmli18n-tmp.h:4264
+#: src/xml/xmli18n-tmp.h:6505
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/xml/xmli18n-tmp.h:4265
+#: src/xml/xmli18n-tmp.h:6506
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:6507
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:6508
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:6509
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:6510
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:6511
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:6512
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:6513
 msgid "Epson PM A820"
 msgstr "Epson PM A820"
 
-#: src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:6514
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:4274
+#: src/xml/xmli18n-tmp.h:6515
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/xml/xmli18n-tmp.h:4275
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6516
 msgid "Epson PM A940"
-msgstr "Epson PM 940C"
+msgstr "Epson PM A940"
 
-#: src/xml/xmli18n-tmp.h:4276
+#: src/xml/xmli18n-tmp.h:6517
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:6518
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:6519
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:6520
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:6521
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:6522
 msgid "Epson PM D870"
 msgstr "Epson PM D870"
 
-#: src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:6523
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:6524
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:6525
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/xml/xmli18n-tmp.h:4285
+#: src/xml/xmli18n-tmp.h:6526
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/xml/xmli18n-tmp.h:4286
+#: src/xml/xmli18n-tmp.h:6527
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:6528
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:6529
 msgid "Epson PM G850"
 msgstr "Epson PM G850"
 
-#: src/xml/xmli18n-tmp.h:4289
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6530
 msgid "Epson PM T960"
-msgstr "Epson PM 670C"
+msgstr "Epson PM T960"
 
-#: src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:6531
 msgid "Epson PM G4500"
 msgstr "Epson PM G4500"
 
-#: src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:6532
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4292
+#: src/xml/xmli18n-tmp.h:6533
 msgid "Epson Offirio PX B300"
 msgstr "Epson Offirio PX B300"
 
-#: src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:6534
 msgid "Epson Offirio PX B500"
 msgstr "Epson Offirio PX B500"
 
-#: src/xml/xmli18n-tmp.h:4294
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6535
 msgid "Epson PX 101"
-msgstr "Epson PX A650"
+msgstr "Epson PX 101"
 
-#: src/xml/xmli18n-tmp.h:4295
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6536
 msgid "Epson PX 201"
-msgstr "Epson PX G920"
+msgstr "Epson PX 201"
 
-#: src/xml/xmli18n-tmp.h:4296
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6537
 msgid "Epson PX 401A"
-msgstr "Epson PX A650"
+msgstr "Epson PX 401A"
 
-#: src/xml/xmli18n-tmp.h:4297
-#, fuzzy
+#: src/xml/xmli18n-tmp.h:6538
 msgid "Epson PX 601F"
-msgstr "Epson PX A650"
+msgstr "Epson PX 601F"
 
-#: src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:6539
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:4299
+#: src/xml/xmli18n-tmp.h:6540
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:6541
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:6542
 msgid "Epson PX G5300"
 msgstr "Epson PX G5300"
 
-#: src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:6543
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:6544
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/xml/xmli18n-tmp.h:4305
+#: src/xml/xmli18n-tmp.h:6546
 msgid "Epson PX V780"
 msgstr "Epson PX V780"
 
-#: src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:6547
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/xml/xmli18n-tmp.h:4307
+#: src/xml/xmli18n-tmp.h:6548
+msgid "Epson PX G5600"
+msgstr "Epson PX G5600"
+
+#: src/xml/xmli18n-tmp.h:6549
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/xml/xmli18n-tmp.h:4308
+#: src/xml/xmli18n-tmp.h:6550
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/xml/xmli18n-tmp.h:4309
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/xml/xmli18n-tmp.h:4310
+#: src/xml/xmli18n-tmp.h:6552
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:6553
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:6554
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/xml/xmli18n-tmp.h:4313
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:6556
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/xml/xmli18n-tmp.h:4315
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:6559
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:6560
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:6561
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:6562
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:6563
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:6564
 msgid "Brother DCP-8045D"
 msgstr "Brother DCP-8045D"
 
-#: src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:6565
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:4324
+#: src/xml/xmli18n-tmp.h:6566
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:6567
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/xml/xmli18n-tmp.h:4326
+#: src/xml/xmli18n-tmp.h:6568
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:4327
+#: src/xml/xmli18n-tmp.h:6569
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:6570
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:6571
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Brother HL-1430"
 msgstr "Brother HL-1430"
 
-#: src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:6576
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Brother HL-1450"
 msgstr "Brother HL-1450"
 
-#: src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Brother HL-1470N"
 msgstr "Brother HL-1470N"
 
-#: src/xml/xmli18n-tmp.h:4337
+#: src/xml/xmli18n-tmp.h:6579
 msgid "Brother HL-1650"
 msgstr "Brother HL-1650"
 
-#: src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:6580
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:6581
 msgid "Brother HL-1670N"
 msgstr "Brother HL-1670N"
 
-#: src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:6582
 msgid "Brother HL-1850"
 msgstr "Brother HL-1850"
 
-#: src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:6583
 msgid "Brother HL-1870N"
 msgstr "Brother HL-1870N"
 
-#: src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:6584
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:6585
 msgid "Brother HL-2460"
 msgstr "Brother HL-2460"
 
-#: src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:6586
 msgid "Brother HL-2460N"
 msgstr "Brother HL-2460N"
 
-#: src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:6587
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/xml/xmli18n-tmp.h:4346
+#: src/xml/xmli18n-tmp.h:6588
 msgid "Brother HL-5030"
 msgstr "Brother HL-5030"
 
-#: src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:6589
 msgid "Brother HL-5040"
 msgstr "Brother HL-5040"
 
-#: src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:6590
 msgid "Brother HL-5050"
 msgstr "Brother HL-5050"
 
-#: src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:6591
 msgid "Brother HL-5070N"
 msgstr "Brother HL-5070N"
 
-#: src/xml/xmli18n-tmp.h:4350
+#: src/xml/xmli18n-tmp.h:6592
 msgid "Brother HL-5140"
 msgstr "Brother HL-5140"
 
-#: src/xml/xmli18n-tmp.h:4351
+#: src/xml/xmli18n-tmp.h:6593
 msgid "Brother HL-5150D"
 msgstr "Brother HL-5150D"
 
-#: src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:6594
 msgid "Brother HL-5170DN"
 msgstr "Brother HL-5170DN"
 
-#: src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:6595
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:4354
+#: src/xml/xmli18n-tmp.h:6596
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:6597
 msgid "Brother HL-7050"
 msgstr "Brother HL-7050"
 
-#: src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:6598
 msgid "Brother HL-7050N"
 msgstr "Brother HL-7050N"
 
-#: src/xml/xmli18n-tmp.h:4357
+#: src/xml/xmli18n-tmp.h:6599
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/xml/xmli18n-tmp.h:4358
+#: src/xml/xmli18n-tmp.h:6600
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:6601
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:6602
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:6603
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:6604
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:6605
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:6606
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:6607
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:6608
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:6609
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:6610
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:6611
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:6612
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:6613
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:6614
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/xml/xmli18n-tmp.h:4373
+#: src/xml/xmli18n-tmp.h:6615
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/xml/xmli18n-tmp.h:4374
+#: src/xml/xmli18n-tmp.h:6616
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:6617
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/xml/xmli18n-tmp.h:4376
+#: src/xml/xmli18n-tmp.h:6618
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:6619
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:6620
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:6621
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:6622
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:6623
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:6624
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:6625
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/xml/xmli18n-tmp.h:4384
+#: src/xml/xmli18n-tmp.h:6626
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:4385
+#: src/xml/xmli18n-tmp.h:6627
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:4386
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:4387
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:6630
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/xml/xmli18n-tmp.h:4389
+#: src/xml/xmli18n-tmp.h:6631
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/xml/xmli18n-tmp.h:4392
+#: src/xml/xmli18n-tmp.h:6634
 msgid "Epson EPL-N2050"
 msgstr "Epson EPL-N2050"
 
-#: src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:6635
 msgid "Epson EPL-N2050+"
 msgstr "Epson EPL-N2050+"
 
-#: src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:6636
 msgid "Epson EPL-N2050PS"
 msgstr "Epson EPL-N2050PS"
 
-#: src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:6637
 msgid "Epson EPL-N2050PS+"
 msgstr "Epson EPL-N2050PS+"
 
-#: src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:6638
 msgid "Epson EPL-N2120"
 msgstr "Epson EPL-N2120"
 
-#: src/xml/xmli18n-tmp.h:4397
+#: src/xml/xmli18n-tmp.h:6639
 msgid "Epson EPL-N2500"
 msgstr "Epson EPL-N2500"
 
-#: src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:6640
 msgid "Epson EPL-N2500PS"
 msgstr "Epson EPL-N2500PS"
 
-#: src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:6641
 msgid "Epson EPL-N2750"
 msgstr "Epson EPL-N2750"
 
-#: src/xml/xmli18n-tmp.h:4400
+#: src/xml/xmli18n-tmp.h:6642
 msgid "Epson EPL-N2750PS"
 msgstr "Epson EPL-N2750PS"
 
-#: src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:6643
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/xml/xmli18n-tmp.h:4403
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:6646
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:6647
 msgid "Generic PCL 4 Printer"
 msgstr "Generic PCL 4 Printer"
 
-#: src/xml/xmli18n-tmp.h:4406
+#: src/xml/xmli18n-tmp.h:6648
 msgid "Generic PCL 4 LF Printer"
 msgstr "Generic PCL 4 LF Printer"
 
-#: src/xml/xmli18n-tmp.h:4407
+#: src/xml/xmli18n-tmp.h:6649
 msgid "Generic PCL 5 Printer"
 msgstr "Generic PCL 5 Printer"
 
-#: src/xml/xmli18n-tmp.h:4408
+#: src/xml/xmli18n-tmp.h:6650
 msgid "Generic PCL 5 LF Printer"
 msgstr "Generic PCL 5 LF Printer"
 
-#: src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:6651
 msgid "Generic PCL 5c Printer"
 msgstr "Generic PCL 5c Printer"
 
-#: src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Generic PCL 5c LF Printer"
 msgstr "Generic PCL 5c LF Printer"
 
-#: src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:6653
 msgid "Generic PCL 5e Printer"
 msgstr "Generic PCL 5e Printer"
 
-#: src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:6654
 msgid "Generic PCL 5e LF Printer"
 msgstr "Generic PCL 5e LF Printer"
 
-#: src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Generic PCL 6/PCL XL Printer"
 
-#: src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Generic PCL 6/PCL XL LF Printer"
 
-#: src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:6657
 msgid "Gestetner 10512"
 msgstr "Gestetner 10512"
 
-#: src/xml/xmli18n-tmp.h:4416
+#: src/xml/xmli18n-tmp.h:6658
 msgid "Gestetner 2212"
 msgstr "Gestetner 2212"
 
-#: src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:6659
 msgid "Gestetner 2712"
 msgstr "Gestetner 2712"
 
-#: src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:6660
 msgid "Gestetner 3212"
 msgstr "Gestetner 3212"
 
-#: src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:6661
 msgid "Gestetner 3502"
 msgstr "Gestetner 3502"
 
-#: src/xml/xmli18n-tmp.h:4420
-msgid "Gestetner 3532"
-msgstr "Gestetner 3532"
-
-#: src/xml/xmli18n-tmp.h:4421
-msgid "Gestetner 4235g"
-msgstr "Gestetner 4235g"
+#: src/xml/xmli18n-tmp.h:6662
+msgid "Gestetner 3532/4235g"
+msgstr "Gestetner 3532/4235g"
 
-#: src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:6663
 msgid "Gestetner 4502"
 msgstr "Gestetner 4502"
 
-#: src/xml/xmli18n-tmp.h:4423
-msgid "Gestetner 4532"
-msgstr "Gestetner 4532"
-
-#: src/xml/xmli18n-tmp.h:4424
-msgid "Gestetner 4245g"
-msgstr "Gestetner 4245g"
+#: src/xml/xmli18n-tmp.h:6664
+msgid "Gestetner 4532/4245g"
+msgstr "Gestetner 4532/4245g"
 
-#: src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:6665
 msgid "Gestetner 6002"
 msgstr "Gestetner 6002"
 
-#: src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:6666
 msgid "Gestetner 7502"
 msgstr "Gestetner 7502"
 
-#: src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Gestetner 9002"
 msgstr "Gestetner 9002"
 
-#: src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:6668
 msgid "Gestetner DSm415"
 msgstr "Gestetner DSm415"
 
-#: src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:6669
 msgid "Gestetner DSm615"
 msgstr "Gestetner DSm615"
 
-#: src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:6670
 msgid "Gestetner DSm616"
 msgstr "Gestetner DSm616"
 
-#: src/xml/xmli18n-tmp.h:4431
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Gestetner DSm618"
 msgstr "Gestetner DSm618"
 
-#: src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:6672
 msgid "Gestetner DSm618d"
 msgstr "Gestetner DSm618d"
 
-#: src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:6673
 msgid "Gestetner DSm620"
 msgstr "Gestetner DSm620"
 
-#: src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:6674
 msgid "Gestetner DSm620d"
 msgstr "Gestetner DSm620d"
 
-#: src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:6675
 msgid "Gestetner DSm622"
 msgstr "Gestetner DSm622"
 
-#: src/xml/xmli18n-tmp.h:4436
+#: src/xml/xmli18n-tmp.h:6676
 msgid "Gestetner DSm627"
 msgstr "Gestetner DSm627"
 
-#: src/xml/xmli18n-tmp.h:4437
-msgid "Gestetner DSm635"
-msgstr "Gestetner DSm635"
+#: src/xml/xmli18n-tmp.h:6677
+msgid "Gestetner DSm635/635G"
+msgstr "Gestetner DSm635/635G"
 
-#: src/xml/xmli18n-tmp.h:4438
-msgid "Gestetner DSm635G"
-msgstr "Gestetner DSm635G"
+#: src/xml/xmli18n-tmp.h:6678
+msgid "Gestetner DSm645/645G"
+msgstr "Gestetner DSm645/645G"
 
-#: src/xml/xmli18n-tmp.h:4439
-msgid "Gestetner DSm645"
-msgstr "Gestetner DSm645"
-
-#: src/xml/xmli18n-tmp.h:4440
-msgid "Gestetner DS645G"
-msgstr "Gestetner DS645G"
-
-#: src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:6679
 msgid "Gestetner DSm651"
 msgstr "Gestetner DSm651"
 
-#: src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:6680
 msgid "Gestetner DSm660"
 msgstr "Gestetner DSm660"
 
-#: src/xml/xmli18n-tmp.h:4443
+#: src/xml/xmli18n-tmp.h:6681
 msgid "Gestetner DSm675"
 msgstr "Gestetner DSm675"
 
-#: src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:6682
 msgid "Gestetner DSm725"
 msgstr "Gestetner DSm725"
 
-#: src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:6683
 msgid "Gestetner DSm730"
 msgstr "Gestetner DSm730"
 
-#: src/xml/xmli18n-tmp.h:4446
-msgid "Gestetner DSm735"
-msgstr "Gestetner DSm735"
-
-#: src/xml/xmli18n-tmp.h:4447
-msgid "Gestetner DSm735G"
-msgstr "Gestetner DSm735G"
-
-#: src/xml/xmli18n-tmp.h:4448
-msgid "Gestetner DSm745"
-msgstr "Gestetner DSm745"
-
-#: src/xml/xmli18n-tmp.h:4449
-msgid "Gestetner DSm745G"
-msgstr "Gestetner DSm745G"
-
-#: src/xml/xmli18n-tmp.h:4450
-msgid "Gestetner MP1100"
-msgstr "Gestetner MP1100"
-
-#: src/xml/xmli18n-tmp.h:4451
-msgid "Gestetner DSm7110"
-msgstr "Gestetner DSm7110"
-
-#: src/xml/xmli18n-tmp.h:4452
-msgid "Gestetner MP1350"
-msgstr "Gestetner MP1350"
-
-#: src/xml/xmli18n-tmp.h:4453
-msgid "Gestetner DSm7135"
-msgstr "Gestetner DSm7135"
-
-#: src/xml/xmli18n-tmp.h:4454
-msgid "Gestetner MP1600"
-msgstr "Gestetner MP1600"
-
-#: src/xml/xmli18n-tmp.h:4455
-msgid "Gestetner DSm716"
-msgstr "Gestetner DSm716"
-
-#: src/xml/xmli18n-tmp.h:4456
-msgid "Gestetner MP2000"
-msgstr "Gestetner MP2000"
-
-#: src/xml/xmli18n-tmp.h:4457
-msgid "Gestetner DSm721d"
-msgstr "Gestetner DSm721d"
-
-#: src/xml/xmli18n-tmp.h:4458
-msgid "Gestetner MP2500"
-msgstr "Gestetner MP2500"
-
-#: src/xml/xmli18n-tmp.h:4459
-msgid "Gestetner DSm625"
-msgstr "Gestetner DSm625"
+#: src/xml/xmli18n-tmp.h:6684
+msgid "Gestetner DSm735/735G"
+msgstr "Gestetner DSm735/735G"
 
-#: src/xml/xmli18n-tmp.h:4460
-msgid "Gestetner MP3500"
-msgstr "Gestetner MP3500"
+#: src/xml/xmli18n-tmp.h:6685
+msgid "Gestetner DSm745/745G"
+msgstr "Gestetner DSm745/745G"
 
-#: src/xml/xmli18n-tmp.h:4461
-msgid "Gestetner DSm735e"
-msgstr "Gestetner DSm735e"
+#: src/xml/xmli18n-tmp.h:6686
+msgid "Gestetner MP1100/DSm7110"
+msgstr "Gestetner MP1100/DSm7110"
 
-#: src/xml/xmli18n-tmp.h:4462
-msgid "Gestetner MP4500"
-msgstr "Gestetner MP4500"
+#: src/xml/xmli18n-tmp.h:6687
+msgid "Gestetner MP1350/DSm7135"
+msgstr "Gestetner MP1350/DSm7135"
 
-#: src/xml/xmli18n-tmp.h:4463
-msgid "Gestetner DSm745e"
-msgstr "Gestetner DSm745e"
+#: src/xml/xmli18n-tmp.h:6688
+msgid "Gestetner MP1600/DSm716"
+msgstr "Gestetner MP1600/DSm716"
 
-#: src/xml/xmli18n-tmp.h:4464
-msgid "Gestetner MP5500"
-msgstr "Gestetner MP5500"
+#: src/xml/xmli18n-tmp.h:6689
+msgid "Gestetner MP2000/DSm721d"
+msgstr "Gestetner MP2000/DSm721d"
 
-#: src/xml/xmli18n-tmp.h:4465
-msgid "Gestetner DSm755"
-msgstr "Gestetner DSm755"
+#: src/xml/xmli18n-tmp.h:6690
+msgid "Gestetner MP2500/DSm625"
+msgstr "Gestetner MP2500/DSm625"
 
-#: src/xml/xmli18n-tmp.h:4466
-msgid "Gestetner MP6500"
-msgstr "Gestetner MP6500"
+#: src/xml/xmli18n-tmp.h:6691
+msgid "Gestetner MP3500/DSm735e"
+msgstr "Gestetner MP3500/DSm735e"
 
-#: src/xml/xmli18n-tmp.h:4467
-msgid "Gestetner DSm765"
-msgstr "Gestetner DSm765"
+#: src/xml/xmli18n-tmp.h:6692
+msgid "Gestetner MP4500/DSm745e"
+msgstr "Gestetner MP4500/DSm745e"
 
-#: src/xml/xmli18n-tmp.h:4468
-msgid "Gestetner MP7500"
-msgstr "Gestetner MP7500"
+#: src/xml/xmli18n-tmp.h:6693
+msgid "Gestetner MP5500/DSm755"
+msgstr "Gestetner MP5500/DSm755"
 
-#: src/xml/xmli18n-tmp.h:4469
-msgid "Gestetner DSm775"
-msgstr "Gestetner DSm775"
+#: src/xml/xmli18n-tmp.h:6694
+msgid "Gestetner MP6500/DSm765"
+msgstr "Gestetner MP6500/DSm765"
 
-#: src/xml/xmli18n-tmp.h:4470
-msgid "Gestetner MP9000"
-msgstr "Gestetner MP9000"
+#: src/xml/xmli18n-tmp.h:6695
+msgid "Gestetner MP7500/DSm775"
+msgstr "Gestetner MP7500/DSm775"
 
-#: src/xml/xmli18n-tmp.h:4471
-msgid "Gestetner DSm790"
-msgstr "Gestetner DSm790"
+#: src/xml/xmli18n-tmp.h:6696
+msgid "Gestetner MP9000/DSm790"
+msgstr "Gestetner MP9000/DSm790"
 
-#: src/xml/xmli18n-tmp.h:4472
-msgid "Gestetner MP 161"
-msgstr "Gestetner MP 161"
+#: src/xml/xmli18n-tmp.h:6697
+msgid "Gestetner MP 161/DSm416"
+msgstr "Gestetner MP 161/DSm416"
 
-#: src/xml/xmli18n-tmp.h:4473
-msgid "Gestetner DSm416"
-msgstr "Gestetner DSm416"
+#: src/xml/xmli18n-tmp.h:6698
+msgid "Gestetner MP 2510/DSm725e"
+msgstr "Gestetner MP 2510/DSm725e"
 
-#: src/xml/xmli18n-tmp.h:4474
-msgid "Gestetner MP 2510"
-msgstr "Gestetner MP 2510"
-
-#: src/xml/xmli18n-tmp.h:4475
-msgid "Gestetner DSm725e"
-msgstr "Gestetner DSm725e"
-
-#: src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:6699
 msgid "Gestetner MP 2550"
 msgstr "Gestetner MP 2550"
 
-#: src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:6700
 msgid "Gestetner MP 2550B"
 msgstr "Gestetner MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:4478
-msgid "Gestetner MP 3010"
-msgstr "Gestetner MP 3010"
+#: src/xml/xmli18n-tmp.h:6701
+msgid "Gestetner MP 3010/DSm730e"
+msgstr "Gestetner MP 3010/DSm730e"
 
-#: src/xml/xmli18n-tmp.h:4479
-msgid "Gestetner DSm730e"
-msgstr "Gestetner DSm730e"
-
-#: src/xml/xmli18n-tmp.h:4480
+#: src/xml/xmli18n-tmp.h:6702
 msgid "Gestetner MP 3350"
 msgstr "Gestetner MP 3350"
 
-#: src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:6703
 msgid "Gestetner MP 3350B"
 msgstr "Gestetner MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:6704
 msgid "Gestetner MP 4000"
 msgstr "Gestetner MP 4000"
 
-#: src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:6705
 msgid "Gestetner MP 4000B"
 msgstr "Gestetner MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Gestetner MP 5000"
 msgstr "Gestetner MP 5000"
 
-#: src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:6707
 msgid "Gestetner MP 5000B"
 msgstr "Gestetner MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:6708
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:6709
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:6710
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/xml/xmli18n-tmp.h:4489
+#: src/xml/xmli18n-tmp.h:6711
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:6712
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:6713
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/xml/xmli18n-tmp.h:4492
+#: src/xml/xmli18n-tmp.h:6714
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:6715
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:6716
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/xml/xmli18n-tmp.h:4495
+#: src/xml/xmli18n-tmp.h:6717
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/xml/xmli18n-tmp.h:4496
+#: src/xml/xmli18n-tmp.h:6718
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/xml/xmli18n-tmp.h:4497
+#: src/xml/xmli18n-tmp.h:6719
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:6720
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:6721
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:6722
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:6723
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:6724
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:6725
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:6726
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:6727
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:4506
+#: src/xml/xmli18n-tmp.h:6728
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:6729
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:4508
+#: src/xml/xmli18n-tmp.h:6730
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/xml/xmli18n-tmp.h:4509
+#: src/xml/xmli18n-tmp.h:6731
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:4510
+#: src/xml/xmli18n-tmp.h:6732
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:6733
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:6734
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:6735
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:6736
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:6737
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:6738
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:6739
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:4518
+#: src/xml/xmli18n-tmp.h:6740
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:6741
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:6742
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:6743
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:6744
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:4523
+#: src/xml/xmli18n-tmp.h:6745
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:6746
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:6747
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:6748
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:6749
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/xml/xmli18n-tmp.h:4528
+#: src/xml/xmli18n-tmp.h:6750
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/xml/xmli18n-tmp.h:4529
+#: src/xml/xmli18n-tmp.h:6751
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/xml/xmli18n-tmp.h:4530
+#: src/xml/xmli18n-tmp.h:6752
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:6753
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/xml/xmli18n-tmp.h:4532
+#: src/xml/xmli18n-tmp.h:6754
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:6755
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:6756
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:6757
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:6758
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:6759
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:6760
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/xml/xmli18n-tmp.h:4539
+#: src/xml/xmli18n-tmp.h:6761
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/xml/xmli18n-tmp.h:4540
+#: src/xml/xmli18n-tmp.h:6762
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/xml/xmli18n-tmp.h:4541
+#: src/xml/xmli18n-tmp.h:6763
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/xml/xmli18n-tmp.h:4542
+#: src/xml/xmli18n-tmp.h:6764
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/xml/xmli18n-tmp.h:4543
+#: src/xml/xmli18n-tmp.h:6765
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:6766
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:6767
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/xml/xmli18n-tmp.h:4546
+#: src/xml/xmli18n-tmp.h:6768
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:6769
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:6770
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:6771
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:6772
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:6773
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/xml/xmli18n-tmp.h:4552
+#: src/xml/xmli18n-tmp.h:6774
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:6775
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:6776
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:6777
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:6778
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:6779
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:6780
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:6781
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:6782
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:6783
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:6784
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:6785
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:6786
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:6787
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:6788
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/xml/xmli18n-tmp.h:4567
+#: src/xml/xmli18n-tmp.h:6789
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/xml/xmli18n-tmp.h:4568
+#: src/xml/xmli18n-tmp.h:6790
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:6791
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/xml/xmli18n-tmp.h:4570
+#: src/xml/xmli18n-tmp.h:6792
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/xml/xmli18n-tmp.h:4571
+#: src/xml/xmli18n-tmp.h:6793
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:6794
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:6795
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:6796
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:6797
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:6798
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:6799
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:6800
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:6801
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:6802
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:6803
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/xml/xmli18n-tmp.h:4582
+#: src/xml/xmli18n-tmp.h:6804
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/xml/xmli18n-tmp.h:4583
+#: src/xml/xmli18n-tmp.h:6805
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/xml/xmli18n-tmp.h:4584
+#: src/xml/xmli18n-tmp.h:6806
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/xml/xmli18n-tmp.h:4585
+#: src/xml/xmli18n-tmp.h:6807
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:6808
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:6809
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:6810
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:6811
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:6812
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:6813
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:6814
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:4593
+#: src/xml/xmli18n-tmp.h:6815
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/xml/xmli18n-tmp.h:4594
+#: src/xml/xmli18n-tmp.h:6816
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:6817
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:6818
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/xml/xmli18n-tmp.h:4597
+#: src/xml/xmli18n-tmp.h:6819
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:6820
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:6821
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:6822
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:6823
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/xml/xmli18n-tmp.h:4602
+#: src/xml/xmli18n-tmp.h:6824
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:6825
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:6826
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:6827
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:6828
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:4607
+#: src/xml/xmli18n-tmp.h:6829
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:6830
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/xml/xmli18n-tmp.h:4609
+#: src/xml/xmli18n-tmp.h:6831
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/xml/xmli18n-tmp.h:4610
+#: src/xml/xmli18n-tmp.h:6832
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:6833
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:6834
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4613
+#: src/xml/xmli18n-tmp.h:6835
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:6836
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:6837
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:6838
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:6839
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:6840
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:6841
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:6842
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:6843
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:6844
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:6845
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4624
+#: src/xml/xmli18n-tmp.h:6846
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/xml/xmli18n-tmp.h:4625
+#: src/xml/xmli18n-tmp.h:6847
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:6848
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/xml/xmli18n-tmp.h:4627
+#: src/xml/xmli18n-tmp.h:6849
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/xml/xmli18n-tmp.h:4628
+#: src/xml/xmli18n-tmp.h:6850
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:6851
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:6852
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:6853
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 1022"
 
-#: src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:6854
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:6855
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:6856
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:6857
 msgid "HP LaserJet 1160"
 msgstr "HP LaserJet 1160"
 
-#: src/xml/xmli18n-tmp.h:4636
+#: src/xml/xmli18n-tmp.h:6858
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:4637
+#: src/xml/xmli18n-tmp.h:6859
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/xml/xmli18n-tmp.h:4638
+#: src/xml/xmli18n-tmp.h:6860
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:6861
 msgid "HP LaserJet 1320"
 msgstr "HP LaserJet 1320"
 
-#: src/xml/xmli18n-tmp.h:4640
+#: src/xml/xmli18n-tmp.h:6862
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:6863
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:6864
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:6865
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:4644
+#: src/xml/xmli18n-tmp.h:6866
 msgid "HP LaserJet 2410"
 msgstr "HP LaserJet 2410"
 
-#: src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:6867
 msgid "HP LaserJet 2420"
 msgstr "HP LaserJet 2420"
 
-#: src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:6868
 msgid "HP LaserJet 2430"
 msgstr "HP LaserJet 2430"
 
-#: src/xml/xmli18n-tmp.h:4647
+#: src/xml/xmli18n-tmp.h:6869
 msgid "HP LaserJet 3015"
 msgstr "HP LaserJet 3015"
 
-#: src/xml/xmli18n-tmp.h:4648
+#: src/xml/xmli18n-tmp.h:6870
 msgid "HP LaserJet 3020"
 msgstr "HP LaserJet 3020"
 
-#: src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:6871
 msgid "HP LaserJet 3030"
 msgstr "HP LaserJet 3030"
 
-#: src/xml/xmli18n-tmp.h:4650
+#: src/xml/xmli18n-tmp.h:6872
 msgid "HP LaserJet 3050"
 msgstr "HP LaserJet 3050"
 
-#: src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:6873
 msgid "HP LaserJet 3052"
 msgstr "HP LaserJet 3052"
 
-#: src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:6874
 msgid "HP LaserJet 3055"
 msgstr "HP LaserJet 3055"
 
-#: src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:6875
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:6876
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:6877
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:6878
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:6879
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:6880
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:6881
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/xml/xmli18n-tmp.h:4660
+#: src/xml/xmli18n-tmp.h:6882
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:6883
 msgid "HP LaserJet 3380"
 msgstr "HP LaserJet 3380"
 
-#: src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:6884
 msgid "HP LaserJet 3390"
 msgstr "HP LaserJet 3390"
 
-#: src/xml/xmli18n-tmp.h:4663
+#: src/xml/xmli18n-tmp.h:6885
 msgid "HP LaserJet 3392"
 msgstr "HP LaserJet 3392"
 
-#: src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:6886
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:6887
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:6888
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/xml/xmli18n-tmp.h:4667
+#: src/xml/xmli18n-tmp.h:6889
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:6890
 msgid "HP LaserJet 4240"
 msgstr "HP LaserJet 4240"
 
-#: src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:6891
 msgid "HP LaserJet 4250"
 msgstr "HP LaserJet 4250"
 
-#: src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:6892
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/xml/xmli18n-tmp.h:4671
+#: src/xml/xmli18n-tmp.h:6893
 msgid "HP LaserJet 4345 mfp"
 msgstr "HP LaserJet 4345 mfp"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:6894
 msgid "HP LaserJet 4350"
 msgstr "HP LaserJet 4350"
 
-#: src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:6895
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:6896
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:6897
 msgid "HP LaserJet 5200"
 msgstr "HP LaserJet 5200"
 
-#: src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:6898
 msgid "HP LaserJet 5200L"
 msgstr "HP LaserJet 5200L"
 
-#: src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:6899
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:6900
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:6901
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/xml/xmli18n-tmp.h:4680
+#: src/xml/xmli18n-tmp.h:6902
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:6903
 msgid "HP LaserJet 9040"
 msgstr "HP LaserJet 9040"
 
-#: src/xml/xmli18n-tmp.h:4682
+#: src/xml/xmli18n-tmp.h:6904
 msgid "HP LaserJet 9040 MFP"
 msgstr "HP LaserJet 9040 MFP"
 
-#: src/xml/xmli18n-tmp.h:4683
+#: src/xml/xmli18n-tmp.h:6905
 msgid "HP LaserJet 9050"
 msgstr "HP LaserJet 9050"
 
-#: src/xml/xmli18n-tmp.h:4684
+#: src/xml/xmli18n-tmp.h:6906
 msgid "HP LaserJet 9050 MFP"
 msgstr "HP LaserJet 9050 MFP"
 
-#: src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:6907
 msgid "HP LaserJet M3027 MFP"
 msgstr "HP LaserJet M3027 MFP"
 
-#: src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:6908
 msgid "HP LaserJet M3035 MFP"
 msgstr "HP LaserJet M3035 MFP"
 
-#: src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:6909
 msgid "HP LaserJet M4345 MFP"
 msgstr "HP LaserJet M4345 MFP"
 
-#: src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:6910
 msgid "HP LaserJet M5025 MFP"
 msgstr "HP LaserJet M5025 MFP"
 
-#: src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:6911
 msgid "HP LaserJet M5035 MFP"
 msgstr "HP LaserJet M5035 MFP"
 
-#: src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:6912
 msgid "HP LaserJet P2010"
 msgstr "HP LaserJet P2010"
 
-#: src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:6913
 msgid "HP LaserJet P2015"
 msgstr "HP LaserJet P2015"
 
-#: src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:6914
 msgid "HP LaserJet P3004"
 msgstr "HP LaserJet P3004"
 
-#: src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:6915
 msgid "HP LaserJet P3005"
 msgstr "HP LaserJet P3005"
 
-#: src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:6916
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/xml/xmli18n-tmp.h:4695
+#: src/xml/xmli18n-tmp.h:6917
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:6918
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:6919
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:6920
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:6921
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/xml/xmli18n-tmp.h:4700
+#: src/xml/xmli18n-tmp.h:6922
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:6923
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:6924
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/xml/xmli18n-tmp.h:4703
+#: src/xml/xmli18n-tmp.h:6925
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:6926
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:6927
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/xml/xmli18n-tmp.h:4706
+#: src/xml/xmli18n-tmp.h:6928
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/xml/xmli18n-tmp.h:4707
+#: src/xml/xmli18n-tmp.h:6929
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:6930
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:6931
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/xml/xmli18n-tmp.h:4710
+#: src/xml/xmli18n-tmp.h:6932
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:6933
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:6934
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:6935
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:6936
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:6937
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:6938
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:6939
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/xml/xmli18n-tmp.h:4718
+#: src/xml/xmli18n-tmp.h:6940
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:6941
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:6942
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/xml/xmli18n-tmp.h:4721
+#: src/xml/xmli18n-tmp.h:6943
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:6944
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:6945
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:6946
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/xml/xmli18n-tmp.h:4725
+#: src/xml/xmli18n-tmp.h:6947
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:6948
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:6949
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/xml/xmli18n-tmp.h:4728
+#: src/xml/xmli18n-tmp.h:6950
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/xml/xmli18n-tmp.h:4729
+#: src/xml/xmli18n-tmp.h:6951
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:6952
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:6953
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/xml/xmli18n-tmp.h:4732
+#: src/xml/xmli18n-tmp.h:6954
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:6955
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:6956
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:6957
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:6958
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:6959
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:6960
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/xml/xmli18n-tmp.h:4739
+#: src/xml/xmli18n-tmp.h:6961
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/xml/xmli18n-tmp.h:4740
+#: src/xml/xmli18n-tmp.h:6962
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/xml/xmli18n-tmp.h:4741
+#: src/xml/xmli18n-tmp.h:6963
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/xml/xmli18n-tmp.h:4742
+#: src/xml/xmli18n-tmp.h:6964
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:6965
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:6966
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/xml/xmli18n-tmp.h:4745
+#: src/xml/xmli18n-tmp.h:6967
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:6968
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:6969
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:6970
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/xml/xmli18n-tmp.h:4749
+#: src/xml/xmli18n-tmp.h:6971
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:6972
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:6973
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/xml/xmli18n-tmp.h:4752
+#: src/xml/xmli18n-tmp.h:6974
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:6975
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:6976
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/xml/xmli18n-tmp.h:4755
+#: src/xml/xmli18n-tmp.h:6977
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:6978
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:6979
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:6980
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/xml/xmli18n-tmp.h:4759
+#: src/xml/xmli18n-tmp.h:6981
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/xml/xmli18n-tmp.h:4760
+#: src/xml/xmli18n-tmp.h:6982
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:6983
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/xml/xmli18n-tmp.h:4762
+#: src/xml/xmli18n-tmp.h:6984
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:6985
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:6986
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/xml/xmli18n-tmp.h:4765
+#: src/xml/xmli18n-tmp.h:6987
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:6988
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:6989
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:6990
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:6991
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:6992
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:6993
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/xml/xmli18n-tmp.h:4772
+#: src/xml/xmli18n-tmp.h:6994
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:6995
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/xml/xmli18n-tmp.h:4774
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Infotec 4353 MF"
 msgstr "Infotec 4353 MF"
 
-#: src/xml/xmli18n-tmp.h:4775
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Infotec 4452 MF"
 msgstr "Infotec 4452 MF"
 
-#: src/xml/xmli18n-tmp.h:4776
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:6999
 msgid "Infotec IS2022"
 msgstr "Infotec IS2022"
 
-#: src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:7000
 msgid "Infotec IS2027"
 msgstr "Infotec IS2027"
 
-#: src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Infotec IS2032"
 msgstr "Infotec IS2032"
 
-#: src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:7002
 msgid "Infotec IS2035"
 msgstr "Infotec IS2035"
 
-#: src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:7003
 msgid "Infotec IS2045"
 msgstr "Infotec IS2045"
 
-#: src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:7004
 msgid "Infotec IS2090"
 msgstr "Infotec IS2090"
 
-#: src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:7005
 msgid "Infotec IS2105"
 msgstr "Infotec IS2105"
 
-#: src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:7006
 msgid "Infotec IS 2015"
 msgstr "Infotec IS 2015"
 
-#: src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:7007
 msgid "Infotec IS 2018"
 msgstr "Infotec IS 2018"
 
-#: src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:7008
 msgid "Infotec IS 2018D"
 msgstr "Infotec IS 2018D"
 
-#: src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:7009
 msgid "Infotec IS 2060"
 msgstr "Infotec IS 2060"
 
-#: src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:7010
 msgid "Infotec IS 2075"
 msgstr "Infotec IS 2075"
 
-#: src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:7011
 msgid "Infotec IS 2122"
 msgstr "Infotec IS 2122"
 
-#: src/xml/xmli18n-tmp.h:4790
+#: src/xml/xmli18n-tmp.h:7012
 msgid "Infotec IS 2127"
 msgstr "Infotec IS 2127"
 
-#: src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:7013
 msgid "Infotec IS 2132"
 msgstr "Infotec IS 2132"
 
-#: src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:7014
 msgid "Infotec IS 2135"
 msgstr "Infotec IS 2135"
 
-#: src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:7015
 msgid "Infotec IS 2145"
 msgstr "Infotec IS 2145"
 
-#: src/xml/xmli18n-tmp.h:4794
+#: src/xml/xmli18n-tmp.h:7016
 msgid "Infotec IS 2151"
 msgstr "Infotec IS 2151"
 
-#: src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:7017
 msgid "Infotec IS 2160"
 msgstr "Infotec IS 2160"
 
-#: src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:7018
 msgid "Infotec IS 2175"
 msgstr "Infotec IS 2175"
 
-#: src/xml/xmli18n-tmp.h:4797
+#: src/xml/xmli18n-tmp.h:7019
 msgid "Infotec IS 2215"
 msgstr "Infotec IS 2215"
 
-#: src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:7020
 msgid "Infotec IS 2216"
 msgstr "Infotec IS 2216"
 
-#: src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:7021
 msgid "Infotec IS 2220"
 msgstr "Infotec IS 2220"
 
-#: src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:7022
 msgid "Infotec IS 2220D"
 msgstr "Infotec IS 2220D"
 
-#: src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:7023
 msgid "Infotec IS 2225"
 msgstr "Infotec IS 2225"
 
-#: src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Infotec IS 2230"
 msgstr "Infotec IS 2230"
 
-#: src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:7025
 msgid "Infotec IS 2235"
 msgstr "Infotec IS 2235"
 
-#: src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:7026
 msgid "Infotec IS 2245"
 msgstr "Infotec IS 2245"
 
-#: src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:7027
 msgid "Infotec IS 2255"
 msgstr "Infotec IS 2255"
 
-#: src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:7028
 msgid "Infotec IS 2265"
 msgstr "Infotec IS 2265"
 
-#: src/xml/xmli18n-tmp.h:4807
+#: src/xml/xmli18n-tmp.h:7029
 msgid "Infotec IS 2275"
 msgstr "Infotec IS 2275"
 
-#: src/xml/xmli18n-tmp.h:4808
+#: src/xml/xmli18n-tmp.h:7030
 msgid "Infotec IS 2316"
 msgstr "Infotec IS 2316"
 
-#: src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:7031
 msgid "Infotec IS 2320"
 msgstr "Infotec IS 2320"
 
-#: src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:7032
 msgid "Infotec IS 2325"
 msgstr "Infotec IS 2325"
 
-#: src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Infotec IS 2416"
 msgstr "Infotec IS 2416"
 
-#: src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:7034
 msgid "Infotec IS 2425"
 msgstr "Infotec IS 2425"
 
-#: src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:7035
 msgid "Infotec IS 2430"
 msgstr "Infotec IS 2430"
 
-#: src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Infotec IS 2435"
 msgstr "Infotec IS 2435"
 
-#: src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:7037
 msgid "Infotec IS 2445"
 msgstr "Infotec IS 2445"
 
-#: src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Infotec IS 3090"
 msgstr "Infotec IS 3090"
 
-#: src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:7039
 msgid "Infotec IS 3110"
 msgstr "Infotec IS 3110"
 
-#: src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:7040
 msgid "Infotec IS 3135"
 msgstr "Infotec IS 3135"
 
-#: src/xml/xmli18n-tmp.h:4819
+#: src/xml/xmli18n-tmp.h:7041
 msgid "Infotec MP 2550"
 msgstr "Infotec MP 2550"
 
-#: src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:7042
 msgid "Infotec MP 2550B"
 msgstr "Infotec MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:7043
 msgid "Infotec MP 3350"
 msgstr "Infotec MP 3350"
 
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:7044
 msgid "Infotec MP 3350B"
 msgstr "Infotec MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:7045
 msgid "Infotec MP 4000"
 msgstr "Infotec MP 4000"
 
-#: src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:7046
 msgid "Infotec MP 4000B"
 msgstr "Infotec MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:7047
 msgid "Infotec MP 5000"
 msgstr "Infotec MP 5000"
 
-#: src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:7048
 msgid "Infotec MP 5000B"
 msgstr "Infotec MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:7049
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:7050
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:7051
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:4830
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:7057
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:4837
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:4840
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:4842
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:4852
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/xml/xmli18n-tmp.h:4853
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/xml/xmli18n-tmp.h:4854
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/xml/xmli18n-tmp.h:4855
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:4866
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/xml/xmli18n-tmp.h:4867
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/xml/xmli18n-tmp.h:4873
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Lanier 5622"
 msgstr "Lanier 5622"
 
-#: src/xml/xmli18n-tmp.h:4874
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Lanier 5627"
 msgstr "Lanier 5627"
 
-#: src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Lanier 5632"
 msgstr "Lanier 5632"
 
-#: src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Lanier 5635"
 msgstr "Lanier 5635"
 
-#: src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Lanier 5645"
 msgstr "Lanier 5645"
 
-#: src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Lanier LD0105"
 msgstr "Lanier LD0105"
 
-#: src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Lanier LD015"
 msgstr "Lanier LD015"
 
-#: src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Lanier LD035"
 msgstr "Lanier LD035"
 
-#: src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Lanier LD045"
 msgstr "Lanier LD045"
 
-#: src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Lanier LD060"
 msgstr "Lanier LD060"
 
-#: src/xml/xmli18n-tmp.h:4883
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Lanier LD075"
 msgstr "Lanier LD075"
 
-#: src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Lanier LD090"
 msgstr "Lanier LD090"
 
-#: src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Lanier LD115"
 msgstr "Lanier LD115"
 
-#: src/xml/xmli18n-tmp.h:4886
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Lanier LD116"
 msgstr "Lanier LD116"
 
-#: src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Lanier LD118"
 msgstr "Lanier LD118"
 
-#: src/xml/xmli18n-tmp.h:4888
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Lanier LD118d"
 msgstr "Lanier LD118d"
 
-#: src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Lanier LD120"
 msgstr "Lanier LD120"
 
-#: src/xml/xmli18n-tmp.h:4890
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Lanier LD120d"
 msgstr "Lanier LD120d"
 
-#: src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Lanier LD122"
 msgstr "Lanier LD122"
 
-#: src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Lanier LD127"
 msgstr "Lanier LD127"
 
-#: src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Lanier LD132"
 msgstr "Lanier LD132"
 
-#: src/xml/xmli18n-tmp.h:4894
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Lanier LD135"
 msgstr "Lanier LD135"
 
-#: src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Lanier LD145"
 msgstr "Lanier LD145"
 
-#: src/xml/xmli18n-tmp.h:4896
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Lanier LD151"
 msgstr "Lanier LD151"
 
-#: src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Lanier LD160"
 msgstr "Lanier LD160"
 
-#: src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Lanier LD175"
 msgstr "Lanier LD175"
 
-#: src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Lanier LD225"
 msgstr "Lanier LD225"
 
-#: src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Lanier LD230"
 msgstr "Lanier LD230"
 
-#: src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Lanier LD235"
 msgstr "Lanier LD235"
 
-#: src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Lanier LD245"
 msgstr "Lanier LD245"
 
-#: src/xml/xmli18n-tmp.h:4903
-msgid "Lanier MP 2500"
-msgstr "Lanier MP 2500"
-
-#: src/xml/xmli18n-tmp.h:4904
-msgid "Lanier LD125"
-msgstr "Lanier LD125"
-
-#: src/xml/xmli18n-tmp.h:4905
-msgid "Lanier MP 1100"
-msgstr "Lanier MP 1100"
-
-#: src/xml/xmli18n-tmp.h:4906
-msgid "Lanier LD1100"
-msgstr "Lanier LD1100"
-
-#: src/xml/xmli18n-tmp.h:4907
-msgid "Lanier MP 1350"
-msgstr "Lanier MP 1350"
-
-#: src/xml/xmli18n-tmp.h:4908
-msgid "Lanier LD1135"
-msgstr "Lanier LD1135"
-
-#: src/xml/xmli18n-tmp.h:4909
-msgid "Lanier MP 1600"
-msgstr "Lanier MP 1600"
-
-#: src/xml/xmli18n-tmp.h:4910
-msgid "Lanier LD316"
-msgstr "Lanier LD316"
-
-#: src/xml/xmli18n-tmp.h:4911
-msgid "Lanier MP 161"
-msgstr "Lanier MP 161"
-
-#: src/xml/xmli18n-tmp.h:4912
-msgid "Lanier LD016"
-msgstr "Lanier LD016"
-
-#: src/xml/xmli18n-tmp.h:4913
-msgid "Lanier MP 2000"
-msgstr "Lanier MP 2000"
-
-#: src/xml/xmli18n-tmp.h:4914
-msgid "Lanier LD320d"
-msgstr "Lanier LD320d"
-
-#: src/xml/xmli18n-tmp.h:4915
-msgid "Lanier MP 2510"
-msgstr "Lanier MP 2510"
+#: src/xml/xmli18n-tmp.h:7125
+msgid "Lanier MP2500/LD125"
+msgstr "Lanier MP2500/LD125"
 
-#: src/xml/xmli18n-tmp.h:4916
-msgid "Lanier LD325"
-msgstr "Lanier LD325"
+#: src/xml/xmli18n-tmp.h:7126
+msgid "Lanier MP 1100/LD1100"
+msgstr "Lanier MP 1100/LD1100"
 
-#: src/xml/xmli18n-tmp.h:4917
-msgid "Lanier MP 2550B"
-msgstr "Lanier MP 2550B"
+#: src/xml/xmli18n-tmp.h:7127
+msgid "Lanier MP 1350/LD1135"
+msgstr "Lanier MP 1350/LD1135"
 
-#: src/xml/xmli18n-tmp.h:4918
-msgid "Lanier LD425B"
-msgstr "Lanier LD425B"
+#: src/xml/xmli18n-tmp.h:7128
+msgid "Lanier MP 1600/LD316"
+msgstr "Lanier MP 1600/LD316"
 
-#: src/xml/xmli18n-tmp.h:4919
-msgid "Lanier MP 2550"
-msgstr "Lanier MP 2550"
+#: src/xml/xmli18n-tmp.h:7129
+msgid "Lanier MP 161/LD016"
+msgstr "Lanier MP 161/LD016"
 
-#: src/xml/xmli18n-tmp.h:4920
-msgid "Lanier LD425"
-msgstr "Lanier LD425"
+#: src/xml/xmli18n-tmp.h:7130
+msgid "Lanier MP 2000/LD320d"
+msgstr "Lanier MP 2000/LD320d"
 
-#: src/xml/xmli18n-tmp.h:4921
-msgid "Lanier MP 3010"
-msgstr "Lanier MP 3010"
+#: src/xml/xmli18n-tmp.h:7131
+msgid "Lanier MP 2510/LD325"
+msgstr "Lanier MP 2510/LD325"
 
-#: src/xml/xmli18n-tmp.h:4922
-msgid "Lanier LD330"
-msgstr "Lanier LD330"
+#: src/xml/xmli18n-tmp.h:7132
+msgid "Lanier MP 2550B/LD425B"
+msgstr "Lanier MP 2550B/LD425B"
 
-#: src/xml/xmli18n-tmp.h:4923
-msgid "Lanier MP 3350B"
-msgstr "Lanier MP 3350B"
+#: src/xml/xmli18n-tmp.h:7133
+msgid "Lanier MP 2550/LD425"
+msgstr "Lanier MP 2550/LD425"
 
-#: src/xml/xmli18n-tmp.h:4924
-msgid "Lanier LD433B"
-msgstr "Lanier LD433B"
+#: src/xml/xmli18n-tmp.h:7134
+msgid "Lanier MP 3010/LD330"
+msgstr "Lanier MP 3010/LD330"
 
-#: src/xml/xmli18n-tmp.h:4925
-msgid "Lanier MP 3350"
-msgstr "Lanier MP 3350"
+#: src/xml/xmli18n-tmp.h:7135
+msgid "Lanier MP 3350B/LD433B"
+msgstr "Lanier MP 3350B/LD433B"
 
-#: src/xml/xmli18n-tmp.h:4926
-msgid "Lanier LD433"
-msgstr "Lanier LD433"
+#: src/xml/xmli18n-tmp.h:7136
+msgid "Lanier MP 3350/LD433"
+msgstr "Lanier MP 3350/LD433"
 
-#: src/xml/xmli18n-tmp.h:4927
-msgid "Lanier MP 3500"
-msgstr "Lanier MP 3500"
+#: src/xml/xmli18n-tmp.h:7137
+msgid "Lanier MP 3500/LD335"
+msgstr "Lanier MP 3500/LD335"
 
-#: src/xml/xmli18n-tmp.h:4928
-msgid "Lanier LD335"
-msgstr "Lanier LD335"
+#: src/xml/xmli18n-tmp.h:7138
+msgid "Lanier MP 4000B/LD040B"
+msgstr "Lanier MP 4000B/LD040B"
 
-#: src/xml/xmli18n-tmp.h:4929
-msgid "Lanier MP 4000B"
-msgstr "Lanier MP 4000B"
+#: src/xml/xmli18n-tmp.h:7139
+msgid "Lanier MP 4000/LD040"
+msgstr "Lanier MP 4000/LD040"
 
-#: src/xml/xmli18n-tmp.h:4930
-msgid "Lanier LD040B"
-msgstr "Lanier LD040B"
+#: src/xml/xmli18n-tmp.h:7140
+msgid "Lanier MP 4500/LD345"
+msgstr "Lanier MP 4500/LD345"
 
-#: src/xml/xmli18n-tmp.h:4931
-msgid "Lanier MP 4000"
-msgstr "Lanier MP 4000"
+#: src/xml/xmli18n-tmp.h:7141
+msgid "Lanier MP 5000B/LD050B"
+msgstr "Lanier MP 5000B/LD050B"
 
-#: src/xml/xmli18n-tmp.h:4932
-msgid "Lanier LD040"
-msgstr "Lanier LD040"
+#: src/xml/xmli18n-tmp.h:7142
+msgid "Lanier MP 5000/LD050"
+msgstr "Lanier MP 5000/LD050"
 
-#: src/xml/xmli18n-tmp.h:4933
-msgid "Lanier MP 4500"
-msgstr "Lanier MP 4500"
+#: src/xml/xmli18n-tmp.h:7143
+msgid "Lanier MP 5500/LD255"
+msgstr "Lanier MP 5500/LD255"
 
-#: src/xml/xmli18n-tmp.h:4934
-msgid "Lanier LD345"
-msgstr "Lanier LD345"
+#: src/xml/xmli18n-tmp.h:7144
+msgid "Lanier MP 6500/LD265"
+msgstr "Lanier MP 6500/LD265"
 
-#: src/xml/xmli18n-tmp.h:4935
-msgid "Lanier MP 5000B"
-msgstr "Lanier MP 5000B"
+#: src/xml/xmli18n-tmp.h:7145
+msgid "Lanier MP 7500/LD275"
+msgstr "Lanier MP 7500/LD275"
 
-#: src/xml/xmli18n-tmp.h:4936
-msgid "Lanier LD050B"
-msgstr "Lanier LD050B"
+#: src/xml/xmli18n-tmp.h:7146
+msgid "Lanier MP 9000/LD190"
+msgstr "Lanier MP 9000/LD190"
 
-#: src/xml/xmli18n-tmp.h:4937
-msgid "Lanier MP 5000"
-msgstr "Lanier MP 5000"
-
-#: src/xml/xmli18n-tmp.h:4938
-msgid "Lanier LD050"
-msgstr "Lanier LD050"
-
-#: src/xml/xmli18n-tmp.h:4939
-msgid "Lanier MP 5500"
-msgstr "Lanier MP 5500"
-
-#: src/xml/xmli18n-tmp.h:4940
-msgid "Lanier LD255"
-msgstr "Lanier LD255"
-
-#: src/xml/xmli18n-tmp.h:4941
-msgid "Lanier MP 6500"
-msgstr "Lanier MP 6500"
-
-#: src/xml/xmli18n-tmp.h:4942
-msgid "Lanier LD265"
-msgstr "Lanier LD265"
-
-#: src/xml/xmli18n-tmp.h:4943
-msgid "Lanier MP 7500"
-msgstr "Lanier MP 7500"
-
-#: src/xml/xmli18n-tmp.h:4944
-msgid "Lanier LD275"
-msgstr "Lanier LD275"
-
-#: src/xml/xmli18n-tmp.h:4945
-msgid "Lanier MP 9000"
-msgstr "Lanier MP 9000"
-
-#: src/xml/xmli18n-tmp.h:4946
-msgid "Lanier LD190"
-msgstr "Lanier LD190"
-
-#: src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:7148
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/xml/xmli18n-tmp.h:4950
+#: src/xml/xmli18n-tmp.h:7150
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E220"
 
-#: src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:7151
 msgid "Lexmark Optra E321"
 msgstr "Lexmark Optra E321"
 
-#: src/xml/xmli18n-tmp.h:4952
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Lexmark Optra E323"
 msgstr "Lexmark Optra E323"
 
-#: src/xml/xmli18n-tmp.h:4953
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:7155
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/xml/xmli18n-tmp.h:4960
+#: src/xml/xmli18n-tmp.h:7160
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:7161
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:7162
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/xml/xmli18n-tmp.h:4963
+#: src/xml/xmli18n-tmp.h:7163
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:7164
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:7165
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/xml/xmli18n-tmp.h:4966
-msgid "NRG 10515"
-msgstr "NRG 10515"
-
-#: src/xml/xmli18n-tmp.h:4967
-msgid "NRG 10518"
-msgstr "NRG 10518"
-
-#: src/xml/xmli18n-tmp.h:4968
-msgid "NRG 10512"
-msgstr "NRG 10512"
-
-#: src/xml/xmli18n-tmp.h:4969
-msgid "NRG 2205"
-msgstr "NRG 2205"
-
-#: src/xml/xmli18n-tmp.h:4970
-msgid "NRG 2238"
-msgstr "NRG 2238"
-
-#: src/xml/xmli18n-tmp.h:4971
-msgid "NRG 2212"
-msgstr "NRG 2212"
+#: src/xml/xmli18n-tmp.h:7166
+msgid "NRG 10515/10518/10512"
+msgstr "NRG 10515/10518/10512"
 
-#: src/xml/xmli18n-tmp.h:4972
-msgid "NRG 2705"
-msgstr "NRG 2705"
+#: src/xml/xmli18n-tmp.h:7167
+msgid "NRG 2205/2238/2212"
+msgstr "NRG 2205/2238/2212"
 
-#: src/xml/xmli18n-tmp.h:4973
-msgid "NRG 2738"
-msgstr "NRG 2738"
+#: src/xml/xmli18n-tmp.h:7168
+msgid "NRG 2705/2738/2712"
+msgstr "NRG 2705/2738/2712"
 
-#: src/xml/xmli18n-tmp.h:4974
-msgid "NRG 2712"
-msgstr "NRG 2712"
+#: src/xml/xmli18n-tmp.h:7169
+msgid "NRG 3205/3238/3212"
+msgstr "NRG 3205/3238/3212"
 
-#: src/xml/xmli18n-tmp.h:4975
-msgid "NRG 3205"
-msgstr "NRG 3205"
+#: src/xml/xmli18n-tmp.h:7170
+msgid "NRG 3525/3508/3502"
+msgstr "NRG 3525/3508/3502"
 
-#: src/xml/xmli18n-tmp.h:4976
-msgid "NRG 3238"
-msgstr "NRG 3238"
+#: src/xml/xmli18n-tmp.h:7171
+msgid "NRG 3545/3518/3532"
+msgstr "NRG 3545/3518/3532"
 
-#: src/xml/xmli18n-tmp.h:4977
-msgid "NRG 3212"
-msgstr "NRG 3212"
+#: src/xml/xmli18n-tmp.h:7172
+msgid "NRG 4525/4508/4502"
+msgstr "NRG 4525/4508/4502"
 
-#: src/xml/xmli18n-tmp.h:4978
-msgid "NRG 3525"
-msgstr "NRG 3525"
+#: src/xml/xmli18n-tmp.h:7173
+msgid "NRG 4545/4518/4532"
+msgstr "NRG 4545/4518/4532"
 
-#: src/xml/xmli18n-tmp.h:4979
-msgid "NRG 3508"
-msgstr "NRG 3508"
+#: src/xml/xmli18n-tmp.h:7174
+msgid "NRG 6002/6005/6008"
+msgstr "NRG 6002/6005/6008"
 
-#: src/xml/xmli18n-tmp.h:4980
-msgid "NRG 3502"
-msgstr "NRG 3502"
+#: src/xml/xmli18n-tmp.h:7175
+msgid "NRG 7502/7505/7508"
+msgstr "NRG 7502/7505/7508"
 
-#: src/xml/xmli18n-tmp.h:4981
-msgid "NRG 3545"
-msgstr "NRG 3545"
+#: src/xml/xmli18n-tmp.h:7176
+msgid "NRG 9005/9008/9002"
+msgstr "NRG 9005/9008/9002"
 
-#: src/xml/xmli18n-tmp.h:4982
-msgid "NRG 3518"
-msgstr "NRG 3518"
-
-#: src/xml/xmli18n-tmp.h:4983
-msgid "NRG 3532"
-msgstr "NRG 3532"
-
-#: src/xml/xmli18n-tmp.h:4984
-msgid "NRG 4525"
-msgstr "NRG 4525"
-
-#: src/xml/xmli18n-tmp.h:4985
-msgid "NRG 4508"
-msgstr "NRG 4508"
-
-#: src/xml/xmli18n-tmp.h:4986
-msgid "NRG 4502"
-msgstr "NRG 4502"
-
-#: src/xml/xmli18n-tmp.h:4987
-msgid "NRG 4545"
-msgstr "NRG 4545"
-
-#: src/xml/xmli18n-tmp.h:4988
-msgid "NRG 4518"
-msgstr "NRG 4518"
-
-#: src/xml/xmli18n-tmp.h:4989
-msgid "NRG 4532"
-msgstr "NRG 4532"
-
-#: src/xml/xmli18n-tmp.h:4990
-msgid "NRG 6002"
-msgstr "NRG 6002"
-
-#: src/xml/xmli18n-tmp.h:4991
-msgid "NRG 6005"
-msgstr "NRG 6005"
-
-#: src/xml/xmli18n-tmp.h:4992
-msgid "NRG 6008"
-msgstr "NRG 6008"
-
-#: src/xml/xmli18n-tmp.h:4993
-msgid "NRG 7502"
-msgstr "NRG 7502"
-
-#: src/xml/xmli18n-tmp.h:4994
-msgid "NRG 7505"
-msgstr "NRG 7505"
-
-#: src/xml/xmli18n-tmp.h:4995
-msgid "NRG 7508"
-msgstr "NRG 7508"
-
-#: src/xml/xmli18n-tmp.h:4996
-msgid "NRG 9005"
-msgstr "NRG 9005"
-
-#: src/xml/xmli18n-tmp.h:4997
-msgid "NRG 9008"
-msgstr "NRG 9008"
-
-#: src/xml/xmli18n-tmp.h:4998
-msgid "NRG 9002"
-msgstr "NRG 9002"
-
-#: src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:7177
 msgid "NRG DSm415"
 msgstr "NRG DSm415"
 
-#: src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:7178
 msgid "NRG DSm615"
 msgstr "NRG DSm615"
 
-#: src/xml/xmli18n-tmp.h:5001
+#: src/xml/xmli18n-tmp.h:7179
 msgid "NRG DSm616"
 msgstr "NRG DSm616"
 
-#: src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:7180
 msgid "NRG DSm618"
 msgstr "NRG DSm618"
 
-#: src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:7181
 msgid "NRG DSm618d"
 msgstr "NRG DSm618d"
 
-#: src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:7182
 msgid "NRG DSm620"
 msgstr "NRG DSm620"
 
-#: src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:7183
 msgid "NRG DSm620d"
 msgstr "NRG DSm620d"
 
-#: src/xml/xmli18n-tmp.h:5006
+#: src/xml/xmli18n-tmp.h:7184
 msgid "NRG DSm622"
 msgstr "NRG DSm622"
 
-#: src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:7185
 msgid "NRG DSm627"
 msgstr "NRG DSm627"
 
-#: src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:7186
 msgid "NRG DSm632"
 msgstr "NRG DSm632"
 
-#: src/xml/xmli18n-tmp.h:5009
+#: src/xml/xmli18n-tmp.h:7187
 msgid "NRG DSm635"
 msgstr "NRG DSm635"
 
-#: src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:7188
 msgid "NRG DSm645"
 msgstr "NRG DSm645"
 
-#: src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:7189
 msgid "NRG DSm651"
 msgstr "NRG DSm651"
 
-#: src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:7190
 msgid "NRG DSm660"
 msgstr "NRG DSm660"
 
-#: src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:7191
 msgid "NRG DSm675"
 msgstr "NRG DSm675"
 
-#: src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:7192
 msgid "NRG DSm725"
 msgstr "NRG DSm725"
 
-#: src/xml/xmli18n-tmp.h:5015
+#: src/xml/xmli18n-tmp.h:7193
 msgid "NRG DSm730"
 msgstr "NRG DSm730"
 
-#: src/xml/xmli18n-tmp.h:5016
+#: src/xml/xmli18n-tmp.h:7194
 msgid "NRG DSm735"
 msgstr "NRG DSm735"
 
-#: src/xml/xmli18n-tmp.h:5017
+#: src/xml/xmli18n-tmp.h:7195
 msgid "NRG DSm745"
 msgstr "NRG DSm745"
 
-#: src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:7196
 msgid "NRG MP 1100"
 msgstr "NRG MP 1100"
 
-#: src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:7197
 msgid "NRG MP 1350"
 msgstr "NRG MP 1350"
 
-#: src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:7198
 msgid "NRG MP 1600"
 msgstr "NRG MP 1600"
 
-#: src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:7199
 msgid "NRG MP 161"
 msgstr "NRG MP 161"
 
-#: src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:7200
 msgid "NRG MP 2000"
 msgstr "NRG MP 2000"
 
-#: src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:7201
 msgid "NRG MP 2500"
 msgstr "NRG MP 2500"
 
-#: src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:7202
 msgid "NRG MP 2510"
 msgstr "NRG MP 2510"
 
-#: src/xml/xmli18n-tmp.h:5025
+#: src/xml/xmli18n-tmp.h:7203
 msgid "NRG MP 2550"
 msgstr "NRG MP 2550"
 
-#: src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:7204
 msgid "NRG MP 2550B"
 msgstr "NRG MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:7205
 msgid "NRG MP 3010"
 msgstr "NRG MP 3010"
 
-#: src/xml/xmli18n-tmp.h:5028
+#: src/xml/xmli18n-tmp.h:7206
 msgid "NRG MP 3350"
 msgstr "NRG MP 3350"
 
-#: src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:7207
 msgid "NRG MP 3350B"
 msgstr "NRG MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:7208
 msgid "NRG MP 3500"
 msgstr "NRG MP 3500"
 
-#: src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:7209
 msgid "NRG MP 4000"
 msgstr "NRG MP 4000"
 
-#: src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:7210
 msgid "NRG MP 4000B"
 msgstr "NRG MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:5033
+#: src/xml/xmli18n-tmp.h:7211
 msgid "NRG MP 4500"
 msgstr "NRG MP 4500"
 
-#: src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:7212
 msgid "NRG MP 5000"
 msgstr "NRG MP 5000"
 
-#: src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:7213
 msgid "NRG MP 5000B"
 msgstr "NRG MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:7214
 msgid "NRG MP 5500"
 msgstr "NRG MP 5500"
 
-#: src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:7215
 msgid "NRG MP 6500"
 msgstr "NRG MP 6500"
 
-#: src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:7216
 msgid "NRG MP 7500"
 msgstr "NRG MP 7500"
 
-#: src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:7217
 msgid "NRG MP 9000"
 msgstr "NRG MP 9000"
 
-#: src/xml/xmli18n-tmp.h:5040
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Oki OL400"
 msgstr "Oki OL400"
 
-#: src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Oki OL400e"
 msgstr "Oki OL400e"
 
-#: src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Oki OL400ex"
 msgstr "Oki OL400ex"
 
-#: src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Oki OL410e"
 msgstr "Oki OL410e"
 
-#: src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Oki OL600e"
 msgstr "Oki OL600e"
 
-#: src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Oki OL610e/S"
 msgstr "Oki OL610e/S"
 
-#: src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Oki OL800"
 msgstr "Oki OL800"
 
-#: src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Oki OL810ex"
 msgstr "Oki OL810ex"
 
-#: src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Oki Okipage 6e"
 msgstr "Oki Okipage 6e"
 
-#: src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Oki Okipage 6ex"
 msgstr "Oki Okipage 6ex"
 
-#: src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Oki Okipage 8p"
 msgstr "Oki Okipage 8p"
 
-#: src/xml/xmli18n-tmp.h:5051
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Oki Okipage 10e"
 msgstr "Oki Okipage 10e"
 
-#: src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Oki Okipage 10ex"
 msgstr "Oki Okipage 10ex"
 
-#: src/xml/xmli18n-tmp.h:5053
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Oki Okipage 14ex"
 msgstr "Oki Okipage 14ex"
 
-#: src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:7232
 msgid "Oki Super 6e"
 msgstr "Oki Super 6e"
 
-#: src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:7234
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:7235
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/xml/xmli18n-tmp.h:5060
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/xml/xmli18n-tmp.h:5062
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5063
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Ricoh Aficio 1022"
 msgstr "Ricoh Aficio 1022"
 
-#: src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:7242
 msgid "Ricoh Aficio 1027"
 msgstr "Ricoh Aficio 1027"
 
-#: src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:7243
 msgid "Ricoh Aficio 1032"
 msgstr "Ricoh Aficio 1032"
 
-#: src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:7244
 msgid "Ricoh Aficio 1035"
 msgstr "Ricoh Aficio 1035"
 
-#: src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:7245
 msgid "Ricoh Aficio 1045"
 msgstr "Ricoh Aficio 1045"
 
-#: src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:7246
 msgid "Ricoh Aficio 1060"
 msgstr "Ricoh Aficio 1060"
 
-#: src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:7247
 msgid "Ricoh Aficio 1075"
 msgstr "Ricoh Aficio 1075"
 
-#: src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:7248
 msgid "Ricoh Aficio 1515"
 msgstr "Ricoh Aficio 1515"
 
-#: src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:7249
 msgid "Ricoh Aficio 2015"
 msgstr "Ricoh Aficio 2015"
 
-#: src/xml/xmli18n-tmp.h:5072
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Ricoh Aficio 2016"
 msgstr "Ricoh Aficio 2016"
 
-#: src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Ricoh Aficio 2018"
 msgstr "Ricoh Aficio 2018"
 
-#: src/xml/xmli18n-tmp.h:5074
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Ricoh Aficio 2018D"
 msgstr "Ricoh Aficio 2018D"
 
-#: src/xml/xmli18n-tmp.h:5075
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Ricoh Aficio 2020"
 msgstr "Ricoh Aficio 2020"
 
-#: src/xml/xmli18n-tmp.h:5076
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Ricoh Aficio 2020D"
 msgstr "Ricoh Aficio 2020D"
 
-#: src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:7255
 msgid "Ricoh Aficio 2022"
 msgstr "Ricoh Aficio 2022"
 
-#: src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Ricoh Aficio 2027"
 msgstr "Ricoh Aficio 2027"
 
-#: src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Ricoh Aficio 2032"
 msgstr "Ricoh Aficio 2032"
 
-#: src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:7258
 msgid "Ricoh Aficio 2035"
 msgstr "Ricoh Aficio 2035"
 
-#: src/xml/xmli18n-tmp.h:5081
+#: src/xml/xmli18n-tmp.h:7259
 msgid "Ricoh Aficio 2035e"
 msgstr "Ricoh Aficio 2035e"
 
-#: src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Ricoh Aficio 2045"
 msgstr "Ricoh Aficio 2045"
 
-#: src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Ricoh Aficio 2045e"
 msgstr "Ricoh Aficio 2045e"
 
-#: src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Ricoh Aficio 2051"
 msgstr "Ricoh Aficio 2051"
 
-#: src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:7263
 msgid "Ricoh Aficio 2060"
 msgstr "Ricoh Aficio 2060"
 
-#: src/xml/xmli18n-tmp.h:5086
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Ricoh Aficio 2075"
 msgstr "Ricoh Aficio 2075"
 
-#: src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Ricoh Aficio 2090"
 msgstr "Ricoh Aficio 2090"
 
-#: src/xml/xmli18n-tmp.h:5088
+#: src/xml/xmli18n-tmp.h:7266
 msgid "Ricoh Aficio 2105"
 msgstr "Ricoh Aficio 2105"
 
-#: src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:7267
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5090
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Ricoh Aficio 3025"
 msgstr "Ricoh Aficio 3025"
 
-#: src/xml/xmli18n-tmp.h:5091
+#: src/xml/xmli18n-tmp.h:7269
 msgid "Ricoh Aficio 3030"
 msgstr "Ricoh Aficio 3030"
 
-#: src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:7270
 msgid "Ricoh Aficio 3035"
 msgstr "Ricoh Aficio 3035"
 
-#: src/xml/xmli18n-tmp.h:5093
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Ricoh Aficio 3045"
 msgstr "Ricoh Aficio 3045"
 
-#: src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Ricoh Aficio MP 1100"
 msgstr "Ricoh Aficio MP 1100"
 
-#: src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Ricoh Aficio MP 1350"
 msgstr "Ricoh Aficio MP 1350"
 
-#: src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Ricoh Aficio MP 1600"
 msgstr "Ricoh Aficio MP 1600"
 
-#: src/xml/xmli18n-tmp.h:5099
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Ricoh Aficio MP 161"
 msgstr "Ricoh Aficio MP 161"
 
-#: src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Ricoh Aficio MP 2000"
 msgstr "Ricoh Aficio MP 2000"
 
-#: src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Ricoh Aficio MP 2500"
 msgstr "Ricoh Aficio MP 2500"
 
-#: src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Ricoh Aficio MP 2510"
 msgstr "Ricoh Aficio MP 2510"
 
-#: src/xml/xmli18n-tmp.h:5103
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Ricoh Aficio MP 2550"
 msgstr "Ricoh Aficio MP 2550"
 
-#: src/xml/xmli18n-tmp.h:5104
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Ricoh Aficio MP 2550B"
 msgstr "Ricoh Aficio MP 2550B"
 
-#: src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Ricoh Aficio MP 3010"
 msgstr "Ricoh Aficio MP 3010"
 
-#: src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:7284
 msgid "Ricoh Aficio MP 3350"
 msgstr "Ricoh Aficio MP 3350"
 
-#: src/xml/xmli18n-tmp.h:5107
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Ricoh Aficio MP 3350B"
 msgstr "Ricoh Aficio MP 3350B"
 
-#: src/xml/xmli18n-tmp.h:5108
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Ricoh Aficio MP 3500"
 msgstr "Ricoh Aficio MP 3500"
 
-#: src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Ricoh Aficio MP 4000"
 msgstr "Ricoh Aficio MP 4000"
 
-#: src/xml/xmli18n-tmp.h:5110
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Ricoh Aficio MP 4000B"
 msgstr "Ricoh Aficio MP 4000B"
 
-#: src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Ricoh Aficio MP 4500"
 msgstr "Ricoh Aficio MP 4500"
 
-#: src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Ricoh Aficio MP 5000"
 msgstr "Ricoh Aficio MP 5000"
 
-#: src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Ricoh Aficio MP 5000B"
 msgstr "Ricoh Aficio MP 5000B"
 
-#: src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Ricoh Aficio MP 5500"
 msgstr "Ricoh Aficio MP 5500"
 
-#: src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Ricoh Aficio MP 6500"
 msgstr "Ricoh Aficio MP 6500"
 
-#: src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Ricoh Aficio MP 7500"
 msgstr "Ricoh Aficio MP 7500"
 
-#: src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Ricoh Aficio MP 9000"
 msgstr "Ricoh Aficio MP 9000"
 
-#: src/xml/xmli18n-tmp.h:5118
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Samsung ML-1250"
 msgstr "Samsung ML-1250"
 
-#: src/xml/xmli18n-tmp.h:5120
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Samsung ML-1450"
 msgstr "Samsung ML-1450"
 
-#: src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Samsung ML-1450PS"
 msgstr "Samsung ML-1450PS"
 
-#: src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Samsung ML-1650"
 msgstr "Samsung ML-1650"
 
-#: src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Samsung ML-1651N"
 msgstr "Samsung ML-1651N"
 
-#: src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Samsung ML-1750"
 msgstr "Samsung ML-1750"
 
-#: src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Samsung ML-2150"
 msgstr "Samsung ML-2150"
 
-#: src/xml/xmli18n-tmp.h:5126
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Samsung ML-2150PS"
 msgstr "Samsung ML-2150PS"
 
-#: src/xml/xmli18n-tmp.h:5127
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Samsung ML-2151N"
 msgstr "Samsung ML-2151N"
 
-#: src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Samsung ML-2151NPS"
 msgstr "Samsung ML-2151NPS"
 
-#: src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Samsung ML-2152W"
 msgstr "Samsung ML-2152W"
 
-#: src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Samsung ML-2152WPS"
 msgstr "Samsung ML-2152WPS"
 
-#: src/xml/xmli18n-tmp.h:5131
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Samsung ML-2250"
 msgstr "Samsung ML-2250"
 
-#: src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Samsung ML-2550"
 msgstr "Samsung ML-2550"
 
-#: src/xml/xmli18n-tmp.h:5133
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Samsung ML-2551N"
 msgstr "Samsung ML-2551N"
 
-#: src/xml/xmli18n-tmp.h:5134
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Samsung ML-2552W"
 msgstr "Samsung ML-2552W"
 
-#: src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/xml/xmli18n-tmp.h:5138
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Samsung ML-7300"
 msgstr "Samsung ML-7300"
 
-#: src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Samsung ML-7300N"
 msgstr "Samsung ML-7300N"
 
-#: src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/xml/xmli18n-tmp.h:5146
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/xml/xmli18n-tmp.h:5147
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Savin 2522"
 msgstr "Savin 2522"
 
-#: src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Savin 2527"
 msgstr "Savin 2527"
 
-#: src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Savin 2532"
 msgstr "Savin 2532"
 
-#: src/xml/xmli18n-tmp.h:5150
-msgid "Savin 2535"
-msgstr "Savin 2535"
-
-#: src/xml/xmli18n-tmp.h:5151
-msgid "Savin 2235"
-msgstr "Savin 2235"
-
-#: src/xml/xmli18n-tmp.h:5152
-msgid "Savin 2545"
-msgstr "Savin 2545"
+#: src/xml/xmli18n-tmp.h:7328
+msgid "Savin 2535/2235"
+msgstr "Savin 2535/2235"
 
-#: src/xml/xmli18n-tmp.h:5153
-msgid "Savin 2245"
-msgstr "Savin 2245"
+#: src/xml/xmli18n-tmp.h:7329
+msgid "Savin 2545/2245"
+msgstr "Savin 2545/2245"
 
-#: src/xml/xmli18n-tmp.h:5154
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Savin 2560"
 msgstr "Savin 2560"
 
-#: src/xml/xmli18n-tmp.h:5155
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Savin 2575"
 msgstr "Savin 2575"
 
-#: src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Savin 3515"
 msgstr "Savin 3515"
 
-#: src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Savin 40105"
 msgstr "Savin 40105"
 
-#: src/xml/xmli18n-tmp.h:5158
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Savin 4015"
 msgstr "Savin 4015"
 
-#: src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Savin 4018"
 msgstr "Savin 4018"
 
-#: src/xml/xmli18n-tmp.h:5160
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Savin 4018d"
 msgstr "Savin 4018d"
 
-#: src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Savin 4022"
 msgstr "Savin 4022"
 
-#: src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Savin 4027"
 msgstr "Savin 4027"
 
-#: src/xml/xmli18n-tmp.h:5163
-msgid "Savin 4035"
-msgstr "Savin 4035"
-
-#: src/xml/xmli18n-tmp.h:5164
-msgid "Savin 4135g"
-msgstr "Savin 4135g"
-
-#: src/xml/xmli18n-tmp.h:5165
-msgid "Savin 4035e"
-msgstr "Savin 4035e"
+#: src/xml/xmli18n-tmp.h:7339
+msgid "Savin 4035/4135g"
+msgstr "Savin 4035/4135g"
 
-#: src/xml/xmli18n-tmp.h:5166
-msgid "Savin 4135eG"
-msgstr "Savin 4135eG"
+#: src/xml/xmli18n-tmp.h:7340
+msgid "Savin 4035e/4135eG"
+msgstr "Savin 4035e/4135eG"
 
-#: src/xml/xmli18n-tmp.h:5167
-msgid "Savin 4045"
-msgstr "Savin 4045"
+#: src/xml/xmli18n-tmp.h:7341
+msgid "Savin 4045/4145g"
+msgstr "Savin 4045/4145g"
 
-#: src/xml/xmli18n-tmp.h:5168
-msgid "Savin 4145g"
-msgstr "Savin 4145g"
+#: src/xml/xmli18n-tmp.h:7342
+msgid "Savin 4045e/4145eG"
+msgstr "Savin 4045e/4145eG"
 
-#: src/xml/xmli18n-tmp.h:5169
-msgid "Savin 4045e"
-msgstr "Savin 4045e"
-
-#: src/xml/xmli18n-tmp.h:5170
-msgid "Savin 4145eG"
-msgstr "Savin 4145eG"
-
-#: src/xml/xmli18n-tmp.h:5171
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Savin 4051"
 msgstr "Savin 4051"
 
-#: src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Savin 4060"
 msgstr "Savin 4060"
 
-#: src/xml/xmli18n-tmp.h:5173
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Savin 4075"
 msgstr "Savin 4075"
 
-#: src/xml/xmli18n-tmp.h:5174
+#: src/xml/xmli18n-tmp.h:7346
 msgid "Savin 4090"
 msgstr "Savin 4090"
 
-#: src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Savin 7025"
 msgstr "Savin 7025"
 
-#: src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:7348
 msgid "Savin 8016"
 msgstr "Savin 8016"
 
-#: src/xml/xmli18n-tmp.h:5177
+#: src/xml/xmli18n-tmp.h:7349
 msgid "Savin 8020"
 msgstr "Savin 8020"
 
-#: src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Savin 8020d"
 msgstr "Savin 8020d"
 
-#: src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Savin 8025"
 msgstr "Savin 8025"
 
-#: src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Savin 8025e"
 msgstr "Savin 8025e"
 
-#: src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:7353
 msgid "Savin 8030"
 msgstr "Savin 8030"
 
-#: src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Savin 8030e"
 msgstr "Savin 8030e"
 
-#: src/xml/xmli18n-tmp.h:5183
-msgid "Savin 8035"
-msgstr "Savin 8035"
+#: src/xml/xmli18n-tmp.h:7355
+msgid "Savin 8035/8035g"
+msgstr "Savin 8035/8035g"
 
-#: src/xml/xmli18n-tmp.h:5184
-msgid "Savin 8035g"
-msgstr "Savin 8035g"
-
-#: src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Savin 8035e"
 msgstr "Savin 8035e"
 
-#: src/xml/xmli18n-tmp.h:5186
-msgid "Savin 8045"
-msgstr "Savin 8045"
-
-#: src/xml/xmli18n-tmp.h:5187
-msgid "Savin 8045g"
-msgstr "Savin 8045g"
+#: src/xml/xmli18n-tmp.h:7357
+msgid "Savin 8045/8045g"
+msgstr "Savin 8045/8045g"
 
-#: src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Savin 8045e"
 msgstr "Savin 8045e"
 
-#: src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Savin 8055"
 msgstr "Savin 8055"
 
-#: src/xml/xmli18n-tmp.h:5190
+#: src/xml/xmli18n-tmp.h:7360
 msgid "Savin 8065"
 msgstr "Savin 8065"
 
-#: src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Savin 8075"
 msgstr "Savin 8075"
 
-#: src/xml/xmli18n-tmp.h:5192
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Savin 8090"
 msgstr "Savin 8090"
 
-#: src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Savin 8110"
 msgstr "Savin 8110"
 
-#: src/xml/xmli18n-tmp.h:5194
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Savin 8135"
 msgstr "Savin 8135"
 
-#: src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Savin 816"
 msgstr "Savin 816"
 
-#: src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Savin 9016"
 msgstr "Savin 9016"
 
-#: src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Savin 9021d"
 msgstr "Savin 9021d"
 
-#: src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Savin 9025"
 msgstr "Savin 9025"
 
-#: src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Savin 9025b"
 msgstr "Savin 9025b"
 
-#: src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:7370
 msgid "Savin 9033"
 msgstr "Savin 9033"
 
-#: src/xml/xmli18n-tmp.h:5201
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Savin 9033b"
 msgstr "Savin 9033b"
 
-#: src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Savin 9040"
 msgstr "Savin 9040"
 
-#: src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:7373
 msgid "Savin 9040b"
 msgstr "Savin 9040b"
 
-#: src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:7374
 msgid "Savin 9050"
 msgstr "Savin 9050"
 
-#: src/xml/xmli18n-tmp.h:5205
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Savin 9050b"
 msgstr "Savin 9050b"
 
-#: src/xml/xmli18n-tmp.h:5206
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Sharp AR-M257"
 msgstr "Sharp AR-M257"
 
-#: src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:7379
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/xml/xmli18n-tmp.h:5211
+#: src/xml/xmli18n-tmp.h:7381
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/xml/xmli18n-tmp.h:5212
+#: src/xml/xmli18n-tmp.h:7382
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/xml/xmli18n-tmp.h:5213
+#: src/xml/xmli18n-tmp.h:7383
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/xml/xmli18n-tmp.h:5216
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/xml/xmli18n-tmp.h:5221
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox WorkCentre M118"
 
-#: src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Compaq IJ1200"
 msgstr "Compaq IJ1200"
 
-#: src/xml/xmli18n-tmp.h:5224
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Lexmark X73"
 msgstr "Lexmark X73"
 
-#: src/xml/xmli18n-tmp.h:5225
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:5227
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:5230
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:7404
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/xml/xmli18n-tmp.h:5236
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:7409
 msgid "Olympus P-S100"
 msgstr "Olympus P-S100"
 
-#: src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:7410
 msgid "Canon CP-10"
 msgstr "Canon CP-10"
 
-#: src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/xml/xmli18n-tmp.h:5244
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Canon SELPHY-CP-400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:5247
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Canon SELPHY-CP-500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Canon SELPHY-CP-510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:5249
+#: src/xml/xmli18n-tmp.h:7419
+msgid "Canon SELPHY-CP-520"
+msgstr "Canon SELPHY-CP-520"
+
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Canon SELPHY-CP-600"
 msgstr "Canon SELPHY-CP-600"
 
-#: src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Canon SELPHY-CP-710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Canon SELPHY-CP-720"
 msgstr "Canon SELPHY-CP-720"
 
-#: src/xml/xmli18n-tmp.h:5252
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Canon SELPHY-CP-730"
 msgstr "Canon SELPHY-CP-730"
 
-#: src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Canon SELPHY-CP-740"
 msgstr "Canon SELPHY-CP-740"
 
-#: src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Canon SELPHY-CP-750"
 msgstr "Canon SELPHY-CP-750"
 
-#: src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Canon SELPHY ES1"
 msgstr "Canon SELPHY ES1"
 
-#: src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Canon SELPHY ES2"
 msgstr "Canon SELPHY ES2"
 
-#: src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Canon SELPHY ES20"
 msgstr "Canon SELPHY ES20"
 
-#: src/xml/xmli18n-tmp.h:5258
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Sony DPP-EX5"
 msgstr "Sony DPP-EX5"
 
-#: src/xml/xmli18n-tmp.h:5259
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Sony DPP-EX7"
 msgstr "Sony DPP-EX7"
 
-#: src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR100"
 
-#: src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:7434
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm FinePix-NX-500"
 
-#: src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr "Kodak Easyshare-Printer-Dock"
 
-#: src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:7438
 msgid "Shinko CHC-S9045"
 msgstr "Shinko CHC-S9045"
 
-#: src/xml/xmli18n-tmp.h:5268
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Dai Nippon Printing DS40"
+msgstr "Dai Nippon Printing DS40"
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Dai Nippon Printing DS80"
+msgstr "Dai Nippon Printing DS80"
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "RAW DATA 16 bit"
 msgstr "RAW DATA 16 bit"
 
-#: src/xml/xmli18n-tmp.h:5269
+#: src/xml/xmli18n-tmp.h:7442
 msgid "RAW DATA 8 bit"
 msgstr "RAW DATA 8 bit"
diff --git a/po/pl.gmo b/po/pl.gmo
index 986c19c..317ce72 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 8dc1dc0..d90a603 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: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-21 22:25-0500\n"
+"POT-Creation-Date: 2009-07-26 19:14-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"
@@ -21,7 +21,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2109 src/main/print-pcl.c:1779
+#: src/main/print-escp2.c:2314 src/main/print-pcl.c:1779
 #, fuzzy
 msgid "Default"
 msgstr "Ustaw domy¶lne"
@@ -100,15 +100,15 @@ msgstr "Gêsto¶æ:"
 
 #: src/main/dither-main.c:91 src/main/print-canon.c:300
 #: src/main/print-canon.c:308 src/main/print-canon.c:316
-#: src/main/print-canon.c:324 src/main/print-escp2.c:439
-#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
-#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-canon.c:324 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: 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-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:1769
-#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
-#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1935
+#: src/main/print-olympus.c:1943 src/main/print-olympus.c:1951
+#: src/main/print-olympus.c:1959 src/main/print-pcl.c:1324
 #: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
 #: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
@@ -159,7 +159,7 @@ msgid "Dither algorithm"
 msgstr "Algorytm ditherowania"
 
 #: src/main/print-canon.c:199 src/main/print-escp2.c:165
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1866
 #: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
@@ -177,8 +177,8 @@ msgstr "Rozmiar"
 #: src/main/print-escp2.c:254 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:1704 src/main/print-olympus.c:1710
-#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-olympus.c:1866 src/main/print-olympus.c:1872
+#: src/main/print-olympus.c:1878 src/main/print-olympus.c:1884
 #: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
 #: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
 #: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
@@ -188,31 +188,31 @@ msgid "Basic Printer Setup"
 msgstr "Ustawienia drukarki"
 
 #: src/main/print-canon.c:200 src/main/print-escp2.c:166
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1867
 #: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr ""
 
 #: src/main/print-canon.c:205 src/main/print-escp2.c:171
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1259 src/cups/genppd.c:1339 src/cups/genppd.c:2001
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1872
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1372 src/cups/genppd.c:2035
 msgid "Media Type"
 msgstr ""
 
 #: src/main/print-canon.c:206 src/main/print-escp2.c:172
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1873
 #: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
 #: src/main/print-canon.c:211 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
-#: src/main/print-pcl.c:1265 src/cups/genppd.c:1368 src/cups/genppd.c:2020
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1878
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1401 src/cups/genppd.c:2054
 msgid "Media Source"
 msgstr ""
 
 #: src/main/print-canon.c:212 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1879
 #: src/main/print-pcl.c:1266
 msgid "Source (input slot) of the media"
 msgstr ""
@@ -248,8 +248,8 @@ msgstr ""
 #: src/main/print-canon.c:235 src/main/print-canon.c:241
 #: src/main/print-canon.c:253 src/main/print-escp2.c:207
 #: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1906
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
@@ -264,25 +264,25 @@ msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:247 src/main/print-escp2.c:219
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
-#: src/main/print-pcl.c:1277 src/cups/genppd.c:1446 src/cups/genppd.c:2056
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1884
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1479 src/cups/genppd.c:2090
 msgid "Resolution"
 msgstr "Rozdzielczo¶æ"
 
 #: src/main/print-canon.c:248 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1723
+#: src/main/print-olympus.c:1885
 msgid "Resolution and quality of the print"
 msgstr ""
 
 #: src/main/print-canon.c:253 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr ""
 
 #: src/main/print-canon.c:254 src/main/print-escp2.c:231
 #: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
+#: src/main/print-olympus.c:1891 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr ""
@@ -300,17 +300,18 @@ msgstr ""
 #: 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-escp2.c:320 src/main/print-escp2.c:767
-#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
-#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
-#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
-#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:893 src/main/print-escp2.c:901
+#: src/main/print-escp2.c:909 src/main/print-escp2.c:925
+#: src/main/print-escp2.c:933 src/main/print-escp2.c:941
+#: src/main/print-escp2.c:949 src/main/print-escp2.c:957
+#: src/main/print-escp2.c:965 src/main/print-escp2.c:973
 #: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:265 src/main/print-escp2.c:326
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-canon.c:265 src/main/print-escp2.c:332
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1912
 #: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
@@ -318,16 +319,16 @@ msgstr "Model drukarki:"
 
 #: src/main/print-canon.c:265 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:326
-#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-color.c:208 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1912 src/main/print-pcl.c:1295
 #: src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Zwyk³y papier"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:327
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-canon.c:266 src/main/print-escp2.c:333
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1913
 #: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
@@ -355,81 +356,88 @@ msgstr ""
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:300 src/main/print-escp2.c:439
+#: src/main/print-canon.c:300 src/main/print-escp2.c:445
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:301 src/main/print-escp2.c:446
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 msgid "Adjust the cyan density"
 msgstr ""
 
-#: src/main/print-canon.c:308 src/main/print-escp2.c:447
+#: src/main/print-canon.c:308 src/main/print-escp2.c:453
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Purpurowy"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:309 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 msgid "Adjust the magenta density"
 msgstr ""
 
-#: src/main/print-canon.c:316 src/main/print-escp2.c:455
+#: src/main/print-canon.c:316 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:317 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 msgid "Adjust the yellow density"
 msgstr ""
 
-#: src/main/print-canon.c:324 src/main/print-escp2.c:463
+#: src/main/print-canon.c:324 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 #, fuzzy
 msgid "Black Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-canon.c:325 src/main/print-escp2.c:464
+#: src/main/print-canon.c:325 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 msgid "Adjust the black density"
 msgstr ""
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:333
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:541 src/main/print-escp2.c:542
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 msgid "Light Cyan Transition"
 msgstr ""
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:340
-#: src/main/print-canon.c:348 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
-#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
-#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
-#: src/main/print-pcl.c:1364
+#: src/main/print-canon.c:348 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:541
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:557
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:573
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:589
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:605
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:621
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:637
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:653
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:669
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:685
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:701
+#: src/main/print-escp2.c:709 src/main/print-escp2.c:717
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:733
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:749
+#: src/main/print-escp2.c:757 src/main/print-escp2.c:765
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:781
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:797
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:813
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:829
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:845
+#: src/main/print-escp2.c:853 src/main/print-escp2.c:861
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:340 src/main/print-canon.c:341
-#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
+#: src/main/print-escp2.c:573 src/main/print-escp2.c:574
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 msgid "Light Magenta Transition"
@@ -439,14 +447,14 @@ msgstr ""
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:368 src/main/print-escp2.c:2283
-#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3609
-#: src/xml/xmli18n-tmp.h:3614 src/xml/xmli18n-tmp.h:3620
-#: src/xml/xmli18n-tmp.h:3627
+#: src/main/print-canon.c:368 src/main/print-escp2.c:2488
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5851 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5864
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:369 src/main/print-escp2.c:2285
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2490
 #: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
@@ -455,66 +463,67 @@ msgstr ""
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:646 src/main/print-escp2.c:2005
-#: src/xml/xmli18n-tmp.h:3676
+#: src/main/print-canon.c:646 src/main/print-escp2.c:2210
+#: src/xml/xmli18n-tmp.h:5913
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:648 src/main/print-escp2.c:2007
-#: src/xml/xmli18n-tmp.h:3677
+#: src/main/print-canon.c:648 src/main/print-escp2.c:2212
+#: src/xml/xmli18n-tmp.h:5914
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:650 src/main/print-escp2.c:2009
-#: src/xml/xmli18n-tmp.h:3678
+#: src/main/print-canon.c:650 src/main/print-escp2.c:2214
+#: src/xml/xmli18n-tmp.h:5915
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Automatycznie"
 
-#: src/main/print-canon.c:673 src/main/print-escp2.c:2034
-#: src/cups/genppd.c:1323 src/cups/genppd.c:1572 src/cups/genppd.c:1988
-#: src/cups/genppd.c:2079
+#: src/main/print-canon.c:673 src/main/print-escp2.c:2239
+#: src/cups/genppd.c:1356 src/cups/genppd.c:1605 src/cups/genppd.c:2022
+#: src/cups/genppd.c:2113
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:675 src/main/print-escp2.c:2036
+#: src/main/print-canon.c:675 src/main/print-escp2.c:2241
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Wydrukowaæ do pliku?"
 
-#: src/main/print-canon.c:790 src/main/print-escp2.c:2447
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-canon.c:790 src/main/print-escp2.c:2652
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2167
 #: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
 #: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Kolor"
 
-#: src/main/print-canon.c:792 src/main/print-escp2.c:2449
+#: src/main/print-canon.c:792 src/main/print-escp2.c:2654
 #: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
 #: src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr ""
 
-#: src/main/print-canon.c:831 src/main/print-escp2.c:2089
+#: src/main/print-canon.c:831 src/main/print-escp2.c:2294
 #: src/main/print-pcl.c:1797 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/main/print-canon.c:833 src/main/print-escp2.c:2131
-#: src/main/print-escp2.c:2229 src/main/print-escp2.c:2241
+#: src/main/print-canon.c:833 src/main/print-escp2.c:2336
+#: src/main/print-escp2.c:2434 src/main/print-escp2.c:2446
 #: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
 #: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
-#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1215
-#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1219
-#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
-#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3170
-#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3177
-#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3461
-#: src/xml/xmli18n-tmp.h:3464 src/xml/xmli18n-tmp.h:3632
-#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3648
-#: src/xml/xmli18n-tmp.h:3657 src/xml/xmli18n-tmp.h:3665
+#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1627 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3713 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3722 src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5902
 msgid "Standard"
 msgstr ""
 
@@ -553,7 +562,7 @@ msgid "Pre-Dithered"
 msgstr "Wydrukuj"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1268 src/cups/genppd.c:1971
+#: src/cups/genppd.c:1301 src/cups/genppd.c:2005
 msgid "Grayscale"
 msgstr "Odcienie szaro¶ci"
 
@@ -570,11 +579,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1299 src/cups/genppd.c:1978
+#: src/main/print-color.c:129 src/cups/genppd.c:1332 src/cups/genppd.c:2012
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1306 src/cups/genppd.c:1979
+#: src/main/print-color.c:131 src/cups/genppd.c:1339 src/cups/genppd.c:2013
 msgid "KCMY"
 msgstr ""
 
@@ -640,7 +649,7 @@ msgid "Output image type"
 msgstr "Typ wyj¶ciowy:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338
 msgid "Raw Channels"
 msgstr ""
 
@@ -706,56 +715,208 @@ msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
 #: src/escputil/escputil.c:997 src/escputil/escputil.c:1017
-#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:1812
-#: src/xml/xmli18n-tmp.h:1823 src/xml/xmli18n-tmp.h:1836
-#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1863
-#: src/xml/xmli18n-tmp.h:1876 src/xml/xmli18n-tmp.h:1889
-#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1918
-#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1949
-#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1975
-#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:1999
-#: src/xml/xmli18n-tmp.h:2013 src/xml/xmli18n-tmp.h:2027
-#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2051
-#: src/xml/xmli18n-tmp.h:2064 src/xml/xmli18n-tmp.h:2076
-#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2102
-#: src/xml/xmli18n-tmp.h:2116 src/xml/xmli18n-tmp.h:2130
-#: src/xml/xmli18n-tmp.h:2143 src/xml/xmli18n-tmp.h:2156
-#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2184
-#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2210
-#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2236
-#: src/xml/xmli18n-tmp.h:2249 src/xml/xmli18n-tmp.h:2262
-#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2290
-#: src/xml/xmli18n-tmp.h:2305 src/xml/xmli18n-tmp.h:2320
-#: src/xml/xmli18n-tmp.h:2332 src/xml/xmli18n-tmp.h:2343
-#: src/xml/xmli18n-tmp.h:2356 src/xml/xmli18n-tmp.h:2369
-#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2392
-#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2415
-#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2442
-#: src/xml/xmli18n-tmp.h:2454 src/xml/xmli18n-tmp.h:2466
-#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2496
-#: src/xml/xmli18n-tmp.h:2509 src/xml/xmli18n-tmp.h:2522
-#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
-#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2574
-#: src/xml/xmli18n-tmp.h:2586 src/xml/xmli18n-tmp.h:2598
-#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2623
-#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2653
-#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2683
-#: src/xml/xmli18n-tmp.h:2697 src/xml/xmli18n-tmp.h:2715
-#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2745
-#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
-#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2803
-#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2828
-#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2854
-#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2881
-#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2915
-#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2943
-#: src/xml/xmli18n-tmp.h:2959 src/xml/xmli18n-tmp.h:2976
-#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:3004
-#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3032
-#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3062
-#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3093
-#: src/xml/xmli18n-tmp.h:3107 src/xml/xmli18n-tmp.h:3125
-#: src/xml/xmli18n-tmp.h:3141
+#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2387
+#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2413
+#: src/xml/xmli18n-tmp.h:2426 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2499
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2551
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2575
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2708
+#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2786
+#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2814
+#: src/xml/xmli18n-tmp.h:2829 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2893
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2966
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3005 src/xml/xmli18n-tmp.h:3020
+#: src/xml/xmli18n-tmp.h:3033 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3061 src/xml/xmli18n-tmp.h:3073
+#: src/xml/xmli18n-tmp.h:3085 src/xml/xmli18n-tmp.h:3098
+#: src/xml/xmli18n-tmp.h:3110 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3377
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3616
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3648
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3766 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3775 src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:3794 src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:3805 src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3869 src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:3880 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3902 src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:3913 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:3948 src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:3970 src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:3983 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4023 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4064 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4075 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4088 src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:4103 src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:4118 src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:4143 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:4203 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4275 src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4309 src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4356 src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4421
+#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4449
+#: src/xml/xmli18n-tmp.h:4456 src/xml/xmli18n-tmp.h:4462
+#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4485 src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:4551 src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:4694 src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4717 src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:4818 src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:4829 src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4885 src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4935
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:5041 src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:5052 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:5121 src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5165
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5182 src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:5193 src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:5271 src/xml/xmli18n-tmp.h:5299
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5327 src/xml/xmli18n-tmp.h:5331
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5347
+#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5367 src/xml/xmli18n-tmp.h:5371
+#: src/xml/xmli18n-tmp.h:5383 src/xml/xmli18n-tmp.h:5388
+#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5440
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5461 src/xml/xmli18n-tmp.h:5468
+#: src/xml/xmli18n-tmp.h:5476 src/xml/xmli18n-tmp.h:5486
+#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5514
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5525
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5543
+#: src/xml/xmli18n-tmp.h:5550 src/xml/xmli18n-tmp.h:5556
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5574 src/xml/xmli18n-tmp.h:5582
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5592
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5625
+#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5649
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5662
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5690
+#: src/xml/xmli18n-tmp.h:5694 src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5731
+#: src/xml/xmli18n-tmp.h:5738 src/xml/xmli18n-tmp.h:5742
+#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5759
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5770
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5807
+#: src/xml/xmli18n-tmp.h:5811 src/xml/xmli18n-tmp.h:5817
+#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5828
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5843
 msgid "Cyan"
 msgstr "Niebieskozielony"
 
@@ -765,56 +926,208 @@ msgstr ""
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
 #: src/escputil/escputil.c:998 src/escputil/escputil.c:1018
-#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:1813
-#: src/xml/xmli18n-tmp.h:1824 src/xml/xmli18n-tmp.h:1837
-#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1864
-#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1890
-#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1919
-#: src/xml/xmli18n-tmp.h:1935 src/xml/xmli18n-tmp.h:1950
-#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1976
-#: src/xml/xmli18n-tmp.h:1988 src/xml/xmli18n-tmp.h:2000
-#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2028
-#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2052
-#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2077
-#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2103
-#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2131
-#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2157
-#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2185
-#: src/xml/xmli18n-tmp.h:2198 src/xml/xmli18n-tmp.h:2211
-#: src/xml/xmli18n-tmp.h:2224 src/xml/xmli18n-tmp.h:2237
-#: src/xml/xmli18n-tmp.h:2250 src/xml/xmli18n-tmp.h:2263
-#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2291
-#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2321
-#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2344
-#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2370
-#: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2393
-#: src/xml/xmli18n-tmp.h:2405 src/xml/xmli18n-tmp.h:2416
-#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2443
-#: src/xml/xmli18n-tmp.h:2455 src/xml/xmli18n-tmp.h:2467
-#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2497
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2523
-#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2575
-#: src/xml/xmli18n-tmp.h:2587 src/xml/xmli18n-tmp.h:2599
-#: src/xml/xmli18n-tmp.h:2611 src/xml/xmli18n-tmp.h:2624
-#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
-#: src/xml/xmli18n-tmp.h:2670 src/xml/xmli18n-tmp.h:2684
-#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2714
-#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2747
-#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2780
-#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
-#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2829
-#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2855
-#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2882
-#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2914
-#: src/xml/xmli18n-tmp.h:2931 src/xml/xmli18n-tmp.h:2944
-#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2975
-#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:3005
-#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3033
-#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3060
-#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3094
-#: src/xml/xmli18n-tmp.h:3108 src/xml/xmli18n-tmp.h:3124
-#: src/xml/xmli18n-tmp.h:3140
+#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2361
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2388
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2414
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2459 src/xml/xmli18n-tmp.h:2474
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2512 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2552
+#: src/xml/xmli18n-tmp.h:2564 src/xml/xmli18n-tmp.h:2576
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2787
+#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2815
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2868
+#: src/xml/xmli18n-tmp.h:2881 src/xml/xmli18n-tmp.h:2894
+#: src/xml/xmli18n-tmp.h:2905 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:2967
+#: src/xml/xmli18n-tmp.h:2979 src/xml/xmli18n-tmp.h:2991
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3062 src/xml/xmli18n-tmp.h:3074
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3099
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3135 src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:3163 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3353
+#: src/xml/xmli18n-tmp.h:3365 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
+#: src/xml/xmli18n-tmp.h:3420 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3542 src/xml/xmli18n-tmp.h:3556
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3600 src/xml/xmli18n-tmp.h:3617
+#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3647
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3751 src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:3784 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3795 src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:3806 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3837 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3903 src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3939 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3960 src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:3972 src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:3984 src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:3999 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:4039 src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:4104 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:4170 src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4194 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:4230 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:4276 src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4311 src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4338 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:4401 src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:4427 src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:4442 src/xml/xmli18n-tmp.h:4451
+#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4464
+#: src/xml/xmli18n-tmp.h:4470 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4486 src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:4511 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:4809 src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4909 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:5007 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5018 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5111 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5123 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5148 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:5240 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5250 src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:5261 src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5301
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5313
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5349
+#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5401
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5441
+#: src/xml/xmli18n-tmp.h:5453 src/xml/xmli18n-tmp.h:5458
+#: src/xml/xmli18n-tmp.h:5463 src/xml/xmli18n-tmp.h:5470
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5496 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5527
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5552 src/xml/xmli18n-tmp.h:5558
+#: src/xml/xmli18n-tmp.h:5564 src/xml/xmli18n-tmp.h:5568
+#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5593
+#: src/xml/xmli18n-tmp.h:5598 src/xml/xmli18n-tmp.h:5616
+#: src/xml/xmli18n-tmp.h:5620 src/xml/xmli18n-tmp.h:5626
+#: src/xml/xmli18n-tmp.h:5631 src/xml/xmli18n-tmp.h:5651
+#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
+#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5674
+#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5720
+#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5733
+#: src/xml/xmli18n-tmp.h:5739 src/xml/xmli18n-tmp.h:5743
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5818
+#: src/xml/xmli18n-tmp.h:5823 src/xml/xmli18n-tmp.h:5829
+#: src/xml/xmli18n-tmp.h:5833 src/xml/xmli18n-tmp.h:5839
+#: src/xml/xmli18n-tmp.h:5844
 msgid "Magenta"
 msgstr "Purpurowy"
 
@@ -824,56 +1137,208 @@ msgstr ""
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
 #: src/escputil/escputil.c:999 src/escputil/escputil.c:1019
-#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:1814
-#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
-#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1865
-#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1891
-#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1920
-#: src/xml/xmli18n-tmp.h:1936 src/xml/xmli18n-tmp.h:1951
-#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1977
-#: src/xml/xmli18n-tmp.h:1989 src/xml/xmli18n-tmp.h:2001
-#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2029
-#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2053
-#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2078
-#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2104
-#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
-#: src/xml/xmli18n-tmp.h:2145 src/xml/xmli18n-tmp.h:2158
-#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2186
-#: src/xml/xmli18n-tmp.h:2199 src/xml/xmli18n-tmp.h:2212
-#: src/xml/xmli18n-tmp.h:2225 src/xml/xmli18n-tmp.h:2238
-#: src/xml/xmli18n-tmp.h:2251 src/xml/xmli18n-tmp.h:2264
-#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2292
-#: src/xml/xmli18n-tmp.h:2307 src/xml/xmli18n-tmp.h:2322
-#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
-#: src/xml/xmli18n-tmp.h:2358 src/xml/xmli18n-tmp.h:2371
-#: src/xml/xmli18n-tmp.h:2382 src/xml/xmli18n-tmp.h:2394
-#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2417
-#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2444
-#: src/xml/xmli18n-tmp.h:2456 src/xml/xmli18n-tmp.h:2468
-#: src/xml/xmli18n-tmp.h:2483 src/xml/xmli18n-tmp.h:2498
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2524
-#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2551
-#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2576
-#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
-#: src/xml/xmli18n-tmp.h:2612 src/xml/xmli18n-tmp.h:2625
-#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2651
-#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2685
-#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2713
-#: src/xml/xmli18n-tmp.h:2734 src/xml/xmli18n-tmp.h:2749
-#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2779
-#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2805
-#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2830
-#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2856
-#: src/xml/xmli18n-tmp.h:2871 src/xml/xmli18n-tmp.h:2883
-#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2910
-#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2945
-#: src/xml/xmli18n-tmp.h:2960 src/xml/xmli18n-tmp.h:2974
-#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3006
-#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3034
-#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3061
-#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3095
-#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3120
-#: src/xml/xmli18n-tmp.h:3136
+#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2389
+#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2444
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2475
+#: src/xml/xmli18n-tmp.h:2488 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2513 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2565 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2602
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2762
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2788
+#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2816
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2846
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2906 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3022
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3048
+#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3075
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3124
+#: src/xml/xmli18n-tmp.h:3136 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3175
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3315 src/xml/xmli18n-tmp.h:3329
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3433
+#: src/xml/xmli18n-tmp.h:3455 src/xml/xmli18n-tmp.h:3468
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3497
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3601 src/xml/xmli18n-tmp.h:3618
+#: src/xml/xmli18n-tmp.h:3632 src/xml/xmli18n-tmp.h:3643
+#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3747 src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3834 src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:3844 src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:3867 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:3900 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3910 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3935 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:3967 src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:3979 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4005 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4062 src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4110 src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:4124 src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4167 src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:4272 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:4321 src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:4334 src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4367 src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4471
+#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4505 src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4549 src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:4562 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4580 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4602 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:4678 src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:4691 src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4770 src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4893 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4904 src/xml/xmli18n-tmp.h:4911
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:4971 src/xml/xmli18n-tmp.h:4978
+#: src/xml/xmli18n-tmp.h:5004 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5050 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5071 src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:5097 src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:5142 src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:5169 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5184
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5257 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5318
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5358
+#: src/xml/xmli18n-tmp.h:5364 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5385
+#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5438
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5454
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5465
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5511
+#: src/xml/xmli18n-tmp.h:5516 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5547 src/xml/xmli18n-tmp.h:5554
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5584 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5617 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5632
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5687
+#: src/xml/xmli18n-tmp.h:5692 src/xml/xmli18n-tmp.h:5698
+#: src/xml/xmli18n-tmp.h:5705 src/xml/xmli18n-tmp.h:5713
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5729
+#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
+#: src/xml/xmli18n-tmp.h:5744 src/xml/xmli18n-tmp.h:5756
+#: src/xml/xmli18n-tmp.h:5761 src/xml/xmli18n-tmp.h:5767
+#: src/xml/xmli18n-tmp.h:5774 src/xml/xmli18n-tmp.h:5782
+#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5792
+#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5803
+#: src/xml/xmli18n-tmp.h:5809 src/xml/xmli18n-tmp.h:5813
+#: src/xml/xmli18n-tmp.h:5819 src/xml/xmli18n-tmp.h:5824
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5845
 msgid "Yellow"
 msgstr "¯ó³æ"
 
@@ -883,9 +1348,17 @@ msgstr ""
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
 #: src/escputil/escputil.c:1006 src/escputil/escputil.c:1025
-#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2700
-#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2795
-#: src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:4041 src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:4056 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4091 src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:4155 src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5155
 msgid "Red"
 msgstr ""
 
@@ -903,8 +1376,13 @@ msgstr ""
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
 #: src/escputil/escputil.c:1007 src/escputil/escputil.c:1026
-#: src/xml/xmli18n-tmp.h:2657 src/xml/xmli18n-tmp.h:2701
-#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4051 src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:4084 src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:5156
 msgid "Blue"
 msgstr ""
 
@@ -915,53 +1393,183 @@ msgstr ""
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
 #: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1016 src/escputil/escputil.c:1285
-#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
-#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
-#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1875
-#: src/xml/xmli18n-tmp.h:1888 src/xml/xmli18n-tmp.h:1901
-#: src/xml/xmli18n-tmp.h:1917 src/xml/xmli18n-tmp.h:1933
-#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1961
-#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1986
-#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2012
-#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2038
-#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2063
-#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2090
-#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2115
-#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2142
-#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2169
-#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
-#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
-#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2248
-#: src/xml/xmli18n-tmp.h:2261 src/xml/xmli18n-tmp.h:2274
-#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2304
-#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2331
-#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
-#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
-#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2403
-#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2420
-#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2441
-#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2465
-#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2495
-#: src/xml/xmli18n-tmp.h:2508 src/xml/xmli18n-tmp.h:2521
-#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
-#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2573
-#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2597
-#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2622
-#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2672
-#: src/xml/xmli18n-tmp.h:2682 src/xml/xmli18n-tmp.h:2731
-#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2764
-#: src/xml/xmli18n-tmp.h:2781 src/xml/xmli18n-tmp.h:2794
-#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2815
-#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2839
-#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2868
-#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2894
-#: src/xml/xmli18n-tmp.h:2911 src/xml/xmli18n-tmp.h:2929
-#: src/xml/xmli18n-tmp.h:2942 src/xml/xmli18n-tmp.h:2977
-#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:3003
-#: src/xml/xmli18n-tmp.h:3017 src/xml/xmli18n-tmp.h:3031
-#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3079
-#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3110
-#: src/xml/xmli18n-tmp.h:3121 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2372
+#: src/xml/xmli18n-tmp.h:2386 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2457
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2510
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2536
+#: src/xml/xmli18n-tmp.h:2550 src/xml/xmli18n-tmp.h:2562
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2599 src/xml/xmli18n-tmp.h:2614
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2639
+#: src/xml/xmli18n-tmp.h:2653 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2965
+#: src/xml/xmli18n-tmp.h:2977 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3019
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3060 src/xml/xmli18n-tmp.h:3072
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3133 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3196
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3526
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3680 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3755 src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:3804 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3819 src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:3831 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3846 src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3873 src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:3924 src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:3943 src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:4022 src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4059 src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:4142 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4164 src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:4179 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:4255 src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4289 src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:4308 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4413 src/xml/xmli18n-tmp.h:4420
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4455
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4507 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:4565 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:4604 src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:4702 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:4733 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:4786 src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4920 src/xml/xmli18n-tmp.h:4926
+#: src/xml/xmli18n-tmp.h:4934 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:4973 src/xml/xmli18n-tmp.h:4981
+#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:4993
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:5047 src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5151
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5186
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5223 src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5270
+#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5284
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5320
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5337
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5375
+#: src/xml/xmli18n-tmp.h:5378 src/xml/xmli18n-tmp.h:5380
+#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5435
+#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5447
+#: src/xml/xmli18n-tmp.h:5449 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5474
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5492
+#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5571
+#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5590
+#: src/xml/xmli18n-tmp.h:5596 src/xml/xmli18n-tmp.h:5602
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5614
+#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5629
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5655
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5680 src/xml/xmli18n-tmp.h:5682
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5700
+#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5716
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5749
+#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5769 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5794
+#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5806
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5836
+#: src/xml/xmli18n-tmp.h:5842
 msgid "Black"
 msgstr "Czarny"
 
@@ -969,7 +1577,7 @@ msgstr "Czarny"
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1769
+#: src/main/print-color.c:322 src/main/print-olympus.c:1935
 msgid "Cyan Balance"
 msgstr ""
 
@@ -983,7 +1591,7 @@ msgstr "Odcienie szaro¶ci"
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1777
+#: src/main/print-color.c:330 src/main/print-olympus.c:1943
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Purpurowy"
@@ -992,7 +1600,7 @@ msgstr "Purpurowy"
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1785
+#: src/main/print-color.c:338 src/main/print-olympus.c:1951
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "¯ó³æ"
@@ -1020,11 +1628,11 @@ msgstr "Typ tuszu:"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
-#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
-#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
-#: src/main/print-escp2.c:759
+#: src/main/print-escp2.c:344 src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356 src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368 src/main/print-escp2.c:374
+#: src/main/print-escp2.c:869 src/main/print-escp2.c:877
+#: src/main/print-escp2.c:885
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Typ wyj¶ciowy:"
@@ -1033,27 +1641,27 @@ msgstr "Typ wyj¶ciowy:"
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:743
+#: src/main/print-color.c:365 src/main/print-escp2.c:869
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:744
+#: src/main/print-color.c:366 src/main/print-escp2.c:870
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:751
+#: src/main/print-color.c:373 src/main/print-escp2.c:877
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:752
+#: src/main/print-color.c:374 src/main/print-escp2.c:878
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:759
+#: src/main/print-color.c:381 src/main/print-escp2.c:885
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:760
+#: src/main/print-color.c:382 src/main/print-escp2.c:886
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -1321,11 +1929,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1906
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1907
 msgid "Print without borders"
 msgstr ""
 
@@ -1338,7 +1946,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:266 src/main/print-escp2.c:267
-#: src/cups/genppd.c:1567 src/cups/genppd.c:2078
+#: src/cups/genppd.c:1600 src/cups/genppd.c:2112
 #, fuzzy
 msgid "Output Order"
 msgstr "Typ wyj¶ciowy:"
@@ -1381,358 +1989,467 @@ msgstr ""
 
 #: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 #, fuzzy
+msgid "Raw Channel Names"
+msgstr "Anuluj"
+
+#: src/main/print-escp2.c:326 src/main/print-escp2.c:327
+#, fuzzy
 msgid "Channel Names"
 msgstr "Anuluj"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:339
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:344
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Niebieskozielony"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:345
 msgid "Adjust the cyan map"
 msgstr ""
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Purpurowy"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:351
 msgid "Adjust the magenta map"
 msgstr ""
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356
 #, fuzzy
 msgid "Yellow Map"
 msgstr "¯ó³æ"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:357
 msgid "Adjust the yellow map"
 msgstr ""
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362
 #, fuzzy
 msgid "Blue Map"
 msgstr "¯ó³æ"
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:363
 msgid "Adjust the blue map"
 msgstr ""
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368
 #, fuzzy
 msgid "Orange Map"
 msgstr "Niebieskozielony"
 
-#: src/main/print-escp2.c:363
+#: src/main/print-escp2.c:369
 msgid "Adjust the orange map"
 msgstr ""
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:374
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:369
+#: src/main/print-escp2.c:375
 msgid "Adjust the red map"
 msgstr ""
 
-#: src/main/print-escp2.c:471
+#: src/main/print-escp2.c:477
 #, fuzzy
 msgid "Red Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:478
 msgid "Adjust the red density"
 msgstr ""
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:485
 #, fuzzy
 msgid "Blue Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:486
 msgid "Adjust the blue density"
 msgstr ""
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:493
 #, fuzzy
 msgid "Orange Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-escp2.c:488
+#: src/main/print-escp2.c:494
 msgid "Adjust the orange density"
 msgstr ""
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:501
 msgid "Gloss Level"
 msgstr ""
 
-#: src/main/print-escp2.c:496
+#: src/main/print-escp2.c:502
 msgid "Adjust the gloss level"
 msgstr ""
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:509
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:504
+#: src/main/print-escp2.c:510
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:517
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:512
+#: src/main/print-escp2.c:518
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:525
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:520
+#: src/main/print-escp2.c:526
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:534
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "Purpurowy"
 
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:550
 msgid "Light Cyan Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
+#: src/main/print-escp2.c:557 src/main/print-escp2.c:558
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "Purpurowy"
 
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:566
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "Purpurowy"
 
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:582
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "¯ó³æ"
 
-#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
+#: src/main/print-escp2.c:589 src/main/print-escp2.c:590
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:598
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "¯ó³æ"
 
-#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
+#: src/main/print-escp2.c:605 src/main/print-escp2.c:606
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:630
 #, fuzzy
 msgid "Gray Value"
 msgstr "Odcienie szaro¶ci"
 
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
-#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:614
+#: src/main/print-escp2.c:637 src/main/print-escp2.c:638
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
+#: src/main/print-escp2.c:621 src/main/print-escp2.c:622
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:646
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "Odcienie szaro¶ci"
 
-#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
+#: src/main/print-escp2.c:653 src/main/print-escp2.c:654
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:726
 msgid "Light Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
-#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:662
+#: src/main/print-escp2.c:733 src/main/print-escp2.c:734
 msgid "Light Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
-#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
+#: src/main/print-escp2.c:669 src/main/print-escp2.c:670
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:742
 msgid "Light Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:678
 msgid "Dark Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
+#: src/main/print-escp2.c:685 src/main/print-escp2.c:686
 msgid "Dark Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:694
 msgid "Dark Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:701
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "Odcienie szaro¶ci"
 
-#: src/main/print-escp2.c:696
+#: src/main/print-escp2.c:702
 msgid "Medium Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:709
 msgid "Mid Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:704
+#: src/main/print-escp2.c:710
 msgid "Medium Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:717
 msgid "Mid Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:712
+#: src/main/print-escp2.c:718
 msgid "Medium Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:767
+#: src/main/print-escp2.c:749
+#, fuzzy
+msgid "Hextone Gray 5 Value"
+msgstr "Odcienie szaro¶ci"
+
+#: src/main/print-escp2.c:750
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:757
+msgid "Hextone Gray 5 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:758
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:765
+#, fuzzy
+msgid "Hextone Gray 5 Density Scale"
+msgstr "Odcienie szaro¶ci"
+
+#: src/main/print-escp2.c:766
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr "Odcienie szaro¶ci"
+
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:774
+#, fuzzy
+msgid "Hextone Gray 4 Value"
+msgstr "Odcienie szaro¶ci"
+
+#: src/main/print-escp2.c:781 src/main/print-escp2.c:782
+msgid "Hextone Gray 4 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:790
+#, fuzzy
+msgid "Hextone Gray 4 Density Scale"
+msgstr "Odcienie szaro¶ci"
+
+#: src/main/print-escp2.c:797 src/main/print-escp2.c:798
+#, fuzzy
+msgid "Hextone Gray 3 Value"
+msgstr "Odcienie szaro¶ci"
+
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:806
+msgid "Hextone Gray 3 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:813 src/main/print-escp2.c:814
+#, fuzzy
+msgid "Hextone Gray 3 Density Scale"
+msgstr "Odcienie szaro¶ci"
+
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:822
+#, fuzzy
+msgid "Hextone Gray 2 Value"
+msgstr "Odcienie szaro¶ci"
+
+#: src/main/print-escp2.c:829 src/main/print-escp2.c:830
+msgid "Hextone Gray 2 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:838
+#, fuzzy
+msgid "Hextone Gray 2 Density Scale"
+msgstr "Odcienie szaro¶ci"
+
+#: src/main/print-escp2.c:845
+#, fuzzy
+msgid "Hextone Gray 1 Value"
+msgstr "Odcienie szaro¶ci"
+
+#: src/main/print-escp2.c:846
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:853
+msgid "Hextone Gray 1 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:854
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:861
+#, fuzzy
+msgid "Hextone Gray 1 Density Scale"
+msgstr "Odcienie szaro¶ci"
+
+#: src/main/print-escp2.c:862
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr "Purpurowy"
+
+#: src/main/print-escp2.c:893
 msgid "Drying Time Per Page"
 msgstr ""
 
-#: src/main/print-escp2.c:768
+#: src/main/print-escp2.c:894
 msgid "Set drying time per page"
 msgstr ""
 
-#: src/main/print-escp2.c:775
+#: src/main/print-escp2.c:901
 msgid "Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:776
+#: src/main/print-escp2.c:902
 msgid "Set drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:783
+#: src/main/print-escp2.c:909
 msgid "Minimum Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:784
+#: src/main/print-escp2.c:910
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:799
+#: src/main/print-escp2.c:925
+msgid "Quality Enhancement"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Enhance print quality by additional passes"
+msgstr ""
+
+#: src/main/print-escp2.c:933
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "Rozmiar"
 
-#: src/main/print-escp2.c:800
+#: src/main/print-escp2.c:934
 #, fuzzy
 msgid "Set printer paper thickness"
 msgstr "Ustaw domy¶lne"
 
-#: src/main/print-escp2.c:807
+#: src/main/print-escp2.c:941
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-escp2.c:808
+#: src/main/print-escp2.c:942
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:815
+#: src/main/print-escp2.c:949
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:816
+#: src/main/print-escp2.c:950
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:823
+#: src/main/print-escp2.c:957
 #, fuzzy
 msgid "Print Method"
 msgstr "Model drukarki:"
 
-#: src/main/print-escp2.c:824
+#: src/main/print-escp2.c:958
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:831
+#: src/main/print-escp2.c:965
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Zwyk³y papier"
 
-#: src/main/print-escp2.c:832
+#: src/main/print-escp2.c:966
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:839
+#: src/main/print-escp2.c:973
 msgid "Feed Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:840
-#, c-format
+#: src/main/print-escp2.c:975
+#, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:1992
+#: src/main/print-escp2.c:2197
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/main/print-escp2.c:1994
+#: src/main/print-escp2.c:2199
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2208 src/cups/genppd.c:1484 src/cups/genppd.c:2059
+#: src/main/print-escp2.c:2413 src/cups/genppd.c:1517 src/cups/genppd.c:2093
 #, fuzzy
 msgid "Automatic"
 msgstr "Rozmiar"
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2415
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2417
 #, fuzzy
 msgid "Unidirectional"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-escp2.c:2243
+#: src/main/print-escp2.c:2448
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2450
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2452
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2454
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2456
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2287
+#: src/main/print-escp2.c:2492
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:2858
+#: src/main/print-escp2.c:3100
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:4107 src/main/print-olympus.c:2472
+#: src/main/print-escp2.c:4355 src/main/print-olympus.c:2641
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1786,361 +2503,378 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3205
-#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3217
-#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3233
-#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3255
-#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3276
-#: src/xml/xmli18n-tmp.h:3288 src/xml/xmli18n-tmp.h:3295
-#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3315
-#: src/xml/xmli18n-tmp.h:3327 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3368
-#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3380
-#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
-#: src/xml/xmli18n-tmp.h:3412 src/xml/xmli18n-tmp.h:3424
-#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3444
-#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3472
-#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3496
-#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3521
-#: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3544
-#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3556
-#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3581
-#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3598
-#: src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3754 src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:3809 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3863 src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:4058 src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:4163 src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:4227 src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:4335 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4467 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4594 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:4879 src/xml/xmli18n-tmp.h:4946
+#: src/xml/xmli18n-tmp.h:5000 src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:5243 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5365 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5512 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5667 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5784 src/xml/xmli18n-tmp.h:5805
+#: src/xml/xmli18n-tmp.h:5826
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3206
-#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3218
-#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3234
-#: src/xml/xmli18n-tmp.h:3244 src/xml/xmli18n-tmp.h:3251
-#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3268
-#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3289
-#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3306
-#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
-#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3354
-#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3377
-#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3389
-#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3413
-#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3435
-#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3455
-#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3485
-#: src/xml/xmli18n-tmp.h:3497 src/xml/xmli18n-tmp.h:3508
-#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3537
-#: src/xml/xmli18n-tmp.h:3545 src/xml/xmli18n-tmp.h:3549
-#: src/xml/xmli18n-tmp.h:3557 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3593
-#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3605
+#: src/xml/xmli18n-tmp.h:3759 src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3868 src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:4002 src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:4107 src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4472
+#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4817 src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5181 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5315 src/xml/xmli18n-tmp.h:5370
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5672
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5831
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3241
-#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3265
-#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3286
-#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
-#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3351
-#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3374
-#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3398
-#: src/xml/xmli18n-tmp.h:3410 src/xml/xmli18n-tmp.h:3422
-#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3452
-#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3470
-#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3494
-#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3519
-#: src/xml/xmli18n-tmp.h:3534 src/xml/xmli18n-tmp.h:3542
-#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3741 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4086 src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4933
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5421
+#: src/xml/xmli18n-tmp.h:5499 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5723
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3242
-#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3266
-#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3287
-#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3326
-#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3352
-#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3375
-#: src/xml/xmli18n-tmp.h:3387 src/xml/xmli18n-tmp.h:3399
-#: src/xml/xmli18n-tmp.h:3411 src/xml/xmli18n-tmp.h:3423
-#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3453
-#: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3483
-#: src/xml/xmli18n-tmp.h:3495 src/xml/xmli18n-tmp.h:3506
-#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3535
-#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3566
-#: src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3748 src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:3989 src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:4094 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4267 src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4940
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5661
+#: src/xml/xmli18n-tmp.h:5730
 msgid "Five Color Photo Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
-#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
-#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
-#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
-#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
-#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
-#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
-#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
-#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:849
-#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:963
-#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1077
-#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1170
-#: src/xml/xmli18n-tmp.h:1220 src/xml/xmli18n-tmp.h:1277
-#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1376
-#: src/xml/xmli18n-tmp.h:1439 src/xml/xmli18n-tmp.h:1502
-#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1619
-#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1739
-#: src/xml/xmli18n-tmp.h:1773
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1050
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1240
+#: src/xml/xmli18n-tmp.h:1335 src/xml/xmli18n-tmp.h:1449
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1580
+#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1862
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2200 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2297
 msgid "Plain Paper"
 msgstr "Zwyk³y papier"
 
-#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
-#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
-#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
-#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
-#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
-#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
-#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
-#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
-#: src/xml/xmli18n-tmp.h:819 src/xml/xmli18n-tmp.h:858
-#: src/xml/xmli18n-tmp.h:915 src/xml/xmli18n-tmp.h:972
-#: src/xml/xmli18n-tmp.h:1029 src/xml/xmli18n-tmp.h:1086
-#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1176
-#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1286
-#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1385
-#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1508
-#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1628
-#: src/xml/xmli18n-tmp.h:1685 src/xml/xmli18n-tmp.h:1743
-#: src/xml/xmli18n-tmp.h:1779
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:101 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:365 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1160 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1740
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1871
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2136
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2267
+#: src/xml/xmli18n-tmp.h:2303
 msgid "Glossy Film"
 msgstr ""
 
-#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
-#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
-#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
-#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
-#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
-#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
-#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
-#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
-#: src/xml/xmli18n-tmp.h:821 src/xml/xmli18n-tmp.h:861
-#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:975
-#: src/xml/xmli18n-tmp.h:1032 src/xml/xmli18n-tmp.h:1089
-#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1178
-#: src/xml/xmli18n-tmp.h:1232 src/xml/xmli18n-tmp.h:1289
-#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1388
-#: src/xml/xmli18n-tmp.h:1451 src/xml/xmli18n-tmp.h:1511
-#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1631
-#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1745
-#: src/xml/xmli18n-tmp.h:1781
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:845 src/xml/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:965 src/xml/xmli18n-tmp.h:1022
+#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1359
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1550
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1745 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2305
 msgid "Transparencies"
 msgstr "Przezroczyste"
 
-#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
-#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
-#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
-#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
-#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
-#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
-#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
-#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
-#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:823
-#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:921
-#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:1035
-#: src/xml/xmli18n-tmp.h:1092 src/xml/xmli18n-tmp.h:1142
-#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1235
-#: src/xml/xmli18n-tmp.h:1292 src/xml/xmli18n-tmp.h:1344
-#: src/xml/xmli18n-tmp.h:1391 src/xml/xmli18n-tmp.h:1454
-#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1577
-#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1691
-#: src/xml/xmli18n-tmp.h:1747 src/xml/xmli18n-tmp.h:1783
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:55 src/xml/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:151 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1024
+#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2215
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2307
 msgid "Envelopes"
 msgstr "Koperty"
 
-#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
-#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
-#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
-#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
-#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
-#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
-#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
-#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
-#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:827
-#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:927
-#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:1041
-#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1146
-#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1241
-#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1348
-#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1460
-#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1583
-#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1697
-#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1787
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:1028
+#: src/xml/xmli18n-tmp.h:1085 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1275 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1556
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1665
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1834
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2076
+#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2311
 msgid "Matte Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
-#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
-#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
-#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
-#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
-#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
-#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
-#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
-#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:831
-#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:933
-#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:1047
-#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1150
-#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1247
-#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1352
-#: src/xml/xmli18n-tmp.h:1403 src/xml/xmli18n-tmp.h:1466
-#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1589
-#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1703
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1791
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:167 src/xml/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:569
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1032
+#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1285 src/xml/xmli18n-tmp.h:1389
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1675
+#: src/xml/xmli18n-tmp.h:1770 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1889 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2012 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2227
+#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2315
 msgid "Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
-#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
-#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
-#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
-#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
-#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
-#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
-#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
-#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:833
-#: src/xml/xmli18n-tmp.h:879 src/xml/xmli18n-tmp.h:936
-#: src/xml/xmli18n-tmp.h:993 src/xml/xmli18n-tmp.h:1050
-#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1152
-#: src/xml/xmli18n-tmp.h:1190 src/xml/xmli18n-tmp.h:1250
-#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1354
-#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1469
-#: src/xml/xmli18n-tmp.h:1529 src/xml/xmli18n-tmp.h:1592
-#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1706
-#: src/xml/xmli18n-tmp.h:1757 src/xml/xmli18n-tmp.h:1793
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:425 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:512 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1034
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1499 src/xml/xmli18n-tmp.h:1562
+#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1775 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1955
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2088
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2317
 msgid "Photo Quality Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
-#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
-#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
-#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
-#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
-#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
-#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
-#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
-#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:835
-#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:939
-#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:1053
-#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1154
-#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1253
-#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1356
-#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1472
-#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1595
-#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1709
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1795
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1036
+#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1200
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1504 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1842
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2233
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2319
 msgid "Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
-#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
-#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
-#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
-#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
-#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
-#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
-#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
-#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:837
-#: src/xml/xmli18n-tmp.h:885 src/xml/xmli18n-tmp.h:942
-#: src/xml/xmli18n-tmp.h:999 src/xml/xmli18n-tmp.h:1056
-#: src/xml/xmli18n-tmp.h:1113 src/xml/xmli18n-tmp.h:1156
-#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1212
-#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1256
-#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1358
-#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1475
-#: src/xml/xmli18n-tmp.h:1535 src/xml/xmli18n-tmp.h:1598
-#: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1712
-#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1797
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:179 src/xml/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:518 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:869 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1038
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1407
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1566
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1622
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1844
+#: src/xml/xmli18n-tmp.h:1898 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2321
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
-#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
-#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
-#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
-#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
-#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
-#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
-#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
-#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:841
-#: src/xml/xmli18n-tmp.h:891 src/xml/xmli18n-tmp.h:948
-#: src/xml/xmli18n-tmp.h:1005 src/xml/xmli18n-tmp.h:1062
-#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1160
-#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1262
-#: src/xml/xmli18n-tmp.h:1319 src/xml/xmli18n-tmp.h:1362
-#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1481
-#: src/xml/xmli18n-tmp.h:1541 src/xml/xmli18n-tmp.h:1604
-#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1718
-#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1801
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1042
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1419
+#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1570
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2027 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2242
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2325
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
-#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
-#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
-#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
-#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
-#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
-#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
-#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
-#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:843
-#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:951
-#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1065
-#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1162
-#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1265
-#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1368
-#: src/xml/xmli18n-tmp.h:1427 src/xml/xmli18n-tmp.h:1490
-#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1607
-#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1727
-#: src/xml/xmli18n-tmp.h:1767 src/xml/xmli18n-tmp.h:1803
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:91 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:191 src/xml/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:439 src/xml/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:787 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1044
+#: src/xml/xmli18n-tmp.h:1125 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1315 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1854
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2327
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
-#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
-#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
-#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
-#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
-#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
-#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
-#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:897
-#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:1011
-#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1125
-#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1206
-#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1325
-#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1430
-#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1553
-#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1667
-#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1805
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1130
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1320
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1616
+#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1856 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2329
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
-#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
-#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
-#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
-#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
-#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
-#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
-#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
-#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:847
-#: src/xml/xmli18n-tmp.h:903 src/xml/xmli18n-tmp.h:960
-#: src/xml/xmli18n-tmp.h:1017 src/xml/xmli18n-tmp.h:1074
-#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1168
-#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1214
-#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1274
-#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1374
-#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1499
-#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1616
-#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1736
-#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1809
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:129
+#: src/xml/xmli18n-tmp.h:203 src/xml/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:542 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1048
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1443
+#: src/xml/xmli18n-tmp.h:1539 src/xml/xmli18n-tmp.h:1578
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1720
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1985
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2333
 msgid "Other"
 msgstr "Inne"
 
@@ -2156,52 +2890,56 @@ msgstr ""
 msgid "Manual without Pause"
 msgstr ""
 
-#: src/main/print-olympus.c:279
+#: src/main/print-olympus.c:281
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:280 src/cups/genppd.c:1685 src/cups/genppd.c:1713
-#: src/cups/genppd.c:1745 src/cups/genppd.c:1800 src/cups/genppd.c:1846
-#: src/cups/genppd.c:2147 src/cups/genppd.c:2160 src/cups/genppd.c:2183
-#: src/cups/genppd.c:2204 src/cups/genppd.c:2221
+#: src/main/print-olympus.c:282 src/cups/genppd.c:1718 src/cups/genppd.c:1746
+#: src/cups/genppd.c:1778 src/cups/genppd.c:1833 src/cups/genppd.c:1879
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2194 src/cups/genppd.c:2217
+#: src/cups/genppd.c:2238 src/cups/genppd.c:2255
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
-#: src/main/print-olympus.c:1132
+#: src/main/print-olympus.c:998 src/main/print-olympus.c:1061
+#: src/main/print-olympus.c:1165
 msgid "Glossy"
 msgstr ""
 
-#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
-#: src/main/print-olympus.c:1133
+#: src/main/print-olympus.c:999 src/main/print-olympus.c:1062
+#: src/main/print-olympus.c:1166
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
+#: src/main/print-olympus.c:1063 src/main/print-olympus.c:1167
 msgid "Matte"
 msgstr ""
 
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
+#. TRANSLATORS: 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.
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1901
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1770
+#: src/main/print-olympus.c:1936
 msgid "Adjust the cyan balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1778
+#: src/main/print-olympus.c:1944
 msgid "Adjust the magenta balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1952
 msgid "Adjust the yellow balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1793
+#: src/main/print-olympus.c:1959
 msgid "Black Balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1794
+#: src/main/print-olympus.c:1960
 msgid "Adjust the black balance"
 msgstr ""
 
@@ -2233,7 +2971,7 @@ msgstr ""
 msgid "Quick-dry Transparency"
 msgstr ""
 
-#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3687
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:5925
 msgid "Manual"
 msgstr ""
 
@@ -2318,24 +3056,24 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:278 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3638
-#: src/xml/xmli18n-tmp.h:3647 src/xml/xmli18n-tmp.h:3656
-#: src/xml/xmli18n-tmp.h:3664
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5875
+#: src/xml/xmli18n-tmp.h:5884 src/xml/xmli18n-tmp.h:5893
+#: src/xml/xmli18n-tmp.h:5901
 msgid "Draft"
 msgstr ""
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:3633 src/xml/xmli18n-tmp.h:3641
-#: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3658
-#: src/xml/xmli18n-tmp.h:3666
+#: src/xml/xmli18n-tmp.h:5870 src/xml/xmli18n-tmp.h:5878
+#: src/xml/xmli18n-tmp.h:5886 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5903
 #, fuzzy
 msgid "High"
 msgstr "Wysoko¶æ:"
 
 #: src/main/print-pcl.c:282 src/main/print-pcl.c:283
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3634
-#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3650
-#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3667
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5896 src/xml/xmli18n-tmp.h:5904
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografia"
@@ -2371,15 +3109,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3671
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:5908
 msgid "Letter"
 msgstr ""
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3708
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:5946
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3823
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6061
 #, fuzzy
 msgid "Custom"
 msgstr "Automatycznie"
@@ -2388,35 +3126,44 @@ msgstr "Automatycznie"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3629
-#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3654
+#: src/main/print-weave.c:1511
+msgid "Fatal error!"
+msgstr ""
+
+#: src/main/print-weave.c:1547
+msgid ""
+"Please report the above information to gimp-print-devel@lists.sourceforge.net"
+msgstr ""
+
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:5866
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5891
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3630
-#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3655
-#: src/xml/xmli18n-tmp.h:3663
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5900
 msgid "Economy"
 msgstr ""
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3635
-#: src/xml/xmli18n-tmp.h:3642 src/xml/xmli18n-tmp.h:3651
-#: src/xml/xmli18n-tmp.h:3660 src/xml/xmli18n-tmp.h:3668
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:5872
+#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3636
-#: src/xml/xmli18n-tmp.h:3643 src/xml/xmli18n-tmp.h:3652
-#: src/xml/xmli18n-tmp.h:3661 src/xml/xmli18n-tmp.h:3669
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:5873
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5889
+#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5906
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Stylus Photo"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1326 src/cups/genppd.c:1989
-#: src/xml/xmli18n-tmp.h:3637 src/xml/xmli18n-tmp.h:3644
-#: src/xml/xmli18n-tmp.h:3653 src/xml/xmli18n-tmp.h:3662
-#: src/xml/xmli18n-tmp.h:3670
+#: src/main/generic-options.c:41 src/cups/genppd.c:1359 src/cups/genppd.c:2023
+#: src/xml/xmli18n-tmp.h:5874 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5899
+#: src/xml/xmli18n-tmp.h:5907
 msgid "Best"
 msgstr ""
 
@@ -3143,82 +3890,82 @@ msgstr ""
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:960
+#: src/cups/genppd.c:993
 msgid "English"
 msgstr "Polish"
 
-#: src/cups/genppd.c:1159 src/cups/genppd.c:1175 src/cups/genppd.c:1934
-#: src/cups/genppd.c:1935
+#: src/cups/genppd.c:1192 src/cups/genppd.c:1208 src/cups/genppd.c:1968
+#: src/cups/genppd.c:1969
 #, fuzzy
 msgid "Media Size"
 msgstr "Rozmiar papieru:"
 
-#: src/cups/genppd.c:1248 src/cups/genppd.c:1970
+#: src/cups/genppd.c:1281 src/cups/genppd.c:2004
 #, fuzzy
 msgid "Color Model"
 msgstr "Kolor"
 
-#: src/cups/genppd.c:1275 src/cups/genppd.c:1972
+#: src/cups/genppd.c:1308 src/cups/genppd.c:2006
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "Odcienie szaro¶ci"
 
-#: src/cups/genppd.c:1285 src/cups/genppd.c:1976
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2010
 #, fuzzy
 msgid "RGB Color"
 msgstr "Kolor"
 
-#: src/cups/genppd.c:1292 src/cups/genppd.c:1977
+#: src/cups/genppd.c:1325 src/cups/genppd.c:2011
 #, fuzzy
 msgid "CMY Color"
 msgstr "Kolor"
 
-#: src/cups/genppd.c:1317 src/cups/genppd.c:1987
+#: src/cups/genppd.c:1350 src/cups/genppd.c:2021
 msgid "Color Precision"
 msgstr ""
 
-#: src/cups/genppd.c:1573 src/cups/genppd.c:2080
+#: src/cups/genppd.c:1606 src/cups/genppd.c:2114
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:1590 src/cups/genppd.c:2096
+#: src/cups/genppd.c:1623 src/cups/genppd.c:2130
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:1615 src/cups/genppd.c:2113
+#: src/cups/genppd.c:1648 src/cups/genppd.c:2147
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1620 src/cups/genppd.c:2114
+#: src/cups/genppd.c:1653 src/cups/genppd.c:2148
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1621 src/cups/genppd.c:2115
+#: src/cups/genppd.c:1654 src/cups/genppd.c:2149
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1622 src/cups/genppd.c:2116
+#: src/cups/genppd.c:1655 src/cups/genppd.c:2150
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1716 src/cups/genppd.c:2162
+#: src/cups/genppd.c:1749 src/cups/genppd.c:2196
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1718 src/cups/genppd.c:2164
+#: src/cups/genppd.c:1751 src/cups/genppd.c:2198
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1757 src/cups/genppd.c:1820 src/cups/genppd.c:1864
-#: src/cups/genppd.c:2185 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+#: src/cups/genppd.c:1790 src/cups/genppd.c:1853 src/cups/genppd.c:1897
+#: src/cups/genppd.c:2219 src/cups/genppd.c:2249 src/cups/genppd.c:2266
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1762 src/cups/genppd.c:2189
+#: src/cups/genppd.c:1795 src/cups/genppd.c:2223
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/cups/genppd.c:1805 src/cups/genppd.c:2209
+#: src/cups/genppd.c:1838 src/cups/genppd.c:2243
 #, c-format
 msgid "%.1f mm"
 msgstr ""
@@ -3439,51 +4186,61 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:383
-#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
-#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
-#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
-#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
-#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
-#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
-#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
-#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
-#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
-#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
-#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
-#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
-#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
-#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
-#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
-#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
-#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
-#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
-#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
-#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
-#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
-#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
-#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
-#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
-#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
-#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
-#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
-#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
-#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
-#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1503
-#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1509
-#: src/xml/xmli18n-tmp.h:1512 src/xml/xmli18n-tmp.h:1515
-#: src/xml/xmli18n-tmp.h:1518 src/xml/xmli18n-tmp.h:1521
-#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1527
-#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
-#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
-#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
-#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
-#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
-#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:2655
-#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2717
-#: src/xml/xmli18n-tmp.h:3045 src/xml/xmli18n-tmp.h:3252
-#: src/xml/xmli18n-tmp.h:3273 src/xml/xmli18n-tmp.h:3363
-#: src/xml/xmli18n-tmp.h:3531
+#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2001
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2010 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2025
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:4085 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4612 src/xml/xmli18n-tmp.h:5481
 #, fuzzy
 msgid "Photo Black"
 msgstr "Czarny"
@@ -3495,129 +4252,301 @@ msgid "Unknown"
 msgstr ""
 
 #: src/escputil/escputil.c:1000 src/escputil/escputil.c:1289
-#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1921
-#: src/xml/xmli18n-tmp.h:1937 src/xml/xmli18n-tmp.h:2002
-#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2079
-#: src/xml/xmli18n-tmp.h:2105 src/xml/xmli18n-tmp.h:2119
-#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2173
-#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
-#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
-#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2293
-#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2346
-#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2418
-#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2445
-#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2469
-#: src/xml/xmli18n-tmp.h:2484 src/xml/xmli18n-tmp.h:2512
-#: src/xml/xmli18n-tmp.h:2525 src/xml/xmli18n-tmp.h:2564
-#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2626
-#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2746
-#: src/xml/xmli18n-tmp.h:2762 src/xml/xmli18n-tmp.h:2843
-#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2895
-#: src/xml/xmli18n-tmp.h:2912 src/xml/xmli18n-tmp.h:2946
-#: src/xml/xmli18n-tmp.h:3001 src/xml/xmli18n-tmp.h:3015
-#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3122
-#: src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2461 src/xml/xmli18n-tmp.h:2526
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2683 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2711 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3101 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3661
+#: src/xml/xmli18n-tmp.h:3678 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3750 src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:3782 src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:3932 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3964 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4388 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:4639 src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:4875 src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4936
+#: src/xml/xmli18n-tmp.h:4942 src/xml/xmli18n-tmp.h:4968
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5339 src/xml/xmli18n-tmp.h:5348
+#: src/xml/xmli18n-tmp.h:5355 src/xml/xmli18n-tmp.h:5361
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5417
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5430
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5477 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5502
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5536 src/xml/xmli18n-tmp.h:5544
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5557
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5657 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5719
+#: src/xml/xmli18n-tmp.h:5726 src/xml/xmli18n-tmp.h:5732
+#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5779
 msgid "Light Cyan"
 msgstr ""
 
 #: src/escputil/escputil.c:1001 src/escputil/escputil.c:1290
-#: src/xml/xmli18n-tmp.h:1906 src/xml/xmli18n-tmp.h:1922
-#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:2003
-#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2080
-#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2120
-#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2174
-#: src/xml/xmli18n-tmp.h:2188 src/xml/xmli18n-tmp.h:2201
-#: src/xml/xmli18n-tmp.h:2214 src/xml/xmli18n-tmp.h:2227
-#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2294
-#: src/xml/xmli18n-tmp.h:2309 src/xml/xmli18n-tmp.h:2347
-#: src/xml/xmli18n-tmp.h:2360 src/xml/xmli18n-tmp.h:2419
-#: src/xml/xmli18n-tmp.h:2432 src/xml/xmli18n-tmp.h:2446
-#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2470
-#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2513
-#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2565
-#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2627
-#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2748
-#: src/xml/xmli18n-tmp.h:2761 src/xml/xmli18n-tmp.h:2844
-#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2896
-#: src/xml/xmli18n-tmp.h:2913 src/xml/xmli18n-tmp.h:2947
-#: src/xml/xmli18n-tmp.h:3000 src/xml/xmli18n-tmp.h:3014
-#: src/xml/xmli18n-tmp.h:3028 src/xml/xmli18n-tmp.h:3123
-#: src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2446
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2527
+#: src/xml/xmli18n-tmp.h:2541 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2644
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2698
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2751
+#: src/xml/xmli18n-tmp.h:2803 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2956 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2994
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3381
+#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3662
+#: src/xml/xmli18n-tmp.h:3746 src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:3778 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3934 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3966 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:4265 src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:4390 src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:4428 src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4452
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4465
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4512 src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4586 src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:4641 src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4903
+#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4970
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:5044 src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5168
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5241 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5334
+#: src/xml/xmli18n-tmp.h:5341 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5363
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5419
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5471
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5504
+#: src/xml/xmli18n-tmp.h:5510 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5652
+#: src/xml/xmli18n-tmp.h:5659 src/xml/xmli18n-tmp.h:5665
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5721
+#: src/xml/xmli18n-tmp.h:5728 src/xml/xmli18n-tmp.h:5734
+#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5781
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Purpurowy"
 
-#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2433
-#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:3002
-#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3030
+#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3679 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4409 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:4566 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4605 src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4664 src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5376 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5450
+#: src/xml/xmli18n-tmp.h:5475 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5533 src/xml/xmli18n-tmp.h:5542
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5678 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5717
+#: src/xml/xmli18n-tmp.h:5747 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5777
 #, fuzzy
 msgid "Light Black"
 msgstr "Czarny"
 
-#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:384
-#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
-#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
-#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
-#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
-#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
-#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
-#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
-#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
-#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
-#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
-#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
-#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
-#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
-#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
-#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
-#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
-#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
-#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
-#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
-#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
-#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
-#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
-#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
-#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
-#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
-#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
-#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
-#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
-#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
-#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1504
-#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1510
-#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1516
-#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1522
-#: src/xml/xmli18n-tmp.h:1525 src/xml/xmli18n-tmp.h:1528
-#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1534
-#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1540
-#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1546
-#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1552
-#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1558
-#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:2654
-#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2716
-#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3264
-#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3371
-#: src/xml/xmli18n-tmp.h:3539
+#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:508 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:532 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:538 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:562 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:568 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
+#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
+#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
+#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
+#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
+#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
+#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
+#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
+#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
+#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
+#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
+#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2011 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2026
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2032
+#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2038
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:4044 src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:5530
 #, fuzzy
 msgid "Matte Black"
 msgstr "Czarny"
 
-#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:2658
-#: src/xml/xmli18n-tmp.h:2702 src/xml/xmli18n-tmp.h:2720
-#: src/xml/xmli18n-tmp.h:3048
+#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3995 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4006 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4020 src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:4106 src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:2760
-#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3013
-#: src/xml/xmli18n-tmp.h:3027
+#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3676
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4616 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5534 src/xml/xmli18n-tmp.h:5573
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Czarny"
 
 #: src/escputil/escputil.c:1010 src/escputil/escputil.c:1029
-#: src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:4099 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4189
 #, fuzzy
 msgid "Orange"
 msgstr "Rozmiar"
@@ -4168,8194 +5097,8320 @@ msgstr "Drukowanie..."
 #: src/xml/xmli18n-tmp.h:68 src/xml/xmli18n-tmp.h:70 src/xml/xmli18n-tmp.h:72
 #: src/xml/xmli18n-tmp.h:74 src/xml/xmli18n-tmp.h:76 src/xml/xmli18n-tmp.h:78
 #: src/xml/xmli18n-tmp.h:80 src/xml/xmli18n-tmp.h:82 src/xml/xmli18n-tmp.h:84
-#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:92
-#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
-#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
-#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
-#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
-#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
-#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
-#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
-#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
-#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
-#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
-#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
-#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
-#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
-#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
-#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
-#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
-#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
-#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
-#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
-#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
-#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
-#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
-#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
-#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
-#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
-#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
-#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
-#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
-#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
-#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
-#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
-#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
-#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
-#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
-#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
-#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
-#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
-#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
-#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
-#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
-#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
-#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
-#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
-#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
-#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
-#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
-#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
-#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
-#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
-#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
-#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
-#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
-#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
-#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
-#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
-#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
-#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
-#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
-#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
-#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
-#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
-#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
-#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
-#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
-#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
-#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
-#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
-#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
-#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
-#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
-#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
-#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
-#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
-#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
-#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
-#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
-#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
-#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
-#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
-#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
-#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
-#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
-#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
-#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
-#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
-#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
-#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
-#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
-#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
-#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
-#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
-#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
-#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
-#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
-#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
-#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:92 src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:102 src/xml/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:106 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:114 src/xml/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:118 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:126 src/xml/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:130 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:136 src/xml/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:144 src/xml/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:168 src/xml/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:192 src/xml/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:216 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:232 src/xml/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:240 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:256 src/xml/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:264 src/xml/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:304 src/xml/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:312 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:320 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:328 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:336 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:344 src/xml/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:352 src/xml/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:384 src/xml/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:408 src/xml/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:412 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:432 src/xml/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:444 src/xml/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:448 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:468 src/xml/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:484 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:642 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:698 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:714 src/xml/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:722 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:738 src/xml/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:746 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:764 src/xml/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:780 src/xml/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:804 src/xml/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:814
 #: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:818
 #: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:822
 #: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:826
 #: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:830
-#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:834
-#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:838
-#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:842
-#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:846
-#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:850
-#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
-#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
-#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
-#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
-#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
-#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
-#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
-#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:898
-#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
-#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
-#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
-#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
-#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
-#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
-#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
-#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
-#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
-#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
-#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
-#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
-#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
-#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
-#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
-#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
-#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
-#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
-#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
-#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1018
-#: src/xml/xmli18n-tmp.h:1021 src/xml/xmli18n-tmp.h:1024
-#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1030
-#: src/xml/xmli18n-tmp.h:1033 src/xml/xmli18n-tmp.h:1036
-#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1042
-#: src/xml/xmli18n-tmp.h:1045 src/xml/xmli18n-tmp.h:1048
-#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1054
-#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1060
-#: src/xml/xmli18n-tmp.h:1063 src/xml/xmli18n-tmp.h:1066
-#: src/xml/xmli18n-tmp.h:1069 src/xml/xmli18n-tmp.h:1072
-#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1078
-#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1084
-#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1090
-#: src/xml/xmli18n-tmp.h:1093 src/xml/xmli18n-tmp.h:1096
-#: src/xml/xmli18n-tmp.h:1099 src/xml/xmli18n-tmp.h:1102
-#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1108
-#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1114
-#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1120
-#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1126
-#: src/xml/xmli18n-tmp.h:1129 src/xml/xmli18n-tmp.h:1132
-#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
-#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
-#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
-#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
-#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
-#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
-#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
-#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
-#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
-#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
-#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
-#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
-#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
-#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1189
-#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1193
-#: src/xml/xmli18n-tmp.h:1195 src/xml/xmli18n-tmp.h:1197
-#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1201
-#: src/xml/xmli18n-tmp.h:1203 src/xml/xmli18n-tmp.h:1205
-#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1209
-#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1221
-#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
-#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
-#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
-#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
-#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
-#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
-#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
-#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
-#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
-#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
-#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
-#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
-#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
-#: src/xml/xmli18n-tmp.h:1302 src/xml/xmli18n-tmp.h:1305
-#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1311
-#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1317
-#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1323
-#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1329
-#: src/xml/xmli18n-tmp.h:1332 src/xml/xmli18n-tmp.h:1335
-#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
-#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1343
-#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1347
-#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1351
-#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1355
-#: src/xml/xmli18n-tmp.h:1357 src/xml/xmli18n-tmp.h:1359
-#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1363
-#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1367
-#: src/xml/xmli18n-tmp.h:1369 src/xml/xmli18n-tmp.h:1371
-#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1375
-#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1566
-#: src/xml/xmli18n-tmp.h:1569 src/xml/xmli18n-tmp.h:1572
-#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1578
-#: src/xml/xmli18n-tmp.h:1581 src/xml/xmli18n-tmp.h:1584
-#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1590
-#: src/xml/xmli18n-tmp.h:1593 src/xml/xmli18n-tmp.h:1596
-#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1602
-#: src/xml/xmli18n-tmp.h:1605 src/xml/xmli18n-tmp.h:1608
-#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1614
-#: src/xml/xmli18n-tmp.h:1617 src/xml/xmli18n-tmp.h:1620
-#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1626
-#: src/xml/xmli18n-tmp.h:1629 src/xml/xmli18n-tmp.h:1632
-#: src/xml/xmli18n-tmp.h:1635 src/xml/xmli18n-tmp.h:1638
-#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1644
-#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
-#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
-#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
-#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
-#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
-#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
-#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
-#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
-#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
-#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
-#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
-#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
-#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
-#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
-#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:1778
-#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1782
-#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1786
-#: src/xml/xmli18n-tmp.h:1788 src/xml/xmli18n-tmp.h:1790
-#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1794
-#: src/xml/xmli18n-tmp.h:1796 src/xml/xmli18n-tmp.h:1798
-#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1802
-#: src/xml/xmli18n-tmp.h:1804 src/xml/xmli18n-tmp.h:1806
-#: src/xml/xmli18n-tmp.h:1808 src/xml/xmli18n-tmp.h:1810
-#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3204
-#: src/xml/xmli18n-tmp.h:3210 src/xml/xmli18n-tmp.h:3216
-#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3232
-#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3250
-#: src/xml/xmli18n-tmp.h:3294 src/xml/xmli18n-tmp.h:3302
-#: src/xml/xmli18n-tmp.h:3304 src/xml/xmli18n-tmp.h:3312
-#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3379
-#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
-#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3421
-#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3441
-#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3469
-#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3555
-#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3597
-#: src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:1017
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1025
+#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1035 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1047 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1056
+#: src/xml/xmli18n-tmp.h:1061 src/xml/xmli18n-tmp.h:1066
+#: src/xml/xmli18n-tmp.h:1071 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1086
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1096
+#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1116
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1126
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1136
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1161 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1181 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1206
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1216
+#: src/xml/xmli18n-tmp.h:1221 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1236
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1246
+#: src/xml/xmli18n-tmp.h:1251 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1261 src/xml/xmli18n-tmp.h:1266
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1281 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1291 src/xml/xmli18n-tmp.h:1296
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1311 src/xml/xmli18n-tmp.h:1316
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1326
+#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1336
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1378 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1414 src/xml/xmli18n-tmp.h:1420
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1432
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1450 src/xml/xmli18n-tmp.h:1455
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1465
+#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1480 src/xml/xmli18n-tmp.h:1485
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1540 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1551 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1583 src/xml/xmli18n-tmp.h:1585
+#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1603 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1607 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1646
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1666
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1676
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1716
+#: src/xml/xmli18n-tmp.h:1721 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1736
+#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1835
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1843
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1851
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:2049
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2057
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2065
+#: src/xml/xmli18n-tmp.h:2069 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2113
+#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2129
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2137
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2153
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2161
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2185
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2264
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2272
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2276
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2282 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2286 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2296
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2300
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2308
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2314 src/xml/xmli18n-tmp.h:2316
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2324
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:3787 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3895 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:4223 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5579
+#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5825
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:405
 msgid "Bright White Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
-#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
-#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
-#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
-#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
-#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
-#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
-#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:817
-#: src/xml/xmli18n-tmp.h:855 src/xml/xmli18n-tmp.h:912
-#: src/xml/xmli18n-tmp.h:969 src/xml/xmli18n-tmp.h:1026
-#: src/xml/xmli18n-tmp.h:1083 src/xml/xmli18n-tmp.h:1136
-#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1226
-#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1338
-#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1445
-#: src/xml/xmli18n-tmp.h:1505 src/xml/xmli18n-tmp.h:1568
-#: src/xml/xmli18n-tmp.h:1625 src/xml/xmli18n-tmp.h:1682
-#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1777
-#: src/xml/xmli18n-tmp.h:3675
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:139 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:959 src/xml/xmli18n-tmp.h:1018
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1155
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1546
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1931
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:5912
 msgid "Postcard"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
-#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
-#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
-#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
-#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
-#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
-#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
-#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:825
-#: src/xml/xmli18n-tmp.h:867 src/xml/xmli18n-tmp.h:924
-#: src/xml/xmli18n-tmp.h:981 src/xml/xmli18n-tmp.h:1038
-#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1144
-#: src/xml/xmli18n-tmp.h:1182 src/xml/xmli18n-tmp.h:1238
-#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1346
-#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1457
-#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1580
-#: src/xml/xmli18n-tmp.h:1637 src/xml/xmli18n-tmp.h:1694
-#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1785
+#: src/xml/xmli18n-tmp.h:13 src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:155 src/xml/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:415 src/xml/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:851 src/xml/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1026
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1175
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1554
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1832
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2309
 msgid "Back Light Film"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
-#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
-#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
-#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
-#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
-#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
-#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
-#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:829
-#: src/xml/xmli18n-tmp.h:873 src/xml/xmli18n-tmp.h:930
-#: src/xml/xmli18n-tmp.h:987 src/xml/xmli18n-tmp.h:1044
-#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1148
-#: src/xml/xmli18n-tmp.h:1186 src/xml/xmli18n-tmp.h:1244
-#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1350
-#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1463
-#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1586
-#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1700
-#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1789
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:419 src/xml/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:857 src/xml/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1030
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1383
+#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1558
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2313
 msgid "Matte Paper Heavyweight"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
-#: src/xml/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:421
 msgid "Premium Presentation Paper Matte"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:27
-msgid "Premium Glossy Photo Paper 170 wt"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:29
-msgid "Premium Glossy Photo Paper 250 wt"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
-#: src/xml/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:431
 #, fuzzy
 msgid "Ultra Glossy Photo Paper"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
-#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
-#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
-#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
-#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
-#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
-#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
-#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:839
-#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:945
-#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1059
-#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1158
-#: src/xml/xmli18n-tmp.h:1196 src/xml/xmli18n-tmp.h:1259
-#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1360
-#: src/xml/xmli18n-tmp.h:1415 src/xml/xmli18n-tmp.h:1478
-#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1601
-#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1715
-#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1210
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1413
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1568
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1695
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1964
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2176 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2287 src/xml/xmli18n-tmp.h:2323
 msgid "Premium Semigloss Photo Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:35
-msgid "Premium Semigloss Photo Paper 170 wt"
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:437
+msgid "Ultra Premium Photo Paper Luster"
 msgstr ""
 
 #: src/xml/xmli18n-tmp.h:37
-msgid "Premium Semigloss Photo Paper 250 wt"
+msgid "CD or DVD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:93 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1230
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1437
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2331
+#, fuzzy
+msgid "ColorLife Paper"
+msgstr "Zwyk³y papier"
+
+#: src/xml/xmli18n-tmp.h:73
+msgid "Premium Glossy Photo Paper 170 wt"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:41
-msgid "Premium Luster Photo Paper 250 wt"
+#: src/xml/xmli18n-tmp.h:75
+msgid "Premium Glossy Photo Paper 250 wt"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
-#: src/xml/xmli18n-tmp.h:334
-msgid "Ultra Premium Photo Paper Luster"
+#: src/xml/xmli18n-tmp.h:81
+msgid "Premium Semigloss Photo Paper 170 wt"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
-#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
-#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
-#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
-#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
-#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
-#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
-#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:845
-#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:957
-#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1071
-#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1166
-#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1271
-#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1372
-#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1496
-#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1613
-#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1733
-#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1807
-#, fuzzy
-msgid "ColorLife Paper"
-msgstr "Zwyk³y papier"
+#: src/xml/xmli18n-tmp.h:83
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr ""
 
-#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
-#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
-#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
-#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
-#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
-#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
-#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
-#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
-#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
-#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
-#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
-#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
-#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
-#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
-#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
-#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
-#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
-#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
-#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
-#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
-#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
-#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
-#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
-#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
-#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
-#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
-#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
-#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
-#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
-#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
-#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
-#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
-#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
-#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
-#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
-#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
-#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
-#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
-#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
-#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
-#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
-#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
-#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
-#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
-#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
-#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
-#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:851
-#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:857
-#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:863
-#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:869
-#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:875
-#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:881
-#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:887
-#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:893
-#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:899
-#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:905
-#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:911
-#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:917
-#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:923
-#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:929
-#: src/xml/xmli18n-tmp.h:932 src/xml/xmli18n-tmp.h:935
-#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:941
-#: src/xml/xmli18n-tmp.h:944 src/xml/xmli18n-tmp.h:947
-#: src/xml/xmli18n-tmp.h:950 src/xml/xmli18n-tmp.h:953
-#: src/xml/xmli18n-tmp.h:956 src/xml/xmli18n-tmp.h:959
-#: src/xml/xmli18n-tmp.h:962 src/xml/xmli18n-tmp.h:965
-#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:971
-#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:977
-#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:983
-#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:989
-#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:995
-#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1001
-#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1007
-#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1013
-#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1019
-#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1025
-#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1031
-#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1037
-#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1043
-#: src/xml/xmli18n-tmp.h:1046 src/xml/xmli18n-tmp.h:1049
-#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1055
-#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1061
-#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1067
-#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1073
-#: src/xml/xmli18n-tmp.h:1076 src/xml/xmli18n-tmp.h:1079
-#: src/xml/xmli18n-tmp.h:1082 src/xml/xmli18n-tmp.h:1085
-#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1091
-#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1097
-#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1103
-#: src/xml/xmli18n-tmp.h:1106 src/xml/xmli18n-tmp.h:1109
-#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1115
-#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1121
-#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1127
-#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1133
-#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1225
-#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1231
-#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1237
-#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1243
-#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1249
-#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1255
-#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1261
-#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1267
-#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1273
-#: src/xml/xmli18n-tmp.h:1276 src/xml/xmli18n-tmp.h:1279
-#: src/xml/xmli18n-tmp.h:1282 src/xml/xmli18n-tmp.h:1285
-#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1291
-#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1297
-#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1303
-#: src/xml/xmli18n-tmp.h:1306 src/xml/xmli18n-tmp.h:1309
-#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1315
-#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1321
-#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1327
-#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1333
-#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1567
-#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1573
-#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1579
-#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1585
-#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1591
-#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1597
-#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1603
-#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1609
-#: src/xml/xmli18n-tmp.h:1612 src/xml/xmli18n-tmp.h:1615
-#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1621
-#: src/xml/xmli18n-tmp.h:1624 src/xml/xmli18n-tmp.h:1627
-#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1633
-#: src/xml/xmli18n-tmp.h:1636 src/xml/xmli18n-tmp.h:1639
-#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1645
-#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1651
-#: src/xml/xmli18n-tmp.h:1654 src/xml/xmli18n-tmp.h:1657
-#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1663
-#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1669
-#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1675
-#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3223
-#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3231
-#: src/xml/xmli18n-tmp.h:3238 src/xml/xmli18n-tmp.h:3239
-#: src/xml/xmli18n-tmp.h:3300 src/xml/xmli18n-tmp.h:3301
-#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3311
-#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3396
-#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3408
-#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3420
-#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3432
-#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3440
-#: src/xml/xmli18n-tmp.h:3479 src/xml/xmli18n-tmp.h:3480
-#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3492
-#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3554
-#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:87
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:133 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:149 src/xml/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:173 src/xml/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:197 src/xml/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:205 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:221 src/xml/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:229 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:245 src/xml/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:253 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:261 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:269 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:277 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:285 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:293 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:301 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:309 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:317 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:325 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:333 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:341 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:349 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:357 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:619 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:643 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:667 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:691 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:707 src/xml/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:715 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:731 src/xml/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:739 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:755 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1062
+#: src/xml/xmli18n-tmp.h:1067 src/xml/xmli18n-tmp.h:1072
+#: src/xml/xmli18n-tmp.h:1077 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1092
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1102
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1112
+#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1122
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1132
+#: src/xml/xmli18n-tmp.h:1137 src/xml/xmli18n-tmp.h:1142
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1157 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1177 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1192
+#: src/xml/xmli18n-tmp.h:1197 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1212
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1222
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1242
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1252
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1272
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1287 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1297 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1327 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1385 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1445 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1461
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1516 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1647
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1657
+#: src/xml/xmli18n-tmp.h:1662 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1677
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1687
+#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1742 src/xml/xmli18n-tmp.h:1747
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1767
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1807
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2090 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2098 src/xml/xmli18n-tmp.h:2102
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2118
+#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2126
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2162 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2190
+#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:3884 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:4779 src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:4845 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4919
+#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4980
+#: src/xml/xmli18n-tmp.h:4986 src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5209 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5276
+#: src/xml/xmli18n-tmp.h:5277 src/xml/xmli18n-tmp.h:5283
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5607 src/xml/xmli18n-tmp.h:5633
+#: src/xml/xmli18n-tmp.h:5634 src/xml/xmli18n-tmp.h:5640
 msgid "Quadtone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
-#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
-#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
-#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
-#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:852
-#: src/xml/xmli18n-tmp.h:909 src/xml/xmli18n-tmp.h:966
-#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1080
-#: src/xml/xmli18n-tmp.h:1172 src/xml/xmli18n-tmp.h:1223
-#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1336
-#: src/xml/xmli18n-tmp.h:1379 src/xml/xmli18n-tmp.h:1442
-#: src/xml/xmli18n-tmp.h:1565 src/xml/xmli18n-tmp.h:1622
-#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1775
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:142 src/xml/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:150 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:174 src/xml/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:198 src/xml/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:214 src/xml/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:222 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:238 src/xml/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:246 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:262 src/xml/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:302 src/xml/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:310 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:318 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:326 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:334 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:342 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:350 src/xml/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:636 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:660 src/xml/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:708 src/xml/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:716 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:732 src/xml/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:756 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1103
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1123
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1158 src/xml/xmli18n-tmp.h:1163
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1183
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1193
+#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1213
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1223
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1238 src/xml/xmli18n-tmp.h:1243
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1253
+#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1283
+#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1313
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1333
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1362 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1374 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1462
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1472
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1487 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1502
+#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:1532
+#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1542
+#: src/xml/xmli18n-tmp.h:1633 src/xml/xmli18n-tmp.h:1638
+#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1648
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1658
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1713 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1728
+#: src/xml/xmli18n-tmp.h:1733 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1768
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2071
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2095
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2115 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2123 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2139 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2183
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2191
+#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2199
+msgid "MISQuadtone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1150 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2299
 #, fuzzy
 msgid "Plain Paper Fast Load"
 msgstr "Zwyk³y papier"
 
-#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
-#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
-#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1364
-#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1484
-#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1970 src/xml/xmli18n-tmp.h:2030
+#: src/xml/xmli18n-tmp.h:2245
 msgid "Archival Matte Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
-#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
-#: src/xml/xmli18n-tmp.h:1202 src/xml/xmli18n-tmp.h:1366
-#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1487
-#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:881 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2248
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
-#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
-#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
-#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
-#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
-#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
-#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
-#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
-#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
-#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
-#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1377
-#: src/xml/xmli18n-tmp.h:1380 src/xml/xmli18n-tmp.h:1383
-#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1389
-#: src/xml/xmli18n-tmp.h:1392 src/xml/xmli18n-tmp.h:1395
-#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1401
-#: src/xml/xmli18n-tmp.h:1404 src/xml/xmli18n-tmp.h:1407
-#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1413
-#: src/xml/xmli18n-tmp.h:1416 src/xml/xmli18n-tmp.h:1419
-#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1425
-#: src/xml/xmli18n-tmp.h:1428 src/xml/xmli18n-tmp.h:1431
-#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1437
-#: src/xml/xmli18n-tmp.h:1440 src/xml/xmli18n-tmp.h:1443
-#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1449
-#: src/xml/xmli18n-tmp.h:1452 src/xml/xmli18n-tmp.h:1455
-#: src/xml/xmli18n-tmp.h:1458 src/xml/xmli18n-tmp.h:1461
-#: src/xml/xmli18n-tmp.h:1464 src/xml/xmli18n-tmp.h:1467
-#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1473
-#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1479
-#: src/xml/xmli18n-tmp.h:1482 src/xml/xmli18n-tmp.h:1485
-#: src/xml/xmli18n-tmp.h:1488 src/xml/xmli18n-tmp.h:1491
-#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1497
-#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1677
-#: src/xml/xmli18n-tmp.h:1680 src/xml/xmli18n-tmp.h:1683
-#: src/xml/xmli18n-tmp.h:1686 src/xml/xmli18n-tmp.h:1689
-#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1695
-#: src/xml/xmli18n-tmp.h:1698 src/xml/xmli18n-tmp.h:1701
-#: src/xml/xmli18n-tmp.h:1704 src/xml/xmli18n-tmp.h:1707
-#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1713
-#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1719
-#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1725
-#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1731
-#: src/xml/xmli18n-tmp.h:1734 src/xml/xmli18n-tmp.h:1737
-#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3503
-#: src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:1863
+#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1881
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1893
+#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1905
+#: src/xml/xmli18n-tmp.h:1908 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1923
+#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:1950 src/xml/xmli18n-tmp.h:1953
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1968 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1983
+#: src/xml/xmli18n-tmp.h:1986 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2204 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2255
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5645
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
-#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
-#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
-#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
-#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
-#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
-#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
-#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
-#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
-#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
-#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1378
-#: src/xml/xmli18n-tmp.h:1381 src/xml/xmli18n-tmp.h:1384
-#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1390
-#: src/xml/xmli18n-tmp.h:1393 src/xml/xmli18n-tmp.h:1396
-#: src/xml/xmli18n-tmp.h:1399 src/xml/xmli18n-tmp.h:1402
-#: src/xml/xmli18n-tmp.h:1405 src/xml/xmli18n-tmp.h:1408
-#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1414
-#: src/xml/xmli18n-tmp.h:1417 src/xml/xmli18n-tmp.h:1420
-#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1426
-#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1432
-#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1438
-#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1444
-#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1450
-#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1456
-#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1462
-#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1468
-#: src/xml/xmli18n-tmp.h:1471 src/xml/xmli18n-tmp.h:1474
-#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1480
-#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1486
-#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1492
-#: src/xml/xmli18n-tmp.h:1495 src/xml/xmli18n-tmp.h:1498
-#: src/xml/xmli18n-tmp.h:1501 src/xml/xmli18n-tmp.h:1678
-#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1684
-#: src/xml/xmli18n-tmp.h:1687 src/xml/xmli18n-tmp.h:1690
-#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1696
-#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1702
-#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1708
-#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1714
-#: src/xml/xmli18n-tmp.h:1717 src/xml/xmli18n-tmp.h:1720
-#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1726
-#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1732
-#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1738
-#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3517
-#: src/xml/xmli18n-tmp.h:3577
+#: src/xml/xmli18n-tmp.h:835 src/xml/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:841 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1879 src/xml/xmli18n-tmp.h:1882
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1894
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1909 src/xml/xmli18n-tmp.h:1912
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1924
+#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1954
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1969 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1984
+#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2208
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2229 src/xml/xmli18n-tmp.h:2232
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2238
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2244
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2253 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2259 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5714
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1826
-#: src/xml/xmli18n-tmp.h:1839 src/xml/xmli18n-tmp.h:1852
-#: src/xml/xmli18n-tmp.h:1907 src/xml/xmli18n-tmp.h:1923
-#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1952
-#: src/xml/xmli18n-tmp.h:1965 src/xml/xmli18n-tmp.h:2054
-#: src/xml/xmli18n-tmp.h:2081 src/xml/xmli18n-tmp.h:2146
-#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
-#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
-#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2348
-#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2407
-#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2899
-#: src/xml/xmli18n-tmp.h:2916 src/xml/xmli18n-tmp.h:3142
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1139
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1154 src/xml/xmli18n-tmp.h:1159
+#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1179
+#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1199
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1214 src/xml/xmli18n-tmp.h:1219
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1229
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1244 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1259
+#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1274 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1289
+#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1309
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1329
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1423
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1429
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1447
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1634
+#: src/xml/xmli18n-tmp.h:1639 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1664
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1764
+#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1784
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1799 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1819
+msgid "MIS Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1463 src/xml/xmli18n-tmp.h:1468
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1478
+#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1508
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1533 src/xml/xmli18n-tmp.h:1538
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4858 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:5289
+msgid "Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2489 src/xml/xmli18n-tmp.h:2578
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2713 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2752
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2885 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:3051 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3665
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1828
-#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1853
-#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1879
-#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
-#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1940
-#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1966
-#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2055
-#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2133
-#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2175
-#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
-#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
-#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2336
-#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
-#: src/xml/xmli18n-tmp.h:2408 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2699
+#: src/xml/xmli18n-tmp.h:2714 src/xml/xmli18n-tmp.h:2727
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2886
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:3052
 msgid "180 DPI Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1830
-#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1854
-#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1880
-#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
-#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1941
-#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1967
-#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
-#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2134
-#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2176
-#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
-#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
-#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2337
-#: src/xml/xmli18n-tmp.h:2350 src/xml/xmli18n-tmp.h:2363
-#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
-#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2434
-#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2459
-#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2529
-#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2601
-#: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2703
-#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2735
-#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2768
-#: src/xml/xmli18n-tmp.h:2872 src/xml/xmli18n-tmp.h:2884
-#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2917
-#: src/xml/xmli18n-tmp.h:2961 src/xml/xmli18n-tmp.h:3007
-#: src/xml/xmli18n-tmp.h:3021 src/xml/xmli18n-tmp.h:3035
-#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3126
-#: src/xml/xmli18n-tmp.h:3143
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2404
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2658
+#: src/xml/xmli18n-tmp.h:2672 src/xml/xmli18n-tmp.h:2700
+#: src/xml/xmli18n-tmp.h:2715 src/xml/xmli18n-tmp.h:2728
+#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2754
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2919 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3053
+#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3125
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3292
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3530
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3649
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3684
 #, fuzzy
 msgid "360 x 180 DPI Draft"
 msgstr "150x150 DPI"
 
-#: src/xml/xmli18n-tmp.h:1818 src/xml/xmli18n-tmp.h:1831
-#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1855
-#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1881
-#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
-#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1942
-#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1968
-#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2135
-#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2392 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2418 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2479 src/xml/xmli18n-tmp.h:2492
+#: src/xml/xmli18n-tmp.h:2581 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2862 src/xml/xmli18n-tmp.h:2934
 msgid "360 DPI High Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1819 src/xml/xmli18n-tmp.h:1832
-#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1856
-#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1882
-#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
-#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1943
-#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1969
-#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1992
-#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2020
-#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
-#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
-#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2096
-#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2123
-#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2149
-#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2177
-#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2205
-#: src/xml/xmli18n-tmp.h:2218 src/xml/xmli18n-tmp.h:2231
-#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2254
-#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
-#: src/xml/xmli18n-tmp.h:2297 src/xml/xmli18n-tmp.h:2312
-#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2339
-#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
-#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2385
-#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2411
-#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2435
-#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2460
-#: src/xml/xmli18n-tmp.h:2473 src/xml/xmli18n-tmp.h:2488
-#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2516
-#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2541
-#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2591
-#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
-#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2645
-#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2675
-#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2704
-#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2736
-#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2769
-#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2808
-#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2833
-#: src/xml/xmli18n-tmp.h:2847 src/xml/xmli18n-tmp.h:2861
-#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2885
-#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2918
-#: src/xml/xmli18n-tmp.h:2935 src/xml/xmli18n-tmp.h:2950
-#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2987
-#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3022
-#: src/xml/xmli18n-tmp.h:3036 src/xml/xmli18n-tmp.h:3050
-#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3081
-#: src/xml/xmli18n-tmp.h:3098 src/xml/xmli18n-tmp.h:3113
-#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2369 src/xml/xmli18n-tmp.h:2380
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2406
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2493
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2544
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
+#: src/xml/xmli18n-tmp.h:2582 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2729
+#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2806
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2836
+#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
+#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3012
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3040
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3184 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3424 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3485 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3573
+#: src/xml/xmli18n-tmp.h:3587 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3650 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3685
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
 
-#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1833
-#: src/xml/xmli18n-tmp.h:1846 src/xml/xmli18n-tmp.h:1857
-#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1883
-#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1912
-#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1944
-#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1970
-#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1993
-#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2021
-#: src/xml/xmli18n-tmp.h:2033 src/xml/xmli18n-tmp.h:2045
-#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
-#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2097
-#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2124
-#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2150
-#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2178
-#: src/xml/xmli18n-tmp.h:2193 src/xml/xmli18n-tmp.h:2206
-#: src/xml/xmli18n-tmp.h:2219 src/xml/xmli18n-tmp.h:2232
-#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2255
-#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
-#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2313
-#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2340
-#: src/xml/xmli18n-tmp.h:2352 src/xml/xmli18n-tmp.h:2365
-#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2386
-#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2412
-#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2436
-#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2461
-#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2489
-#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2517
-#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2542
-#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2567
-#: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2592
-#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2616
-#: src/xml/xmli18n-tmp.h:2631 src/xml/xmli18n-tmp.h:2646
-#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2676
-#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2705
-#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2737
-#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2770
-#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2809
-#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2834
-#: src/xml/xmli18n-tmp.h:2848 src/xml/xmli18n-tmp.h:2862
-#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2886
-#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2919
-#: src/xml/xmli18n-tmp.h:2936 src/xml/xmli18n-tmp.h:2951
-#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2988
-#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3023
-#: src/xml/xmli18n-tmp.h:3037 src/xml/xmli18n-tmp.h:3051
-#: src/xml/xmli18n-tmp.h:3066 src/xml/xmli18n-tmp.h:3083
-#: src/xml/xmli18n-tmp.h:3099 src/xml/xmli18n-tmp.h:3114
-#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:2344 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2452 src/xml/xmli18n-tmp.h:2468
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2494
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2557 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:2594
+#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2648
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2674
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2807
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2837
+#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
+#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3013
+#: src/xml/xmli18n-tmp.h:3026 src/xml/xmli18n-tmp.h:3041
+#: src/xml/xmli18n-tmp.h:3055 src/xml/xmli18n-tmp.h:3066
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3140
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3170
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3229
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3333
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3358
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3385
+#: src/xml/xmli18n-tmp.h:3397 src/xml/xmli18n-tmp.h:3409
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3442
+#: src/xml/xmli18n-tmp.h:3459 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3574
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3637
+#: src/xml/xmli18n-tmp.h:3651 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3686
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "1440 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1834
-#: src/xml/xmli18n-tmp.h:1847 src/xml/xmli18n-tmp.h:1858
-#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1884
-#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1913
-#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1945
-#: src/xml/xmli18n-tmp.h:1958 src/xml/xmli18n-tmp.h:1971
-#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:1994
-#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2022
-#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2046
-#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2071
-#: src/xml/xmli18n-tmp.h:2086 src/xml/xmli18n-tmp.h:2098
-#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2125
-#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2151
-#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2179
-#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2207
-#: src/xml/xmli18n-tmp.h:2220 src/xml/xmli18n-tmp.h:2233
-#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2256
-#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
-#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2314
-#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2341
-#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
-#: src/xml/xmli18n-tmp.h:2376 src/xml/xmli18n-tmp.h:2387
-#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2413
-#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2437
-#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2462
-#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2490
-#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2518
-#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2543
-#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
-#: src/xml/xmli18n-tmp.h:2580 src/xml/xmli18n-tmp.h:2593
-#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2617
-#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
-#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2677
-#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2706
-#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2738
-#: src/xml/xmli18n-tmp.h:2753 src/xml/xmli18n-tmp.h:2771
-#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2810
-#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2835
-#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
-#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2887
-#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2921
-#: src/xml/xmli18n-tmp.h:2937 src/xml/xmli18n-tmp.h:2952
-#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2990
-#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3024
-#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3052
-#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3085
-#: src/xml/xmli18n-tmp.h:3100 src/xml/xmli18n-tmp.h:3115
-#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:2345 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2469
+#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2546
+#: src/xml/xmli18n-tmp.h:2558 src/xml/xmli18n-tmp.h:2570
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2595
+#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2622
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2675
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2731
+#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2808
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2838
+#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2890
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2922 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3014
+#: src/xml/xmli18n-tmp.h:3027 src/xml/xmli18n-tmp.h:3042
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3067
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3186 src/xml/xmli18n-tmp.h:3201
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3334
+#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3359
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3444
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3475
+#: src/xml/xmli18n-tmp.h:3489 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3533 src/xml/xmli18n-tmp.h:3547
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3652 src/xml/xmli18n-tmp.h:3669
+#: src/xml/xmli18n-tmp.h:3687
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
-#: src/xml/xmli18n-tmp.h:1978 src/xml/xmli18n-tmp.h:2004
-#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2030
-#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2067
-#: src/xml/xmli18n-tmp.h:2094 src/xml/xmli18n-tmp.h:2107
-#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2161
-#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2252
-#: src/xml/xmli18n-tmp.h:2280 src/xml/xmli18n-tmp.h:2295
-#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2323
-#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
-#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2486
-#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2552
-#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2613
-#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
-#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2686
-#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2806
-#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2831
-#: src/xml/xmli18n-tmp.h:2845 src/xml/xmli18n-tmp.h:2859
-#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2948
-#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3080
-#: src/xml/xmli18n-tmp.h:3097 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2554
+#: src/xml/xmli18n-tmp.h:2566 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2804 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2834 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3076
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3382
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3586 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3634
 msgid "360 x 120 DPI Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1842
-#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2005
-#: src/xml/xmli18n-tmp.h:2019 src/xml/xmli18n-tmp.h:2031
-#: src/xml/xmli18n-tmp.h:2043 src/xml/xmli18n-tmp.h:2068
-#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
-#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2162
-#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2253
-#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2296
-#: src/xml/xmli18n-tmp.h:2311 src/xml/xmli18n-tmp.h:2324
-#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2384
-#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2487
-#: src/xml/xmli18n-tmp.h:2500 src/xml/xmli18n-tmp.h:2553
-#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2614
-#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2644
-#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2687
-#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2807
-#: src/xml/xmli18n-tmp.h:2820 src/xml/xmli18n-tmp.h:2832
-#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
-#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2949
-#: src/xml/xmli18n-tmp.h:3112
+#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2555
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2632
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3077
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3211
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3383
+#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3635
 #, fuzzy
 msgid "360 x 240 DPI Draft"
 msgstr "600x600 DPI"
 
-#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1872
-#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1898
-#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1930
-#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1959
-#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:1995
-#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2023
-#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2047
-#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2087
-#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2112
-#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2139
-#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2166
-#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2328
-#: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2388
-#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2557
-#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2922
-#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2991
-#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3086
+#: src/xml/xmli18n-tmp.h:2383 src/xml/xmli18n-tmp.h:2396
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2422
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2470 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2507 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2704 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:3057 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3118 src/xml/xmli18n-tmp.h:3445
+#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3514
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3609
 msgid "720 DPI High Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1873
-#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1899
-#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1931
-#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1984
-#: src/xml/xmli18n-tmp.h:1996 src/xml/xmli18n-tmp.h:2010
-#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2036
-#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2061
-#: src/xml/xmli18n-tmp.h:2073 src/xml/xmli18n-tmp.h:2088
-#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2127
-#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2153
-#: src/xml/xmli18n-tmp.h:2167 src/xml/xmli18n-tmp.h:2181
-#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2208
-#: src/xml/xmli18n-tmp.h:2221 src/xml/xmli18n-tmp.h:2234
-#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2257
-#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2285
-#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2315
-#: src/xml/xmli18n-tmp.h:2329 src/xml/xmli18n-tmp.h:2354
-#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2389
-#: src/xml/xmli18n-tmp.h:2399 src/xml/xmli18n-tmp.h:2425
-#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2451
-#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
-#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2504
-#: src/xml/xmli18n-tmp.h:2519 src/xml/xmli18n-tmp.h:2534
-#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2558
-#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2605
-#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2633
-#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2663
-#: src/xml/xmli18n-tmp.h:2678 src/xml/xmli18n-tmp.h:2691
-#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2725
-#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2754
-#: src/xml/xmli18n-tmp.h:2772 src/xml/xmli18n-tmp.h:2787
-#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2811
-#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2836
-#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
-#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2888
-#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2923
-#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2953
-#: src/xml/xmli18n-tmp.h:2968 src/xml/xmli18n-tmp.h:2978
-#: src/xml/xmli18n-tmp.h:2992 src/xml/xmli18n-tmp.h:3011
-#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3039
-#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
-#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3101
-#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3130
-#: src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:2384 src/xml/xmli18n-tmp.h:2397
+#: src/xml/xmli18n-tmp.h:2410 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2548 src/xml/xmli18n-tmp.h:2560
+#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2691 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2794 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2839
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2923 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3105
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3129
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3231 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3311
+#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3335
+#: src/xml/xmli18n-tmp.h:3348 src/xml/xmli18n-tmp.h:3360
+#: src/xml/xmli18n-tmp.h:3372 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3427 src/xml/xmli18n-tmp.h:3446
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3576 src/xml/xmli18n-tmp.h:3593
+#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3688
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1874
-#: src/xml/xmli18n-tmp.h:1887 src/xml/xmli18n-tmp.h:1900
-#: src/xml/xmli18n-tmp.h:1916 src/xml/xmli18n-tmp.h:1932
-#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1985
-#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2011
-#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2037
-#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2062
-#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2089
-#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2128
-#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2154
-#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2182
-#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2258
-#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
-#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2316
-#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2390
-#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2559
-#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2634
-#: src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2385 src/xml/xmli18n-tmp.h:2398
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2535
+#: src/xml/xmli18n-tmp.h:2549 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2782
+#: src/xml/xmli18n-tmp.h:2795 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3388
 msgid "1440 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1960
-#: src/xml/xmli18n-tmp.h:2100 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2902
 msgid "720 DPI Highest Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2259
-#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
-#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2317
-#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2477
-#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2505
-#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2606
-#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2635
-#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2740
-#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2866
-#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2796 src/xml/xmli18n-tmp.h:2811
+#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3216 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3412
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2260
-#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
-#: src/xml/xmli18n-tmp.h:2303 src/xml/xmli18n-tmp.h:2318
-#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2771 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2812
+#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:3160 src/xml/xmli18n-tmp.h:3390
 msgid "2880 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2439
-#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2493
-#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2546
-#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2582
-#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2620
-#: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2664
-#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
-#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2726
-#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2755
-#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2789
-#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2812
-#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2878
-#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
-#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2939
-#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2969
-#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2994
-#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
-#: src/xml/xmli18n-tmp.h:3088 src/xml/xmli18n-tmp.h:3102
-#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3131
-#: src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2963
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3070
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3106
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3297 src/xml/xmli18n-tmp.h:3313
+#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
+#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3401
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3492
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3577 src/xml/xmli18n-tmp.h:3594
+#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3671 src/xml/xmli18n-tmp.h:3689
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2426
-#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2452
-#: src/xml/xmli18n-tmp.h:2464 src/xml/xmli18n-tmp.h:2479
-#: src/xml/xmli18n-tmp.h:2494 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2547
-#: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2583
-#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2621
-#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2665
-#: src/xml/xmli18n-tmp.h:2680 src/xml/xmli18n-tmp.h:2694
-#: src/xml/xmli18n-tmp.h:2709 src/xml/xmli18n-tmp.h:2727
-#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2756
-#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2790
-#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2813
-#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2837
-#: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2879
-#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
-#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2940
-#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2970
-#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2995
-#: src/xml/xmli18n-tmp.h:3012 src/xml/xmli18n-tmp.h:3026
-#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3055
-#: src/xml/xmli18n-tmp.h:3072 src/xml/xmli18n-tmp.h:3089
-#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3118
-#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3071
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3107
+#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3251
+#: src/xml/xmli18n-tmp.h:3266 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3298 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3324 src/xml/xmli18n-tmp.h:3337
+#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3374 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3463
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3535 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3563 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3612
+#: src/xml/xmli18n-tmp.h:3626 src/xml/xmli18n-tmp.h:3641
+#: src/xml/xmli18n-tmp.h:3655 src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:3690
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:4374
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "¯ó³æ"
 
-#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2584
-#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2711
-#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2743
-#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2776
-#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2908
-#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2972
-#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3057
-#: src/xml/xmli18n-tmp.h:3074 src/xml/xmli18n-tmp.h:3091
-#: src/xml/xmli18n-tmp.h:3105 src/xml/xmli18n-tmp.h:3134
-#: src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3108
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3267
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3495
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3614
+#: src/xml/xmli18n-tmp.h:3628 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3692
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2666 src/xml/xmli18n-tmp.h:2681
-#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2728
-#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2775
-#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2814
-#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2838
-#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2926
-#: src/xml/xmli18n-tmp.h:2941 src/xml/xmli18n-tmp.h:2971
-#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
-#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
-#: src/xml/xmli18n-tmp.h:3090 src/xml/xmli18n-tmp.h:3104
-#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3133
-#: src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3190 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3234 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3325 src/xml/xmli18n-tmp.h:3338
+#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3362
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3505
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3613
+#: src/xml/xmli18n-tmp.h:3627 src/xml/xmli18n-tmp.h:3642
+#: src/xml/xmli18n-tmp.h:3656 src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:3691
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2712
-#: src/xml/xmli18n-tmp.h:2730 src/xml/xmli18n-tmp.h:2759
-#: src/xml/xmli18n-tmp.h:2777 src/xml/xmli18n-tmp.h:2909
-#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2973
-#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3058
-#: src/xml/xmli18n-tmp.h:3075 src/xml/xmli18n-tmp.h:3092
-#: src/xml/xmli18n-tmp.h:3106 src/xml/xmli18n-tmp.h:3135
-#: src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3301 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3496
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3615
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2798 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3502
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2965
-#: src/xml/xmli18n-tmp.h:2989 src/xml/xmli18n-tmp.h:3067
-#: src/xml/xmli18n-tmp.h:3084
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:3607
 #, fuzzy
 msgid "720 x 360 DPI Enhanced"
 msgstr "1440 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:3479
 #, fuzzy
 msgid "Black 1"
 msgstr "Czarny"
 
-#: src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3480
 #, fuzzy
 msgid "Black 2"
 msgstr "Czarny"
 
-#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3065
-#: src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3605
 #, fuzzy
 msgid "360 DPI Enhanced"
 msgstr "1440 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3516
 #, fuzzy
 msgid "1440 x 720 DPI High Quality"
 msgstr "1440 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:3153
-msgid "Lower Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3677
+#, fuzzy
+msgid "Vivid Light Magenta"
+msgstr "Purpurowy"
 
-#: src/xml/xmli18n-tmp.h:3154
-msgid "Upper Front Tray"
+#: src/xml/xmli18n-tmp.h:3682
+#, fuzzy
+msgid "Vivid Magenta"
+msgstr "Purpurowy"
+
+#: src/xml/xmli18n-tmp.h:3694
+msgid "Main Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3160
-#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3176
-#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3186
+#: src/xml/xmli18n-tmp.h:3695
+#, fuzzy
+msgid "Photo Tray"
+msgstr "Fotografia"
+
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3725 src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:3732
 #, fuzzy
 msgid "Print to CD"
 msgstr "Wydrukowaæ do pliku?"
 
-#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3181
-#: src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:3730
 msgid "Rear Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3157 src/xml/xmli18n-tmp.h:3182
-#: src/xml/xmli18n-tmp.h:3185
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:3731
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3159 src/xml/xmli18n-tmp.h:3164
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3705
 msgid "Manual Feed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3709
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3710
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3171
-#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3180
-#: src/xml/xmli18n-tmp.h:3193
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3716 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3739
 msgid "Roll Feed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3714 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3723
 msgid "Manual Sheet Guide"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3715 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3724
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3733
 #, fuzzy
 msgid "Photo Board"
 msgstr "Czarny"
 
-#: src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3734
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3735
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3190
+#: src/xml/xmli18n-tmp.h:3736
 msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3191
+#: src/xml/xmli18n-tmp.h:3737
 msgid "Manual Selection"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3199 src/xml/xmli18n-tmp.h:3207
-#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3219
-#: src/xml/xmli18n-tmp.h:3227 src/xml/xmli18n-tmp.h:3235
-#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3257
-#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3278
-#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3297
-#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3317
-#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3342
-#: src/xml/xmli18n-tmp.h:3356 src/xml/xmli18n-tmp.h:3382
-#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
-#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3426
-#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3446
-#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3474
-#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3498
-#: src/xml/xmli18n-tmp.h:3510 src/xml/xmli18n-tmp.h:3524
-#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3558
-#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:3584
-#: src/xml/xmli18n-tmp.h:3594 src/xml/xmli18n-tmp.h:3600
-#: src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3763 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3872 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:4067 src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4172 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4236 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:4754 src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5102 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5679 src/xml/xmli18n-tmp.h:5748
+#: src/xml/xmli18n-tmp.h:5793 src/xml/xmli18n-tmp.h:5814
+#: src/xml/xmli18n-tmp.h:5835
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3208
-#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3220
-#: src/xml/xmli18n-tmp.h:3228 src/xml/xmli18n-tmp.h:3236
-#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3259
-#: src/xml/xmli18n-tmp.h:3270 src/xml/xmli18n-tmp.h:3280
-#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3298
-#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3318
-#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3344
-#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3383
-#: src/xml/xmli18n-tmp.h:3391 src/xml/xmli18n-tmp.h:3403
-#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3427
-#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3447
-#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3475
-#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3499
-#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3526
-#: src/xml/xmli18n-tmp.h:3551 src/xml/xmli18n-tmp.h:3559
-#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3586
-#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3601
-#: src/xml/xmli18n-tmp.h:3607
+#: src/xml/xmli18n-tmp.h:3765 src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4484 src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:4756 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5321
+#: src/xml/xmli18n-tmp.h:5382 src/xml/xmli18n-tmp.h:5451
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5795 src/xml/xmli18n-tmp.h:5816
+#: src/xml/xmli18n-tmp.h:5837
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
-#: src/xml/xmli18n-tmp.h:3215 src/xml/xmli18n-tmp.h:3221
-#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3237
-#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3271
-#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3299
-#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3319
-#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3345
-#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3384
-#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
-#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3428
-#: src/xml/xmli18n-tmp.h:3438 src/xml/xmli18n-tmp.h:3448
-#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3463
-#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3476
-#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3500
-#: src/xml/xmli18n-tmp.h:3513 src/xml/xmli18n-tmp.h:3527
-#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3560
-#: src/xml/xmli18n-tmp.h:3573 src/xml/xmli18n-tmp.h:3587
-#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3602
-#: src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:3824 src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5325
+#: src/xml/xmli18n-tmp.h:5386 src/xml/xmli18n-tmp.h:5455
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5757
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5841
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3248
-#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
-#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3360
-#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
-#: src/xml/xmli18n-tmp.h:3417 src/xml/xmli18n-tmp.h:3429
-#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3459
-#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3501 src/xml/xmli18n-tmp.h:3514
-#: src/xml/xmli18n-tmp.h:3528 src/xml/xmli18n-tmp.h:3574
-#: src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4424 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:5066 src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:5196 src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5391
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5762
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3249
-#: src/xml/xmli18n-tmp.h:3272 src/xml/xmli18n-tmp.h:3293
-#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3333
-#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3361
-#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
-#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3430
-#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3460
-#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3478
-#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3502
-#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3529
-#: src/xml/xmli18n-tmp.h:3575 src/xml/xmli18n-tmp.h:3589
+#: src/xml/xmli18n-tmp.h:3780 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:4078 src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:4430 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4972
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5150 src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5336
+#: src/xml/xmli18n-tmp.h:5397 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5768
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3919 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:4781 src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:4795 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4921
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:4996
+#: src/xml/xmli18n-tmp.h:5023 src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:5226 src/xml/xmli18n-tmp.h:5279
+#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5603 src/xml/xmli18n-tmp.h:5609
+#: src/xml/xmli18n-tmp.h:5636 src/xml/xmli18n-tmp.h:5642
+#, fuzzy
+msgid "Gray 3"
+msgstr "Odcienie szaro¶ci"
+
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4782 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4796 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4916 src/xml/xmli18n-tmp.h:4922
+#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4983
+#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5286 src/xml/xmli18n-tmp.h:5294
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5643
+#, fuzzy
+msgid "Gray 2"
+msgstr "Odcienie szaro¶ci"
+
+#: src/xml/xmli18n-tmp.h:3855 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:4856 src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:4931 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4998
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:5214 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5611
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5644
+#, fuzzy
+msgid "Gray 1"
+msgstr "Odcienie szaro¶ci"
+
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4985 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5606 src/xml/xmli18n-tmp.h:5639
+msgid "MIS Quadtone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4114
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3260 src/xml/xmli18n-tmp.h:3281
+#: src/xml/xmli18n-tmp.h:4016 src/xml/xmli18n-tmp.h:4121
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3282
+#: src/xml/xmli18n-tmp.h:4021 src/xml/xmli18n-tmp.h:4126
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/xml/xmli18n-tmp.h:3262 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4132
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:4035 src/xml/xmli18n-tmp.h:4140
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:4141
+#, fuzzy
+msgid "MatteBlack"
+msgstr "Czarny"
+
+#: src/xml/xmli18n-tmp.h:4224
 #, fuzzy
 msgid "Default Black"
 msgstr "Ustaw domy¶lne"
 
-#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
-#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3365
-#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3504
-#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3533
-#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3564
-#: src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4446 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4573 src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:5344
+#: src/xml/xmli18n-tmp.h:5413 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5715
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:4315
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3348
-#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3516
-#: src/xml/xmli18n-tmp.h:3530 src/xml/xmli18n-tmp.h:3576
-#: src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:4368 src/xml/xmli18n-tmp.h:4437
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:5404
+#: src/xml/xmli18n-tmp.h:5473 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5775
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3355
-#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3523
-#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5745
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Odcienie szaro¶ci"
 
-#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3357
-#: src/xml/xmli18n-tmp.h:3511 src/xml/xmli18n-tmp.h:3525
-#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:4412 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5448
+#: src/xml/xmli18n-tmp.h:5681 src/xml/xmli18n-tmp.h:5750
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3372
-#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3540
+#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5531
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3378
-#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:4652 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5570
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/xml/xmli18n-tmp.h:3462 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:5288
+msgid "MIS Six Tone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:4994
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5291
+#, fuzzy
+msgid "Gray 5"
+msgstr "Odcienie szaro¶ci"
+
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:4928 src/xml/xmli18n-tmp.h:4995
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5292
+#, fuzzy
+msgid "Gray 4"
+msgstr "Odcienie szaro¶ci"
+
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5145
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3615
-#: src/xml/xmli18n-tmp.h:3621
+#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5852
+#: src/xml/xmli18n-tmp.h:5858
 #, fuzzy
 msgid "Interleave"
 msgstr "Ustawienia drukarki"
 
-#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3616
-#: src/xml/xmli18n-tmp.h:3622
+#: src/xml/xmli18n-tmp.h:5848 src/xml/xmli18n-tmp.h:5853
+#: src/xml/xmli18n-tmp.h:5859
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3612 src/xml/xmli18n-tmp.h:3617
-#: src/xml/xmli18n-tmp.h:3623
+#: src/xml/xmli18n-tmp.h:5849 src/xml/xmli18n-tmp.h:5854
+#: src/xml/xmli18n-tmp.h:5860
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3613 src/xml/xmli18n-tmp.h:3618
-#: src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5855
+#: src/xml/xmli18n-tmp.h:5861
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:5862
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Ustawienia drukarki"
 
-#: src/xml/xmli18n-tmp.h:3626
+#: src/xml/xmli18n-tmp.h:5863
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Jasno¶æ:"
 
-#: src/xml/xmli18n-tmp.h:3628
+#: src/xml/xmli18n-tmp.h:5865
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:5909
 msgid "Legal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:5910
 msgid "Tabloid"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3674
+#: src/xml/xmli18n-tmp.h:5911
 msgid "Executive"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3679
+#: src/xml/xmli18n-tmp.h:5916
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:3680
+#: src/xml/xmli18n-tmp.h:5917
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:5918
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:3682
+#: src/xml/xmli18n-tmp.h:5919
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:5920
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5921
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:3684
+#: src/xml/xmli18n-tmp.h:5922
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:3685
+#: src/xml/xmli18n-tmp.h:5923
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:3686
+#: src/xml/xmli18n-tmp.h:5924
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:3688
+#: src/xml/xmli18n-tmp.h:5926
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:3689
+#: src/xml/xmli18n-tmp.h:5927
 msgid "Super B 13x19"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3690
+#: src/xml/xmli18n-tmp.h:5928
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3691
+#: src/xml/xmli18n-tmp.h:5929
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:3692
+#: src/xml/xmli18n-tmp.h:5930
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:3693
+#: src/xml/xmli18n-tmp.h:5931
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:3694
+#: src/xml/xmli18n-tmp.h:5932
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:3695
+#: src/xml/xmli18n-tmp.h:5933
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:3696
+#: src/xml/xmli18n-tmp.h:5934
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:3697
+#: src/xml/xmli18n-tmp.h:5935
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:3698
+#: src/xml/xmli18n-tmp.h:5936
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:3699
+#: src/xml/xmli18n-tmp.h:5937
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3700
+#: src/xml/xmli18n-tmp.h:5938
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:5939
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:3702
+#: src/xml/xmli18n-tmp.h:5940
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:3703
+#: src/xml/xmli18n-tmp.h:5941
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:5942
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:3705
+#: src/xml/xmli18n-tmp.h:5943
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:3706
+#: src/xml/xmli18n-tmp.h:5944
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:3707
+#: src/xml/xmli18n-tmp.h:5945
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:3709
+#: src/xml/xmli18n-tmp.h:5947
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:3710
+#: src/xml/xmli18n-tmp.h:5948
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:5949
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:5950
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:3713
+#: src/xml/xmli18n-tmp.h:5951
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:3714
+#: src/xml/xmli18n-tmp.h:5952
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:3715
+#: src/xml/xmli18n-tmp.h:5953
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:3716
+#: src/xml/xmli18n-tmp.h:5954
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:5955
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:5956
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:5957
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:5958
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:5959
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:3722
+#: src/xml/xmli18n-tmp.h:5960
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:3723
+#: src/xml/xmli18n-tmp.h:5961
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:3724
+#: src/xml/xmli18n-tmp.h:5962
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:3725
+#: src/xml/xmli18n-tmp.h:5963
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:3726
+#: src/xml/xmli18n-tmp.h:5964
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:5965
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:5966
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:5967
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:3730
+#: src/xml/xmli18n-tmp.h:5968
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:3731
+#: src/xml/xmli18n-tmp.h:5969
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:3732
+#: src/xml/xmli18n-tmp.h:5970
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:3733
+#: src/xml/xmli18n-tmp.h:5971
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:3734
+#: src/xml/xmli18n-tmp.h:5972
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:3735
+#: src/xml/xmli18n-tmp.h:5973
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:3736
+#: src/xml/xmli18n-tmp.h:5974
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:3737
+#: src/xml/xmli18n-tmp.h:5975
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5976
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3739
+#: src/xml/xmli18n-tmp.h:5977
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:5978
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:3741
+#: src/xml/xmli18n-tmp.h:5979
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:5980
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:3743
+#: src/xml/xmli18n-tmp.h:5981
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:5982
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:5983
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:3746
+#: src/xml/xmli18n-tmp.h:5984
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:3747
+#: src/xml/xmli18n-tmp.h:5985
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:3748
+#: src/xml/xmli18n-tmp.h:5986
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:5987
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:3750
+#: src/xml/xmli18n-tmp.h:5988
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:3751
+#: src/xml/xmli18n-tmp.h:5989
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:5990
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:5991
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:3754
+#: src/xml/xmli18n-tmp.h:5992
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:3755
+#: src/xml/xmli18n-tmp.h:5993
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:3756
+#: src/xml/xmli18n-tmp.h:5994
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:5995
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:3758
+#: src/xml/xmli18n-tmp.h:5996
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:3759
+#: src/xml/xmli18n-tmp.h:5997
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:5998
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:3761
+#: src/xml/xmli18n-tmp.h:5999
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:6000
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:3763
+#: src/xml/xmli18n-tmp.h:6001
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:6002
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:3765
+#: src/xml/xmli18n-tmp.h:6003
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:3766
+#: src/xml/xmli18n-tmp.h:6004
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:6005
 #, fuzzy
 msgid "DL landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:3768
+#: src/xml/xmli18n-tmp.h:6006
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:3769
+#: src/xml/xmli18n-tmp.h:6007
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:3770
+#: src/xml/xmli18n-tmp.h:6008
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:6009
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:3772
+#: src/xml/xmli18n-tmp.h:6010
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:6011
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:3774
+#: src/xml/xmli18n-tmp.h:6012
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:3775
+#: src/xml/xmli18n-tmp.h:6013
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:6014
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:6015
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Pejza¿"
 
-#: src/xml/xmli18n-tmp.h:3778
+#: src/xml/xmli18n-tmp.h:6016
 msgid "ArchA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3779
+#: src/xml/xmli18n-tmp.h:6017
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3780
+#: src/xml/xmli18n-tmp.h:6018
 msgid "ArchB"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:6019
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3782
+#: src/xml/xmli18n-tmp.h:6020
 msgid "ArchC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:6021
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3784
+#: src/xml/xmli18n-tmp.h:6022
 msgid "ArchD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:6023
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:6024
 msgid "ArchE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3787
+#: src/xml/xmli18n-tmp.h:6025
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:6026
 msgid "American foolscap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3789
+#: src/xml/xmli18n-tmp.h:6027
 msgid "European foolscap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:6028
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:6029
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3792
+#: src/xml/xmli18n-tmp.h:6030
 msgid "Demy Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:6031
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3794
+#: src/xml/xmli18n-tmp.h:6032
 msgid "Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3795
+#: src/xml/xmli18n-tmp.h:6033
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:6034
 msgid "Demy Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:6035
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:6036
 msgid "Small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:6037
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:6038
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:6039
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3802
+#: src/xml/xmli18n-tmp.h:6040
 msgid "Hagaki Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:6041
 msgid "Oufuku Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3804
+#: src/xml/xmli18n-tmp.h:6042
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3805
+#: src/xml/xmli18n-tmp.h:6043
 msgid "Japanese long envelope #3 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3806
+#: src/xml/xmli18n-tmp.h:6044
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:6045
 msgid "Japanese long envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:6046
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3809
+#: src/xml/xmli18n-tmp.h:6047
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:6048
 msgid "Commercial 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:6049
 msgid "Commercial 10 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:6050
 msgid "A2 Invitation"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3813
+#: src/xml/xmli18n-tmp.h:6051
 #, fuzzy
 msgid "Monarch Envelope"
 msgstr "Koperta"
 
-#: src/xml/xmli18n-tmp.h:3814
+#: src/xml/xmli18n-tmp.h:6052
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Koperta"
 
-#: src/xml/xmli18n-tmp.h:3815
+#: src/xml/xmli18n-tmp.h:6053
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3816
+#: src/xml/xmli18n-tmp.h:6054
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:6055
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3818
+#: src/xml/xmli18n-tmp.h:6056
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3819
+#: src/xml/xmli18n-tmp.h:6057
 msgid "Wide Postcard"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3820
+#: src/xml/xmli18n-tmp.h:6058
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:6059
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:6060
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3824
+#: src/xml/xmli18n-tmp.h:6062
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:6063
 msgid "4 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3826
+#: src/xml/xmli18n-tmp.h:6064
 msgid "5 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3827
+#: src/xml/xmli18n-tmp.h:6065
 msgid "210 mm Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:6066
 msgid "13 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3829
+#: src/xml/xmli18n-tmp.h:6067
 msgid "17 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:6068
 msgid "22 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3831
+#: src/xml/xmli18n-tmp.h:6069
 msgid "24 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:6070
 msgid "36 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:6071
 msgid "44 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3834
+#: src/xml/xmli18n-tmp.h:6072
 msgid "60 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:6073
 msgid "64 Inch Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3836
+#: src/xml/xmli18n-tmp.h:6074
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3837
+#: src/xml/xmli18n-tmp.h:6075
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:6076
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:6077
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:6078
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:6079
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:6080
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:6081
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3844
+#: src/xml/xmli18n-tmp.h:6082
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:6083
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3846
+#: src/xml/xmli18n-tmp.h:6084
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3847
+#: src/xml/xmli18n-tmp.h:6085
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3848
+#: src/xml/xmli18n-tmp.h:6086
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:6087
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3850
+#: src/xml/xmli18n-tmp.h:6088
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:6089
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:6090
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3853
+#: src/xml/xmli18n-tmp.h:6091
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3854
+#: src/xml/xmli18n-tmp.h:6092
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3855
+#: src/xml/xmli18n-tmp.h:6093
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3856
+#: src/xml/xmli18n-tmp.h:6094
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3857
+#: src/xml/xmli18n-tmp.h:6095
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3858
+#: src/xml/xmli18n-tmp.h:6096
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:6097
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:6098
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:6099
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:6100
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3863
+#: src/xml/xmli18n-tmp.h:6101
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:6102
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:6103
 msgid "Canon S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:6104
 msgid "Canon S200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3867
+#: src/xml/xmli18n-tmp.h:6105
 msgid "Canon S300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3868
+#: src/xml/xmli18n-tmp.h:6106
 msgid "Canon S400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3869
+#: src/xml/xmli18n-tmp.h:6107
 msgid "Canon S450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3870
+#: src/xml/xmli18n-tmp.h:6108
 msgid "Canon S500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:6109
 msgid "Canon S600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3872
+#: src/xml/xmli18n-tmp.h:6110
 msgid "Canon S630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3873
+#: src/xml/xmli18n-tmp.h:6111
 msgid "Canon S800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3874
+#: src/xml/xmli18n-tmp.h:6112
 msgid "Canon S4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:6113
 msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:6114
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3877
+#: src/xml/xmli18n-tmp.h:6115
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3878
+#: src/xml/xmli18n-tmp.h:6116
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:6117
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3880
+#: src/xml/xmli18n-tmp.h:6118
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3881
+#: src/xml/xmli18n-tmp.h:6119
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:6120
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:6121
 msgid "Canon PIXMA iP4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3884
+#: src/xml/xmli18n-tmp.h:6122
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3885
+#: src/xml/xmli18n-tmp.h:6123
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3886
+#: src/xml/xmli18n-tmp.h:6124
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3887
+#: src/xml/xmli18n-tmp.h:6125
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3888
+#: src/xml/xmli18n-tmp.h:6126
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:6127
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:6128
+msgid "Canon PIXMA iX4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6129
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:6130
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:6131
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:6132
 msgid "Canon PIXMA MP160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:6133
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3895
+#: src/xml/xmli18n-tmp.h:6134
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:6135
 msgid "Canon PIXMA MP220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3897
+#: src/xml/xmli18n-tmp.h:6136
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:6137
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:6138
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3900
+#: src/xml/xmli18n-tmp.h:6139
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:6140
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3902
+#: src/xml/xmli18n-tmp.h:6141
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3903
+#: src/xml/xmli18n-tmp.h:6142
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:6143
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:6144
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:6145
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:6146
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:6147
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:6148
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3910
+#: src/xml/xmli18n-tmp.h:6149
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:6150
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3912
+#: src/xml/xmli18n-tmp.h:6151
 msgid "Canon i80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3913
+#: src/xml/xmli18n-tmp.h:6152
 msgid "Canon i560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3914
+#: src/xml/xmli18n-tmp.h:6153
 msgid "Canon i850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:6154
 msgid "Canon i860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3916
+#: src/xml/xmli18n-tmp.h:6155
 msgid "Canon i865"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:6156
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:6157
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3919
+#: src/xml/xmli18n-tmp.h:6158
 #, fuzzy
 msgid "Epson B-300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3920
+#: src/xml/xmli18n-tmp.h:6159
 #, fuzzy
 msgid "Epson B-308"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3921
+#: src/xml/xmli18n-tmp.h:6160
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3922
+#: src/xml/xmli18n-tmp.h:6161
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3923
+#: src/xml/xmli18n-tmp.h:6162
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:3924
+#: src/xml/xmli18n-tmp.h:6163
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:6164
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:6165
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:6166
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:6167
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:6168
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:6169
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:6170
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3932
+#: src/xml/xmli18n-tmp.h:6171
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:6172
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3934
+#: src/xml/xmli18n-tmp.h:6173
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3935
+#: src/xml/xmli18n-tmp.h:6174
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:6175
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3937
+#: src/xml/xmli18n-tmp.h:6176
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:6177
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3939
+#: src/xml/xmli18n-tmp.h:6178
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:6179
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:6180
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3942
+#: src/xml/xmli18n-tmp.h:6181
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3943
+#: src/xml/xmli18n-tmp.h:6182
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:6183
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:6184
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3946
+#: src/xml/xmli18n-tmp.h:6185
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3947
+#: src/xml/xmli18n-tmp.h:6186
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3948
+#: src/xml/xmli18n-tmp.h:6187
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3949
+#: src/xml/xmli18n-tmp.h:6188
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:6189
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3951
+#: src/xml/xmli18n-tmp.h:6190
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:6191
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3953
+#: src/xml/xmli18n-tmp.h:6192
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:6193
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:6194
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3956
+#: src/xml/xmli18n-tmp.h:6195
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3957
+#: src/xml/xmli18n-tmp.h:6196
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3958
+#: src/xml/xmli18n-tmp.h:6197
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3959
+#: src/xml/xmli18n-tmp.h:6198
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3960
+#: src/xml/xmli18n-tmp.h:6199
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:6200
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:6201
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:6202
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3964
+#: src/xml/xmli18n-tmp.h:6203
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:6204
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3966
+#: src/xml/xmli18n-tmp.h:6205
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3967
+#: src/xml/xmli18n-tmp.h:6206
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:6207
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:6208
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3970
+#: src/xml/xmli18n-tmp.h:6209
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:6210
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:3972
+#: src/xml/xmli18n-tmp.h:6211
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:6212
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:6213
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:3975
+#: src/xml/xmli18n-tmp.h:6214
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:6215
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:6216
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:6217
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:3979
+#: src/xml/xmli18n-tmp.h:6218
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:6219
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:3981
+#: src/xml/xmli18n-tmp.h:6220
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:3982
+#: src/xml/xmli18n-tmp.h:6221
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:3983
+#: src/xml/xmli18n-tmp.h:6222
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:3984
+#: src/xml/xmli18n-tmp.h:6223
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:6224
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:6225
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:3987
+#: src/xml/xmli18n-tmp.h:6226
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:6227
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:3989
+#: src/xml/xmli18n-tmp.h:6228
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:6229
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:6230
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:3992
+#: src/xml/xmli18n-tmp.h:6231
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:3993
+#: src/xml/xmli18n-tmp.h:6232
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:6233
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:3995
+#: src/xml/xmli18n-tmp.h:6234
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:6235
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:6236
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3998
+#: src/xml/xmli18n-tmp.h:6237
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3999
+#: src/xml/xmli18n-tmp.h:6238
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:6239
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:6240
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:4002
+#: src/xml/xmli18n-tmp.h:6241
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:6242
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:6243
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4005
+#: src/xml/xmli18n-tmp.h:6244
 #, fuzzy
-msgid "Epson Stylus Offixe TX300F"
+msgid "Epson Stylus Office TX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4006
+#: src/xml/xmli18n-tmp.h:6245
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:6246
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:4008
+#: src/xml/xmli18n-tmp.h:6247
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4009
+#: src/xml/xmli18n-tmp.h:6248
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:6249
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:6250
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:6251
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4013
+#: src/xml/xmli18n-tmp.h:6252
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4014
+#: src/xml/xmli18n-tmp.h:6253
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:6254
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:4016
+#: src/xml/xmli18n-tmp.h:6255
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:6256
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:6257
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4019
+#: src/xml/xmli18n-tmp.h:6258
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4020
+#: src/xml/xmli18n-tmp.h:6259
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4021
+#: src/xml/xmli18n-tmp.h:6260
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:4022
+#: src/xml/xmli18n-tmp.h:6261
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:4023
+#: src/xml/xmli18n-tmp.h:6262
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:4024
+#: src/xml/xmli18n-tmp.h:6263
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:6264
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:6265
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4027
+#: src/xml/xmli18n-tmp.h:6266
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:6267
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:6268
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:6269
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:4031
+#: src/xml/xmli18n-tmp.h:6270
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:6271
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4033
+#: src/xml/xmli18n-tmp.h:6272
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4034
+#: src/xml/xmli18n-tmp.h:6273
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4035
+#: src/xml/xmli18n-tmp.h:6274
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:6275
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4037
+#: src/xml/xmli18n-tmp.h:6276
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:4038
+#: src/xml/xmli18n-tmp.h:6277
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4039
+#: src/xml/xmli18n-tmp.h:6278
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:6279
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4041
+#: src/xml/xmli18n-tmp.h:6280
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:6281
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:6282
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4044
+#: src/xml/xmli18n-tmp.h:6283
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:6284
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:6285
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:6286
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:6287
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4049
+#: src/xml/xmli18n-tmp.h:6288
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:6289
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4051
+#: src/xml/xmli18n-tmp.h:6290
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:6291
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4053
+#: src/xml/xmli18n-tmp.h:6292
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4054
+#: src/xml/xmli18n-tmp.h:6293
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:6294
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4056
+#: src/xml/xmli18n-tmp.h:6295
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:6296
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4058
+#: src/xml/xmli18n-tmp.h:6297
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4059
+#: src/xml/xmli18n-tmp.h:6298
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:6299
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:6300
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4062
+#: src/xml/xmli18n-tmp.h:6301
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:6302
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4064
+#: src/xml/xmli18n-tmp.h:6303
+#, fuzzy
+msgid "Epson Stylus Photo R2880"
+msgstr "Stylus Photo 1280"
+
+#: src/xml/xmli18n-tmp.h:6304
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4065
+#: src/xml/xmli18n-tmp.h:6305
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:6306
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4067
+#: src/xml/xmli18n-tmp.h:6307
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:6308
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4069
+#: src/xml/xmli18n-tmp.h:6309
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:6310
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:6311
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4072
+#: src/xml/xmli18n-tmp.h:6312
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:6313
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4074
+#: src/xml/xmli18n-tmp.h:6314
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4075
+#: src/xml/xmli18n-tmp.h:6315
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4076
+#: src/xml/xmli18n-tmp.h:6316
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:6317
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4078
+#: src/xml/xmli18n-tmp.h:6318
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:6319
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:6320
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:6321
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4082
+#: src/xml/xmli18n-tmp.h:6322
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:6323
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4084
+#: src/xml/xmli18n-tmp.h:6324
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4085
+#: src/xml/xmli18n-tmp.h:6325
 #, fuzzy
-msgid "Epson Stylus Photo TX800W"
+msgid "Epson Stylus Photo TX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4086
+#: src/xml/xmli18n-tmp.h:6326
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:4087
+#: src/xml/xmli18n-tmp.h:6327
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:4088
+#: src/xml/xmli18n-tmp.h:6328
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4089
+#: src/xml/xmli18n-tmp.h:6329
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:6330
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4091
+#: src/xml/xmli18n-tmp.h:6331
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:6332
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4093
+#: src/xml/xmli18n-tmp.h:6333
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4094
+#: src/xml/xmli18n-tmp.h:6334
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:6335
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:6336
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4097
+#: src/xml/xmli18n-tmp.h:6337
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:6338
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4099
+#: src/xml/xmli18n-tmp.h:6339
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:6340
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:6341
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:6342
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:6343
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:6344
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:6345
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:6346
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:6347
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:6348
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:6349
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4110
+#: src/xml/xmli18n-tmp.h:6350
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:6351
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:6352
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4113
+#: src/xml/xmli18n-tmp.h:6353
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:6354
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:6355
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4116
+#: src/xml/xmli18n-tmp.h:6356
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:6357
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4118
+#: src/xml/xmli18n-tmp.h:6358
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4119
+#: src/xml/xmli18n-tmp.h:6359
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:6360
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4121
+#: src/xml/xmli18n-tmp.h:6361
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:6362
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:6363
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4124
+#: src/xml/xmli18n-tmp.h:6364
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:6365
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4126
+#: src/xml/xmli18n-tmp.h:6366
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4127
+#: src/xml/xmli18n-tmp.h:6367
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4128
+#: src/xml/xmli18n-tmp.h:6368
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4129
+#: src/xml/xmli18n-tmp.h:6369
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:6370
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:6371
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:6372
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:6373
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:6374
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:6375
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:6376
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:6377
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:6378
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:6379
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:6380
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:6381
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:6382
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:6383
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4144
+#: src/xml/xmli18n-tmp.h:6384
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:6385
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:6386
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:6387
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:6388
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:6389
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:6390
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:6391
+#, fuzzy
+msgid "Epson Stylus DX4000"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:6392
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:6393
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:6394
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4154
+#: src/xml/xmli18n-tmp.h:6395
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:6396
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:6397
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:6398
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:6399
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:6400
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:6401
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:6402
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:6403
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:6404
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:6405
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:6406
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:6407
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:6408
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:6409
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:6410
 #, fuzzy
-msgid "Epson Stylus PX700FW"
+msgid "Epson Stylus PX700W"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:6411
 #, fuzzy
 msgid "Epson Stylus PX800FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:6412
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4172
+#: src/xml/xmli18n-tmp.h:6413
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:6414
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4174
+#: src/xml/xmli18n-tmp.h:6415
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:6416
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:6417
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4177
+#: src/xml/xmli18n-tmp.h:6418
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4178
+#: src/xml/xmli18n-tmp.h:6419
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4179
+#: src/xml/xmli18n-tmp.h:6420
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4180
+#: src/xml/xmli18n-tmp.h:6421
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4181
+#: src/xml/xmli18n-tmp.h:6422
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:6423
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:6424
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:6425
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:6426
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:6427
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4187
+#: src/xml/xmli18n-tmp.h:6428
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4188
+#: src/xml/xmli18n-tmp.h:6429
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:6430
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:6431
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:6432
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4192
+#: src/xml/xmli18n-tmp.h:6433
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:6434
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:6435
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:6436
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4196
+#: src/xml/xmli18n-tmp.h:6437
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:6438
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:6439
 msgid "Epson PictureMate 215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4199
+#: src/xml/xmli18n-tmp.h:6440
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:6441
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:6442
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:6443
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4204
+#: src/xml/xmli18n-tmp.h:6445
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:6446
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:6447
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4207
+#: src/xml/xmli18n-tmp.h:6448
 msgid "Epson WorkForce 30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:6449
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:6450
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:6451
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:6452
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4212
+#: src/xml/xmli18n-tmp.h:6453
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:6454
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:6455
 msgid "Epson E 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4215
+#: src/xml/xmli18n-tmp.h:6456
 msgid "Epson E 150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4216
+#: src/xml/xmli18n-tmp.h:6457
 msgid "Epson E 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:6458
 msgid "Epson E 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:6459
 msgid "Epson E 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4219
+#: src/xml/xmli18n-tmp.h:6460
 msgid "Epson E 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:6461
 msgid "Epson E 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:6462
 msgid "Epson E 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:6463
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:6464
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4224
+#: src/xml/xmli18n-tmp.h:6465
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:6466
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:6467
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:6468
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4228
+#: src/xml/xmli18n-tmp.h:6469
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4229
+#: src/xml/xmli18n-tmp.h:6470
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:6471
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:6472
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:6473
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:6474
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:6475
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:6476
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:6477
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:6478
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4238
+#: src/xml/xmli18n-tmp.h:6479
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:6480
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:6481
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:6482
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4242
+#: src/xml/xmli18n-tmp.h:6483
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4243
+#: src/xml/xmli18n-tmp.h:6484
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:6485
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:6486
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4246
+#: src/xml/xmli18n-tmp.h:6487
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:6488
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:6490
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4251
+#: src/xml/xmli18n-tmp.h:6492
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4253
+#: src/xml/xmli18n-tmp.h:6494
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4254
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:6496
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:6497
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:6498
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:6499
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4259
+#: src/xml/xmli18n-tmp.h:6500
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4260
+#: src/xml/xmli18n-tmp.h:6501
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:6502
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4262
+#: src/xml/xmli18n-tmp.h:6503
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4263
+#: src/xml/xmli18n-tmp.h:6504
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4264
+#: src/xml/xmli18n-tmp.h:6505
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4265
+#: src/xml/xmli18n-tmp.h:6506
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:6507
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:6508
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:6509
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:6510
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:6511
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:6512
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:6513
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:6514
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4274
+#: src/xml/xmli18n-tmp.h:6515
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4275
+#: src/xml/xmli18n-tmp.h:6516
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4276
+#: src/xml/xmli18n-tmp.h:6517
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:6518
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:6519
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:6520
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:6521
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:6522
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:6523
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:6524
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:6525
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4285
+#: src/xml/xmli18n-tmp.h:6526
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4286
+#: src/xml/xmli18n-tmp.h:6527
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:6528
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:6529
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:6530
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:6531
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:6532
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4292
+#: src/xml/xmli18n-tmp.h:6533
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:6534
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:6535
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4295
+#: src/xml/xmli18n-tmp.h:6536
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4296
+#: src/xml/xmli18n-tmp.h:6537
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4297
+#: src/xml/xmli18n-tmp.h:6538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:6539
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4299
+#: src/xml/xmli18n-tmp.h:6540
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:6541
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:6542
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:6543
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:6544
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4305
+#: src/xml/xmli18n-tmp.h:6546
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:6547
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4307
+#: src/xml/xmli18n-tmp.h:6548
+#, fuzzy
+msgid "Epson PX G5600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6549
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4308
+#: src/xml/xmli18n-tmp.h:6550
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4309
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4310
+#: src/xml/xmli18n-tmp.h:6552
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:6553
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:6554
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4313
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:6556
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4315
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:6559
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:6560
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:6561
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:6562
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:6563
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:6564
 msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:6565
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4324
+#: src/xml/xmli18n-tmp.h:6566
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:6567
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4326
+#: src/xml/xmli18n-tmp.h:6568
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4327
+#: src/xml/xmli18n-tmp.h:6569
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:6570
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:6571
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Brother HL-1430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:6576
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Brother HL-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4337
+#: src/xml/xmli18n-tmp.h:6579
 msgid "Brother HL-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:6580
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:6581
 msgid "Brother HL-1670N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:6582
 msgid "Brother HL-1850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:6583
 msgid "Brother HL-1870N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:6584
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:6585
 msgid "Brother HL-2460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:6586
 msgid "Brother HL-2460N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:6587
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4346
+#: src/xml/xmli18n-tmp.h:6588
 msgid "Brother HL-5030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:6589
 msgid "Brother HL-5040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:6590
 msgid "Brother HL-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:6591
 msgid "Brother HL-5070N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4350
+#: src/xml/xmli18n-tmp.h:6592
 msgid "Brother HL-5140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4351
+#: src/xml/xmli18n-tmp.h:6593
 msgid "Brother HL-5150D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:6594
 msgid "Brother HL-5170DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:6595
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4354
+#: src/xml/xmli18n-tmp.h:6596
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:6597
 msgid "Brother HL-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:6598
 msgid "Brother HL-7050N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4357
+#: src/xml/xmli18n-tmp.h:6599
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4358
+#: src/xml/xmli18n-tmp.h:6600
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:6601
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:6602
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:6603
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:6604
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:6605
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:6606
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:6607
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:6608
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:6609
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:6610
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:6611
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:6612
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:6613
 msgid "DEC 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:6614
 msgid "DEC LN17"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4373
+#: src/xml/xmli18n-tmp.h:6615
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4374
+#: src/xml/xmli18n-tmp.h:6616
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:6617
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4376
+#: src/xml/xmli18n-tmp.h:6618
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:6619
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:6620
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:6621
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:6622
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:6623
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:6624
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:6625
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4384
+#: src/xml/xmli18n-tmp.h:6626
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4385
+#: src/xml/xmli18n-tmp.h:6627
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4386
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4387
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:6630
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4389
+#: src/xml/xmli18n-tmp.h:6631
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4392
+#: src/xml/xmli18n-tmp.h:6634
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:6635
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:6636
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:6637
 msgid "Epson EPL-N2050PS+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4397
+#: src/xml/xmli18n-tmp.h:6639
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:6640
 #, fuzzy
 msgid "Epson EPL-N2500PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4400
+#: src/xml/xmli18n-tmp.h:6642
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:6643
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4403
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:6646
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:6647
 msgid "Generic PCL 4 Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4406
+#: src/xml/xmli18n-tmp.h:6648
 msgid "Generic PCL 4 LF Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4407
+#: src/xml/xmli18n-tmp.h:6649
 msgid "Generic PCL 5 Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4408
+#: src/xml/xmli18n-tmp.h:6650
 msgid "Generic PCL 5 LF Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:6651
 msgid "Generic PCL 5c Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:6652
 msgid "Generic PCL 5c LF Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:6653
 msgid "Generic PCL 5e Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:6654
 msgid "Generic PCL 5e LF Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:6656
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:6657
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4416
+#: src/xml/xmli18n-tmp.h:6658
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:6659
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:6660
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:6661
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4420
-msgid "Gestetner 3532"
+#: src/xml/xmli18n-tmp.h:6662
+msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4421
-msgid "Gestetner 4235g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:6663
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4423
-msgid "Gestetner 4532"
+#: src/xml/xmli18n-tmp.h:6664
+msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4424
-msgid "Gestetner 4245g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:6665
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:6666
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:6668
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:6669
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:6670
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4431
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:6672
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:6673
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:6674
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:6675
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4436
+#: src/xml/xmli18n-tmp.h:6676
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4437
-msgid "Gestetner DSm635"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4438
-msgid "Gestetner DSm635G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4439
-msgid "Gestetner DSm645"
+#: src/xml/xmli18n-tmp.h:6677
+msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4440
-msgid "Gestetner DS645G"
+#: src/xml/xmli18n-tmp.h:6678
+msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:6679
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:6680
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4443
+#: src/xml/xmli18n-tmp.h:6681
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:6682
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:6683
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4446
-msgid "Gestetner DSm735"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4447
-msgid "Gestetner DSm735G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4448
-msgid "Gestetner DSm745"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4449
-msgid "Gestetner DSm745G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4450
-msgid "Gestetner MP1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4451
-msgid "Gestetner DSm7110"
+#: src/xml/xmli18n-tmp.h:6684
+msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4452
-msgid "Gestetner MP1350"
+#: src/xml/xmli18n-tmp.h:6685
+msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4453
-msgid "Gestetner DSm7135"
+#: src/xml/xmli18n-tmp.h:6686
+msgid "Gestetner MP1100/DSm7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4454
-msgid "Gestetner MP1600"
+#: src/xml/xmli18n-tmp.h:6687
+msgid "Gestetner MP1350/DSm7135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4455
-msgid "Gestetner DSm716"
+#: src/xml/xmli18n-tmp.h:6688
+msgid "Gestetner MP1600/DSm716"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4456
-msgid "Gestetner MP2000"
+#: src/xml/xmli18n-tmp.h:6689
+msgid "Gestetner MP2000/DSm721d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4457
-msgid "Gestetner DSm721d"
+#: src/xml/xmli18n-tmp.h:6690
+msgid "Gestetner MP2500/DSm625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4458
-msgid "Gestetner MP2500"
+#: src/xml/xmli18n-tmp.h:6691
+msgid "Gestetner MP3500/DSm735e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4459
-msgid "Gestetner DSm625"
+#: src/xml/xmli18n-tmp.h:6692
+msgid "Gestetner MP4500/DSm745e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4460
-msgid "Gestetner MP3500"
+#: src/xml/xmli18n-tmp.h:6693
+msgid "Gestetner MP5500/DSm755"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4461
-msgid "Gestetner DSm735e"
+#: src/xml/xmli18n-tmp.h:6694
+msgid "Gestetner MP6500/DSm765"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4462
-msgid "Gestetner MP4500"
+#: src/xml/xmli18n-tmp.h:6695
+msgid "Gestetner MP7500/DSm775"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4463
-msgid "Gestetner DSm745e"
+#: src/xml/xmli18n-tmp.h:6696
+msgid "Gestetner MP9000/DSm790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4464
-msgid "Gestetner MP5500"
+#: src/xml/xmli18n-tmp.h:6697
+msgid "Gestetner MP 161/DSm416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4465
-msgid "Gestetner DSm755"
+#: src/xml/xmli18n-tmp.h:6698
+msgid "Gestetner MP 2510/DSm725e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4466
-msgid "Gestetner MP6500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4467
-msgid "Gestetner DSm765"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4468
-msgid "Gestetner MP7500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4469
-msgid "Gestetner DSm775"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4470
-msgid "Gestetner MP9000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4471
-msgid "Gestetner DSm790"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4472
-msgid "Gestetner MP 161"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4473
-msgid "Gestetner DSm416"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4474
-msgid "Gestetner MP 2510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4475
-msgid "Gestetner DSm725e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:6699
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:6700
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4478
-msgid "Gestetner MP 3010"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4479
-msgid "Gestetner DSm730e"
+#: src/xml/xmli18n-tmp.h:6701
+msgid "Gestetner MP 3010/DSm730e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4480
+#: src/xml/xmli18n-tmp.h:6702
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:6703
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:6704
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:6705
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Gestetner MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:6707
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:6708
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:6709
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:6710
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4489
+#: src/xml/xmli18n-tmp.h:6711
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:6712
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:6713
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4492
+#: src/xml/xmli18n-tmp.h:6714
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:6715
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:6716
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4495
+#: src/xml/xmli18n-tmp.h:6717
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4496
+#: src/xml/xmli18n-tmp.h:6718
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4497
+#: src/xml/xmli18n-tmp.h:6719
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:6720
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:6721
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:6722
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:6723
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:6724
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:6725
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:6726
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:6727
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4506
+#: src/xml/xmli18n-tmp.h:6728
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:6729
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4508
+#: src/xml/xmli18n-tmp.h:6730
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4509
+#: src/xml/xmli18n-tmp.h:6731
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4510
+#: src/xml/xmli18n-tmp.h:6732
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:6733
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:6734
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:6735
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:6736
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:6737
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:6738
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:6739
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4518
+#: src/xml/xmli18n-tmp.h:6740
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:6741
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:6742
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:6743
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:6744
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4523
+#: src/xml/xmli18n-tmp.h:6745
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:6746
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:6747
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:6748
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:6749
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4528
+#: src/xml/xmli18n-tmp.h:6750
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4529
+#: src/xml/xmli18n-tmp.h:6751
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4530
+#: src/xml/xmli18n-tmp.h:6752
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:6753
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4532
+#: src/xml/xmli18n-tmp.h:6754
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:6755
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:6756
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:6757
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:6758
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:6759
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:6760
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4539
+#: src/xml/xmli18n-tmp.h:6761
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4540
+#: src/xml/xmli18n-tmp.h:6762
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4541
+#: src/xml/xmli18n-tmp.h:6763
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4542
+#: src/xml/xmli18n-tmp.h:6764
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4543
+#: src/xml/xmli18n-tmp.h:6765
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:6766
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:6767
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4546
+#: src/xml/xmli18n-tmp.h:6768
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:6769
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:6770
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:6771
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:6772
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:6773
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4552
+#: src/xml/xmli18n-tmp.h:6774
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:6775
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:6776
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:6777
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:6778
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:6779
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:6780
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:6781
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:6782
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:6783
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:6784
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:6785
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:6786
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:6787
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:6788
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4567
+#: src/xml/xmli18n-tmp.h:6789
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4568
+#: src/xml/xmli18n-tmp.h:6790
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:6791
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4570
+#: src/xml/xmli18n-tmp.h:6792
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4571
+#: src/xml/xmli18n-tmp.h:6793
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:6794
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:6795
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:6796
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:6797
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:6798
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:6799
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:6800
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:6801
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:6802
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:6803
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4582
+#: src/xml/xmli18n-tmp.h:6804
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4583
+#: src/xml/xmli18n-tmp.h:6805
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4584
+#: src/xml/xmli18n-tmp.h:6806
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4585
+#: src/xml/xmli18n-tmp.h:6807
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:6808
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:6809
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:6810
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:6811
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:6812
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:6813
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:6814
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4593
+#: src/xml/xmli18n-tmp.h:6815
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4594
+#: src/xml/xmli18n-tmp.h:6816
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:6817
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:6818
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4597
+#: src/xml/xmli18n-tmp.h:6819
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:6820
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:6821
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:6822
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:6823
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4602
+#: src/xml/xmli18n-tmp.h:6824
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:6825
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:6826
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:6827
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:6828
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4607
+#: src/xml/xmli18n-tmp.h:6829
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:6830
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4609
+#: src/xml/xmli18n-tmp.h:6831
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4610
+#: src/xml/xmli18n-tmp.h:6832
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:6833
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:6834
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4613
+#: src/xml/xmli18n-tmp.h:6835
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:6836
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:6837
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:6838
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:6839
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:6840
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:6841
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:6842
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:6843
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:6844
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:6845
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4624
+#: src/xml/xmli18n-tmp.h:6846
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4625
+#: src/xml/xmli18n-tmp.h:6847
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:6848
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4627
+#: src/xml/xmli18n-tmp.h:6849
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4628
+#: src/xml/xmli18n-tmp.h:6850
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:6851
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:6852
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:6853
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:6854
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:6855
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:6856
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:6857
 msgid "HP LaserJet 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4636
+#: src/xml/xmli18n-tmp.h:6858
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4637
+#: src/xml/xmli18n-tmp.h:6859
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4638
+#: src/xml/xmli18n-tmp.h:6860
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:6861
 msgid "HP LaserJet 1320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4640
+#: src/xml/xmli18n-tmp.h:6862
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:6863
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:6864
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:6865
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4644
+#: src/xml/xmli18n-tmp.h:6866
 msgid "HP LaserJet 2410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:6867
 msgid "HP LaserJet 2420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:6868
 msgid "HP LaserJet 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4647
+#: src/xml/xmli18n-tmp.h:6869
 msgid "HP LaserJet 3015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4648
+#: src/xml/xmli18n-tmp.h:6870
 msgid "HP LaserJet 3020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:6871
 msgid "HP LaserJet 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4650
+#: src/xml/xmli18n-tmp.h:6872
 msgid "HP LaserJet 3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:6873
 msgid "HP LaserJet 3052"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:6874
 msgid "HP LaserJet 3055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:6875
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:6876
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:6877
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:6878
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:6879
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:6880
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:6881
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4660
+#: src/xml/xmli18n-tmp.h:6882
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:6883
 msgid "HP LaserJet 3380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:6884
 msgid "HP LaserJet 3390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4663
+#: src/xml/xmli18n-tmp.h:6885
 msgid "HP LaserJet 3392"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:6886
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:6887
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:6888
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4667
+#: src/xml/xmli18n-tmp.h:6889
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:6890
 msgid "HP LaserJet 4240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:6891
 msgid "HP LaserJet 4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:6892
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4671
+#: src/xml/xmli18n-tmp.h:6893
 msgid "HP LaserJet 4345 mfp"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:6894
 msgid "HP LaserJet 4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:6895
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:6896
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:6897
 msgid "HP LaserJet 5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:6898
 msgid "HP LaserJet 5200L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:6899
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:6900
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:6901
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4680
+#: src/xml/xmli18n-tmp.h:6902
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:6903
 msgid "HP LaserJet 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4682
+#: src/xml/xmli18n-tmp.h:6904
 msgid "HP LaserJet 9040 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4683
+#: src/xml/xmli18n-tmp.h:6905
 msgid "HP LaserJet 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4684
+#: src/xml/xmli18n-tmp.h:6906
 msgid "HP LaserJet 9050 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:6907
 msgid "HP LaserJet M3027 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:6908
 msgid "HP LaserJet M3035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:6909
 msgid "HP LaserJet M4345 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:6910
 msgid "HP LaserJet M5025 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:6911
 msgid "HP LaserJet M5035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:6912
 msgid "HP LaserJet P2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:6913
 msgid "HP LaserJet P2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:6914
 msgid "HP LaserJet P3004"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:6915
 msgid "HP LaserJet P3005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:6916
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4695
+#: src/xml/xmli18n-tmp.h:6917
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:6918
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:6919
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:6920
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:6921
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4700
+#: src/xml/xmli18n-tmp.h:6922
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:6923
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:6924
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4703
+#: src/xml/xmli18n-tmp.h:6925
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:6926
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:6927
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4706
+#: src/xml/xmli18n-tmp.h:6928
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4707
+#: src/xml/xmli18n-tmp.h:6929
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:6930
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:6931
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4710
+#: src/xml/xmli18n-tmp.h:6932
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:6933
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:6934
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:6935
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:6936
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:6937
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:6938
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:6939
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4718
+#: src/xml/xmli18n-tmp.h:6940
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:6941
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:6942
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4721
+#: src/xml/xmli18n-tmp.h:6943
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:6944
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:6945
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:6946
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4725
+#: src/xml/xmli18n-tmp.h:6947
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:6948
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:6949
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4728
+#: src/xml/xmli18n-tmp.h:6950
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4729
+#: src/xml/xmli18n-tmp.h:6951
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:6952
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:6953
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4732
+#: src/xml/xmli18n-tmp.h:6954
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:6955
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:6956
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:6957
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:6958
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:6959
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:6960
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4739
+#: src/xml/xmli18n-tmp.h:6961
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4740
+#: src/xml/xmli18n-tmp.h:6962
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4741
+#: src/xml/xmli18n-tmp.h:6963
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4742
+#: src/xml/xmli18n-tmp.h:6964
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:6965
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:6966
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4745
+#: src/xml/xmli18n-tmp.h:6967
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:6968
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:6969
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:6970
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4749
+#: src/xml/xmli18n-tmp.h:6971
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:6972
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:6973
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4752
+#: src/xml/xmli18n-tmp.h:6974
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:6975
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:6976
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4755
+#: src/xml/xmli18n-tmp.h:6977
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:6978
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:6979
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:6980
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4759
+#: src/xml/xmli18n-tmp.h:6981
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4760
+#: src/xml/xmli18n-tmp.h:6982
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:6983
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4762
+#: src/xml/xmli18n-tmp.h:6984
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:6985
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:6986
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4765
+#: src/xml/xmli18n-tmp.h:6987
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:6988
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:6989
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Model drukarki:"
 
-#: src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:6991
 msgid "IBM 4019"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:6992
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:6993
 msgid "IBM 4312"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4772
+#: src/xml/xmli18n-tmp.h:6994
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:6995
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4774
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4775
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4776
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:6999
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:7000
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:7002
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:7003
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:7004
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:7005
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:7006
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:7007
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:7008
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:7009
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:7010
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:7011
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4790
+#: src/xml/xmli18n-tmp.h:7012
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:7013
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:7014
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:7015
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4794
+#: src/xml/xmli18n-tmp.h:7016
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:7017
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:7018
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4797
+#: src/xml/xmli18n-tmp.h:7019
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:7020
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:7021
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:7022
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:7023
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:7025
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:7026
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:7027
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:7028
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4807
+#: src/xml/xmli18n-tmp.h:7029
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4808
+#: src/xml/xmli18n-tmp.h:7030
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:7031
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:7032
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:7034
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:7035
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:7037
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:7039
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:7040
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4819
+#: src/xml/xmli18n-tmp.h:7041
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:7042
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:7043
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:7044
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:7045
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:7046
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:7047
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:7048
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:7049
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:7050
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:7051
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4830
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:7057
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4837
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4840
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4842
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4852
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4853
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4854
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4855
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4866
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4867
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4873
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4874
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4883
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4886
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4888
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4890
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4894
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4896
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4903
-msgid "Lanier MP 2500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4904
-msgid "Lanier LD125"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4905
-msgid "Lanier MP 1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4906
-msgid "Lanier LD1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4907
-msgid "Lanier MP 1350"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4908
-msgid "Lanier LD1135"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4909
-msgid "Lanier MP 1600"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4910
-msgid "Lanier LD316"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4911
-msgid "Lanier MP 161"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4912
-msgid "Lanier LD016"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4913
-msgid "Lanier MP 2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4914
-msgid "Lanier LD320d"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4915
-msgid "Lanier MP 2510"
+#: src/xml/xmli18n-tmp.h:7125
+msgid "Lanier MP2500/LD125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4916
-msgid "Lanier LD325"
+#: src/xml/xmli18n-tmp.h:7126
+msgid "Lanier MP 1100/LD1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4917
-msgid "Lanier MP 2550B"
+#: src/xml/xmli18n-tmp.h:7127
+msgid "Lanier MP 1350/LD1135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4918
-msgid "Lanier LD425B"
+#: src/xml/xmli18n-tmp.h:7128
+msgid "Lanier MP 1600/LD316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4919
-msgid "Lanier MP 2550"
+#: src/xml/xmli18n-tmp.h:7129
+msgid "Lanier MP 161/LD016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4920
-msgid "Lanier LD425"
+#: src/xml/xmli18n-tmp.h:7130
+msgid "Lanier MP 2000/LD320d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4921
-msgid "Lanier MP 3010"
+#: src/xml/xmli18n-tmp.h:7131
+msgid "Lanier MP 2510/LD325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4922
-msgid "Lanier LD330"
+#: src/xml/xmli18n-tmp.h:7132
+msgid "Lanier MP 2550B/LD425B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4923
-msgid "Lanier MP 3350B"
+#: src/xml/xmli18n-tmp.h:7133
+msgid "Lanier MP 2550/LD425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4924
-msgid "Lanier LD433B"
+#: src/xml/xmli18n-tmp.h:7134
+msgid "Lanier MP 3010/LD330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4925
-msgid "Lanier MP 3350"
+#: src/xml/xmli18n-tmp.h:7135
+msgid "Lanier MP 3350B/LD433B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4926
-msgid "Lanier LD433"
+#: src/xml/xmli18n-tmp.h:7136
+msgid "Lanier MP 3350/LD433"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4927
-msgid "Lanier MP 3500"
+#: src/xml/xmli18n-tmp.h:7137
+msgid "Lanier MP 3500/LD335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4928
-msgid "Lanier LD335"
+#: src/xml/xmli18n-tmp.h:7138
+msgid "Lanier MP 4000B/LD040B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4929
-msgid "Lanier MP 4000B"
+#: src/xml/xmli18n-tmp.h:7139
+msgid "Lanier MP 4000/LD040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4930
-msgid "Lanier LD040B"
+#: src/xml/xmli18n-tmp.h:7140
+msgid "Lanier MP 4500/LD345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4931
-msgid "Lanier MP 4000"
+#: src/xml/xmli18n-tmp.h:7141
+msgid "Lanier MP 5000B/LD050B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4932
-msgid "Lanier LD040"
+#: src/xml/xmli18n-tmp.h:7142
+msgid "Lanier MP 5000/LD050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4933
-msgid "Lanier MP 4500"
+#: src/xml/xmli18n-tmp.h:7143
+msgid "Lanier MP 5500/LD255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4934
-msgid "Lanier LD345"
+#: src/xml/xmli18n-tmp.h:7144
+msgid "Lanier MP 6500/LD265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4935
-msgid "Lanier MP 5000B"
+#: src/xml/xmli18n-tmp.h:7145
+msgid "Lanier MP 7500/LD275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4936
-msgid "Lanier LD050B"
+#: src/xml/xmli18n-tmp.h:7146
+msgid "Lanier MP 9000/LD190"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4937
-msgid "Lanier MP 5000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4938
-msgid "Lanier LD050"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4939
-msgid "Lanier MP 5500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4940
-msgid "Lanier LD255"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4941
-msgid "Lanier MP 6500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4942
-msgid "Lanier LD265"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4943
-msgid "Lanier MP 7500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4944
-msgid "Lanier LD275"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4945
-msgid "Lanier MP 9000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4946
-msgid "Lanier LD190"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:7148
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4950
+#: src/xml/xmli18n-tmp.h:7150
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:7151
 msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4952
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4953
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:7155
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4960
+#: src/xml/xmli18n-tmp.h:7160
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:7161
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:7162
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4963
+#: src/xml/xmli18n-tmp.h:7163
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:7164
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:7165
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4966
-msgid "NRG 10515"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4967
-msgid "NRG 10518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4968
-msgid "NRG 10512"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4969
-msgid "NRG 2205"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4970
-msgid "NRG 2238"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4971
-msgid "NRG 2212"
+#: src/xml/xmli18n-tmp.h:7166
+msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4972
-msgid "NRG 2705"
+#: src/xml/xmli18n-tmp.h:7167
+msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4973
-msgid "NRG 2738"
+#: src/xml/xmli18n-tmp.h:7168
+msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4974
-msgid "NRG 2712"
+#: src/xml/xmli18n-tmp.h:7169
+msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4975
-msgid "NRG 3205"
+#: src/xml/xmli18n-tmp.h:7170
+msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4976
-msgid "NRG 3238"
+#: src/xml/xmli18n-tmp.h:7171
+msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4977
-msgid "NRG 3212"
+#: src/xml/xmli18n-tmp.h:7172
+msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4978
-msgid "NRG 3525"
+#: src/xml/xmli18n-tmp.h:7173
+msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4979
-msgid "NRG 3508"
+#: src/xml/xmli18n-tmp.h:7174
+msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4980
-msgid "NRG 3502"
+#: src/xml/xmli18n-tmp.h:7175
+msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4981
-msgid "NRG 3545"
+#: src/xml/xmli18n-tmp.h:7176
+msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4982
-msgid "NRG 3518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4983
-msgid "NRG 3532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4984
-msgid "NRG 4525"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4985
-msgid "NRG 4508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4986
-msgid "NRG 4502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4987
-msgid "NRG 4545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4988
-msgid "NRG 4518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4989
-msgid "NRG 4532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4990
-msgid "NRG 6002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4991
-msgid "NRG 6005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4992
-msgid "NRG 6008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4993
-msgid "NRG 7502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4994
-msgid "NRG 7505"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4995
-msgid "NRG 7508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4996
-msgid "NRG 9005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4997
-msgid "NRG 9008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4998
-msgid "NRG 9002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:7177
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:7178
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5001
+#: src/xml/xmli18n-tmp.h:7179
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:7180
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:7181
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:7182
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:7183
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5006
+#: src/xml/xmli18n-tmp.h:7184
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:7185
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:7186
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5009
+#: src/xml/xmli18n-tmp.h:7187
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:7188
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:7189
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:7190
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:7191
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:7192
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5015
+#: src/xml/xmli18n-tmp.h:7193
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5016
+#: src/xml/xmli18n-tmp.h:7194
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5017
+#: src/xml/xmli18n-tmp.h:7195
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:7196
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:7197
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:7198
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:7199
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:7200
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:7201
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:7202
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5025
+#: src/xml/xmli18n-tmp.h:7203
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:7204
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:7205
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5028
+#: src/xml/xmli18n-tmp.h:7206
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:7207
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:7208
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:7209
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:7210
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5033
+#: src/xml/xmli18n-tmp.h:7211
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:7212
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:7213
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:7214
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:7215
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:7216
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:7217
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5040
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5051
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5053
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:7234
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:7235
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5060
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5062
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5063
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:7242
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:7243
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:7244
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:7245
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:7246
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:7247
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:7248
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:7249
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5072
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5074
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5075
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5076
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:7255
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:7258
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5081
+#: src/xml/xmli18n-tmp.h:7259
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:7263
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5086
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5088
+#: src/xml/xmli18n-tmp.h:7266
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:7267
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5090
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5091
+#: src/xml/xmli18n-tmp.h:7269
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:7270
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5093
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5099
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5103
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5104
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:7284
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5107
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5108
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5110
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5118
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5120
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5126
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5127
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5131
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5133
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5134
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5138
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5146
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5147
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5150
-msgid "Savin 2535"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5151
-msgid "Savin 2235"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5152
-msgid "Savin 2545"
+#: src/xml/xmli18n-tmp.h:7328
+msgid "Savin 2535/2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5153
-msgid "Savin 2245"
+#: src/xml/xmli18n-tmp.h:7329
+msgid "Savin 2545/2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5154
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Savin 2560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5155
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5158
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5160
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5163
-msgid "Savin 4035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5164
-msgid "Savin 4135g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5165
-msgid "Savin 4035e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5166
-msgid "Savin 4135eG"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5167
-msgid "Savin 4045"
+#: src/xml/xmli18n-tmp.h:7339
+msgid "Savin 4035/4135g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5168
-msgid "Savin 4145g"
+#: src/xml/xmli18n-tmp.h:7340
+msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5169
-msgid "Savin 4045e"
+#: src/xml/xmli18n-tmp.h:7341
+msgid "Savin 4045/4145g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5170
-msgid "Savin 4145eG"
+#: src/xml/xmli18n-tmp.h:7342
+msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5171
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Savin 4060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5173
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5174
+#: src/xml/xmli18n-tmp.h:7346
 msgid "Savin 4090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:7348
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5177
+#: src/xml/xmli18n-tmp.h:7349
 msgid "Savin 8020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:7353
 msgid "Savin 8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5183
-msgid "Savin 8035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5184
-msgid "Savin 8035g"
+#: src/xml/xmli18n-tmp.h:7355
+msgid "Savin 8035/8035g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5186
-msgid "Savin 8045"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5187
-msgid "Savin 8045g"
+#: src/xml/xmli18n-tmp.h:7357
+msgid "Savin 8045/8045g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5190
+#: src/xml/xmli18n-tmp.h:7360
 msgid "Savin 8065"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5192
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Savin 8090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5194
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:7370
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5201
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:7373
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:7374
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5205
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5206
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:7379
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5211
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Ustawienia drukarki"
 
-#: src/xml/xmli18n-tmp.h:5212
+#: src/xml/xmli18n-tmp.h:7382
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5213
+#: src/xml/xmli18n-tmp.h:7383
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5216
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5221
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5224
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5225
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5227
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5230
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:7404
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5236
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:7409
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:7410
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5244
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5247
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5249
+#: src/xml/xmli18n-tmp.h:7419
+msgid "Canon SELPHY-CP-520"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Canon SELPHY-CP-720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5252
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Canon SELPHY-CP-730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Canon SELPHY-CP-740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Canon SELPHY-CP-750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Canon SELPHY ES1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Canon SELPHY ES2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Canon SELPHY ES20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5258
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5259
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:7434
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:7438
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5268
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Dai Nippon Printing DS40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Dai Nippon Printing DS80"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5269
+#: src/xml/xmli18n-tmp.h:7442
 msgid "RAW DATA 8 bit"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Epson Stylus Offixe TX300F"
+#~ msgstr "Stylus C20sx"
+
 #~ msgid "ISOLatin1"
 #~ msgstr "ISOLatin2"
 
diff --git a/po/pt.gmo b/po/pt.gmo
index 173947e..16f8435 100644
--- a/po/pt.gmo
+++ b/po/pt.gmo
diff --git a/po/pt.po b/po/pt.po
index ecf1d77..fc04aa9 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimpprint 4.3.4\n"
 "Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-21 22:25-0500\n"
+"POT-Creation-Date: 2009-07-26 19:14-0400\n"
 "PO-Revision-Date: 2002-10-16 19:24+0100\n"
 "Last-Translator: Filipe Maia <fmaia@gmx.net>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
@@ -17,7 +17,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2109 src/main/print-pcl.c:1779
+#: src/main/print-escp2.c:2314 src/main/print-pcl.c:1779
 #, fuzzy
 msgid "Default"
 msgstr "Definir Valores Padrão"
@@ -97,15 +97,15 @@ msgstr "Densidade:"
 
 #: src/main/dither-main.c:91 src/main/print-canon.c:300
 #: src/main/print-canon.c:308 src/main/print-canon.c:316
-#: src/main/print-canon.c:324 src/main/print-escp2.c:439
-#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
-#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-canon.c:324 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: 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-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:1769
-#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
-#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1935
+#: src/main/print-olympus.c:1943 src/main/print-olympus.c:1951
+#: src/main/print-olympus.c:1959 src/main/print-pcl.c:1324
 #: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
 #: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
@@ -167,7 +167,7 @@ msgid "Dither algorithm"
 msgstr "Algoritmos de \"Dither\"\""
 
 #: src/main/print-canon.c:199 src/main/print-escp2.c:165
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1866
 #: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
@@ -185,8 +185,8 @@ msgstr "Tamanho"
 #: src/main/print-escp2.c:254 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:1704 src/main/print-olympus.c:1710
-#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-olympus.c:1866 src/main/print-olympus.c:1872
+#: src/main/print-olympus.c:1878 src/main/print-olympus.c:1884
 #: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
 #: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
 #: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
@@ -196,32 +196,32 @@ msgid "Basic Printer Setup"
 msgstr "Definições da Impressora"
 
 #: src/main/print-canon.c:200 src/main/print-escp2.c:166
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1867
 #: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Tamanho do papel para o qual deseja imprimir"
 
 #: src/main/print-canon.c:205 src/main/print-escp2.c:171
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1259 src/cups/genppd.c:1339 src/cups/genppd.c:2001
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1872
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1372 src/cups/genppd.c:2035
 msgid "Media Type"
 msgstr "Tipo de Média"
 
 #: src/main/print-canon.c:206 src/main/print-escp2.c:172
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1873
 #: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
 #: src/main/print-canon.c:211 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
-#: src/main/print-pcl.c:1265 src/cups/genppd.c:1368 src/cups/genppd.c:2020
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1878
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1401 src/cups/genppd.c:2054
 msgid "Media Source"
 msgstr "Fonte de Média"
 
 #: src/main/print-canon.c:212 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1879
 #: src/main/print-pcl.c:1266
 #, fuzzy
 msgid "Source (input slot) of the media"
@@ -259,8 +259,8 @@ msgstr ""
 #: src/main/print-canon.c:235 src/main/print-canon.c:241
 #: src/main/print-canon.c:253 src/main/print-escp2.c:207
 #: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1906
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
@@ -275,25 +275,25 @@ msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:247 src/main/print-escp2.c:219
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
-#: src/main/print-pcl.c:1277 src/cups/genppd.c:1446 src/cups/genppd.c:2056
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1884
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1479 src/cups/genppd.c:2090
 msgid "Resolution"
 msgstr "Resolução"
 
 #: src/main/print-canon.c:248 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1723
+#: src/main/print-olympus.c:1885
 msgid "Resolution and quality of the print"
 msgstr "Resolução e qualidade da impressão"
 
 #: src/main/print-canon.c:253 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tipo de tinta"
 
 #: src/main/print-canon.c:254 src/main/print-escp2.c:231
 #: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
+#: src/main/print-olympus.c:1891 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Tipo de tinta na impressora"
@@ -311,17 +311,18 @@ msgstr ""
 #: 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-escp2.c:320 src/main/print-escp2.c:767
-#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
-#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
-#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
-#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:893 src/main/print-escp2.c:901
+#: src/main/print-escp2.c:909 src/main/print-escp2.c:925
+#: src/main/print-escp2.c:933 src/main/print-escp2.c:941
+#: src/main/print-escp2.c:949 src/main/print-escp2.c:957
+#: src/main/print-escp2.c:965 src/main/print-escp2.c:973
 #: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:265 src/main/print-escp2.c:326
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-canon.c:265 src/main/print-escp2.c:332
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1912
 #: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
@@ -329,16 +330,16 @@ msgstr "Modelo da Impressora:"
 
 #: src/main/print-canon.c:265 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:326
-#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-color.c:208 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1912 src/main/print-pcl.c:1295
 #: src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Papel ColorLife"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:327
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-canon.c:266 src/main/print-escp2.c:333
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1913
 #: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
@@ -367,56 +368,56 @@ msgstr "720 DPI Qualidade Máxima"
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:300 src/main/print-escp2.c:439
+#: src/main/print-canon.c:300 src/main/print-escp2.c:445
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Densidade:"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:301 src/main/print-escp2.c:446
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-canon.c:308 src/main/print-escp2.c:447
+#: src/main/print-canon.c:308 src/main/print-escp2.c:453
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:309 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-canon.c:316 src/main/print-escp2.c:455
+#: src/main/print-canon.c:316 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Densidade:"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:317 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-canon.c:324 src/main/print-escp2.c:463
+#: src/main/print-canon.c:324 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 #, fuzzy
 msgid "Black Density"
 msgstr "Densidade:"
 
-#: src/main/print-canon.c:325 src/main/print-escp2.c:464
+#: src/main/print-canon.c:325 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:333
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:541 src/main/print-escp2.c:542
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 #, fuzzy
@@ -424,29 +425,36 @@ msgid "Light Cyan Transition"
 msgstr "Ciano Claro"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:340
-#: src/main/print-canon.c:348 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
-#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
-#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
-#: src/main/print-pcl.c:1364
+#: src/main/print-canon.c:348 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:541
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:557
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:573
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:589
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:605
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:621
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:637
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:653
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:669
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:685
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:701
+#: src/main/print-escp2.c:709 src/main/print-escp2.c:717
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:733
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:749
+#: src/main/print-escp2.c:757 src/main/print-escp2.c:765
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:781
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:797
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:813
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:829
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:845
+#: src/main/print-escp2.c:853 src/main/print-escp2.c:861
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:340 src/main/print-canon.c:341
-#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
+#: src/main/print-escp2.c:573 src/main/print-escp2.c:574
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #, fuzzy
@@ -458,14 +466,14 @@ msgstr "Magenta Claro"
 msgid "Light Yellow Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-canon.c:368 src/main/print-escp2.c:2283
-#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3609
-#: src/xml/xmli18n-tmp.h:3614 src/xml/xmli18n-tmp.h:3620
-#: src/xml/xmli18n-tmp.h:3627
+#: src/main/print-canon.c:368 src/main/print-escp2.c:2488
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5851 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5864
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:369 src/main/print-escp2.c:2285
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2490
 #: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
@@ -474,67 +482,68 @@ msgstr ""
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:646 src/main/print-escp2.c:2005
-#: src/xml/xmli18n-tmp.h:3676
+#: src/main/print-canon.c:646 src/main/print-escp2.c:2210
+#: src/xml/xmli18n-tmp.h:5913
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:648 src/main/print-escp2.c:2007
-#: src/xml/xmli18n-tmp.h:3677
+#: src/main/print-canon.c:648 src/main/print-escp2.c:2212
+#: src/xml/xmli18n-tmp.h:5914
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:650 src/main/print-escp2.c:2009
-#: src/xml/xmli18n-tmp.h:3678
+#: src/main/print-canon.c:650 src/main/print-escp2.c:2214
+#: src/xml/xmli18n-tmp.h:5915
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Personalizado"
 
-#: src/main/print-canon.c:673 src/main/print-escp2.c:2034
-#: src/cups/genppd.c:1323 src/cups/genppd.c:1572 src/cups/genppd.c:1988
-#: src/cups/genppd.c:2079
+#: src/main/print-canon.c:673 src/main/print-escp2.c:2239
+#: src/cups/genppd.c:1356 src/cups/genppd.c:1605 src/cups/genppd.c:2022
+#: src/cups/genppd.c:2113
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:675 src/main/print-escp2.c:2036
+#: src/main/print-canon.c:675 src/main/print-escp2.c:2241
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Imprimir para o Ficheiro?"
 
-#: src/main/print-canon.c:790 src/main/print-escp2.c:2447
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-canon.c:790 src/main/print-escp2.c:2652
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2167
 #: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
 #: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Cor"
 
-#: src/main/print-canon.c:792 src/main/print-escp2.c:2449
+#: src/main/print-canon.c:792 src/main/print-escp2.c:2654
 #: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
 #: src/main/print-ps.c:331 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
 msgstr "Preto e Branco"
 
-#: src/main/print-canon.c:831 src/main/print-escp2.c:2089
+#: src/main/print-canon.c:831 src/main/print-escp2.c:2294
 #: src/main/print-pcl.c:1797 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Tipo de Output:"
 
-#: src/main/print-canon.c:833 src/main/print-escp2.c:2131
-#: src/main/print-escp2.c:2229 src/main/print-escp2.c:2241
+#: src/main/print-canon.c:833 src/main/print-escp2.c:2336
+#: src/main/print-escp2.c:2434 src/main/print-escp2.c:2446
 #: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
 #: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
-#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1215
-#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1219
-#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
-#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3170
-#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3177
-#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3461
-#: src/xml/xmli18n-tmp.h:3464 src/xml/xmli18n-tmp.h:3632
-#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3648
-#: src/xml/xmli18n-tmp.h:3657 src/xml/xmli18n-tmp.h:3665
+#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1627 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3713 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3722 src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5902
 msgid "Standard"
 msgstr "Standard"
 
@@ -573,7 +582,7 @@ msgid "Pre-Dithered"
 msgstr "Imprimir"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1268 src/cups/genppd.c:1971
+#: src/cups/genppd.c:1301 src/cups/genppd.c:2005
 msgid "Grayscale"
 msgstr "Escala de Cinzento"
 
@@ -590,11 +599,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1299 src/cups/genppd.c:1978
+#: src/main/print-color.c:129 src/cups/genppd.c:1332 src/cups/genppd.c:2012
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1306 src/cups/genppd.c:1979
+#: src/main/print-color.c:131 src/cups/genppd.c:1339 src/cups/genppd.c:2013
 msgid "KCMY"
 msgstr ""
 
@@ -660,7 +669,7 @@ msgid "Output image type"
 msgstr "Tipo de Output:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338
 msgid "Raw Channels"
 msgstr ""
 
@@ -731,56 +740,208 @@ msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
 #: src/escputil/escputil.c:997 src/escputil/escputil.c:1017
-#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:1812
-#: src/xml/xmli18n-tmp.h:1823 src/xml/xmli18n-tmp.h:1836
-#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1863
-#: src/xml/xmli18n-tmp.h:1876 src/xml/xmli18n-tmp.h:1889
-#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1918
-#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1949
-#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1975
-#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:1999
-#: src/xml/xmli18n-tmp.h:2013 src/xml/xmli18n-tmp.h:2027
-#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2051
-#: src/xml/xmli18n-tmp.h:2064 src/xml/xmli18n-tmp.h:2076
-#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2102
-#: src/xml/xmli18n-tmp.h:2116 src/xml/xmli18n-tmp.h:2130
-#: src/xml/xmli18n-tmp.h:2143 src/xml/xmli18n-tmp.h:2156
-#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2184
-#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2210
-#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2236
-#: src/xml/xmli18n-tmp.h:2249 src/xml/xmli18n-tmp.h:2262
-#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2290
-#: src/xml/xmli18n-tmp.h:2305 src/xml/xmli18n-tmp.h:2320
-#: src/xml/xmli18n-tmp.h:2332 src/xml/xmli18n-tmp.h:2343
-#: src/xml/xmli18n-tmp.h:2356 src/xml/xmli18n-tmp.h:2369
-#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2392
-#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2415
-#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2442
-#: src/xml/xmli18n-tmp.h:2454 src/xml/xmli18n-tmp.h:2466
-#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2496
-#: src/xml/xmli18n-tmp.h:2509 src/xml/xmli18n-tmp.h:2522
-#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
-#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2574
-#: src/xml/xmli18n-tmp.h:2586 src/xml/xmli18n-tmp.h:2598
-#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2623
-#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2653
-#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2683
-#: src/xml/xmli18n-tmp.h:2697 src/xml/xmli18n-tmp.h:2715
-#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2745
-#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
-#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2803
-#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2828
-#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2854
-#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2881
-#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2915
-#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2943
-#: src/xml/xmli18n-tmp.h:2959 src/xml/xmli18n-tmp.h:2976
-#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:3004
-#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3032
-#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3062
-#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3093
-#: src/xml/xmli18n-tmp.h:3107 src/xml/xmli18n-tmp.h:3125
-#: src/xml/xmli18n-tmp.h:3141
+#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2387
+#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2413
+#: src/xml/xmli18n-tmp.h:2426 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2499
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2551
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2575
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2708
+#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2786
+#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2814
+#: src/xml/xmli18n-tmp.h:2829 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2893
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2966
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3005 src/xml/xmli18n-tmp.h:3020
+#: src/xml/xmli18n-tmp.h:3033 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3061 src/xml/xmli18n-tmp.h:3073
+#: src/xml/xmli18n-tmp.h:3085 src/xml/xmli18n-tmp.h:3098
+#: src/xml/xmli18n-tmp.h:3110 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3377
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3616
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3648
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3766 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3775 src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:3794 src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:3805 src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3869 src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:3880 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3902 src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:3913 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:3948 src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:3970 src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:3983 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4023 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4064 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4075 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4088 src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:4103 src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:4118 src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:4143 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:4203 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4275 src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4309 src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4356 src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4421
+#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4449
+#: src/xml/xmli18n-tmp.h:4456 src/xml/xmli18n-tmp.h:4462
+#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4485 src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:4551 src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:4694 src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4717 src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:4818 src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:4829 src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4885 src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4935
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:5041 src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:5052 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:5121 src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5165
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5182 src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:5193 src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:5271 src/xml/xmli18n-tmp.h:5299
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5327 src/xml/xmli18n-tmp.h:5331
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5347
+#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5367 src/xml/xmli18n-tmp.h:5371
+#: src/xml/xmli18n-tmp.h:5383 src/xml/xmli18n-tmp.h:5388
+#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5440
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5461 src/xml/xmli18n-tmp.h:5468
+#: src/xml/xmli18n-tmp.h:5476 src/xml/xmli18n-tmp.h:5486
+#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5514
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5525
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5543
+#: src/xml/xmli18n-tmp.h:5550 src/xml/xmli18n-tmp.h:5556
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5574 src/xml/xmli18n-tmp.h:5582
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5592
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5625
+#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5649
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5662
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5690
+#: src/xml/xmli18n-tmp.h:5694 src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5731
+#: src/xml/xmli18n-tmp.h:5738 src/xml/xmli18n-tmp.h:5742
+#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5759
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5770
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5807
+#: src/xml/xmli18n-tmp.h:5811 src/xml/xmli18n-tmp.h:5817
+#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5828
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5843
 msgid "Cyan"
 msgstr "Ciano"
 
@@ -791,56 +952,208 @@ msgstr "Ajustar o equilíbrio de ciano na impressão"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
 #: src/escputil/escputil.c:998 src/escputil/escputil.c:1018
-#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:1813
-#: src/xml/xmli18n-tmp.h:1824 src/xml/xmli18n-tmp.h:1837
-#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1864
-#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1890
-#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1919
-#: src/xml/xmli18n-tmp.h:1935 src/xml/xmli18n-tmp.h:1950
-#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1976
-#: src/xml/xmli18n-tmp.h:1988 src/xml/xmli18n-tmp.h:2000
-#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2028
-#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2052
-#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2077
-#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2103
-#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2131
-#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2157
-#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2185
-#: src/xml/xmli18n-tmp.h:2198 src/xml/xmli18n-tmp.h:2211
-#: src/xml/xmli18n-tmp.h:2224 src/xml/xmli18n-tmp.h:2237
-#: src/xml/xmli18n-tmp.h:2250 src/xml/xmli18n-tmp.h:2263
-#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2291
-#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2321
-#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2344
-#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2370
-#: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2393
-#: src/xml/xmli18n-tmp.h:2405 src/xml/xmli18n-tmp.h:2416
-#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2443
-#: src/xml/xmli18n-tmp.h:2455 src/xml/xmli18n-tmp.h:2467
-#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2497
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2523
-#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2575
-#: src/xml/xmli18n-tmp.h:2587 src/xml/xmli18n-tmp.h:2599
-#: src/xml/xmli18n-tmp.h:2611 src/xml/xmli18n-tmp.h:2624
-#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
-#: src/xml/xmli18n-tmp.h:2670 src/xml/xmli18n-tmp.h:2684
-#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2714
-#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2747
-#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2780
-#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
-#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2829
-#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2855
-#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2882
-#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2914
-#: src/xml/xmli18n-tmp.h:2931 src/xml/xmli18n-tmp.h:2944
-#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2975
-#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:3005
-#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3033
-#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3060
-#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3094
-#: src/xml/xmli18n-tmp.h:3108 src/xml/xmli18n-tmp.h:3124
-#: src/xml/xmli18n-tmp.h:3140
+#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2361
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2388
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2414
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2459 src/xml/xmli18n-tmp.h:2474
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2512 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2552
+#: src/xml/xmli18n-tmp.h:2564 src/xml/xmli18n-tmp.h:2576
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2787
+#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2815
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2868
+#: src/xml/xmli18n-tmp.h:2881 src/xml/xmli18n-tmp.h:2894
+#: src/xml/xmli18n-tmp.h:2905 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:2967
+#: src/xml/xmli18n-tmp.h:2979 src/xml/xmli18n-tmp.h:2991
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3062 src/xml/xmli18n-tmp.h:3074
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3099
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3135 src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:3163 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3353
+#: src/xml/xmli18n-tmp.h:3365 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
+#: src/xml/xmli18n-tmp.h:3420 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3542 src/xml/xmli18n-tmp.h:3556
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3600 src/xml/xmli18n-tmp.h:3617
+#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3647
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3751 src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:3784 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3795 src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:3806 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3837 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3903 src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3939 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3960 src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:3972 src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:3984 src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:3999 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:4039 src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:4104 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:4170 src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4194 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:4230 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:4276 src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4311 src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4338 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:4401 src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:4427 src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:4442 src/xml/xmli18n-tmp.h:4451
+#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4464
+#: src/xml/xmli18n-tmp.h:4470 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4486 src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:4511 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:4809 src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4909 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:5007 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5018 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5111 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5123 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5148 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:5240 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5250 src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:5261 src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5301
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5313
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5349
+#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5401
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5441
+#: src/xml/xmli18n-tmp.h:5453 src/xml/xmli18n-tmp.h:5458
+#: src/xml/xmli18n-tmp.h:5463 src/xml/xmli18n-tmp.h:5470
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5496 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5527
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5552 src/xml/xmli18n-tmp.h:5558
+#: src/xml/xmli18n-tmp.h:5564 src/xml/xmli18n-tmp.h:5568
+#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5593
+#: src/xml/xmli18n-tmp.h:5598 src/xml/xmli18n-tmp.h:5616
+#: src/xml/xmli18n-tmp.h:5620 src/xml/xmli18n-tmp.h:5626
+#: src/xml/xmli18n-tmp.h:5631 src/xml/xmli18n-tmp.h:5651
+#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
+#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5674
+#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5720
+#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5733
+#: src/xml/xmli18n-tmp.h:5739 src/xml/xmli18n-tmp.h:5743
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5818
+#: src/xml/xmli18n-tmp.h:5823 src/xml/xmli18n-tmp.h:5829
+#: src/xml/xmli18n-tmp.h:5833 src/xml/xmli18n-tmp.h:5839
+#: src/xml/xmli18n-tmp.h:5844
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -851,56 +1164,208 @@ msgstr "Ajustar o equilíbrio de magenta da impressão"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
 #: src/escputil/escputil.c:999 src/escputil/escputil.c:1019
-#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:1814
-#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
-#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1865
-#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1891
-#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1920
-#: src/xml/xmli18n-tmp.h:1936 src/xml/xmli18n-tmp.h:1951
-#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1977
-#: src/xml/xmli18n-tmp.h:1989 src/xml/xmli18n-tmp.h:2001
-#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2029
-#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2053
-#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2078
-#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2104
-#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
-#: src/xml/xmli18n-tmp.h:2145 src/xml/xmli18n-tmp.h:2158
-#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2186
-#: src/xml/xmli18n-tmp.h:2199 src/xml/xmli18n-tmp.h:2212
-#: src/xml/xmli18n-tmp.h:2225 src/xml/xmli18n-tmp.h:2238
-#: src/xml/xmli18n-tmp.h:2251 src/xml/xmli18n-tmp.h:2264
-#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2292
-#: src/xml/xmli18n-tmp.h:2307 src/xml/xmli18n-tmp.h:2322
-#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
-#: src/xml/xmli18n-tmp.h:2358 src/xml/xmli18n-tmp.h:2371
-#: src/xml/xmli18n-tmp.h:2382 src/xml/xmli18n-tmp.h:2394
-#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2417
-#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2444
-#: src/xml/xmli18n-tmp.h:2456 src/xml/xmli18n-tmp.h:2468
-#: src/xml/xmli18n-tmp.h:2483 src/xml/xmli18n-tmp.h:2498
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2524
-#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2551
-#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2576
-#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
-#: src/xml/xmli18n-tmp.h:2612 src/xml/xmli18n-tmp.h:2625
-#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2651
-#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2685
-#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2713
-#: src/xml/xmli18n-tmp.h:2734 src/xml/xmli18n-tmp.h:2749
-#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2779
-#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2805
-#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2830
-#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2856
-#: src/xml/xmli18n-tmp.h:2871 src/xml/xmli18n-tmp.h:2883
-#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2910
-#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2945
-#: src/xml/xmli18n-tmp.h:2960 src/xml/xmli18n-tmp.h:2974
-#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3006
-#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3034
-#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3061
-#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3095
-#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3120
-#: src/xml/xmli18n-tmp.h:3136
+#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2389
+#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2444
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2475
+#: src/xml/xmli18n-tmp.h:2488 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2513 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2565 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2602
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2762
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2788
+#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2816
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2846
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2906 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3022
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3048
+#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3075
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3124
+#: src/xml/xmli18n-tmp.h:3136 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3175
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3315 src/xml/xmli18n-tmp.h:3329
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3433
+#: src/xml/xmli18n-tmp.h:3455 src/xml/xmli18n-tmp.h:3468
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3497
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3601 src/xml/xmli18n-tmp.h:3618
+#: src/xml/xmli18n-tmp.h:3632 src/xml/xmli18n-tmp.h:3643
+#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3747 src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3834 src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:3844 src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:3867 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:3900 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3910 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3935 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:3967 src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:3979 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4005 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4062 src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4110 src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:4124 src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4167 src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:4272 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:4321 src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:4334 src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4367 src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4471
+#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4505 src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4549 src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:4562 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4580 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4602 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:4678 src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:4691 src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4770 src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4893 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4904 src/xml/xmli18n-tmp.h:4911
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:4971 src/xml/xmli18n-tmp.h:4978
+#: src/xml/xmli18n-tmp.h:5004 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5050 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5071 src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:5097 src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:5142 src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:5169 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5184
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5257 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5318
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5358
+#: src/xml/xmli18n-tmp.h:5364 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5385
+#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5438
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5454
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5465
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5511
+#: src/xml/xmli18n-tmp.h:5516 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5547 src/xml/xmli18n-tmp.h:5554
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5584 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5617 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5632
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5687
+#: src/xml/xmli18n-tmp.h:5692 src/xml/xmli18n-tmp.h:5698
+#: src/xml/xmli18n-tmp.h:5705 src/xml/xmli18n-tmp.h:5713
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5729
+#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
+#: src/xml/xmli18n-tmp.h:5744 src/xml/xmli18n-tmp.h:5756
+#: src/xml/xmli18n-tmp.h:5761 src/xml/xmli18n-tmp.h:5767
+#: src/xml/xmli18n-tmp.h:5774 src/xml/xmli18n-tmp.h:5782
+#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5792
+#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5803
+#: src/xml/xmli18n-tmp.h:5809 src/xml/xmli18n-tmp.h:5813
+#: src/xml/xmli18n-tmp.h:5819 src/xml/xmli18n-tmp.h:5824
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5845
 msgid "Yellow"
 msgstr "Amarelo"
 
@@ -911,9 +1376,17 @@ msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
 #: src/escputil/escputil.c:1006 src/escputil/escputil.c:1025
-#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2700
-#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2795
-#: src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:4041 src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:4056 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4091 src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:4155 src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5155
 msgid "Red"
 msgstr ""
 
@@ -933,8 +1406,13 @@ msgstr "Ajustar o equilíbrio de magenta da impressão"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
 #: src/escputil/escputil.c:1007 src/escputil/escputil.c:1026
-#: src/xml/xmli18n-tmp.h:2657 src/xml/xmli18n-tmp.h:2701
-#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4051 src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:4084 src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:5156
 msgid "Blue"
 msgstr ""
 
@@ -946,53 +1424,183 @@ msgstr "Ajustar o equilíbrio de ciano na impressão"
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
 #: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1016 src/escputil/escputil.c:1285
-#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
-#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
-#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1875
-#: src/xml/xmli18n-tmp.h:1888 src/xml/xmli18n-tmp.h:1901
-#: src/xml/xmli18n-tmp.h:1917 src/xml/xmli18n-tmp.h:1933
-#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1961
-#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1986
-#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2012
-#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2038
-#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2063
-#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2090
-#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2115
-#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2142
-#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2169
-#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
-#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
-#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2248
-#: src/xml/xmli18n-tmp.h:2261 src/xml/xmli18n-tmp.h:2274
-#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2304
-#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2331
-#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
-#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
-#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2403
-#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2420
-#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2441
-#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2465
-#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2495
-#: src/xml/xmli18n-tmp.h:2508 src/xml/xmli18n-tmp.h:2521
-#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
-#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2573
-#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2597
-#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2622
-#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2672
-#: src/xml/xmli18n-tmp.h:2682 src/xml/xmli18n-tmp.h:2731
-#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2764
-#: src/xml/xmli18n-tmp.h:2781 src/xml/xmli18n-tmp.h:2794
-#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2815
-#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2839
-#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2868
-#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2894
-#: src/xml/xmli18n-tmp.h:2911 src/xml/xmli18n-tmp.h:2929
-#: src/xml/xmli18n-tmp.h:2942 src/xml/xmli18n-tmp.h:2977
-#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:3003
-#: src/xml/xmli18n-tmp.h:3017 src/xml/xmli18n-tmp.h:3031
-#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3079
-#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3110
-#: src/xml/xmli18n-tmp.h:3121 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2372
+#: src/xml/xmli18n-tmp.h:2386 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2457
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2510
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2536
+#: src/xml/xmli18n-tmp.h:2550 src/xml/xmli18n-tmp.h:2562
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2599 src/xml/xmli18n-tmp.h:2614
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2639
+#: src/xml/xmli18n-tmp.h:2653 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2965
+#: src/xml/xmli18n-tmp.h:2977 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3019
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3060 src/xml/xmli18n-tmp.h:3072
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3133 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3196
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3526
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3680 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3755 src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:3804 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3819 src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:3831 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3846 src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3873 src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:3924 src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:3943 src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:4022 src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4059 src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:4142 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4164 src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:4179 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:4255 src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4289 src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:4308 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4413 src/xml/xmli18n-tmp.h:4420
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4455
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4507 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:4565 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:4604 src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:4702 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:4733 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:4786 src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4920 src/xml/xmli18n-tmp.h:4926
+#: src/xml/xmli18n-tmp.h:4934 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:4973 src/xml/xmli18n-tmp.h:4981
+#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:4993
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:5047 src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5151
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5186
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5223 src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5270
+#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5284
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5320
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5337
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5375
+#: src/xml/xmli18n-tmp.h:5378 src/xml/xmli18n-tmp.h:5380
+#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5435
+#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5447
+#: src/xml/xmli18n-tmp.h:5449 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5474
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5492
+#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5571
+#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5590
+#: src/xml/xmli18n-tmp.h:5596 src/xml/xmli18n-tmp.h:5602
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5614
+#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5629
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5655
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5680 src/xml/xmli18n-tmp.h:5682
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5700
+#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5716
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5749
+#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5769 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5794
+#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5806
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5836
+#: src/xml/xmli18n-tmp.h:5842
 msgid "Black"
 msgstr "Preto"
 
@@ -1001,7 +1609,7 @@ msgstr "Preto"
 msgid "Adjust the black gamma"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1769
+#: src/main/print-color.c:322 src/main/print-olympus.c:1935
 msgid "Cyan Balance"
 msgstr ""
 
@@ -1016,7 +1624,7 @@ msgstr "Escala de Cinzento"
 msgid "Adjust the cyan gray balance"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1777
+#: src/main/print-color.c:330 src/main/print-olympus.c:1943
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
@@ -1026,7 +1634,7 @@ msgstr "Magenta"
 msgid "Adjust the magenta gray balance"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1785
+#: src/main/print-color.c:338 src/main/print-olympus.c:1951
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
@@ -1058,11 +1666,11 @@ msgstr "Tipo de tinta"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
-#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
-#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
-#: src/main/print-escp2.c:759
+#: src/main/print-escp2.c:344 src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356 src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368 src/main/print-escp2.c:374
+#: src/main/print-escp2.c:869 src/main/print-escp2.c:877
+#: src/main/print-escp2.c:885
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Tipo de Output:"
@@ -1071,27 +1679,27 @@ msgstr "Tipo de Output:"
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:743
+#: src/main/print-color.c:365 src/main/print-escp2.c:869
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:744
+#: src/main/print-color.c:366 src/main/print-escp2.c:870
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:751
+#: src/main/print-color.c:373 src/main/print-escp2.c:877
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:752
+#: src/main/print-color.c:374 src/main/print-escp2.c:878
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:759
+#: src/main/print-color.c:381 src/main/print-escp2.c:885
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:760
+#: src/main/print-color.c:382 src/main/print-escp2.c:886
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -1362,11 +1970,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1906
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1907
 msgid "Print without borders"
 msgstr ""
 
@@ -1379,7 +1987,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:266 src/main/print-escp2.c:267
-#: src/cups/genppd.c:1567 src/cups/genppd.c:2078
+#: src/cups/genppd.c:1600 src/cups/genppd.c:2112
 #, fuzzy
 msgid "Output Order"
 msgstr "Tipo de Output:"
@@ -1424,382 +2032,498 @@ msgstr ""
 
 #: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 #, fuzzy
+msgid "Raw Channel Names"
+msgstr "Cancelar"
+
+#: src/main/print-escp2.c:326 src/main/print-escp2.c:327
+#, fuzzy
 msgid "Channel Names"
 msgstr "Cancelar"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:339
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:344
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Ciano"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:345
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Magenta"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:351
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356
 #, fuzzy
 msgid "Yellow Map"
 msgstr "Amarelo"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:357
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362
 #, fuzzy
 msgid "Blue Map"
 msgstr "Preto e Branco"
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:363
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368
 #, fuzzy
 msgid "Orange Map"
 msgstr "Ciano"
 
-#: src/main/print-escp2.c:363
+#: src/main/print-escp2.c:369
 #, fuzzy
 msgid "Adjust the orange map"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:374
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:369
+#: src/main/print-escp2.c:375
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-escp2.c:471
+#: src/main/print-escp2.c:477
 #, fuzzy
 msgid "Red Density"
 msgstr "Densidade:"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:478
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:485
 #, fuzzy
 msgid "Blue Density"
 msgstr "Densidade:"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:486
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:493
 #, fuzzy
 msgid "Orange Density"
 msgstr "Densidade:"
 
-#: src/main/print-escp2.c:488
+#: src/main/print-escp2.c:494
 #, fuzzy
 msgid "Adjust the orange density"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:501
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Filme Lustroso"
 
-#: src/main/print-escp2.c:496
+#: src/main/print-escp2.c:502
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:509
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:504
+#: src/main/print-escp2.c:510
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:517
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:512
+#: src/main/print-escp2.c:518
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:525
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:520
+#: src/main/print-escp2.c:526
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:534
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:550
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
+#: src/main/print-escp2.c:557 src/main/print-escp2.c:558
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "Magenta Claro"
 
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:566
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "Magenta Claro"
 
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:582
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "Amarelo"
 
-#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
+#: src/main/print-escp2.c:589 src/main/print-escp2.c:590
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:598
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "Amarelo"
 
-#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
+#: src/main/print-escp2.c:605 src/main/print-escp2.c:606
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:630
 #, fuzzy
 msgid "Gray Value"
 msgstr "Escala de Cinzento"
 
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
-#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:614
+#: src/main/print-escp2.c:637 src/main/print-escp2.c:638
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
+#: src/main/print-escp2.c:621 src/main/print-escp2.c:622
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:646
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "Escala de Cinzento"
 
-#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
+#: src/main/print-escp2.c:653 src/main/print-escp2.c:654
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:726
 #, fuzzy
 msgid "Light Gray Value"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
-#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:662
+#: src/main/print-escp2.c:733 src/main/print-escp2.c:734
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
-#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
+#: src/main/print-escp2.c:669 src/main/print-escp2.c:670
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:742
 #, fuzzy
 msgid "Light Gray Density Scale"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:678
 #, fuzzy
 msgid "Dark Gray Value"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
+#: src/main/print-escp2.c:685 src/main/print-escp2.c:686
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:694
 #, fuzzy
 msgid "Dark Gray Density Scale"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:701
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "Escala de Cinzento"
 
-#: src/main/print-escp2.c:696
+#: src/main/print-escp2.c:702
 #, fuzzy
 msgid "Medium Gray Value"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:709
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:704
+#: src/main/print-escp2.c:710
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:717
 #, fuzzy
 msgid "Mid Gray Density Scale"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:712
+#: src/main/print-escp2.c:718
 #, fuzzy
 msgid "Medium Gray Density Scale"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:767
+#: src/main/print-escp2.c:749
+#, fuzzy
+msgid "Hextone Gray 5 Value"
+msgstr "Escala de Cinzento"
+
+#: src/main/print-escp2.c:750
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:757
+#, fuzzy
+msgid "Hextone Gray 5 Transition"
+msgstr "Ciano Claro"
+
+#: src/main/print-escp2.c:758
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr "Ciano Claro"
+
+#: src/main/print-escp2.c:765
+#, fuzzy
+msgid "Hextone Gray 5 Density Scale"
+msgstr "Escala de Cinzento"
+
+#: src/main/print-escp2.c:766
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr "Ciano Claro"
+
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:774
+#, fuzzy
+msgid "Hextone Gray 4 Value"
+msgstr "Escala de Cinzento"
+
+#: src/main/print-escp2.c:781 src/main/print-escp2.c:782
+#, fuzzy
+msgid "Hextone Gray 4 Transition"
+msgstr "Ciano Claro"
+
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:790
+#, fuzzy
+msgid "Hextone Gray 4 Density Scale"
+msgstr "Escala de Cinzento"
+
+#: src/main/print-escp2.c:797 src/main/print-escp2.c:798
+#, fuzzy
+msgid "Hextone Gray 3 Value"
+msgstr "Escala de Cinzento"
+
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:806
+#, fuzzy
+msgid "Hextone Gray 3 Transition"
+msgstr "Ciano Claro"
+
+#: src/main/print-escp2.c:813 src/main/print-escp2.c:814
+#, fuzzy
+msgid "Hextone Gray 3 Density Scale"
+msgstr "Escala de Cinzento"
+
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:822
+#, fuzzy
+msgid "Hextone Gray 2 Value"
+msgstr "Escala de Cinzento"
+
+#: src/main/print-escp2.c:829 src/main/print-escp2.c:830
+#, fuzzy
+msgid "Hextone Gray 2 Transition"
+msgstr "Ciano Claro"
+
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:838
+#, fuzzy
+msgid "Hextone Gray 2 Density Scale"
+msgstr "Escala de Cinzento"
+
+#: src/main/print-escp2.c:845
+#, fuzzy
+msgid "Hextone Gray 1 Value"
+msgstr "Escala de Cinzento"
+
+#: src/main/print-escp2.c:846
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:853
+#, fuzzy
+msgid "Hextone Gray 1 Transition"
+msgstr "Ciano Claro"
+
+#: src/main/print-escp2.c:854
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr "Magenta Claro"
+
+#: src/main/print-escp2.c:861
+#, fuzzy
+msgid "Hextone Gray 1 Density Scale"
+msgstr "Escala de Cinzento"
+
+#: src/main/print-escp2.c:862
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr "Magenta Claro"
+
+#: src/main/print-escp2.c:893
 msgid "Drying Time Per Page"
 msgstr ""
 
-#: src/main/print-escp2.c:768
+#: src/main/print-escp2.c:894
 msgid "Set drying time per page"
 msgstr ""
 
-#: src/main/print-escp2.c:775
+#: src/main/print-escp2.c:901
 msgid "Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:776
+#: src/main/print-escp2.c:902
 msgid "Set drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:783
+#: src/main/print-escp2.c:909
 msgid "Minimum Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:784
+#: src/main/print-escp2.c:910
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:799
+#: src/main/print-escp2.c:925
+msgid "Quality Enhancement"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Enhance print quality by additional passes"
+msgstr ""
+
+#: src/main/print-escp2.c:933
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "Tamanho"
 
-#: src/main/print-escp2.c:800
+#: src/main/print-escp2.c:934
 #, fuzzy
 msgid "Set printer paper thickness"
 msgstr "Definir Valores Padrão"
 
-#: src/main/print-escp2.c:807
+#: src/main/print-escp2.c:941
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Densidade:"
 
-#: src/main/print-escp2.c:808
+#: src/main/print-escp2.c:942
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:815
+#: src/main/print-escp2.c:949
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:816
+#: src/main/print-escp2.c:950
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:823
+#: src/main/print-escp2.c:957
 #, fuzzy
 msgid "Print Method"
 msgstr "Modelo da Impressora:"
 
-#: src/main/print-escp2.c:824
+#: src/main/print-escp2.c:958
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:831
+#: src/main/print-escp2.c:965
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Papel Normal"
 
-#: src/main/print-escp2.c:832
+#: src/main/print-escp2.c:966
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:839
+#: src/main/print-escp2.c:973
 msgid "Feed Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:840
-#, c-format
+#: src/main/print-escp2.c:975
+#, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:1992
+#: src/main/print-escp2.c:2197
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Tipo de Output:"
 
-#: src/main/print-escp2.c:1994
+#: src/main/print-escp2.c:2199
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2208 src/cups/genppd.c:1484 src/cups/genppd.c:2059
+#: src/main/print-escp2.c:2413 src/cups/genppd.c:1517 src/cups/genppd.c:2093
 #, fuzzy
 msgid "Automatic"
 msgstr "Tamanho"
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2415
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidireccional"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2417
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidireccional"
 
-#: src/main/print-escp2.c:2243
+#: src/main/print-escp2.c:2448
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2450
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2452
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2454
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2456
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2287
+#: src/main/print-escp2.c:2492
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:2858
+#: src/main/print-escp2.c:3100
 #, 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:4107 src/main/print-olympus.c:2472
+#: src/main/print-escp2.c:4355 src/main/print-olympus.c:2641
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1853,361 +2577,378 @@ msgid "test print"
 msgstr "impressão de teste"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3205
-#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3217
-#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3233
-#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3255
-#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3276
-#: src/xml/xmli18n-tmp.h:3288 src/xml/xmli18n-tmp.h:3295
-#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3315
-#: src/xml/xmli18n-tmp.h:3327 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3368
-#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3380
-#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
-#: src/xml/xmli18n-tmp.h:3412 src/xml/xmli18n-tmp.h:3424
-#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3444
-#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3472
-#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3496
-#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3521
-#: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3544
-#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3556
-#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3581
-#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3598
-#: src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3754 src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:3809 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3863 src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:4058 src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:4163 src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:4227 src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:4335 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4467 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4594 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:4879 src/xml/xmli18n-tmp.h:4946
+#: src/xml/xmli18n-tmp.h:5000 src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:5243 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5365 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5512 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5667 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5784 src/xml/xmli18n-tmp.h:5805
+#: src/xml/xmli18n-tmp.h:5826
 msgid "Four Color Standard"
 msgstr "Quatro Cores Standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3206
-#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3218
-#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3234
-#: src/xml/xmli18n-tmp.h:3244 src/xml/xmli18n-tmp.h:3251
-#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3268
-#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3289
-#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3306
-#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
-#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3354
-#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3377
-#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3389
-#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3413
-#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3435
-#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3455
-#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3485
-#: src/xml/xmli18n-tmp.h:3497 src/xml/xmli18n-tmp.h:3508
-#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3537
-#: src/xml/xmli18n-tmp.h:3545 src/xml/xmli18n-tmp.h:3549
-#: src/xml/xmli18n-tmp.h:3557 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3593
-#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3605
+#: src/xml/xmli18n-tmp.h:3759 src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3868 src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:4002 src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:4107 src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4472
+#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4817 src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5181 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5315 src/xml/xmli18n-tmp.h:5370
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5672
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5831
 msgid "Three Color Composite"
 msgstr "Três Cores Compósito"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3241
-#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3265
-#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3286
-#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
-#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3351
-#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3374
-#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3398
-#: src/xml/xmli18n-tmp.h:3410 src/xml/xmli18n-tmp.h:3422
-#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3452
-#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3470
-#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3494
-#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3519
-#: src/xml/xmli18n-tmp.h:3534 src/xml/xmli18n-tmp.h:3542
-#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3741 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4086 src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4933
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5421
+#: src/xml/xmli18n-tmp.h:5499 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5723
 msgid "Six Color Photo"
 msgstr "Seis Cores Foto"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3242
-#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3266
-#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3287
-#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3326
-#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3352
-#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3375
-#: src/xml/xmli18n-tmp.h:3387 src/xml/xmli18n-tmp.h:3399
-#: src/xml/xmli18n-tmp.h:3411 src/xml/xmli18n-tmp.h:3423
-#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3453
-#: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3483
-#: src/xml/xmli18n-tmp.h:3495 src/xml/xmli18n-tmp.h:3506
-#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3535
-#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3566
-#: src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3748 src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:3989 src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:4094 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4267 src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4940
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5661
+#: src/xml/xmli18n-tmp.h:5730
 msgid "Five Color Photo Composite"
 msgstr "Cinco Cores Foto Compósito"
 
 #: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
-#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
-#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
-#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
-#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
-#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
-#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
-#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
-#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:849
-#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:963
-#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1077
-#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1170
-#: src/xml/xmli18n-tmp.h:1220 src/xml/xmli18n-tmp.h:1277
-#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1376
-#: src/xml/xmli18n-tmp.h:1439 src/xml/xmli18n-tmp.h:1502
-#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1619
-#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1739
-#: src/xml/xmli18n-tmp.h:1773
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1050
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1240
+#: src/xml/xmli18n-tmp.h:1335 src/xml/xmli18n-tmp.h:1449
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1580
+#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1862
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2200 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2297
 msgid "Plain Paper"
 msgstr "Papel Normal"
 
-#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
-#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
-#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
-#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
-#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
-#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
-#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
-#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
-#: src/xml/xmli18n-tmp.h:819 src/xml/xmli18n-tmp.h:858
-#: src/xml/xmli18n-tmp.h:915 src/xml/xmli18n-tmp.h:972
-#: src/xml/xmli18n-tmp.h:1029 src/xml/xmli18n-tmp.h:1086
-#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1176
-#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1286
-#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1385
-#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1508
-#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1628
-#: src/xml/xmli18n-tmp.h:1685 src/xml/xmli18n-tmp.h:1743
-#: src/xml/xmli18n-tmp.h:1779
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:101 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:365 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1160 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1740
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1871
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2136
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2267
+#: src/xml/xmli18n-tmp.h:2303
 msgid "Glossy Film"
 msgstr "Filme Lustroso"
 
-#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
-#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
-#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
-#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
-#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
-#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
-#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
-#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
-#: src/xml/xmli18n-tmp.h:821 src/xml/xmli18n-tmp.h:861
-#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:975
-#: src/xml/xmli18n-tmp.h:1032 src/xml/xmli18n-tmp.h:1089
-#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1178
-#: src/xml/xmli18n-tmp.h:1232 src/xml/xmli18n-tmp.h:1289
-#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1388
-#: src/xml/xmli18n-tmp.h:1451 src/xml/xmli18n-tmp.h:1511
-#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1631
-#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1745
-#: src/xml/xmli18n-tmp.h:1781
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:845 src/xml/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:965 src/xml/xmli18n-tmp.h:1022
+#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1359
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1550
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1745 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2305
 msgid "Transparencies"
 msgstr "Transparências"
 
-#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
-#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
-#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
-#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
-#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
-#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
-#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
-#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
-#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:823
-#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:921
-#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:1035
-#: src/xml/xmli18n-tmp.h:1092 src/xml/xmli18n-tmp.h:1142
-#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1235
-#: src/xml/xmli18n-tmp.h:1292 src/xml/xmli18n-tmp.h:1344
-#: src/xml/xmli18n-tmp.h:1391 src/xml/xmli18n-tmp.h:1454
-#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1577
-#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1691
-#: src/xml/xmli18n-tmp.h:1747 src/xml/xmli18n-tmp.h:1783
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:55 src/xml/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:151 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1024
+#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2215
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2307
 msgid "Envelopes"
 msgstr "Envelopes"
 
-#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
-#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
-#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
-#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
-#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
-#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
-#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
-#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
-#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:827
-#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:927
-#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:1041
-#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1146
-#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1241
-#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1348
-#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1460
-#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1583
-#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1697
-#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1787
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:1028
+#: src/xml/xmli18n-tmp.h:1085 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1275 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1556
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1665
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1834
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2076
+#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2311
 msgid "Matte Paper"
 msgstr "Papel Mate"
 
-#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
-#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
-#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
-#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
-#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
-#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
-#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
-#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
-#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:831
-#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:933
-#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:1047
-#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1150
-#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1247
-#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1352
-#: src/xml/xmli18n-tmp.h:1403 src/xml/xmli18n-tmp.h:1466
-#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1589
-#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1703
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1791
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:167 src/xml/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:569
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1032
+#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1285 src/xml/xmli18n-tmp.h:1389
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1675
+#: src/xml/xmli18n-tmp.h:1770 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1889 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2012 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2227
+#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2315
 msgid "Inkjet Paper"
 msgstr "Papel para Impressora Jacto de Tinta"
 
-#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
-#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
-#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
-#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
-#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
-#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
-#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
-#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
-#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:833
-#: src/xml/xmli18n-tmp.h:879 src/xml/xmli18n-tmp.h:936
-#: src/xml/xmli18n-tmp.h:993 src/xml/xmli18n-tmp.h:1050
-#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1152
-#: src/xml/xmli18n-tmp.h:1190 src/xml/xmli18n-tmp.h:1250
-#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1354
-#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1469
-#: src/xml/xmli18n-tmp.h:1529 src/xml/xmli18n-tmp.h:1592
-#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1706
-#: src/xml/xmli18n-tmp.h:1757 src/xml/xmli18n-tmp.h:1793
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:425 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:512 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1034
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1499 src/xml/xmli18n-tmp.h:1562
+#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1775 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1955
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2088
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2317
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papel de Qualidade Fotografica para Impressora Jacto de Tinta"
 
-#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
-#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
-#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
-#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
-#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
-#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
-#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
-#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
-#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:835
-#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:939
-#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:1053
-#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1154
-#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1253
-#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1356
-#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1472
-#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1595
-#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1709
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1795
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1036
+#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1200
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1504 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1842
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2233
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2319
 msgid "Photo Paper"
 msgstr "Papel de Fotografia"
 
-#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
-#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
-#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
-#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
-#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
-#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
-#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
-#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
-#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:837
-#: src/xml/xmli18n-tmp.h:885 src/xml/xmli18n-tmp.h:942
-#: src/xml/xmli18n-tmp.h:999 src/xml/xmli18n-tmp.h:1056
-#: src/xml/xmli18n-tmp.h:1113 src/xml/xmli18n-tmp.h:1156
-#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1212
-#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1256
-#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1358
-#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1475
-#: src/xml/xmli18n-tmp.h:1535 src/xml/xmli18n-tmp.h:1598
-#: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1712
-#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1797
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:179 src/xml/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:518 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:869 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1038
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1407
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1566
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1622
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1844
+#: src/xml/xmli18n-tmp.h:1898 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2321
 msgid "Premium Glossy Photo Paper"
 msgstr "Papel de Fotografia Lustroso Premium"
 
-#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
-#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
-#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
-#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
-#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
-#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
-#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
-#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
-#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:841
-#: src/xml/xmli18n-tmp.h:891 src/xml/xmli18n-tmp.h:948
-#: src/xml/xmli18n-tmp.h:1005 src/xml/xmli18n-tmp.h:1062
-#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1160
-#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1262
-#: src/xml/xmli18n-tmp.h:1319 src/xml/xmli18n-tmp.h:1362
-#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1481
-#: src/xml/xmli18n-tmp.h:1541 src/xml/xmli18n-tmp.h:1604
-#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1718
-#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1801
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1042
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1419
+#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1570
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2027 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2242
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2325
 msgid "Premium Luster Photo Paper"
 msgstr "Papel de Fotografia Brilhante Premium"
 
-#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
-#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
-#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
-#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
-#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
-#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
-#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
-#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
-#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:843
-#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:951
-#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1065
-#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1162
-#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1265
-#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1368
-#: src/xml/xmli18n-tmp.h:1427 src/xml/xmli18n-tmp.h:1490
-#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1607
-#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1727
-#: src/xml/xmli18n-tmp.h:1767 src/xml/xmli18n-tmp.h:1803
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:91 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:191 src/xml/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:439 src/xml/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:787 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1044
+#: src/xml/xmli18n-tmp.h:1125 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1315 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1854
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2327
 msgid "Photo Quality Glossy Paper"
 msgstr "Papel de Qualidade Fotografica Lustroso"
 
-#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
-#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
-#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
-#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
-#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
-#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
-#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
-#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:897
-#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:1011
-#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1125
-#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1206
-#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1325
-#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1430
-#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1553
-#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1667
-#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1805
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1130
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1320
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1616
+#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1856 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2329
 msgid "Ilford Heavy Paper"
 msgstr "Papel Pesado Ilford"
 
-#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
-#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
-#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
-#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
-#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
-#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
-#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
-#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
-#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:847
-#: src/xml/xmli18n-tmp.h:903 src/xml/xmli18n-tmp.h:960
-#: src/xml/xmli18n-tmp.h:1017 src/xml/xmli18n-tmp.h:1074
-#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1168
-#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1214
-#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1274
-#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1374
-#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1499
-#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1616
-#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1736
-#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1809
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:129
+#: src/xml/xmli18n-tmp.h:203 src/xml/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:542 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1048
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1443
+#: src/xml/xmli18n-tmp.h:1539 src/xml/xmli18n-tmp.h:1578
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1720
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1985
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2333
 msgid "Other"
 msgstr "Outro"
 
@@ -2223,58 +2964,62 @@ msgstr "Manual com Pausa"
 msgid "Manual without Pause"
 msgstr "Manual sem Pausa"
 
-#: src/main/print-olympus.c:279
+#: src/main/print-olympus.c:281
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:280 src/cups/genppd.c:1685 src/cups/genppd.c:1713
-#: src/cups/genppd.c:1745 src/cups/genppd.c:1800 src/cups/genppd.c:1846
-#: src/cups/genppd.c:2147 src/cups/genppd.c:2160 src/cups/genppd.c:2183
-#: src/cups/genppd.c:2204 src/cups/genppd.c:2221
+#: src/main/print-olympus.c:282 src/cups/genppd.c:1718 src/cups/genppd.c:1746
+#: src/cups/genppd.c:1778 src/cups/genppd.c:1833 src/cups/genppd.c:1879
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2194 src/cups/genppd.c:2217
+#: src/cups/genppd.c:2238 src/cups/genppd.c:2255
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
-#: src/main/print-olympus.c:1132
+#: src/main/print-olympus.c:998 src/main/print-olympus.c:1061
+#: src/main/print-olympus.c:1165
 #, fuzzy
 msgid "Glossy"
 msgstr "Filme Lustroso"
 
-#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
-#: src/main/print-olympus.c:1133
+#: src/main/print-olympus.c:999 src/main/print-olympus.c:1062
+#: src/main/print-olympus.c:1166
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
+#: src/main/print-olympus.c:1063 src/main/print-olympus.c:1167
 #, fuzzy
 msgid "Matte"
 msgstr "Papel Mate"
 
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
+#. TRANSLATORS: 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.
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1901
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1770
+#: src/main/print-olympus.c:1936
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-olympus.c:1778
+#: src/main/print-olympus.c:1944
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1952
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-olympus.c:1793
+#: src/main/print-olympus.c:1959
 #, fuzzy
 msgid "Black Balance"
 msgstr "Preto e Branco"
 
-#: src/main/print-olympus.c:1794
+#: src/main/print-olympus.c:1960
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
@@ -2307,7 +3052,7 @@ msgstr "Foto Secagem Rápida"
 msgid "Quick-dry Transparency"
 msgstr "Transparência Secagem Rápida"
 
-#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3687
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:5925
 msgid "Manual"
 msgstr "Manual"
 
@@ -2392,24 +3137,24 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:278 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3638
-#: src/xml/xmli18n-tmp.h:3647 src/xml/xmli18n-tmp.h:3656
-#: src/xml/xmli18n-tmp.h:3664
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5875
+#: src/xml/xmli18n-tmp.h:5884 src/xml/xmli18n-tmp.h:5893
+#: src/xml/xmli18n-tmp.h:5901
 msgid "Draft"
 msgstr ""
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:3633 src/xml/xmli18n-tmp.h:3641
-#: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3658
-#: src/xml/xmli18n-tmp.h:3666
+#: src/xml/xmli18n-tmp.h:5870 src/xml/xmli18n-tmp.h:5878
+#: src/xml/xmli18n-tmp.h:5886 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5903
 #, fuzzy
 msgid "High"
 msgstr "Altura"
 
 #: src/main/print-pcl.c:282 src/main/print-pcl.c:283
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3634
-#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3650
-#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3667
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5896 src/xml/xmli18n-tmp.h:5904
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografia"
@@ -2445,15 +3190,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3671
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:5908
 msgid "Letter"
 msgstr "Carta"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3708
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:5946
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3823
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6061
 msgid "Custom"
 msgstr "Personalizado"
 
@@ -2461,35 +3206,44 @@ msgstr "Personalizado"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3629
-#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3654
+#: src/main/print-weave.c:1511
+msgid "Fatal error!"
+msgstr ""
+
+#: src/main/print-weave.c:1547
+msgid ""
+"Please report the above information to gimp-print-devel@lists.sourceforge.net"
+msgstr ""
+
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:5866
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5891
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3630
-#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3655
-#: src/xml/xmli18n-tmp.h:3663
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5900
 msgid "Economy"
 msgstr ""
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3635
-#: src/xml/xmli18n-tmp.h:3642 src/xml/xmli18n-tmp.h:3651
-#: src/xml/xmli18n-tmp.h:3660 src/xml/xmli18n-tmp.h:3668
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:5872
+#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3636
-#: src/xml/xmli18n-tmp.h:3643 src/xml/xmli18n-tmp.h:3652
-#: src/xml/xmli18n-tmp.h:3661 src/xml/xmli18n-tmp.h:3669
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:5873
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5889
+#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5906
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Seis Cores Foto"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1326 src/cups/genppd.c:1989
-#: src/xml/xmli18n-tmp.h:3637 src/xml/xmli18n-tmp.h:3644
-#: src/xml/xmli18n-tmp.h:3653 src/xml/xmli18n-tmp.h:3662
-#: src/xml/xmli18n-tmp.h:3670
+#: src/main/generic-options.c:41 src/cups/genppd.c:1359 src/cups/genppd.c:2023
+#: src/xml/xmli18n-tmp.h:5874 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5899
+#: src/xml/xmli18n-tmp.h:5907
 msgid "Best"
 msgstr ""
 
@@ -3260,81 +4014,81 @@ msgstr ""
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:960
+#: src/cups/genppd.c:993
 msgid "English"
 msgstr "Portuguese"
 
-#: src/cups/genppd.c:1159 src/cups/genppd.c:1175 src/cups/genppd.c:1934
-#: src/cups/genppd.c:1935
+#: src/cups/genppd.c:1192 src/cups/genppd.c:1208 src/cups/genppd.c:1968
+#: src/cups/genppd.c:1969
 #, fuzzy
 msgid "Media Size"
 msgstr "Tamanho do \"Media\":"
 
-#: src/cups/genppd.c:1248 src/cups/genppd.c:1970
+#: src/cups/genppd.c:1281 src/cups/genppd.c:2004
 #, fuzzy
 msgid "Color Model"
 msgstr "Cor"
 
-#: src/cups/genppd.c:1275 src/cups/genppd.c:1972
+#: src/cups/genppd.c:1308 src/cups/genppd.c:2006
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "Escala de Cinzento"
 
-#: src/cups/genppd.c:1285 src/cups/genppd.c:1976
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2010
 #, fuzzy
 msgid "RGB Color"
 msgstr "Cor"
 
-#: src/cups/genppd.c:1292 src/cups/genppd.c:1977
+#: src/cups/genppd.c:1325 src/cups/genppd.c:2011
 msgid "CMY Color"
 msgstr "Cor CMY"
 
-#: src/cups/genppd.c:1317 src/cups/genppd.c:1987
+#: src/cups/genppd.c:1350 src/cups/genppd.c:2021
 msgid "Color Precision"
 msgstr ""
 
-#: src/cups/genppd.c:1573 src/cups/genppd.c:2080
+#: src/cups/genppd.c:1606 src/cups/genppd.c:2114
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:1590 src/cups/genppd.c:2096
+#: src/cups/genppd.c:1623 src/cups/genppd.c:2130
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:1615 src/cups/genppd.c:2113
+#: src/cups/genppd.c:1648 src/cups/genppd.c:2147
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1620 src/cups/genppd.c:2114
+#: src/cups/genppd.c:1653 src/cups/genppd.c:2148
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1621 src/cups/genppd.c:2115
+#: src/cups/genppd.c:1654 src/cups/genppd.c:2149
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1622 src/cups/genppd.c:2116
+#: src/cups/genppd.c:1655 src/cups/genppd.c:2150
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1716 src/cups/genppd.c:2162
+#: src/cups/genppd.c:1749 src/cups/genppd.c:2196
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1718 src/cups/genppd.c:2164
+#: src/cups/genppd.c:1751 src/cups/genppd.c:2198
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1757 src/cups/genppd.c:1820 src/cups/genppd.c:1864
-#: src/cups/genppd.c:2185 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+#: src/cups/genppd.c:1790 src/cups/genppd.c:1853 src/cups/genppd.c:1897
+#: src/cups/genppd.c:2219 src/cups/genppd.c:2249 src/cups/genppd.c:2266
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1762 src/cups/genppd.c:2189
+#: src/cups/genppd.c:1795 src/cups/genppd.c:2223
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/cups/genppd.c:1805 src/cups/genppd.c:2209
+#: src/cups/genppd.c:1838 src/cups/genppd.c:2243
 #, c-format
 msgid "%.1f mm"
 msgstr ""
@@ -3649,51 +4403,61 @@ 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:995 src/xml/xmli18n-tmp.h:383
-#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
-#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
-#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
-#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
-#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
-#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
-#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
-#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
-#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
-#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
-#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
-#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
-#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
-#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
-#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
-#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
-#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
-#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
-#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
-#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
-#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
-#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
-#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
-#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
-#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
-#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
-#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
-#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
-#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
-#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1503
-#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1509
-#: src/xml/xmli18n-tmp.h:1512 src/xml/xmli18n-tmp.h:1515
-#: src/xml/xmli18n-tmp.h:1518 src/xml/xmli18n-tmp.h:1521
-#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1527
-#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
-#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
-#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
-#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
-#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
-#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:2655
-#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2717
-#: src/xml/xmli18n-tmp.h:3045 src/xml/xmli18n-tmp.h:3252
-#: src/xml/xmli18n-tmp.h:3273 src/xml/xmli18n-tmp.h:3363
-#: src/xml/xmli18n-tmp.h:3531
+#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2001
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2010 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2025
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:4085 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4612 src/xml/xmli18n-tmp.h:5481
 #, fuzzy
 msgid "Photo Black"
 msgstr "Papel de Fotografia"
@@ -3705,131 +4469,303 @@ msgid "Unknown"
 msgstr ""
 
 #: src/escputil/escputil.c:1000 src/escputil/escputil.c:1289
-#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1921
-#: src/xml/xmli18n-tmp.h:1937 src/xml/xmli18n-tmp.h:2002
-#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2079
-#: src/xml/xmli18n-tmp.h:2105 src/xml/xmli18n-tmp.h:2119
-#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2173
-#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
-#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
-#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2293
-#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2346
-#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2418
-#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2445
-#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2469
-#: src/xml/xmli18n-tmp.h:2484 src/xml/xmli18n-tmp.h:2512
-#: src/xml/xmli18n-tmp.h:2525 src/xml/xmli18n-tmp.h:2564
-#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2626
-#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2746
-#: src/xml/xmli18n-tmp.h:2762 src/xml/xmli18n-tmp.h:2843
-#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2895
-#: src/xml/xmli18n-tmp.h:2912 src/xml/xmli18n-tmp.h:2946
-#: src/xml/xmli18n-tmp.h:3001 src/xml/xmli18n-tmp.h:3015
-#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3122
-#: src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2461 src/xml/xmli18n-tmp.h:2526
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2683 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2711 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3101 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3661
+#: src/xml/xmli18n-tmp.h:3678 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3750 src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:3782 src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:3932 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3964 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4388 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:4639 src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:4875 src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4936
+#: src/xml/xmli18n-tmp.h:4942 src/xml/xmli18n-tmp.h:4968
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5339 src/xml/xmli18n-tmp.h:5348
+#: src/xml/xmli18n-tmp.h:5355 src/xml/xmli18n-tmp.h:5361
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5417
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5430
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5477 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5502
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5536 src/xml/xmli18n-tmp.h:5544
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5557
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5657 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5719
+#: src/xml/xmli18n-tmp.h:5726 src/xml/xmli18n-tmp.h:5732
+#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5779
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Ciano Claro"
 
 #: src/escputil/escputil.c:1001 src/escputil/escputil.c:1290
-#: src/xml/xmli18n-tmp.h:1906 src/xml/xmli18n-tmp.h:1922
-#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:2003
-#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2080
-#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2120
-#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2174
-#: src/xml/xmli18n-tmp.h:2188 src/xml/xmli18n-tmp.h:2201
-#: src/xml/xmli18n-tmp.h:2214 src/xml/xmli18n-tmp.h:2227
-#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2294
-#: src/xml/xmli18n-tmp.h:2309 src/xml/xmli18n-tmp.h:2347
-#: src/xml/xmli18n-tmp.h:2360 src/xml/xmli18n-tmp.h:2419
-#: src/xml/xmli18n-tmp.h:2432 src/xml/xmli18n-tmp.h:2446
-#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2470
-#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2513
-#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2565
-#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2627
-#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2748
-#: src/xml/xmli18n-tmp.h:2761 src/xml/xmli18n-tmp.h:2844
-#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2896
-#: src/xml/xmli18n-tmp.h:2913 src/xml/xmli18n-tmp.h:2947
-#: src/xml/xmli18n-tmp.h:3000 src/xml/xmli18n-tmp.h:3014
-#: src/xml/xmli18n-tmp.h:3028 src/xml/xmli18n-tmp.h:3123
-#: src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2446
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2527
+#: src/xml/xmli18n-tmp.h:2541 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2644
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2698
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2751
+#: src/xml/xmli18n-tmp.h:2803 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2956 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2994
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3381
+#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3662
+#: src/xml/xmli18n-tmp.h:3746 src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:3778 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3934 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3966 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:4265 src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:4390 src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:4428 src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4452
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4465
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4512 src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4586 src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:4641 src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4903
+#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4970
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:5044 src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5168
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5241 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5334
+#: src/xml/xmli18n-tmp.h:5341 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5363
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5419
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5471
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5504
+#: src/xml/xmli18n-tmp.h:5510 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5652
+#: src/xml/xmli18n-tmp.h:5659 src/xml/xmli18n-tmp.h:5665
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5721
+#: src/xml/xmli18n-tmp.h:5728 src/xml/xmli18n-tmp.h:5734
+#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5781
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Magenta Claro"
 
-#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2433
-#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:3002
-#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3030
+#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3679 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4409 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:4566 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4605 src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4664 src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5376 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5450
+#: src/xml/xmli18n-tmp.h:5475 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5533 src/xml/xmli18n-tmp.h:5542
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5678 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5717
+#: src/xml/xmli18n-tmp.h:5747 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5777
 #, fuzzy
 msgid "Light Black"
 msgstr "Preto"
 
-#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:384
-#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
-#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
-#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
-#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
-#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
-#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
-#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
-#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
-#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
-#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
-#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
-#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
-#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
-#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
-#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
-#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
-#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
-#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
-#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
-#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
-#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
-#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
-#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
-#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
-#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
-#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
-#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
-#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
-#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
-#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1504
-#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1510
-#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1516
-#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1522
-#: src/xml/xmli18n-tmp.h:1525 src/xml/xmli18n-tmp.h:1528
-#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1534
-#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1540
-#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1546
-#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1552
-#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1558
-#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:2654
-#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2716
-#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3264
-#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3371
-#: src/xml/xmli18n-tmp.h:3539
+#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:508 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:532 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:538 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:562 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:568 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
+#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
+#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
+#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
+#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
+#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
+#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
+#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
+#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
+#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
+#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
+#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2011 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2026
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2032
+#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2038
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:4044 src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:5530
 #, fuzzy
 msgid "Matte Black"
 msgstr "Papel Mate"
 
-#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:2658
-#: src/xml/xmli18n-tmp.h:2702 src/xml/xmli18n-tmp.h:2720
-#: src/xml/xmli18n-tmp.h:3048
+#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3995 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4006 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4020 src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:4106 src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4148
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Filme Lustroso"
 
-#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:2760
-#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3013
-#: src/xml/xmli18n-tmp.h:3027
+#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3676
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4616 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5534 src/xml/xmli18n-tmp.h:5573
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Preto"
 
 #: src/escputil/escputil.c:1010 src/escputil/escputil.c:1029
-#: src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:4099 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4189
 #, fuzzy
 msgid "Orange"
 msgstr "Tamanho"
@@ -4501,8230 +5437,8360 @@ msgstr "Imprimindo..."
 #: src/xml/xmli18n-tmp.h:68 src/xml/xmli18n-tmp.h:70 src/xml/xmli18n-tmp.h:72
 #: src/xml/xmli18n-tmp.h:74 src/xml/xmli18n-tmp.h:76 src/xml/xmli18n-tmp.h:78
 #: src/xml/xmli18n-tmp.h:80 src/xml/xmli18n-tmp.h:82 src/xml/xmli18n-tmp.h:84
-#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:92
-#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
-#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
-#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
-#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
-#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
-#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
-#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
-#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
-#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
-#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
-#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
-#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
-#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
-#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
-#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
-#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
-#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
-#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
-#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
-#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
-#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
-#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
-#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
-#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
-#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
-#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
-#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
-#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
-#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
-#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
-#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
-#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
-#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
-#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
-#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
-#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
-#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
-#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
-#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
-#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
-#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
-#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
-#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
-#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
-#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
-#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
-#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
-#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
-#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
-#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
-#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
-#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
-#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
-#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
-#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
-#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
-#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
-#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
-#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
-#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
-#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
-#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
-#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
-#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
-#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
-#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
-#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
-#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
-#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
-#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
-#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
-#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
-#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
-#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
-#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
-#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
-#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
-#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
-#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
-#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
-#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
-#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
-#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
-#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
-#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
-#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
-#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
-#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
-#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
-#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
-#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
-#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
-#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
-#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
-#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
-#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:92 src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:102 src/xml/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:106 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:114 src/xml/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:118 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:126 src/xml/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:130 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:136 src/xml/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:144 src/xml/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:168 src/xml/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:192 src/xml/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:216 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:232 src/xml/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:240 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:256 src/xml/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:264 src/xml/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:304 src/xml/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:312 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:320 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:328 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:336 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:344 src/xml/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:352 src/xml/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:384 src/xml/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:408 src/xml/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:412 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:432 src/xml/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:444 src/xml/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:448 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:468 src/xml/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:484 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:642 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:698 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:714 src/xml/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:722 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:738 src/xml/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:746 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:764 src/xml/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:780 src/xml/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:804 src/xml/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:814
 #: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:818
 #: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:822
 #: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:826
 #: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:830
-#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:834
-#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:838
-#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:842
-#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:846
-#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:850
-#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
-#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
-#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
-#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
-#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
-#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
-#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
-#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:898
-#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
-#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
-#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
-#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
-#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
-#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
-#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
-#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
-#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
-#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
-#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
-#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
-#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
-#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
-#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
-#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
-#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
-#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
-#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
-#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1018
-#: src/xml/xmli18n-tmp.h:1021 src/xml/xmli18n-tmp.h:1024
-#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1030
-#: src/xml/xmli18n-tmp.h:1033 src/xml/xmli18n-tmp.h:1036
-#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1042
-#: src/xml/xmli18n-tmp.h:1045 src/xml/xmli18n-tmp.h:1048
-#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1054
-#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1060
-#: src/xml/xmli18n-tmp.h:1063 src/xml/xmli18n-tmp.h:1066
-#: src/xml/xmli18n-tmp.h:1069 src/xml/xmli18n-tmp.h:1072
-#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1078
-#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1084
-#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1090
-#: src/xml/xmli18n-tmp.h:1093 src/xml/xmli18n-tmp.h:1096
-#: src/xml/xmli18n-tmp.h:1099 src/xml/xmli18n-tmp.h:1102
-#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1108
-#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1114
-#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1120
-#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1126
-#: src/xml/xmli18n-tmp.h:1129 src/xml/xmli18n-tmp.h:1132
-#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
-#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
-#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
-#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
-#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
-#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
-#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
-#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
-#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
-#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
-#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
-#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
-#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
-#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1189
-#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1193
-#: src/xml/xmli18n-tmp.h:1195 src/xml/xmli18n-tmp.h:1197
-#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1201
-#: src/xml/xmli18n-tmp.h:1203 src/xml/xmli18n-tmp.h:1205
-#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1209
-#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1221
-#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
-#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
-#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
-#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
-#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
-#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
-#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
-#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
-#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
-#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
-#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
-#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
-#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
-#: src/xml/xmli18n-tmp.h:1302 src/xml/xmli18n-tmp.h:1305
-#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1311
-#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1317
-#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1323
-#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1329
-#: src/xml/xmli18n-tmp.h:1332 src/xml/xmli18n-tmp.h:1335
-#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
-#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1343
-#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1347
-#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1351
-#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1355
-#: src/xml/xmli18n-tmp.h:1357 src/xml/xmli18n-tmp.h:1359
-#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1363
-#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1367
-#: src/xml/xmli18n-tmp.h:1369 src/xml/xmli18n-tmp.h:1371
-#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1375
-#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1566
-#: src/xml/xmli18n-tmp.h:1569 src/xml/xmli18n-tmp.h:1572
-#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1578
-#: src/xml/xmli18n-tmp.h:1581 src/xml/xmli18n-tmp.h:1584
-#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1590
-#: src/xml/xmli18n-tmp.h:1593 src/xml/xmli18n-tmp.h:1596
-#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1602
-#: src/xml/xmli18n-tmp.h:1605 src/xml/xmli18n-tmp.h:1608
-#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1614
-#: src/xml/xmli18n-tmp.h:1617 src/xml/xmli18n-tmp.h:1620
-#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1626
-#: src/xml/xmli18n-tmp.h:1629 src/xml/xmli18n-tmp.h:1632
-#: src/xml/xmli18n-tmp.h:1635 src/xml/xmli18n-tmp.h:1638
-#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1644
-#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
-#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
-#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
-#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
-#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
-#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
-#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
-#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
-#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
-#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
-#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
-#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
-#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
-#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
-#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:1778
-#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1782
-#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1786
-#: src/xml/xmli18n-tmp.h:1788 src/xml/xmli18n-tmp.h:1790
-#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1794
-#: src/xml/xmli18n-tmp.h:1796 src/xml/xmli18n-tmp.h:1798
-#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1802
-#: src/xml/xmli18n-tmp.h:1804 src/xml/xmli18n-tmp.h:1806
-#: src/xml/xmli18n-tmp.h:1808 src/xml/xmli18n-tmp.h:1810
-#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3204
-#: src/xml/xmli18n-tmp.h:3210 src/xml/xmli18n-tmp.h:3216
-#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3232
-#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3250
-#: src/xml/xmli18n-tmp.h:3294 src/xml/xmli18n-tmp.h:3302
-#: src/xml/xmli18n-tmp.h:3304 src/xml/xmli18n-tmp.h:3312
-#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3379
-#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
-#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3421
-#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3441
-#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3469
-#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3555
-#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3597
-#: src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:1017
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1025
+#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1035 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1047 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1056
+#: src/xml/xmli18n-tmp.h:1061 src/xml/xmli18n-tmp.h:1066
+#: src/xml/xmli18n-tmp.h:1071 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1086
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1096
+#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1116
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1126
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1136
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1161 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1181 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1206
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1216
+#: src/xml/xmli18n-tmp.h:1221 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1236
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1246
+#: src/xml/xmli18n-tmp.h:1251 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1261 src/xml/xmli18n-tmp.h:1266
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1281 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1291 src/xml/xmli18n-tmp.h:1296
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1311 src/xml/xmli18n-tmp.h:1316
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1326
+#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1336
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1378 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1414 src/xml/xmli18n-tmp.h:1420
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1432
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1450 src/xml/xmli18n-tmp.h:1455
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1465
+#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1480 src/xml/xmli18n-tmp.h:1485
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1540 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1551 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1583 src/xml/xmli18n-tmp.h:1585
+#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1603 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1607 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1646
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1666
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1676
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1716
+#: src/xml/xmli18n-tmp.h:1721 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1736
+#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1835
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1843
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1851
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:2049
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2057
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2065
+#: src/xml/xmli18n-tmp.h:2069 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2113
+#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2129
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2137
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2153
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2161
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2185
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2264
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2272
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2276
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2282 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2286 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2296
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2300
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2308
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2314 src/xml/xmli18n-tmp.h:2316
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2324
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:3787 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3895 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:4223 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5579
+#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5825
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Bright White Paper"
 msgstr "Papel Mate"
 
-#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
-#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
-#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
-#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
-#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
-#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
-#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
-#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:817
-#: src/xml/xmli18n-tmp.h:855 src/xml/xmli18n-tmp.h:912
-#: src/xml/xmli18n-tmp.h:969 src/xml/xmli18n-tmp.h:1026
-#: src/xml/xmli18n-tmp.h:1083 src/xml/xmli18n-tmp.h:1136
-#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1226
-#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1338
-#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1445
-#: src/xml/xmli18n-tmp.h:1505 src/xml/xmli18n-tmp.h:1568
-#: src/xml/xmli18n-tmp.h:1625 src/xml/xmli18n-tmp.h:1682
-#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1777
-#: src/xml/xmli18n-tmp.h:3675
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:139 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:959 src/xml/xmli18n-tmp.h:1018
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1155
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1546
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1931
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:5912
 msgid "Postcard"
 msgstr "Cartão"
 
-#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
-#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
-#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
-#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
-#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
-#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
-#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
-#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:825
-#: src/xml/xmli18n-tmp.h:867 src/xml/xmli18n-tmp.h:924
-#: src/xml/xmli18n-tmp.h:981 src/xml/xmli18n-tmp.h:1038
-#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1144
-#: src/xml/xmli18n-tmp.h:1182 src/xml/xmli18n-tmp.h:1238
-#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1346
-#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1457
-#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1580
-#: src/xml/xmli18n-tmp.h:1637 src/xml/xmli18n-tmp.h:1694
-#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1785
+#: src/xml/xmli18n-tmp.h:13 src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:155 src/xml/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:415 src/xml/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:851 src/xml/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1026
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1175
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1554
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1832
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2309
 msgid "Back Light Film"
 msgstr "Película"
 
-#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
-#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
-#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
-#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
-#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
-#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
-#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
-#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:829
-#: src/xml/xmli18n-tmp.h:873 src/xml/xmli18n-tmp.h:930
-#: src/xml/xmli18n-tmp.h:987 src/xml/xmli18n-tmp.h:1044
-#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1148
-#: src/xml/xmli18n-tmp.h:1186 src/xml/xmli18n-tmp.h:1244
-#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1350
-#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1463
-#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1586
-#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1700
-#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1789
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:419 src/xml/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:857 src/xml/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1030
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1383
+#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1558
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2313
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Papel Mate"
 
-#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
-#: src/xml/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:421
 #, fuzzy
 msgid "Premium Presentation Paper Matte"
 msgstr "Papel de Fotografia Brilhante Premium"
 
-#: src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:431
 #, fuzzy
-msgid "Premium Glossy Photo Paper 170 wt"
+msgid "Ultra Glossy Photo Paper"
+msgstr "Papel de Fotografia Lustroso"
+
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1210
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1413
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1568
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1695
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1964
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2176 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2287 src/xml/xmli18n-tmp.h:2323
+#, fuzzy
+msgid "Premium Semigloss Photo Paper"
 msgstr "Papel de Fotografia Lustroso Premium"
 
-#: src/xml/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:437
 #, fuzzy
-msgid "Premium Glossy Photo Paper 250 wt"
+msgid "Ultra Premium Photo Paper Luster"
 msgstr "Papel de Fotografia Lustroso Premium"
 
-#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
-#: src/xml/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:37
+msgid "CD or DVD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:93 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1230
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1437
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2331
 #, fuzzy
-msgid "Ultra Glossy Photo Paper"
-msgstr "Papel de Fotografia Lustroso"
+msgid "ColorLife Paper"
+msgstr "Papel ColorLife"
 
-#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
-#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
-#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
-#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
-#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
-#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
-#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
-#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:839
-#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:945
-#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1059
-#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1158
-#: src/xml/xmli18n-tmp.h:1196 src/xml/xmli18n-tmp.h:1259
-#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1360
-#: src/xml/xmli18n-tmp.h:1415 src/xml/xmli18n-tmp.h:1478
-#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1601
-#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1715
-#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:73
 #, fuzzy
-msgid "Premium Semigloss Photo Paper"
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Papel de Fotografia Lustroso Premium"
+
+#: src/xml/xmli18n-tmp.h:75
+#, fuzzy
+msgid "Premium Glossy Photo Paper 250 wt"
 msgstr "Papel de Fotografia Lustroso Premium"
 
-#: src/xml/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:81
 #, fuzzy
 msgid "Premium Semigloss Photo Paper 170 wt"
 msgstr "Papel de Fotografia Lustroso Premium"
 
-#: src/xml/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:83
 #, fuzzy
 msgid "Premium Semigloss Photo Paper 250 wt"
 msgstr "Papel de Fotografia Lustroso Premium"
 
-#: src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:87
 #, fuzzy
 msgid "Premium Luster Photo Paper 250 wt"
 msgstr "Papel de Fotografia Brilhante Premium"
 
-#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
-#: src/xml/xmli18n-tmp.h:334
-#, fuzzy
-msgid "Ultra Premium Photo Paper Luster"
-msgstr "Papel de Fotografia Lustroso Premium"
-
-#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
-#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
-#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
-#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
-#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
-#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
-#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
-#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:845
-#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:957
-#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1071
-#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1166
-#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1271
-#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1372
-#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1496
-#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1613
-#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1733
-#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1807
-#, fuzzy
-msgid "ColorLife Paper"
-msgstr "Papel ColorLife"
-
-#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
-#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
-#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
-#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
-#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
-#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
-#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
-#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
-#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
-#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
-#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
-#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
-#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
-#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
-#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
-#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
-#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
-#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
-#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
-#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
-#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
-#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
-#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
-#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
-#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
-#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
-#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
-#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
-#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
-#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
-#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
-#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
-#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
-#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
-#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
-#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
-#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
-#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
-#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
-#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
-#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
-#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
-#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
-#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
-#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
-#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
-#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:851
-#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:857
-#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:863
-#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:869
-#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:875
-#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:881
-#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:887
-#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:893
-#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:899
-#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:905
-#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:911
-#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:917
-#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:923
-#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:929
-#: src/xml/xmli18n-tmp.h:932 src/xml/xmli18n-tmp.h:935
-#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:941
-#: src/xml/xmli18n-tmp.h:944 src/xml/xmli18n-tmp.h:947
-#: src/xml/xmli18n-tmp.h:950 src/xml/xmli18n-tmp.h:953
-#: src/xml/xmli18n-tmp.h:956 src/xml/xmli18n-tmp.h:959
-#: src/xml/xmli18n-tmp.h:962 src/xml/xmli18n-tmp.h:965
-#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:971
-#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:977
-#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:983
-#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:989
-#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:995
-#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1001
-#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1007
-#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1013
-#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1019
-#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1025
-#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1031
-#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1037
-#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1043
-#: src/xml/xmli18n-tmp.h:1046 src/xml/xmli18n-tmp.h:1049
-#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1055
-#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1061
-#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1067
-#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1073
-#: src/xml/xmli18n-tmp.h:1076 src/xml/xmli18n-tmp.h:1079
-#: src/xml/xmli18n-tmp.h:1082 src/xml/xmli18n-tmp.h:1085
-#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1091
-#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1097
-#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1103
-#: src/xml/xmli18n-tmp.h:1106 src/xml/xmli18n-tmp.h:1109
-#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1115
-#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1121
-#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1127
-#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1133
-#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1225
-#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1231
-#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1237
-#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1243
-#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1249
-#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1255
-#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1261
-#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1267
-#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1273
-#: src/xml/xmli18n-tmp.h:1276 src/xml/xmli18n-tmp.h:1279
-#: src/xml/xmli18n-tmp.h:1282 src/xml/xmli18n-tmp.h:1285
-#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1291
-#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1297
-#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1303
-#: src/xml/xmli18n-tmp.h:1306 src/xml/xmli18n-tmp.h:1309
-#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1315
-#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1321
-#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1327
-#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1333
-#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1567
-#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1573
-#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1579
-#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1585
-#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1591
-#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1597
-#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1603
-#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1609
-#: src/xml/xmli18n-tmp.h:1612 src/xml/xmli18n-tmp.h:1615
-#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1621
-#: src/xml/xmli18n-tmp.h:1624 src/xml/xmli18n-tmp.h:1627
-#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1633
-#: src/xml/xmli18n-tmp.h:1636 src/xml/xmli18n-tmp.h:1639
-#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1645
-#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1651
-#: src/xml/xmli18n-tmp.h:1654 src/xml/xmli18n-tmp.h:1657
-#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1663
-#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1669
-#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1675
-#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3223
-#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3231
-#: src/xml/xmli18n-tmp.h:3238 src/xml/xmli18n-tmp.h:3239
-#: src/xml/xmli18n-tmp.h:3300 src/xml/xmli18n-tmp.h:3301
-#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3311
-#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3396
-#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3408
-#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3420
-#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3432
-#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3440
-#: src/xml/xmli18n-tmp.h:3479 src/xml/xmli18n-tmp.h:3480
-#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3492
-#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3554
-#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:133 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:149 src/xml/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:173 src/xml/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:197 src/xml/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:205 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:221 src/xml/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:229 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:245 src/xml/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:253 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:261 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:269 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:277 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:285 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:293 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:301 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:309 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:317 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:325 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:333 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:341 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:349 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:357 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:619 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:643 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:667 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:691 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:707 src/xml/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:715 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:731 src/xml/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:739 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:755 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1062
+#: src/xml/xmli18n-tmp.h:1067 src/xml/xmli18n-tmp.h:1072
+#: src/xml/xmli18n-tmp.h:1077 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1092
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1102
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1112
+#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1122
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1132
+#: src/xml/xmli18n-tmp.h:1137 src/xml/xmli18n-tmp.h:1142
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1157 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1177 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1192
+#: src/xml/xmli18n-tmp.h:1197 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1212
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1222
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1242
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1252
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1272
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1287 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1297 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1327 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1385 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1445 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1461
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1516 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1647
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1657
+#: src/xml/xmli18n-tmp.h:1662 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1677
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1687
+#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1742 src/xml/xmli18n-tmp.h:1747
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1767
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1807
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2090 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2098 src/xml/xmli18n-tmp.h:2102
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2118
+#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2126
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2162 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2190
+#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:3884 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:4779 src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:4845 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4919
+#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4980
+#: src/xml/xmli18n-tmp.h:4986 src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5209 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5276
+#: src/xml/xmli18n-tmp.h:5277 src/xml/xmli18n-tmp.h:5283
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5607 src/xml/xmli18n-tmp.h:5633
+#: src/xml/xmli18n-tmp.h:5634 src/xml/xmli18n-tmp.h:5640
 msgid "Quadtone"
 msgstr "Quato Tons"
 
-#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
-#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
-#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
-#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
-#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:852
-#: src/xml/xmli18n-tmp.h:909 src/xml/xmli18n-tmp.h:966
-#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1080
-#: src/xml/xmli18n-tmp.h:1172 src/xml/xmli18n-tmp.h:1223
-#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1336
-#: src/xml/xmli18n-tmp.h:1379 src/xml/xmli18n-tmp.h:1442
-#: src/xml/xmli18n-tmp.h:1565 src/xml/xmli18n-tmp.h:1622
-#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1775
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:142 src/xml/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:150 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:174 src/xml/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:198 src/xml/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:214 src/xml/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:222 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:238 src/xml/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:246 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:262 src/xml/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:302 src/xml/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:310 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:318 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:326 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:334 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:342 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:350 src/xml/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:636 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:660 src/xml/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:708 src/xml/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:716 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:732 src/xml/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:756 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1103
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1123
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1158 src/xml/xmli18n-tmp.h:1163
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1183
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1193
+#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1213
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1223
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1238 src/xml/xmli18n-tmp.h:1243
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1253
+#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1283
+#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1313
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1333
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1362 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1374 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1462
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1472
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1487 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1502
+#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:1532
+#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1542
+#: src/xml/xmli18n-tmp.h:1633 src/xml/xmli18n-tmp.h:1638
+#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1648
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1658
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1713 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1728
+#: src/xml/xmli18n-tmp.h:1733 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1768
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2071
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2095
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2115 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2123 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2139 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2183
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2191
+#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2199
+#, fuzzy
+msgid "MISQuadtone"
+msgstr "Quato Tons"
+
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1150 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2299
 msgid "Plain Paper Fast Load"
 msgstr "Papel Normal Carregação Rápida"
 
-#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
-#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
-#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1364
-#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1484
-#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1970 src/xml/xmli18n-tmp.h:2030
+#: src/xml/xmli18n-tmp.h:2245
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Papel Mate"
 
-#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
-#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
-#: src/xml/xmli18n-tmp.h:1202 src/xml/xmli18n-tmp.h:1366
-#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1487
-#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:881 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2248
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
-#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
-#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
-#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
-#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
-#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
-#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
-#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
-#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
-#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
-#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1377
-#: src/xml/xmli18n-tmp.h:1380 src/xml/xmli18n-tmp.h:1383
-#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1389
-#: src/xml/xmli18n-tmp.h:1392 src/xml/xmli18n-tmp.h:1395
-#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1401
-#: src/xml/xmli18n-tmp.h:1404 src/xml/xmli18n-tmp.h:1407
-#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1413
-#: src/xml/xmli18n-tmp.h:1416 src/xml/xmli18n-tmp.h:1419
-#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1425
-#: src/xml/xmli18n-tmp.h:1428 src/xml/xmli18n-tmp.h:1431
-#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1437
-#: src/xml/xmli18n-tmp.h:1440 src/xml/xmli18n-tmp.h:1443
-#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1449
-#: src/xml/xmli18n-tmp.h:1452 src/xml/xmli18n-tmp.h:1455
-#: src/xml/xmli18n-tmp.h:1458 src/xml/xmli18n-tmp.h:1461
-#: src/xml/xmli18n-tmp.h:1464 src/xml/xmli18n-tmp.h:1467
-#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1473
-#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1479
-#: src/xml/xmli18n-tmp.h:1482 src/xml/xmli18n-tmp.h:1485
-#: src/xml/xmli18n-tmp.h:1488 src/xml/xmli18n-tmp.h:1491
-#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1497
-#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1677
-#: src/xml/xmli18n-tmp.h:1680 src/xml/xmli18n-tmp.h:1683
-#: src/xml/xmli18n-tmp.h:1686 src/xml/xmli18n-tmp.h:1689
-#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1695
-#: src/xml/xmli18n-tmp.h:1698 src/xml/xmli18n-tmp.h:1701
-#: src/xml/xmli18n-tmp.h:1704 src/xml/xmli18n-tmp.h:1707
-#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1713
-#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1719
-#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1725
-#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1731
-#: src/xml/xmli18n-tmp.h:1734 src/xml/xmli18n-tmp.h:1737
-#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3503
-#: src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:1863
+#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1881
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1893
+#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1905
+#: src/xml/xmli18n-tmp.h:1908 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1923
+#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:1950 src/xml/xmli18n-tmp.h:1953
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1968 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1983
+#: src/xml/xmli18n-tmp.h:1986 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2204 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2255
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5645
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Seis Cores Foto"
 
-#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
-#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
-#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
-#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
-#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
-#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
-#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
-#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
-#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
-#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
-#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1378
-#: src/xml/xmli18n-tmp.h:1381 src/xml/xmli18n-tmp.h:1384
-#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1390
-#: src/xml/xmli18n-tmp.h:1393 src/xml/xmli18n-tmp.h:1396
-#: src/xml/xmli18n-tmp.h:1399 src/xml/xmli18n-tmp.h:1402
-#: src/xml/xmli18n-tmp.h:1405 src/xml/xmli18n-tmp.h:1408
-#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1414
-#: src/xml/xmli18n-tmp.h:1417 src/xml/xmli18n-tmp.h:1420
-#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1426
-#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1432
-#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1438
-#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1444
-#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1450
-#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1456
-#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1462
-#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1468
-#: src/xml/xmli18n-tmp.h:1471 src/xml/xmli18n-tmp.h:1474
-#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1480
-#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1486
-#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1492
-#: src/xml/xmli18n-tmp.h:1495 src/xml/xmli18n-tmp.h:1498
-#: src/xml/xmli18n-tmp.h:1501 src/xml/xmli18n-tmp.h:1678
-#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1684
-#: src/xml/xmli18n-tmp.h:1687 src/xml/xmli18n-tmp.h:1690
-#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1696
-#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1702
-#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1708
-#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1714
-#: src/xml/xmli18n-tmp.h:1717 src/xml/xmli18n-tmp.h:1720
-#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1726
-#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1732
-#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1738
-#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3517
-#: src/xml/xmli18n-tmp.h:3577
+#: src/xml/xmli18n-tmp.h:835 src/xml/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:841 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1879 src/xml/xmli18n-tmp.h:1882
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1894
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1909 src/xml/xmli18n-tmp.h:1912
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1924
+#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1954
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1969 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1984
+#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2208
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2229 src/xml/xmli18n-tmp.h:2232
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2238
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2244
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2253 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2259 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5714
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1826
-#: src/xml/xmli18n-tmp.h:1839 src/xml/xmli18n-tmp.h:1852
-#: src/xml/xmli18n-tmp.h:1907 src/xml/xmli18n-tmp.h:1923
-#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1952
-#: src/xml/xmli18n-tmp.h:1965 src/xml/xmli18n-tmp.h:2054
-#: src/xml/xmli18n-tmp.h:2081 src/xml/xmli18n-tmp.h:2146
-#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
-#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
-#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2348
-#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2407
-#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2899
-#: src/xml/xmli18n-tmp.h:2916 src/xml/xmli18n-tmp.h:3142
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1139
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1154 src/xml/xmli18n-tmp.h:1159
+#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1179
+#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1199
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1214 src/xml/xmli18n-tmp.h:1219
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1229
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1244 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1259
+#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1274 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1289
+#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1309
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1329
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1423
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1429
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1447
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1634
+#: src/xml/xmli18n-tmp.h:1639 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1664
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1764
+#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1784
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1799 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1819
+msgid "MIS Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1463 src/xml/xmli18n-tmp.h:1468
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1478
+#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1508
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1533 src/xml/xmli18n-tmp.h:1538
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4858 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:5289
+msgid "Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2489 src/xml/xmli18n-tmp.h:2578
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2713 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2752
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2885 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:3051 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3665
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1828
-#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1853
-#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1879
-#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
-#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1940
-#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1966
-#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2055
-#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2133
-#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2175
-#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
-#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
-#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2336
-#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
-#: src/xml/xmli18n-tmp.h:2408 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2699
+#: src/xml/xmli18n-tmp.h:2714 src/xml/xmli18n-tmp.h:2727
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2886
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:3052
 msgid "180 DPI Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1830
-#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1854
-#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1880
-#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
-#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1941
-#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1967
-#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
-#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2134
-#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2176
-#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
-#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
-#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2337
-#: src/xml/xmli18n-tmp.h:2350 src/xml/xmli18n-tmp.h:2363
-#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
-#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2434
-#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2459
-#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2529
-#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2601
-#: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2703
-#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2735
-#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2768
-#: src/xml/xmli18n-tmp.h:2872 src/xml/xmli18n-tmp.h:2884
-#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2917
-#: src/xml/xmli18n-tmp.h:2961 src/xml/xmli18n-tmp.h:3007
-#: src/xml/xmli18n-tmp.h:3021 src/xml/xmli18n-tmp.h:3035
-#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3126
-#: src/xml/xmli18n-tmp.h:3143
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2404
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2658
+#: src/xml/xmli18n-tmp.h:2672 src/xml/xmli18n-tmp.h:2700
+#: src/xml/xmli18n-tmp.h:2715 src/xml/xmli18n-tmp.h:2728
+#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2754
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2919 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3053
+#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3125
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3292
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3530
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3649
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3684
 #, fuzzy
 msgid "360 x 180 DPI Draft"
 msgstr "150x150 DPI"
 
-#: src/xml/xmli18n-tmp.h:1818 src/xml/xmli18n-tmp.h:1831
-#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1855
-#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1881
-#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
-#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1942
-#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1968
-#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2135
-#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2392 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2418 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2479 src/xml/xmli18n-tmp.h:2492
+#: src/xml/xmli18n-tmp.h:2581 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2862 src/xml/xmli18n-tmp.h:2934
 #, fuzzy
 msgid "360 DPI High Quality"
 msgstr "1440 x 360 DPI Alta Qualidade"
 
-#: src/xml/xmli18n-tmp.h:1819 src/xml/xmli18n-tmp.h:1832
-#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1856
-#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1882
-#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
-#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1943
-#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1969
-#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1992
-#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2020
-#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
-#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
-#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2096
-#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2123
-#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2149
-#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2177
-#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2205
-#: src/xml/xmli18n-tmp.h:2218 src/xml/xmli18n-tmp.h:2231
-#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2254
-#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
-#: src/xml/xmli18n-tmp.h:2297 src/xml/xmli18n-tmp.h:2312
-#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2339
-#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
-#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2385
-#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2411
-#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2435
-#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2460
-#: src/xml/xmli18n-tmp.h:2473 src/xml/xmli18n-tmp.h:2488
-#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2516
-#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2541
-#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2591
-#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
-#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2645
-#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2675
-#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2704
-#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2736
-#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2769
-#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2808
-#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2833
-#: src/xml/xmli18n-tmp.h:2847 src/xml/xmli18n-tmp.h:2861
-#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2885
-#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2918
-#: src/xml/xmli18n-tmp.h:2935 src/xml/xmli18n-tmp.h:2950
-#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2987
-#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3022
-#: src/xml/xmli18n-tmp.h:3036 src/xml/xmli18n-tmp.h:3050
-#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3081
-#: src/xml/xmli18n-tmp.h:3098 src/xml/xmli18n-tmp.h:3113
-#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2369 src/xml/xmli18n-tmp.h:2380
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2406
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2493
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2544
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
+#: src/xml/xmli18n-tmp.h:2582 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2729
+#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2806
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2836
+#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
+#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3012
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3040
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3184 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3424 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3485 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3573
+#: src/xml/xmli18n-tmp.h:3587 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3650 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3685
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
 
-#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1833
-#: src/xml/xmli18n-tmp.h:1846 src/xml/xmli18n-tmp.h:1857
-#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1883
-#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1912
-#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1944
-#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1970
-#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1993
-#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2021
-#: src/xml/xmli18n-tmp.h:2033 src/xml/xmli18n-tmp.h:2045
-#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
-#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2097
-#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2124
-#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2150
-#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2178
-#: src/xml/xmli18n-tmp.h:2193 src/xml/xmli18n-tmp.h:2206
-#: src/xml/xmli18n-tmp.h:2219 src/xml/xmli18n-tmp.h:2232
-#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2255
-#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
-#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2313
-#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2340
-#: src/xml/xmli18n-tmp.h:2352 src/xml/xmli18n-tmp.h:2365
-#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2386
-#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2412
-#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2436
-#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2461
-#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2489
-#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2517
-#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2542
-#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2567
-#: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2592
-#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2616
-#: src/xml/xmli18n-tmp.h:2631 src/xml/xmli18n-tmp.h:2646
-#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2676
-#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2705
-#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2737
-#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2770
-#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2809
-#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2834
-#: src/xml/xmli18n-tmp.h:2848 src/xml/xmli18n-tmp.h:2862
-#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2886
-#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2919
-#: src/xml/xmli18n-tmp.h:2936 src/xml/xmli18n-tmp.h:2951
-#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2988
-#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3023
-#: src/xml/xmli18n-tmp.h:3037 src/xml/xmli18n-tmp.h:3051
-#: src/xml/xmli18n-tmp.h:3066 src/xml/xmli18n-tmp.h:3083
-#: src/xml/xmli18n-tmp.h:3099 src/xml/xmli18n-tmp.h:3114
-#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:2344 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2452 src/xml/xmli18n-tmp.h:2468
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2494
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2557 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:2594
+#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2648
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2674
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2807
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2837
+#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
+#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3013
+#: src/xml/xmli18n-tmp.h:3026 src/xml/xmli18n-tmp.h:3041
+#: src/xml/xmli18n-tmp.h:3055 src/xml/xmli18n-tmp.h:3066
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3140
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3170
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3229
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3333
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3358
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3385
+#: src/xml/xmli18n-tmp.h:3397 src/xml/xmli18n-tmp.h:3409
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3442
+#: src/xml/xmli18n-tmp.h:3459 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3574
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3637
+#: src/xml/xmli18n-tmp.h:3651 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3686
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1834
-#: src/xml/xmli18n-tmp.h:1847 src/xml/xmli18n-tmp.h:1858
-#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1884
-#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1913
-#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1945
-#: src/xml/xmli18n-tmp.h:1958 src/xml/xmli18n-tmp.h:1971
-#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:1994
-#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2022
-#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2046
-#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2071
-#: src/xml/xmli18n-tmp.h:2086 src/xml/xmli18n-tmp.h:2098
-#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2125
-#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2151
-#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2179
-#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2207
-#: src/xml/xmli18n-tmp.h:2220 src/xml/xmli18n-tmp.h:2233
-#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2256
-#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
-#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2314
-#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2341
-#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
-#: src/xml/xmli18n-tmp.h:2376 src/xml/xmli18n-tmp.h:2387
-#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2413
-#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2437
-#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2462
-#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2490
-#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2518
-#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2543
-#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
-#: src/xml/xmli18n-tmp.h:2580 src/xml/xmli18n-tmp.h:2593
-#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2617
-#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
-#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2677
-#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2706
-#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2738
-#: src/xml/xmli18n-tmp.h:2753 src/xml/xmli18n-tmp.h:2771
-#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2810
-#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2835
-#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
-#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2887
-#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2921
-#: src/xml/xmli18n-tmp.h:2937 src/xml/xmli18n-tmp.h:2952
-#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2990
-#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3024
-#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3052
-#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3085
-#: src/xml/xmli18n-tmp.h:3100 src/xml/xmli18n-tmp.h:3115
-#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:2345 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2469
+#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2546
+#: src/xml/xmli18n-tmp.h:2558 src/xml/xmli18n-tmp.h:2570
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2595
+#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2622
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2675
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2731
+#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2808
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2838
+#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2890
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2922 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3014
+#: src/xml/xmli18n-tmp.h:3027 src/xml/xmli18n-tmp.h:3042
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3067
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3186 src/xml/xmli18n-tmp.h:3201
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3334
+#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3359
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3444
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3475
+#: src/xml/xmli18n-tmp.h:3489 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3533 src/xml/xmli18n-tmp.h:3547
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3652 src/xml/xmli18n-tmp.h:3669
+#: src/xml/xmli18n-tmp.h:3687
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
-#: src/xml/xmli18n-tmp.h:1978 src/xml/xmli18n-tmp.h:2004
-#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2030
-#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2067
-#: src/xml/xmli18n-tmp.h:2094 src/xml/xmli18n-tmp.h:2107
-#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2161
-#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2252
-#: src/xml/xmli18n-tmp.h:2280 src/xml/xmli18n-tmp.h:2295
-#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2323
-#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
-#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2486
-#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2552
-#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2613
-#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
-#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2686
-#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2806
-#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2831
-#: src/xml/xmli18n-tmp.h:2845 src/xml/xmli18n-tmp.h:2859
-#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2948
-#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3080
-#: src/xml/xmli18n-tmp.h:3097 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2554
+#: src/xml/xmli18n-tmp.h:2566 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2804 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2834 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3076
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3382
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3586 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3634
 #, fuzzy
 msgid "360 x 120 DPI Economy"
 msgstr "600x600 DPI monocromático"
 
-#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1842
-#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2005
-#: src/xml/xmli18n-tmp.h:2019 src/xml/xmli18n-tmp.h:2031
-#: src/xml/xmli18n-tmp.h:2043 src/xml/xmli18n-tmp.h:2068
-#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
-#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2162
-#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2253
-#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2296
-#: src/xml/xmli18n-tmp.h:2311 src/xml/xmli18n-tmp.h:2324
-#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2384
-#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2487
-#: src/xml/xmli18n-tmp.h:2500 src/xml/xmli18n-tmp.h:2553
-#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2614
-#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2644
-#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2687
-#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2807
-#: src/xml/xmli18n-tmp.h:2820 src/xml/xmli18n-tmp.h:2832
-#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
-#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2949
-#: src/xml/xmli18n-tmp.h:3112
+#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2555
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2632
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3077
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3211
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3383
+#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3635
 #, fuzzy
 msgid "360 x 240 DPI Draft"
 msgstr "600x600 DPI"
 
-#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1872
-#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1898
-#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1930
-#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1959
-#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:1995
-#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2023
-#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2047
-#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2087
-#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2112
-#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2139
-#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2166
-#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2328
-#: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2388
-#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2557
-#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2922
-#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2991
-#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3086
+#: src/xml/xmli18n-tmp.h:2383 src/xml/xmli18n-tmp.h:2396
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2422
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2470 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2507 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2704 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:3057 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3118 src/xml/xmli18n-tmp.h:3445
+#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3514
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3609
 #, fuzzy
 msgid "720 DPI High Quality"
 msgstr "1200 DPI alta qualidade"
 
-#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1873
-#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1899
-#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1931
-#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1984
-#: src/xml/xmli18n-tmp.h:1996 src/xml/xmli18n-tmp.h:2010
-#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2036
-#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2061
-#: src/xml/xmli18n-tmp.h:2073 src/xml/xmli18n-tmp.h:2088
-#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2127
-#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2153
-#: src/xml/xmli18n-tmp.h:2167 src/xml/xmli18n-tmp.h:2181
-#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2208
-#: src/xml/xmli18n-tmp.h:2221 src/xml/xmli18n-tmp.h:2234
-#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2257
-#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2285
-#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2315
-#: src/xml/xmli18n-tmp.h:2329 src/xml/xmli18n-tmp.h:2354
-#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2389
-#: src/xml/xmli18n-tmp.h:2399 src/xml/xmli18n-tmp.h:2425
-#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2451
-#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
-#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2504
-#: src/xml/xmli18n-tmp.h:2519 src/xml/xmli18n-tmp.h:2534
-#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2558
-#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2605
-#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2633
-#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2663
-#: src/xml/xmli18n-tmp.h:2678 src/xml/xmli18n-tmp.h:2691
-#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2725
-#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2754
-#: src/xml/xmli18n-tmp.h:2772 src/xml/xmli18n-tmp.h:2787
-#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2811
-#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2836
-#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
-#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2888
-#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2923
-#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2953
-#: src/xml/xmli18n-tmp.h:2968 src/xml/xmli18n-tmp.h:2978
-#: src/xml/xmli18n-tmp.h:2992 src/xml/xmli18n-tmp.h:3011
-#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3039
-#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
-#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3101
-#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3130
-#: src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:2384 src/xml/xmli18n-tmp.h:2397
+#: src/xml/xmli18n-tmp.h:2410 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2548 src/xml/xmli18n-tmp.h:2560
+#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2691 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2794 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2839
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2923 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3105
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3129
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3231 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3311
+#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3335
+#: src/xml/xmli18n-tmp.h:3348 src/xml/xmli18n-tmp.h:3360
+#: src/xml/xmli18n-tmp.h:3372 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3427 src/xml/xmli18n-tmp.h:3446
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3576 src/xml/xmli18n-tmp.h:3593
+#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3688
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1874
-#: src/xml/xmli18n-tmp.h:1887 src/xml/xmli18n-tmp.h:1900
-#: src/xml/xmli18n-tmp.h:1916 src/xml/xmli18n-tmp.h:1932
-#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1985
-#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2011
-#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2037
-#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2062
-#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2089
-#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2128
-#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2154
-#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2182
-#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2258
-#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
-#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2316
-#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2390
-#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2559
-#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2634
-#: src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2385 src/xml/xmli18n-tmp.h:2398
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2535
+#: src/xml/xmli18n-tmp.h:2549 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2782
+#: src/xml/xmli18n-tmp.h:2795 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3388
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 360 DPI Máxima Qualidade"
 
-#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1960
-#: src/xml/xmli18n-tmp.h:2100 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2902
 #, fuzzy
 msgid "720 DPI Highest Quality"
 msgstr "1200 DPI qualidade máxima"
 
-#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2259
-#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
-#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2317
-#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2477
-#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2505
-#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2606
-#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2635
-#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2740
-#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2866
-#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2796 src/xml/xmli18n-tmp.h:2811
+#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3216 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3412
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2260
-#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
-#: src/xml/xmli18n-tmp.h:2303 src/xml/xmli18n-tmp.h:2318
-#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2771 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2812
+#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:3160 src/xml/xmli18n-tmp.h:3390
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1440 x 360 DPI Máxima Qualidade"
 
-#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2439
-#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2493
-#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2546
-#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2582
-#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2620
-#: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2664
-#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
-#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2726
-#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2755
-#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2789
-#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2812
-#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2878
-#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
-#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2939
-#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2969
-#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2994
-#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
-#: src/xml/xmli18n-tmp.h:3088 src/xml/xmli18n-tmp.h:3102
-#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3131
-#: src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2963
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3070
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3106
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3297 src/xml/xmli18n-tmp.h:3313
+#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
+#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3401
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3492
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3577 src/xml/xmli18n-tmp.h:3594
+#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3671 src/xml/xmli18n-tmp.h:3689
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2426
-#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2452
-#: src/xml/xmli18n-tmp.h:2464 src/xml/xmli18n-tmp.h:2479
-#: src/xml/xmli18n-tmp.h:2494 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2547
-#: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2583
-#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2621
-#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2665
-#: src/xml/xmli18n-tmp.h:2680 src/xml/xmli18n-tmp.h:2694
-#: src/xml/xmli18n-tmp.h:2709 src/xml/xmli18n-tmp.h:2727
-#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2756
-#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2790
-#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2813
-#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2837
-#: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2879
-#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
-#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2940
-#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2970
-#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2995
-#: src/xml/xmli18n-tmp.h:3012 src/xml/xmli18n-tmp.h:3026
-#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3055
-#: src/xml/xmli18n-tmp.h:3072 src/xml/xmli18n-tmp.h:3089
-#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3118
-#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3071
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3107
+#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3251
+#: src/xml/xmli18n-tmp.h:3266 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3298 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3324 src/xml/xmli18n-tmp.h:3337
+#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3374 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3463
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3535 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3563 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3612
+#: src/xml/xmli18n-tmp.h:3626 src/xml/xmli18n-tmp.h:3641
+#: src/xml/xmli18n-tmp.h:3655 src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:3690
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:4374
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Amarelo"
 
-#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2584
-#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2711
-#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2743
-#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2776
-#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2908
-#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2972
-#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3057
-#: src/xml/xmli18n-tmp.h:3074 src/xml/xmli18n-tmp.h:3091
-#: src/xml/xmli18n-tmp.h:3105 src/xml/xmli18n-tmp.h:3134
-#: src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3108
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3267
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3495
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3614
+#: src/xml/xmli18n-tmp.h:3628 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3692
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2666 src/xml/xmli18n-tmp.h:2681
-#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2728
-#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2775
-#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2814
-#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2838
-#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2926
-#: src/xml/xmli18n-tmp.h:2941 src/xml/xmli18n-tmp.h:2971
-#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
-#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
-#: src/xml/xmli18n-tmp.h:3090 src/xml/xmli18n-tmp.h:3104
-#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3133
-#: src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3190 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3234 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3325 src/xml/xmli18n-tmp.h:3338
+#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3362
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3505
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3613
+#: src/xml/xmli18n-tmp.h:3627 src/xml/xmli18n-tmp.h:3642
+#: src/xml/xmli18n-tmp.h:3656 src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:3691
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2712
-#: src/xml/xmli18n-tmp.h:2730 src/xml/xmli18n-tmp.h:2759
-#: src/xml/xmli18n-tmp.h:2777 src/xml/xmli18n-tmp.h:2909
-#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2973
-#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3058
-#: src/xml/xmli18n-tmp.h:3075 src/xml/xmli18n-tmp.h:3092
-#: src/xml/xmli18n-tmp.h:3106 src/xml/xmli18n-tmp.h:3135
-#: src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3301 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3496
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3615
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2798 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3502
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2965
-#: src/xml/xmli18n-tmp.h:2989 src/xml/xmli18n-tmp.h:3067
-#: src/xml/xmli18n-tmp.h:3084
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:3607
 #, fuzzy
 msgid "720 x 360 DPI Enhanced"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:3479
 #, fuzzy
 msgid "Black 1"
 msgstr "Preto"
 
-#: src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3480
 #, fuzzy
 msgid "Black 2"
 msgstr "Preto"
 
-#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3065
-#: src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3605
 #, fuzzy
 msgid "360 DPI Enhanced"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3516
 #, fuzzy
 msgid "1440 x 720 DPI High Quality"
 msgstr "1440 x 360 DPI Máxima Qualidade"
 
-#: src/xml/xmli18n-tmp.h:3153
-msgid "Lower Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3677
+#, fuzzy
+msgid "Vivid Light Magenta"
+msgstr "Magenta Claro"
 
-#: src/xml/xmli18n-tmp.h:3154
-msgid "Upper Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3682
+#, fuzzy
+msgid "Vivid Magenta"
+msgstr "Magenta"
+
+#: src/xml/xmli18n-tmp.h:3694
+#, fuzzy
+msgid "Main Tray"
+msgstr "Tabuleiro"
+
+#: src/xml/xmli18n-tmp.h:3695
+#, fuzzy
+msgid "Photo Tray"
+msgstr "Fotografia"
 
-#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3160
-#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3176
-#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3186
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3725 src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:3732
 #, fuzzy
 msgid "Print to CD"
 msgstr "Imprimir para o Ficheiro?"
 
-#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3181
-#: src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:3730
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Tabuleiro"
 
-#: src/xml/xmli18n-tmp.h:3157 src/xml/xmli18n-tmp.h:3182
-#: src/xml/xmli18n-tmp.h:3185
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:3731
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3159 src/xml/xmli18n-tmp.h:3164
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3705
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manual"
 
-#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3709
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3710
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3171
-#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3180
-#: src/xml/xmli18n-tmp.h:3193
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3716 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3739
 msgid "Roll Feed"
 msgstr "Rolo de Alimentação"
 
-#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3714 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3723
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Manual"
 
-#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3715 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3724
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Manual"
 
-#: src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3733
 #, fuzzy
 msgid "Photo Board"
 msgstr "Papel de Fotografia"
 
-#: src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3734
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3735
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3190
+#: src/xml/xmli18n-tmp.h:3736
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Auto Seleccionar"
 
-#: src/xml/xmli18n-tmp.h:3191
+#: src/xml/xmli18n-tmp.h:3737
 msgid "Manual Selection"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3199 src/xml/xmli18n-tmp.h:3207
-#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3219
-#: src/xml/xmli18n-tmp.h:3227 src/xml/xmli18n-tmp.h:3235
-#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3257
-#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3278
-#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3297
-#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3317
-#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3342
-#: src/xml/xmli18n-tmp.h:3356 src/xml/xmli18n-tmp.h:3382
-#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
-#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3426
-#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3446
-#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3474
-#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3498
-#: src/xml/xmli18n-tmp.h:3510 src/xml/xmli18n-tmp.h:3524
-#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3558
-#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:3584
-#: src/xml/xmli18n-tmp.h:3594 src/xml/xmli18n-tmp.h:3600
-#: src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3763 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3872 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:4067 src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4172 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4236 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:4754 src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5102 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5679 src/xml/xmli18n-tmp.h:5748
+#: src/xml/xmli18n-tmp.h:5793 src/xml/xmli18n-tmp.h:5814
+#: src/xml/xmli18n-tmp.h:5835
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Foto de Sete Cores"
 
-#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3208
-#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3220
-#: src/xml/xmli18n-tmp.h:3228 src/xml/xmli18n-tmp.h:3236
-#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3259
-#: src/xml/xmli18n-tmp.h:3270 src/xml/xmli18n-tmp.h:3280
-#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3298
-#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3318
-#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3344
-#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3383
-#: src/xml/xmli18n-tmp.h:3391 src/xml/xmli18n-tmp.h:3403
-#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3427
-#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3447
-#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3475
-#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3499
-#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3526
-#: src/xml/xmli18n-tmp.h:3551 src/xml/xmli18n-tmp.h:3559
-#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3586
-#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3601
-#: src/xml/xmli18n-tmp.h:3607
+#: src/xml/xmli18n-tmp.h:3765 src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4484 src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:4756 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5321
+#: src/xml/xmli18n-tmp.h:5382 src/xml/xmli18n-tmp.h:5451
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5795 src/xml/xmli18n-tmp.h:5816
+#: src/xml/xmli18n-tmp.h:5837
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Três Cores Compósito"
 
-#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
-#: src/xml/xmli18n-tmp.h:3215 src/xml/xmli18n-tmp.h:3221
-#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3237
-#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3271
-#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3299
-#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3319
-#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3345
-#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3384
-#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
-#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3428
-#: src/xml/xmli18n-tmp.h:3438 src/xml/xmli18n-tmp.h:3448
-#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3463
-#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3476
-#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3500
-#: src/xml/xmli18n-tmp.h:3513 src/xml/xmli18n-tmp.h:3527
-#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3560
-#: src/xml/xmli18n-tmp.h:3573 src/xml/xmli18n-tmp.h:3587
-#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3602
-#: src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:3824 src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5325
+#: src/xml/xmli18n-tmp.h:5386 src/xml/xmli18n-tmp.h:5455
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5757
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5841
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Quatro Cores Standard"
 
-#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3248
-#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
-#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3360
-#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
-#: src/xml/xmli18n-tmp.h:3417 src/xml/xmli18n-tmp.h:3429
-#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3459
-#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3501 src/xml/xmli18n-tmp.h:3514
-#: src/xml/xmli18n-tmp.h:3528 src/xml/xmli18n-tmp.h:3574
-#: src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4424 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:5066 src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:5196 src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5391
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5762
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Foto de Sete Cores"
 
-#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3249
-#: src/xml/xmli18n-tmp.h:3272 src/xml/xmli18n-tmp.h:3293
-#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3333
-#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3361
-#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
-#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3430
-#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3460
-#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3478
-#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3502
-#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3529
-#: src/xml/xmli18n-tmp.h:3575 src/xml/xmli18n-tmp.h:3589
+#: src/xml/xmli18n-tmp.h:3780 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:4078 src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:4430 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4972
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5150 src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5336
+#: src/xml/xmli18n-tmp.h:5397 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5768
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Seis Cores Foto"
 
-#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3919 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:4781 src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:4795 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4921
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:4996
+#: src/xml/xmli18n-tmp.h:5023 src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:5226 src/xml/xmli18n-tmp.h:5279
+#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5603 src/xml/xmli18n-tmp.h:5609
+#: src/xml/xmli18n-tmp.h:5636 src/xml/xmli18n-tmp.h:5642
+#, fuzzy
+msgid "Gray 3"
+msgstr "Tabuleiro 3"
+
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4782 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4796 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4916 src/xml/xmli18n-tmp.h:4922
+#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4983
+#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5286 src/xml/xmli18n-tmp.h:5294
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5643
+#, fuzzy
+msgid "Gray 2"
+msgstr "Tabuleiro 2"
+
+#: src/xml/xmli18n-tmp.h:3855 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:4856 src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:4931 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4998
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:5214 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5611
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5644
+#, fuzzy
+msgid "Gray 1"
+msgstr "Tabuleiro 1"
+
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4985 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5606 src/xml/xmli18n-tmp.h:5639
+#, fuzzy
+msgid "MIS Quadtone"
+msgstr "Quato Tons"
+
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4114
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Sete Cores Realçado"
 
-#: src/xml/xmli18n-tmp.h:3260 src/xml/xmli18n-tmp.h:3281
+#: src/xml/xmli18n-tmp.h:4016 src/xml/xmli18n-tmp.h:4121
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Três Cores Compósito"
 
-#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3282
+#: src/xml/xmli18n-tmp.h:4021 src/xml/xmli18n-tmp.h:4126
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Quatro Cores Standard"
 
-#: src/xml/xmli18n-tmp.h:3262 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4132
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Seis Cores Compósito Realçado"
 
-#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:4035 src/xml/xmli18n-tmp.h:4140
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sete Cores Realçado"
 
-#: src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:4141
+#, fuzzy
+msgid "MatteBlack"
+msgstr "Papel Mate"
+
+#: src/xml/xmli18n-tmp.h:4224
 #, fuzzy
 msgid "Default Black"
 msgstr "Definir Valores Padrão"
 
-#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
-#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3365
-#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3504
-#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3533
-#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3564
-#: src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4446 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4573 src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:5344
+#: src/xml/xmli18n-tmp.h:5413 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Seven Color Photo"
 msgstr "Foto de Sete Cores"
 
-#: src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:4315
 msgid "Six Color Enhanced Composite"
 msgstr "Seis Cores Compósito Realçado"
 
-#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3348
-#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3516
-#: src/xml/xmli18n-tmp.h:3530 src/xml/xmli18n-tmp.h:3576
-#: src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:4368 src/xml/xmli18n-tmp.h:4437
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:5404
+#: src/xml/xmli18n-tmp.h:5473 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5775
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Foto de Sete Cores"
 
-#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3355
-#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3523
-#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5745
 msgid "Two Level Grayscale"
 msgstr "Escala de Cinzento de 2 Níveis"
 
-#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3357
-#: src/xml/xmli18n-tmp.h:3511 src/xml/xmli18n-tmp.h:3525
-#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:4412 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5448
+#: src/xml/xmli18n-tmp.h:5681 src/xml/xmli18n-tmp.h:5750
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Quatro Cores Standard"
 
-#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3372
-#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3540
+#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5531
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Seis Cores Foto"
 
-#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3378
-#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:4652 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5570
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Seis Cores Foto"
 
-#: src/xml/xmli18n-tmp.h:3462 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:5288
+msgid "MIS Six Tone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:4994
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5291
+#, fuzzy
+msgid "Gray 5"
+msgstr "Tabuleiro 1"
+
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:4928 src/xml/xmli18n-tmp.h:4995
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5292
+#, fuzzy
+msgid "Gray 4"
+msgstr "Tabuleiro 4"
+
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5145
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Seis Cores Foto"
 
-#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3615
-#: src/xml/xmli18n-tmp.h:3621
+#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5852
+#: src/xml/xmli18n-tmp.h:5858
 #, fuzzy
 msgid "Interleave"
 msgstr "Nome da Impressora:"
 
-#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3616
-#: src/xml/xmli18n-tmp.h:3622
+#: src/xml/xmli18n-tmp.h:5848 src/xml/xmli18n-tmp.h:5853
+#: src/xml/xmli18n-tmp.h:5859
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3612 src/xml/xmli18n-tmp.h:3617
-#: src/xml/xmli18n-tmp.h:3623
+#: src/xml/xmli18n-tmp.h:5849 src/xml/xmli18n-tmp.h:5854
+#: src/xml/xmli18n-tmp.h:5860
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3613 src/xml/xmli18n-tmp.h:3618
-#: src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5855
+#: src/xml/xmli18n-tmp.h:5861
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:5862
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Nome da Impressora:"
 
-#: src/xml/xmli18n-tmp.h:3626
+#: src/xml/xmli18n-tmp.h:5863
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Brilho:"
 
-#: src/xml/xmli18n-tmp.h:3628
+#: src/xml/xmli18n-tmp.h:5865
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:5909
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:5910
 msgid "Tabloid"
 msgstr "Tabloide"
 
-#: src/xml/xmli18n-tmp.h:3674
+#: src/xml/xmli18n-tmp.h:5911
 msgid "Executive"
 msgstr "Executivo"
 
-#: src/xml/xmli18n-tmp.h:3679
+#: src/xml/xmli18n-tmp.h:5916
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:3680
+#: src/xml/xmli18n-tmp.h:5917
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:5918
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:3682
+#: src/xml/xmli18n-tmp.h:5919
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Papel de Fotografia Epson 4x6"
 
-#: src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:5920
+#, fuzzy
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr "Papel de Fotografia Epson 4x6"
+
+#: src/xml/xmli18n-tmp.h:5921
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:3684
+#: src/xml/xmli18n-tmp.h:5922
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:3685
+#: src/xml/xmli18n-tmp.h:5923
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:3686
+#: src/xml/xmli18n-tmp.h:5924
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:3688
+#: src/xml/xmli18n-tmp.h:5926
 msgid "12x18"
 msgstr "12x8"
 
-#: src/xml/xmli18n-tmp.h:3689
+#: src/xml/xmli18n-tmp.h:5927
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/xml/xmli18n-tmp.h:3690
+#: src/xml/xmli18n-tmp.h:5928
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3691
+#: src/xml/xmli18n-tmp.h:5929
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:3692
+#: src/xml/xmli18n-tmp.h:5930
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:3693
+#: src/xml/xmli18n-tmp.h:5931
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:3694
+#: src/xml/xmli18n-tmp.h:5932
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:3695
+#: src/xml/xmli18n-tmp.h:5933
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:3696
+#: src/xml/xmli18n-tmp.h:5934
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:3697
+#: src/xml/xmli18n-tmp.h:5935
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:3698
+#: src/xml/xmli18n-tmp.h:5936
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:3699
+#: src/xml/xmli18n-tmp.h:5937
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3700
+#: src/xml/xmli18n-tmp.h:5938
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:5939
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:3702
+#: src/xml/xmli18n-tmp.h:5940
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:3703
+#: src/xml/xmli18n-tmp.h:5941
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:5942
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:3705
+#: src/xml/xmli18n-tmp.h:5943
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:3706
+#: src/xml/xmli18n-tmp.h:5944
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:3707
+#: src/xml/xmli18n-tmp.h:5945
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:3709
+#: src/xml/xmli18n-tmp.h:5947
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:3710
+#: src/xml/xmli18n-tmp.h:5948
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:5949
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:5950
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:3713
+#: src/xml/xmli18n-tmp.h:5951
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:3714
+#: src/xml/xmli18n-tmp.h:5952
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:3715
+#: src/xml/xmli18n-tmp.h:5953
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:3716
+#: src/xml/xmli18n-tmp.h:5954
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:5955
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:5956
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:5957
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:5958
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:5959
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:3722
+#: src/xml/xmli18n-tmp.h:5960
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:3723
+#: src/xml/xmli18n-tmp.h:5961
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:3724
+#: src/xml/xmli18n-tmp.h:5962
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:3725
+#: src/xml/xmli18n-tmp.h:5963
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:3726
+#: src/xml/xmli18n-tmp.h:5964
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:5965
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:5966
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:5967
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:3730
+#: src/xml/xmli18n-tmp.h:5968
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:3731
+#: src/xml/xmli18n-tmp.h:5969
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:3732
+#: src/xml/xmli18n-tmp.h:5970
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:3733
+#: src/xml/xmli18n-tmp.h:5971
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:3734
+#: src/xml/xmli18n-tmp.h:5972
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:3735
+#: src/xml/xmli18n-tmp.h:5973
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:3736
+#: src/xml/xmli18n-tmp.h:5974
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:3737
+#: src/xml/xmli18n-tmp.h:5975
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5976
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3739
+#: src/xml/xmli18n-tmp.h:5977
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:5978
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:3741
+#: src/xml/xmli18n-tmp.h:5979
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:5980
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:3743
+#: src/xml/xmli18n-tmp.h:5981
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:5982
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:5983
 msgid "B6 JIS"
 msgstr "B6 JIs"
 
-#: src/xml/xmli18n-tmp.h:3746
+#: src/xml/xmli18n-tmp.h:5984
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:3747
+#: src/xml/xmli18n-tmp.h:5985
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:3748
+#: src/xml/xmli18n-tmp.h:5986
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:5987
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:3750
+#: src/xml/xmli18n-tmp.h:5988
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:3751
+#: src/xml/xmli18n-tmp.h:5989
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:5990
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:5991
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:3754
+#: src/xml/xmli18n-tmp.h:5992
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:3755
+#: src/xml/xmli18n-tmp.h:5993
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:3756
+#: src/xml/xmli18n-tmp.h:5994
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:5995
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:3758
+#: src/xml/xmli18n-tmp.h:5996
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:3759
+#: src/xml/xmli18n-tmp.h:5997
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:5998
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:3761
+#: src/xml/xmli18n-tmp.h:5999
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:6000
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:3763
+#: src/xml/xmli18n-tmp.h:6001
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:6002
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:3765
+#: src/xml/xmli18n-tmp.h:6003
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:3766
+#: src/xml/xmli18n-tmp.h:6004
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:6005
 #, fuzzy
 msgid "DL landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:3768
+#: src/xml/xmli18n-tmp.h:6006
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:3769
+#: src/xml/xmli18n-tmp.h:6007
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:3770
+#: src/xml/xmli18n-tmp.h:6008
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:6009
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:3772
+#: src/xml/xmli18n-tmp.h:6010
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:6011
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:3774
+#: src/xml/xmli18n-tmp.h:6012
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:3775
+#: src/xml/xmli18n-tmp.h:6013
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:6014
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:6015
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Paisagem"
 
-#: src/xml/xmli18n-tmp.h:3778
+#: src/xml/xmli18n-tmp.h:6016
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:3779
+#: src/xml/xmli18n-tmp.h:6017
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3780
+#: src/xml/xmli18n-tmp.h:6018
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:6019
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3782
+#: src/xml/xmli18n-tmp.h:6020
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:6021
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3784
+#: src/xml/xmli18n-tmp.h:6022
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:6023
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:6024
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:3787
+#: src/xml/xmli18n-tmp.h:6025
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:6026
 msgid "American foolscap"
 msgstr "Papel Ministro Americano"
 
-#: src/xml/xmli18n-tmp.h:3789
+#: src/xml/xmli18n-tmp.h:6027
 msgid "European foolscap"
 msgstr "Papel Ministro Europeu"
 
-#: src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:6028
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:6029
 msgid "Large Crown Quarto"
 msgstr "Crown Quarto Grande"
 
-#: src/xml/xmli18n-tmp.h:3792
+#: src/xml/xmli18n-tmp.h:6030
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:6031
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/xml/xmli18n-tmp.h:3794
+#: src/xml/xmli18n-tmp.h:6032
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:3795
+#: src/xml/xmli18n-tmp.h:6033
 msgid "Large Crown Octavo"
 msgstr "Crown Octavo Grande"
 
-#: src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:6034
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:6035
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:6036
 msgid "Small paperback"
 msgstr "Pequena Brochura"
 
-#: src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:6037
 msgid "Penguin small paperback"
 msgstr "Pequena Brochura Pinguim"
 
-#: src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:6038
 msgid "Penguin large paperback"
 msgstr "Grande Brochura Pinguim"
 
-#: src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:6039
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3802
+#: src/xml/xmli18n-tmp.h:6040
 msgid "Hagaki Card"
 msgstr "Cartão Hagaki"
 
-#: src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:6041
 msgid "Oufuku Card"
 msgstr "Cartão Oufuku"
 
-#: src/xml/xmli18n-tmp.h:3804
+#: src/xml/xmli18n-tmp.h:6042
 msgid "Japanese long envelope #3"
 msgstr "Envelope longo Japonês #3"
 
-#: src/xml/xmli18n-tmp.h:3805
+#: src/xml/xmli18n-tmp.h:6043
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "Envelope longo Japonês #3"
 
-#: src/xml/xmli18n-tmp.h:3806
+#: src/xml/xmli18n-tmp.h:6044
 msgid "Japanese long envelope #4"
 msgstr "Envelope longo Japonês #4"
 
-#: src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:6045
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "Envelope longo Japonês #4"
 
-#: src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:6046
 msgid "Japanese Kaku envelope #4"
 msgstr "Evelope Kaku Japonês #4"
 
-#: src/xml/xmli18n-tmp.h:3809
+#: src/xml/xmli18n-tmp.h:6047
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Evelope Kaku Japonês #4"
 
-#: src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:6048
 msgid "Commercial 10"
 msgstr "Comercial 10"
 
-#: src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:6049
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Comercial 10"
 
-#: src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:6050
 msgid "A2 Invitation"
 msgstr "Convite A2"
 
-#: src/xml/xmli18n-tmp.h:3813
+#: src/xml/xmli18n-tmp.h:6051
 msgid "Monarch Envelope"
 msgstr "Envelope Monarca"
 
-#: src/xml/xmli18n-tmp.h:3814
+#: src/xml/xmli18n-tmp.h:6052
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Envelope Monarca"
 
-#: src/xml/xmli18n-tmp.h:3815
+#: src/xml/xmli18n-tmp.h:6053
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3816
+#: src/xml/xmli18n-tmp.h:6054
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:6055
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3818
+#: src/xml/xmli18n-tmp.h:6056
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3819
+#: src/xml/xmli18n-tmp.h:6057
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Cartão"
 
-#: src/xml/xmli18n-tmp.h:3820
+#: src/xml/xmli18n-tmp.h:6058
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:6059
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:6060
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3824
+#: src/xml/xmli18n-tmp.h:6062
 msgid "89 mm Roll Paper"
 msgstr "Papel Contínuo 89 mm"
 
-#: src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:6063
 msgid "4 Inch Roll Paper"
 msgstr "Papel Contínuo 4 Polegadas"
 
-#: src/xml/xmli18n-tmp.h:3826
+#: src/xml/xmli18n-tmp.h:6064
 msgid "5 Inch Roll Paper"
 msgstr "Papel Contínuo 5 Polegadas"
 
-#: src/xml/xmli18n-tmp.h:3827
+#: src/xml/xmli18n-tmp.h:6065
 msgid "210 mm Roll Paper"
 msgstr "Papel Contínuo 210 mm"
 
-#: src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:6066
 msgid "13 Inch Roll Paper"
 msgstr "Papel Contínuo 13 Polegadas"
 
-#: src/xml/xmli18n-tmp.h:3829
+#: src/xml/xmli18n-tmp.h:6067
 #, fuzzy
 msgid "17 Inch Roll Paper"
 msgstr "Papel Contínuo 13 Polegadas"
 
-#: src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:6068
 msgid "22 Inch Roll Paper"
 msgstr "Papel Contínuo 22 Polegadas"
 
-#: src/xml/xmli18n-tmp.h:3831
+#: src/xml/xmli18n-tmp.h:6069
 msgid "24 Inch Roll Paper"
 msgstr "Papel Contínuo 24 Polegadas"
 
-#: src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:6070
 msgid "36 Inch Roll Paper"
 msgstr "Papel Contínuo 36 Polegadas"
 
-#: src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:6071
 msgid "44 Inch Roll Paper"
 msgstr "Papel Contínuo 44 Polegadas"
 
-#: src/xml/xmli18n-tmp.h:3834
+#: src/xml/xmli18n-tmp.h:6072
 #, fuzzy
 msgid "60 Inch Roll Paper"
 msgstr "Papel Contínuo 36 Polegadas"
 
-#: src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:6073
 #, fuzzy
 msgid "64 Inch Roll Paper"
 msgstr "Papel Contínuo 4 Polegadas"
 
-#: src/xml/xmli18n-tmp.h:3836
+#: src/xml/xmli18n-tmp.h:6074
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3837
+#: src/xml/xmli18n-tmp.h:6075
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:6076
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:6077
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:6078
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:6079
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:6080
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:6081
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3844
+#: src/xml/xmli18n-tmp.h:6082
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:6083
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3846
+#: src/xml/xmli18n-tmp.h:6084
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3847
+#: src/xml/xmli18n-tmp.h:6085
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3848
+#: src/xml/xmli18n-tmp.h:6086
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:6087
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3850
+#: src/xml/xmli18n-tmp.h:6088
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:6089
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:6090
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3853
+#: src/xml/xmli18n-tmp.h:6091
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3854
+#: src/xml/xmli18n-tmp.h:6092
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3855
+#: src/xml/xmli18n-tmp.h:6093
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3856
+#: src/xml/xmli18n-tmp.h:6094
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3857
+#: src/xml/xmli18n-tmp.h:6095
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3858
+#: src/xml/xmli18n-tmp.h:6096
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:6097
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:6098
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:6099
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:6100
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3863
+#: src/xml/xmli18n-tmp.h:6101
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:6102
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:6103
 msgid "Canon S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:6104
 msgid "Canon S200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3867
+#: src/xml/xmli18n-tmp.h:6105
 msgid "Canon S300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3868
+#: src/xml/xmli18n-tmp.h:6106
 msgid "Canon S400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3869
+#: src/xml/xmli18n-tmp.h:6107
 msgid "Canon S450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3870
+#: src/xml/xmli18n-tmp.h:6108
 msgid "Canon S500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:6109
 msgid "Canon S600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3872
+#: src/xml/xmli18n-tmp.h:6110
 msgid "Canon S630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3873
+#: src/xml/xmli18n-tmp.h:6111
 msgid "Canon S800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3874
+#: src/xml/xmli18n-tmp.h:6112
 msgid "Canon S4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:6113
 msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:6114
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3877
+#: src/xml/xmli18n-tmp.h:6115
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3878
+#: src/xml/xmli18n-tmp.h:6116
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:6117
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3880
+#: src/xml/xmli18n-tmp.h:6118
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3881
+#: src/xml/xmli18n-tmp.h:6119
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:6120
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:6121
 msgid "Canon PIXMA iP4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3884
+#: src/xml/xmli18n-tmp.h:6122
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3885
+#: src/xml/xmli18n-tmp.h:6123
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3886
+#: src/xml/xmli18n-tmp.h:6124
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3887
+#: src/xml/xmli18n-tmp.h:6125
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3888
+#: src/xml/xmli18n-tmp.h:6126
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:6127
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:6128
+msgid "Canon PIXMA iX4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6129
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:6130
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:6131
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:6132
 msgid "Canon PIXMA MP160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:6133
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3895
+#: src/xml/xmli18n-tmp.h:6134
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:6135
 msgid "Canon PIXMA MP220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3897
+#: src/xml/xmli18n-tmp.h:6136
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:6137
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:6138
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3900
+#: src/xml/xmli18n-tmp.h:6139
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:6140
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3902
+#: src/xml/xmli18n-tmp.h:6141
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3903
+#: src/xml/xmli18n-tmp.h:6142
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:6143
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:6144
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:6145
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:6146
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:6147
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:6148
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3910
+#: src/xml/xmli18n-tmp.h:6149
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:6150
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3912
+#: src/xml/xmli18n-tmp.h:6151
 msgid "Canon i80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3913
+#: src/xml/xmli18n-tmp.h:6152
 msgid "Canon i560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3914
+#: src/xml/xmli18n-tmp.h:6153
 msgid "Canon i850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:6154
 msgid "Canon i860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3916
+#: src/xml/xmli18n-tmp.h:6155
 msgid "Canon i865"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:6156
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:6157
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3919
+#: src/xml/xmli18n-tmp.h:6158
 #, fuzzy
 msgid "Epson B-300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3920
+#: src/xml/xmli18n-tmp.h:6159
 #, fuzzy
 msgid "Epson B-308"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3921
+#: src/xml/xmli18n-tmp.h:6160
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3922
+#: src/xml/xmli18n-tmp.h:6161
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3923
+#: src/xml/xmli18n-tmp.h:6162
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:3924
+#: src/xml/xmli18n-tmp.h:6163
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:6164
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:6165
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:6166
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:6167
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:6168
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C41sx"
 
-#: src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:6169
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C41ux"
 
-#: src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:6170
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C41ux"
 
-#: src/xml/xmli18n-tmp.h:3932
+#: src/xml/xmli18n-tmp.h:6171
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C42sx"
 
-#: src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:6172
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3934
+#: src/xml/xmli18n-tmp.h:6173
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3935
+#: src/xml/xmli18n-tmp.h:6174
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:6175
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3937
+#: src/xml/xmli18n-tmp.h:6176
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:6177
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3939
+#: src/xml/xmli18n-tmp.h:6178
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:6179
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:6180
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3942
+#: src/xml/xmli18n-tmp.h:6181
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3943
+#: src/xml/xmli18n-tmp.h:6182
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:6183
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:6184
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3946
+#: src/xml/xmli18n-tmp.h:6185
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:3947
+#: src/xml/xmli18n-tmp.h:6186
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:3948
+#: src/xml/xmli18n-tmp.h:6187
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3949
+#: src/xml/xmli18n-tmp.h:6188
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:6189
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3951
+#: src/xml/xmli18n-tmp.h:6190
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:6191
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3953
+#: src/xml/xmli18n-tmp.h:6192
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:6193
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:6194
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3956
+#: src/xml/xmli18n-tmp.h:6195
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:3957
+#: src/xml/xmli18n-tmp.h:6196
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3958
+#: src/xml/xmli18n-tmp.h:6197
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3959
+#: src/xml/xmli18n-tmp.h:6198
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3960
+#: src/xml/xmli18n-tmp.h:6199
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:6200
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:6201
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:6202
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3964
+#: src/xml/xmli18n-tmp.h:6203
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:6204
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:3966
+#: src/xml/xmli18n-tmp.h:6205
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:3967
+#: src/xml/xmli18n-tmp.h:6206
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:6207
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:6208
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3970
+#: src/xml/xmli18n-tmp.h:6209
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:6210
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:3972
+#: src/xml/xmli18n-tmp.h:6211
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:6212
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:6213
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:3975
+#: src/xml/xmli18n-tmp.h:6214
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:6215
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:6216
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:6217
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:3979
+#: src/xml/xmli18n-tmp.h:6218
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:6219
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:3981
+#: src/xml/xmli18n-tmp.h:6220
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:3982
+#: src/xml/xmli18n-tmp.h:6221
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:3983
+#: src/xml/xmli18n-tmp.h:6222
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:3984
+#: src/xml/xmli18n-tmp.h:6223
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:6224
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:6225
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:3987
+#: src/xml/xmli18n-tmp.h:6226
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:6227
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:3989
+#: src/xml/xmli18n-tmp.h:6228
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:6229
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:6230
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:3992
+#: src/xml/xmli18n-tmp.h:6231
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:3993
+#: src/xml/xmli18n-tmp.h:6232
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:6233
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:3995
+#: src/xml/xmli18n-tmp.h:6234
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:6235
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:6236
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:3998
+#: src/xml/xmli18n-tmp.h:6237
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3999
+#: src/xml/xmli18n-tmp.h:6238
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:6239
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Stylus C42ux"
 
-#: src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:6240
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:4002
+#: src/xml/xmli18n-tmp.h:6241
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:6242
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:6243
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4005
+#: src/xml/xmli18n-tmp.h:6244
 #, fuzzy
-msgid "Epson Stylus Offixe TX300F"
+msgid "Epson Stylus Office TX300F"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4006
+#: src/xml/xmli18n-tmp.h:6245
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:6246
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:4008
+#: src/xml/xmli18n-tmp.h:6247
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4009
+#: src/xml/xmli18n-tmp.h:6248
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:6249
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:6250
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:6251
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4013
+#: src/xml/xmli18n-tmp.h:6252
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4014
+#: src/xml/xmli18n-tmp.h:6253
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:6254
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:4016
+#: src/xml/xmli18n-tmp.h:6255
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:6256
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:6257
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4019
+#: src/xml/xmli18n-tmp.h:6258
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:4020
+#: src/xml/xmli18n-tmp.h:6259
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:4021
+#: src/xml/xmli18n-tmp.h:6260
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:4022
+#: src/xml/xmli18n-tmp.h:6261
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:4023
+#: src/xml/xmli18n-tmp.h:6262
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:4024
+#: src/xml/xmli18n-tmp.h:6263
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:6264
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:6265
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:4027
+#: src/xml/xmli18n-tmp.h:6266
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:6267
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:6268
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:6269
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:4031
+#: src/xml/xmli18n-tmp.h:6270
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:6271
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4033
+#: src/xml/xmli18n-tmp.h:6272
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4034
+#: src/xml/xmli18n-tmp.h:6273
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4035
+#: src/xml/xmli18n-tmp.h:6274
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:6275
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4037
+#: src/xml/xmli18n-tmp.h:6276
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:4038
+#: src/xml/xmli18n-tmp.h:6277
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:4039
+#: src/xml/xmli18n-tmp.h:6278
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:6279
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4041
+#: src/xml/xmli18n-tmp.h:6280
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:6281
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:6282
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4044
+#: src/xml/xmli18n-tmp.h:6283
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:6284
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:6285
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:6286
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:6287
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4049
+#: src/xml/xmli18n-tmp.h:6288
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:6289
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4051
+#: src/xml/xmli18n-tmp.h:6290
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:6291
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4053
+#: src/xml/xmli18n-tmp.h:6292
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4054
+#: src/xml/xmli18n-tmp.h:6293
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:6294
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4056
+#: src/xml/xmli18n-tmp.h:6295
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:6296
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4058
+#: src/xml/xmli18n-tmp.h:6297
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4059
+#: src/xml/xmli18n-tmp.h:6298
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:6299
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:6300
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4062
+#: src/xml/xmli18n-tmp.h:6301
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:6302
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4064
+#: src/xml/xmli18n-tmp.h:6303
+#, fuzzy
+msgid "Epson Stylus Photo R2880"
+msgstr "Stylus Photo 1280"
+
+#: src/xml/xmli18n-tmp.h:6304
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4065
+#: src/xml/xmli18n-tmp.h:6305
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:6306
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4067
+#: src/xml/xmli18n-tmp.h:6307
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:6308
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4069
+#: src/xml/xmli18n-tmp.h:6309
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:6310
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:6311
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4072
+#: src/xml/xmli18n-tmp.h:6312
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:6313
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4074
+#: src/xml/xmli18n-tmp.h:6314
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4075
+#: src/xml/xmli18n-tmp.h:6315
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4076
+#: src/xml/xmli18n-tmp.h:6316
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:6317
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4078
+#: src/xml/xmli18n-tmp.h:6318
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:6319
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:6320
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:6321
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4082
+#: src/xml/xmli18n-tmp.h:6322
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:6323
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4084
+#: src/xml/xmli18n-tmp.h:6324
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4085
+#: src/xml/xmli18n-tmp.h:6325
 #, fuzzy
-msgid "Epson Stylus Photo TX800W"
+msgid "Epson Stylus Photo TX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4086
+#: src/xml/xmli18n-tmp.h:6326
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:4087
+#: src/xml/xmli18n-tmp.h:6327
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:4088
+#: src/xml/xmli18n-tmp.h:6328
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4089
+#: src/xml/xmli18n-tmp.h:6329
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:6330
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:4091
+#: src/xml/xmli18n-tmp.h:6331
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:6332
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4093
+#: src/xml/xmli18n-tmp.h:6333
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4094
+#: src/xml/xmli18n-tmp.h:6334
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:6335
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:6336
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4097
+#: src/xml/xmli18n-tmp.h:6337
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:6338
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4099
+#: src/xml/xmli18n-tmp.h:6339
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:6340
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:6341
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:6342
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:6343
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:6344
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:6345
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:6346
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:6347
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:6348
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:6349
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4110
+#: src/xml/xmli18n-tmp.h:6350
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:6351
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:6352
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4113
+#: src/xml/xmli18n-tmp.h:6353
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:6354
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:6355
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4116
+#: src/xml/xmli18n-tmp.h:6356
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:6357
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4118
+#: src/xml/xmli18n-tmp.h:6358
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4119
+#: src/xml/xmli18n-tmp.h:6359
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:6360
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4121
+#: src/xml/xmli18n-tmp.h:6361
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:6362
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:6363
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4124
+#: src/xml/xmli18n-tmp.h:6364
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:6365
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4126
+#: src/xml/xmli18n-tmp.h:6366
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4127
+#: src/xml/xmli18n-tmp.h:6367
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4128
+#: src/xml/xmli18n-tmp.h:6368
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4129
+#: src/xml/xmli18n-tmp.h:6369
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:6370
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:6371
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:6372
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:6373
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:6374
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:6375
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:6376
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:6377
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:6378
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:6379
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:6380
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:6381
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:6382
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:6383
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4144
+#: src/xml/xmli18n-tmp.h:6384
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:6385
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:6386
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:6387
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:6388
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:6389
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:6390
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:6391
+#, fuzzy
+msgid "Epson Stylus DX4000"
+msgstr "Stylus c20sx"
+
+#: src/xml/xmli18n-tmp.h:6392
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:6393
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:6394
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4154
+#: src/xml/xmli18n-tmp.h:6395
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:6396
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:6397
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:6398
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:6399
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:6400
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:6401
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:6402
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:6403
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:6404
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:6405
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:6406
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:6407
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:6408
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:6409
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:6410
 #, fuzzy
-msgid "Epson Stylus PX700FW"
+msgid "Epson Stylus PX700W"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:6411
 #, fuzzy
 msgid "Epson Stylus PX800FW"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:6412
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4172
+#: src/xml/xmli18n-tmp.h:6413
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:6414
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4174
+#: src/xml/xmli18n-tmp.h:6415
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:6416
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:6417
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4177
+#: src/xml/xmli18n-tmp.h:6418
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4178
+#: src/xml/xmli18n-tmp.h:6419
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4179
+#: src/xml/xmli18n-tmp.h:6420
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4180
+#: src/xml/xmli18n-tmp.h:6421
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4181
+#: src/xml/xmli18n-tmp.h:6422
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:6423
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:6424
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:6425
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:6426
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:6427
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4187
+#: src/xml/xmli18n-tmp.h:6428
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4188
+#: src/xml/xmli18n-tmp.h:6429
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Stylus c20sx"
 
-#: src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:6430
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:6431
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:6432
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4192
+#: src/xml/xmli18n-tmp.h:6433
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:6434
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:6435
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:6436
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4196
+#: src/xml/xmli18n-tmp.h:6437
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:6438
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:6439
 msgid "Epson PictureMate 215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4199
+#: src/xml/xmli18n-tmp.h:6440
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:6441
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:6442
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:6443
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4204
+#: src/xml/xmli18n-tmp.h:6445
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:6446
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:6447
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4207
+#: src/xml/xmli18n-tmp.h:6448
 msgid "Epson WorkForce 30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:6449
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:6450
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:6451
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:6452
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4212
+#: src/xml/xmli18n-tmp.h:6453
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:6454
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:6455
 msgid "Epson E 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4215
+#: src/xml/xmli18n-tmp.h:6456
 msgid "Epson E 150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4216
+#: src/xml/xmli18n-tmp.h:6457
 msgid "Epson E 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:6458
 msgid "Epson E 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:6459
 msgid "Epson E 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4219
+#: src/xml/xmli18n-tmp.h:6460
 msgid "Epson E 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:6461
 msgid "Epson E 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:6462
 msgid "Epson E 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:6463
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:6464
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4224
+#: src/xml/xmli18n-tmp.h:6465
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:6466
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:6467
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:6468
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4228
+#: src/xml/xmli18n-tmp.h:6469
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4229
+#: src/xml/xmli18n-tmp.h:6470
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:6471
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:6472
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:6473
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:6474
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:6475
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:6476
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:6477
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:6478
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4238
+#: src/xml/xmli18n-tmp.h:6479
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:6480
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:6481
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:6482
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4242
+#: src/xml/xmli18n-tmp.h:6483
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4243
+#: src/xml/xmli18n-tmp.h:6484
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:6485
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:6486
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4246
+#: src/xml/xmli18n-tmp.h:6487
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:6488
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:6490
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4251
+#: src/xml/xmli18n-tmp.h:6492
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4253
+#: src/xml/xmli18n-tmp.h:6494
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4254
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:6496
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:6497
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:6498
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:6499
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4259
+#: src/xml/xmli18n-tmp.h:6500
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4260
+#: src/xml/xmli18n-tmp.h:6501
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:6502
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4262
+#: src/xml/xmli18n-tmp.h:6503
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4263
+#: src/xml/xmli18n-tmp.h:6504
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4264
+#: src/xml/xmli18n-tmp.h:6505
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4265
+#: src/xml/xmli18n-tmp.h:6506
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:6507
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:6508
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:6509
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:6510
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:6511
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:6512
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:6513
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:6514
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4274
+#: src/xml/xmli18n-tmp.h:6515
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4275
+#: src/xml/xmli18n-tmp.h:6516
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4276
+#: src/xml/xmli18n-tmp.h:6517
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:6518
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:6519
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:6520
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:6521
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:6522
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:6523
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:6524
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:6525
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4285
+#: src/xml/xmli18n-tmp.h:6526
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4286
+#: src/xml/xmli18n-tmp.h:6527
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:6528
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:6529
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:6530
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:6531
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:6532
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4292
+#: src/xml/xmli18n-tmp.h:6533
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:6534
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:6535
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4295
+#: src/xml/xmli18n-tmp.h:6536
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4296
+#: src/xml/xmli18n-tmp.h:6537
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4297
+#: src/xml/xmli18n-tmp.h:6538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:6539
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4299
+#: src/xml/xmli18n-tmp.h:6540
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:6541
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:6542
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:6543
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:6544
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4305
+#: src/xml/xmli18n-tmp.h:6546
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:6547
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4307
+#: src/xml/xmli18n-tmp.h:6548
+#, fuzzy
+msgid "Epson PX G5600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6549
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4308
+#: src/xml/xmli18n-tmp.h:6550
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4309
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4310
+#: src/xml/xmli18n-tmp.h:6552
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:6553
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:6554
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4313
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:6556
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4315
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:6559
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:6560
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:6561
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:6562
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:6563
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:6564
 msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:6565
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4324
+#: src/xml/xmli18n-tmp.h:6566
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:6567
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4326
+#: src/xml/xmli18n-tmp.h:6568
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4327
+#: src/xml/xmli18n-tmp.h:6569
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:6570
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:6571
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Brother HL-1430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:6576
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Brother HL-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4337
+#: src/xml/xmli18n-tmp.h:6579
 msgid "Brother HL-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:6580
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:6581
 msgid "Brother HL-1670N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:6582
 msgid "Brother HL-1850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:6583
 msgid "Brother HL-1870N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:6584
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:6585
 msgid "Brother HL-2460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:6586
 msgid "Brother HL-2460N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:6587
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4346
+#: src/xml/xmli18n-tmp.h:6588
 msgid "Brother HL-5030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:6589
 msgid "Brother HL-5040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:6590
 msgid "Brother HL-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:6591
 msgid "Brother HL-5070N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4350
+#: src/xml/xmli18n-tmp.h:6592
 msgid "Brother HL-5140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4351
+#: src/xml/xmli18n-tmp.h:6593
 msgid "Brother HL-5150D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:6594
 msgid "Brother HL-5170DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:6595
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4354
+#: src/xml/xmli18n-tmp.h:6596
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:6597
 msgid "Brother HL-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:6598
 msgid "Brother HL-7050N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4357
+#: src/xml/xmli18n-tmp.h:6599
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4358
+#: src/xml/xmli18n-tmp.h:6600
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:6601
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:6602
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:6603
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:6604
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:6605
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:6606
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:6607
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:6608
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:6609
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:6610
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:6611
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:6612
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:6613
 msgid "DEC 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:6614
 msgid "DEC LN17"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4373
+#: src/xml/xmli18n-tmp.h:6615
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4374
+#: src/xml/xmli18n-tmp.h:6616
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:6617
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4376
+#: src/xml/xmli18n-tmp.h:6618
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:6619
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:6620
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:6621
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:6622
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:6623
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:6624
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:6625
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4384
+#: src/xml/xmli18n-tmp.h:6626
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4385
+#: src/xml/xmli18n-tmp.h:6627
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4386
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4387
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:6630
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4389
+#: src/xml/xmli18n-tmp.h:6631
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4392
+#: src/xml/xmli18n-tmp.h:6634
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:6635
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:6636
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:6637
 msgid "Epson EPL-N2050PS+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4397
+#: src/xml/xmli18n-tmp.h:6639
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:6640
 #, fuzzy
 msgid "Epson EPL-N2500PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4400
+#: src/xml/xmli18n-tmp.h:6642
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:6643
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4403
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:6646
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:6647
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definir nova Impressora"
 
-#: src/xml/xmli18n-tmp.h:4406
+#: src/xml/xmli18n-tmp.h:6648
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Definir nova Impressora"
 
-#: src/xml/xmli18n-tmp.h:4407
+#: src/xml/xmli18n-tmp.h:6649
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definir nova Impressora"
 
-#: src/xml/xmli18n-tmp.h:4408
+#: src/xml/xmli18n-tmp.h:6650
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Definir nova Impressora"
 
-#: src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:6651
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definir nova Impressora"
 
-#: src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:6652
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Definir nova Impressora"
 
-#: src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:6653
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definir nova Impressora"
 
-#: src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:6654
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Definir nova Impressora"
 
-#: src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:6656
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Definir nova Impressora"
 
-#: src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:6657
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4416
+#: src/xml/xmli18n-tmp.h:6658
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:6659
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:6660
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:6661
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4420
-msgid "Gestetner 3532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4421
-msgid "Gestetner 4235g"
+#: src/xml/xmli18n-tmp.h:6662
+msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:6663
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4423
-msgid "Gestetner 4532"
+#: src/xml/xmli18n-tmp.h:6664
+msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4424
-msgid "Gestetner 4245g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:6665
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:6666
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:6668
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:6669
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:6670
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4431
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:6672
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:6673
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:6674
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:6675
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4436
+#: src/xml/xmli18n-tmp.h:6676
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4437
-msgid "Gestetner DSm635"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4438
-msgid "Gestetner DSm635G"
+#: src/xml/xmli18n-tmp.h:6677
+msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4439
-msgid "Gestetner DSm645"
+#: src/xml/xmli18n-tmp.h:6678
+msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4440
-msgid "Gestetner DS645G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:6679
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:6680
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4443
+#: src/xml/xmli18n-tmp.h:6681
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:6682
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:6683
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4446
-msgid "Gestetner DSm735"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4447
-msgid "Gestetner DSm735G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4448
-msgid "Gestetner DSm745"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4449
-msgid "Gestetner DSm745G"
+#: src/xml/xmli18n-tmp.h:6684
+msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4450
-msgid "Gestetner MP1100"
+#: src/xml/xmli18n-tmp.h:6685
+msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4451
-msgid "Gestetner DSm7110"
+#: src/xml/xmli18n-tmp.h:6686
+msgid "Gestetner MP1100/DSm7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4452
-msgid "Gestetner MP1350"
+#: src/xml/xmli18n-tmp.h:6687
+msgid "Gestetner MP1350/DSm7135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4453
-msgid "Gestetner DSm7135"
+#: src/xml/xmli18n-tmp.h:6688
+msgid "Gestetner MP1600/DSm716"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4454
-msgid "Gestetner MP1600"
+#: src/xml/xmli18n-tmp.h:6689
+msgid "Gestetner MP2000/DSm721d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4455
-msgid "Gestetner DSm716"
+#: src/xml/xmli18n-tmp.h:6690
+msgid "Gestetner MP2500/DSm625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4456
-msgid "Gestetner MP2000"
+#: src/xml/xmli18n-tmp.h:6691
+msgid "Gestetner MP3500/DSm735e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4457
-msgid "Gestetner DSm721d"
+#: src/xml/xmli18n-tmp.h:6692
+msgid "Gestetner MP4500/DSm745e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4458
-msgid "Gestetner MP2500"
+#: src/xml/xmli18n-tmp.h:6693
+msgid "Gestetner MP5500/DSm755"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4459
-msgid "Gestetner DSm625"
+#: src/xml/xmli18n-tmp.h:6694
+msgid "Gestetner MP6500/DSm765"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4460
-msgid "Gestetner MP3500"
+#: src/xml/xmli18n-tmp.h:6695
+msgid "Gestetner MP7500/DSm775"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4461
-msgid "Gestetner DSm735e"
+#: src/xml/xmli18n-tmp.h:6696
+msgid "Gestetner MP9000/DSm790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4462
-msgid "Gestetner MP4500"
+#: src/xml/xmli18n-tmp.h:6697
+msgid "Gestetner MP 161/DSm416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4463
-msgid "Gestetner DSm745e"
+#: src/xml/xmli18n-tmp.h:6698
+msgid "Gestetner MP 2510/DSm725e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4464
-msgid "Gestetner MP5500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4465
-msgid "Gestetner DSm755"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4466
-msgid "Gestetner MP6500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4467
-msgid "Gestetner DSm765"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4468
-msgid "Gestetner MP7500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4469
-msgid "Gestetner DSm775"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4470
-msgid "Gestetner MP9000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4471
-msgid "Gestetner DSm790"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4472
-msgid "Gestetner MP 161"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4473
-msgid "Gestetner DSm416"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4474
-msgid "Gestetner MP 2510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4475
-msgid "Gestetner DSm725e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:6699
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:6700
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4478
-msgid "Gestetner MP 3010"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4479
-msgid "Gestetner DSm730e"
+#: src/xml/xmli18n-tmp.h:6701
+msgid "Gestetner MP 3010/DSm730e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4480
+#: src/xml/xmli18n-tmp.h:6702
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:6703
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:6704
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:6705
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Gestetner MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:6707
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:6708
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:6709
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:6710
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4489
+#: src/xml/xmli18n-tmp.h:6711
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:6712
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:6713
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4492
+#: src/xml/xmli18n-tmp.h:6714
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:6715
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:6716
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4495
+#: src/xml/xmli18n-tmp.h:6717
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4496
+#: src/xml/xmli18n-tmp.h:6718
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4497
+#: src/xml/xmli18n-tmp.h:6719
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:6720
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:6721
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:6722
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:6723
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:6724
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:6725
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:6726
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:6727
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4506
+#: src/xml/xmli18n-tmp.h:6728
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:6729
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4508
+#: src/xml/xmli18n-tmp.h:6730
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4509
+#: src/xml/xmli18n-tmp.h:6731
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4510
+#: src/xml/xmli18n-tmp.h:6732
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:6733
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:6734
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:6735
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:6736
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:6737
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:6738
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:6739
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4518
+#: src/xml/xmli18n-tmp.h:6740
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:6741
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:6742
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:6743
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:6744
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4523
+#: src/xml/xmli18n-tmp.h:6745
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:6746
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:6747
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:6748
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:6749
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4528
+#: src/xml/xmli18n-tmp.h:6750
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4529
+#: src/xml/xmli18n-tmp.h:6751
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4530
+#: src/xml/xmli18n-tmp.h:6752
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:6753
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4532
+#: src/xml/xmli18n-tmp.h:6754
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:6755
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:6756
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:6757
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:6758
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:6759
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:6760
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4539
+#: src/xml/xmli18n-tmp.h:6761
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4540
+#: src/xml/xmli18n-tmp.h:6762
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4541
+#: src/xml/xmli18n-tmp.h:6763
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4542
+#: src/xml/xmli18n-tmp.h:6764
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4543
+#: src/xml/xmli18n-tmp.h:6765
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:6766
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:6767
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4546
+#: src/xml/xmli18n-tmp.h:6768
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:6769
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:6770
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:6771
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:6772
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:6773
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4552
+#: src/xml/xmli18n-tmp.h:6774
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:6775
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:6776
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:6777
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:6778
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:6779
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:6780
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:6781
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:6782
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:6783
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:6784
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:6785
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:6786
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:6787
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:6788
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4567
+#: src/xml/xmli18n-tmp.h:6789
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4568
+#: src/xml/xmli18n-tmp.h:6790
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:6791
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4570
+#: src/xml/xmli18n-tmp.h:6792
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4571
+#: src/xml/xmli18n-tmp.h:6793
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:6794
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:6795
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:6796
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:6797
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:6798
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:6799
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:6800
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:6801
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:6802
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:6803
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4582
+#: src/xml/xmli18n-tmp.h:6804
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4583
+#: src/xml/xmli18n-tmp.h:6805
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4584
+#: src/xml/xmli18n-tmp.h:6806
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4585
+#: src/xml/xmli18n-tmp.h:6807
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:6808
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:6809
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:6810
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:6811
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:6812
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:6813
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:6814
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4593
+#: src/xml/xmli18n-tmp.h:6815
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4594
+#: src/xml/xmli18n-tmp.h:6816
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:6817
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:6818
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4597
+#: src/xml/xmli18n-tmp.h:6819
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:6820
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:6821
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:6822
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:6823
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4602
+#: src/xml/xmli18n-tmp.h:6824
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:6825
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:6826
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:6827
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:6828
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4607
+#: src/xml/xmli18n-tmp.h:6829
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:6830
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4609
+#: src/xml/xmli18n-tmp.h:6831
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4610
+#: src/xml/xmli18n-tmp.h:6832
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:6833
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:6834
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4613
+#: src/xml/xmli18n-tmp.h:6835
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:6836
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:6837
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:6838
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:6839
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:6840
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:6841
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:6842
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:6843
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:6844
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:6845
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4624
+#: src/xml/xmli18n-tmp.h:6846
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4625
+#: src/xml/xmli18n-tmp.h:6847
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:6848
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4627
+#: src/xml/xmli18n-tmp.h:6849
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4628
+#: src/xml/xmli18n-tmp.h:6850
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:6851
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:6852
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:6853
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:6854
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:6855
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:6856
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:6857
 msgid "HP LaserJet 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4636
+#: src/xml/xmli18n-tmp.h:6858
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4637
+#: src/xml/xmli18n-tmp.h:6859
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4638
+#: src/xml/xmli18n-tmp.h:6860
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:6861
 msgid "HP LaserJet 1320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4640
+#: src/xml/xmli18n-tmp.h:6862
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:6863
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:6864
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:6865
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4644
+#: src/xml/xmli18n-tmp.h:6866
 msgid "HP LaserJet 2410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:6867
 msgid "HP LaserJet 2420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:6868
 msgid "HP LaserJet 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4647
+#: src/xml/xmli18n-tmp.h:6869
 msgid "HP LaserJet 3015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4648
+#: src/xml/xmli18n-tmp.h:6870
 msgid "HP LaserJet 3020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:6871
 msgid "HP LaserJet 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4650
+#: src/xml/xmli18n-tmp.h:6872
 msgid "HP LaserJet 3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:6873
 msgid "HP LaserJet 3052"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:6874
 msgid "HP LaserJet 3055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:6875
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:6876
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:6877
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:6878
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:6879
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:6880
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:6881
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4660
+#: src/xml/xmli18n-tmp.h:6882
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:6883
 msgid "HP LaserJet 3380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:6884
 msgid "HP LaserJet 3390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4663
+#: src/xml/xmli18n-tmp.h:6885
 msgid "HP LaserJet 3392"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:6886
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:6887
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:6888
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4667
+#: src/xml/xmli18n-tmp.h:6889
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:6890
 msgid "HP LaserJet 4240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:6891
 msgid "HP LaserJet 4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:6892
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4671
+#: src/xml/xmli18n-tmp.h:6893
 msgid "HP LaserJet 4345 mfp"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:6894
 msgid "HP LaserJet 4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:6895
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:6896
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:6897
 msgid "HP LaserJet 5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:6898
 msgid "HP LaserJet 5200L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:6899
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:6900
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:6901
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4680
+#: src/xml/xmli18n-tmp.h:6902
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:6903
 msgid "HP LaserJet 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4682
+#: src/xml/xmli18n-tmp.h:6904
 msgid "HP LaserJet 9040 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4683
+#: src/xml/xmli18n-tmp.h:6905
 msgid "HP LaserJet 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4684
+#: src/xml/xmli18n-tmp.h:6906
 msgid "HP LaserJet 9050 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:6907
 msgid "HP LaserJet M3027 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:6908
 msgid "HP LaserJet M3035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:6909
 msgid "HP LaserJet M4345 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:6910
 msgid "HP LaserJet M5025 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:6911
 msgid "HP LaserJet M5035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:6912
 msgid "HP LaserJet P2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:6913
 msgid "HP LaserJet P2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:6914
 msgid "HP LaserJet P3004"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:6915
 msgid "HP LaserJet P3005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:6916
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4695
+#: src/xml/xmli18n-tmp.h:6917
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:6918
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:6919
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:6920
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:6921
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4700
+#: src/xml/xmli18n-tmp.h:6922
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:6923
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:6924
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4703
+#: src/xml/xmli18n-tmp.h:6925
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:6926
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:6927
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4706
+#: src/xml/xmli18n-tmp.h:6928
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4707
+#: src/xml/xmli18n-tmp.h:6929
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:6930
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:6931
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4710
+#: src/xml/xmli18n-tmp.h:6932
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:6933
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:6934
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:6935
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:6936
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:6937
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:6938
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:6939
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4718
+#: src/xml/xmli18n-tmp.h:6940
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:6941
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:6942
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4721
+#: src/xml/xmli18n-tmp.h:6943
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:6944
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:6945
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:6946
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4725
+#: src/xml/xmli18n-tmp.h:6947
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:6948
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:6949
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4728
+#: src/xml/xmli18n-tmp.h:6950
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4729
+#: src/xml/xmli18n-tmp.h:6951
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:6952
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:6953
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4732
+#: src/xml/xmli18n-tmp.h:6954
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:6955
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:6956
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:6957
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:6958
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:6959
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:6960
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4739
+#: src/xml/xmli18n-tmp.h:6961
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4740
+#: src/xml/xmli18n-tmp.h:6962
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4741
+#: src/xml/xmli18n-tmp.h:6963
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4742
+#: src/xml/xmli18n-tmp.h:6964
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:6965
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:6966
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4745
+#: src/xml/xmli18n-tmp.h:6967
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:6968
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:6969
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:6970
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4749
+#: src/xml/xmli18n-tmp.h:6971
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:6972
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:6973
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4752
+#: src/xml/xmli18n-tmp.h:6974
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:6975
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:6976
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4755
+#: src/xml/xmli18n-tmp.h:6977
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:6978
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:6979
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:6980
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4759
+#: src/xml/xmli18n-tmp.h:6981
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4760
+#: src/xml/xmli18n-tmp.h:6982
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:6983
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4762
+#: src/xml/xmli18n-tmp.h:6984
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:6985
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:6986
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4765
+#: src/xml/xmli18n-tmp.h:6987
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:6988
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:6989
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Nome da Impressora:"
 
-#: src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:6991
 msgid "IBM 4019"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:6992
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:6993
 msgid "IBM 4312"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4772
+#: src/xml/xmli18n-tmp.h:6994
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:6995
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4774
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4775
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4776
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:6999
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:7000
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:7002
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:7003
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:7004
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:7005
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:7006
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:7007
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:7008
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:7009
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:7010
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:7011
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4790
+#: src/xml/xmli18n-tmp.h:7012
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:7013
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:7014
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:7015
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4794
+#: src/xml/xmli18n-tmp.h:7016
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:7017
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:7018
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4797
+#: src/xml/xmli18n-tmp.h:7019
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:7020
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:7021
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:7022
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:7023
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:7025
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:7026
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:7027
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:7028
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4807
+#: src/xml/xmli18n-tmp.h:7029
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4808
+#: src/xml/xmli18n-tmp.h:7030
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:7031
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:7032
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:7034
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:7035
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:7037
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:7039
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:7040
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4819
+#: src/xml/xmli18n-tmp.h:7041
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:7042
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:7043
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:7044
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:7045
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:7046
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:7047
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:7048
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:7049
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:7050
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:7051
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4830
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:7057
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4837
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4840
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4842
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4852
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4853
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4854
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4855
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4866
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4867
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4873
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4874
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4883
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4886
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4888
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4890
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4894
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4896
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4903
-msgid "Lanier MP 2500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4904
-msgid "Lanier LD125"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4905
-msgid "Lanier MP 1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4906
-msgid "Lanier LD1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4907
-msgid "Lanier MP 1350"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4908
-msgid "Lanier LD1135"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4909
-msgid "Lanier MP 1600"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4910
-msgid "Lanier LD316"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4911
-msgid "Lanier MP 161"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4912
-msgid "Lanier LD016"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4913
-msgid "Lanier MP 2000"
+#: src/xml/xmli18n-tmp.h:7125
+msgid "Lanier MP2500/LD125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4914
-msgid "Lanier LD320d"
+#: src/xml/xmli18n-tmp.h:7126
+msgid "Lanier MP 1100/LD1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4915
-msgid "Lanier MP 2510"
+#: src/xml/xmli18n-tmp.h:7127
+msgid "Lanier MP 1350/LD1135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4916
-msgid "Lanier LD325"
+#: src/xml/xmli18n-tmp.h:7128
+msgid "Lanier MP 1600/LD316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4917
-msgid "Lanier MP 2550B"
+#: src/xml/xmli18n-tmp.h:7129
+msgid "Lanier MP 161/LD016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4918
-msgid "Lanier LD425B"
+#: src/xml/xmli18n-tmp.h:7130
+msgid "Lanier MP 2000/LD320d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4919
-msgid "Lanier MP 2550"
+#: src/xml/xmli18n-tmp.h:7131
+msgid "Lanier MP 2510/LD325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4920
-msgid "Lanier LD425"
+#: src/xml/xmli18n-tmp.h:7132
+msgid "Lanier MP 2550B/LD425B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4921
-msgid "Lanier MP 3010"
+#: src/xml/xmli18n-tmp.h:7133
+msgid "Lanier MP 2550/LD425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4922
-msgid "Lanier LD330"
+#: src/xml/xmli18n-tmp.h:7134
+msgid "Lanier MP 3010/LD330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4923
-msgid "Lanier MP 3350B"
+#: src/xml/xmli18n-tmp.h:7135
+msgid "Lanier MP 3350B/LD433B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4924
-msgid "Lanier LD433B"
+#: src/xml/xmli18n-tmp.h:7136
+msgid "Lanier MP 3350/LD433"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4925
-msgid "Lanier MP 3350"
+#: src/xml/xmli18n-tmp.h:7137
+msgid "Lanier MP 3500/LD335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4926
-msgid "Lanier LD433"
+#: src/xml/xmli18n-tmp.h:7138
+msgid "Lanier MP 4000B/LD040B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4927
-msgid "Lanier MP 3500"
+#: src/xml/xmli18n-tmp.h:7139
+msgid "Lanier MP 4000/LD040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4928
-msgid "Lanier LD335"
+#: src/xml/xmli18n-tmp.h:7140
+msgid "Lanier MP 4500/LD345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4929
-msgid "Lanier MP 4000B"
+#: src/xml/xmli18n-tmp.h:7141
+msgid "Lanier MP 5000B/LD050B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4930
-msgid "Lanier LD040B"
+#: src/xml/xmli18n-tmp.h:7142
+msgid "Lanier MP 5000/LD050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4931
-msgid "Lanier MP 4000"
+#: src/xml/xmli18n-tmp.h:7143
+msgid "Lanier MP 5500/LD255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4932
-msgid "Lanier LD040"
+#: src/xml/xmli18n-tmp.h:7144
+msgid "Lanier MP 6500/LD265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4933
-msgid "Lanier MP 4500"
+#: src/xml/xmli18n-tmp.h:7145
+msgid "Lanier MP 7500/LD275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4934
-msgid "Lanier LD345"
+#: src/xml/xmli18n-tmp.h:7146
+msgid "Lanier MP 9000/LD190"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4935
-msgid "Lanier MP 5000B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4936
-msgid "Lanier LD050B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4937
-msgid "Lanier MP 5000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4938
-msgid "Lanier LD050"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4939
-msgid "Lanier MP 5500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4940
-msgid "Lanier LD255"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4941
-msgid "Lanier MP 6500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4942
-msgid "Lanier LD265"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4943
-msgid "Lanier MP 7500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4944
-msgid "Lanier LD275"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4945
-msgid "Lanier MP 9000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4946
-msgid "Lanier LD190"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:7148
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4950
+#: src/xml/xmli18n-tmp.h:7150
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:7151
 msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4952
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4953
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:7155
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4960
+#: src/xml/xmli18n-tmp.h:7160
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:7161
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:7162
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4963
+#: src/xml/xmli18n-tmp.h:7163
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:7164
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:7165
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4966
-msgid "NRG 10515"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4967
-msgid "NRG 10518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4968
-msgid "NRG 10512"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4969
-msgid "NRG 2205"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4970
-msgid "NRG 2238"
+#: src/xml/xmli18n-tmp.h:7166
+msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4971
-msgid "NRG 2212"
+#: src/xml/xmli18n-tmp.h:7167
+msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4972
-msgid "NRG 2705"
+#: src/xml/xmli18n-tmp.h:7168
+msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4973
-msgid "NRG 2738"
+#: src/xml/xmli18n-tmp.h:7169
+msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4974
-msgid "NRG 2712"
+#: src/xml/xmli18n-tmp.h:7170
+msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4975
-msgid "NRG 3205"
+#: src/xml/xmli18n-tmp.h:7171
+msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4976
-msgid "NRG 3238"
+#: src/xml/xmli18n-tmp.h:7172
+msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4977
-msgid "NRG 3212"
+#: src/xml/xmli18n-tmp.h:7173
+msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4978
-msgid "NRG 3525"
+#: src/xml/xmli18n-tmp.h:7174
+msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4979
-msgid "NRG 3508"
+#: src/xml/xmli18n-tmp.h:7175
+msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4980
-msgid "NRG 3502"
+#: src/xml/xmli18n-tmp.h:7176
+msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4981
-msgid "NRG 3545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4982
-msgid "NRG 3518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4983
-msgid "NRG 3532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4984
-msgid "NRG 4525"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4985
-msgid "NRG 4508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4986
-msgid "NRG 4502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4987
-msgid "NRG 4545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4988
-msgid "NRG 4518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4989
-msgid "NRG 4532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4990
-msgid "NRG 6002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4991
-msgid "NRG 6005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4992
-msgid "NRG 6008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4993
-msgid "NRG 7502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4994
-msgid "NRG 7505"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4995
-msgid "NRG 7508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4996
-msgid "NRG 9005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4997
-msgid "NRG 9008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4998
-msgid "NRG 9002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:7177
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:7178
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5001
+#: src/xml/xmli18n-tmp.h:7179
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:7180
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:7181
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:7182
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:7183
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5006
+#: src/xml/xmli18n-tmp.h:7184
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:7185
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:7186
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5009
+#: src/xml/xmli18n-tmp.h:7187
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:7188
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:7189
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:7190
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:7191
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:7192
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5015
+#: src/xml/xmli18n-tmp.h:7193
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5016
+#: src/xml/xmli18n-tmp.h:7194
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5017
+#: src/xml/xmli18n-tmp.h:7195
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:7196
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:7197
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:7198
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:7199
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:7200
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:7201
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:7202
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5025
+#: src/xml/xmli18n-tmp.h:7203
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:7204
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:7205
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5028
+#: src/xml/xmli18n-tmp.h:7206
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:7207
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:7208
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:7209
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:7210
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5033
+#: src/xml/xmli18n-tmp.h:7211
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:7212
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:7213
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:7214
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:7215
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:7216
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:7217
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5040
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5051
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5053
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:7234
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:7235
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5060
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5062
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5063
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:7242
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:7243
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:7244
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:7245
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:7246
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:7247
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:7248
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:7249
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5072
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5074
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5075
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5076
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:7255
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:7258
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5081
+#: src/xml/xmli18n-tmp.h:7259
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:7263
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5086
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5088
+#: src/xml/xmli18n-tmp.h:7266
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:7267
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5090
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5091
+#: src/xml/xmli18n-tmp.h:7269
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:7270
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5093
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5099
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5103
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5104
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:7284
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5107
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5108
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5110
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5118
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5120
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5126
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5127
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5131
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5133
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5134
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5138
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5146
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5147
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5150
-msgid "Savin 2535"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5151
-msgid "Savin 2235"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5152
-msgid "Savin 2545"
+#: src/xml/xmli18n-tmp.h:7328
+msgid "Savin 2535/2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5153
-msgid "Savin 2245"
+#: src/xml/xmli18n-tmp.h:7329
+msgid "Savin 2545/2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5154
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Savin 2560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5155
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5158
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5160
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5163
-msgid "Savin 4035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5164
-msgid "Savin 4135g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5165
-msgid "Savin 4035e"
+#: src/xml/xmli18n-tmp.h:7339
+msgid "Savin 4035/4135g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5166
-msgid "Savin 4135eG"
+#: src/xml/xmli18n-tmp.h:7340
+msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5167
-msgid "Savin 4045"
+#: src/xml/xmli18n-tmp.h:7341
+msgid "Savin 4045/4145g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5168
-msgid "Savin 4145g"
+#: src/xml/xmli18n-tmp.h:7342
+msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5169
-msgid "Savin 4045e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5170
-msgid "Savin 4145eG"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5171
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Savin 4060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5173
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5174
+#: src/xml/xmli18n-tmp.h:7346
 msgid "Savin 4090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:7348
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5177
+#: src/xml/xmli18n-tmp.h:7349
 msgid "Savin 8020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:7353
 msgid "Savin 8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5183
-msgid "Savin 8035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5184
-msgid "Savin 8035g"
+#: src/xml/xmli18n-tmp.h:7355
+msgid "Savin 8035/8035g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5186
-msgid "Savin 8045"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5187
-msgid "Savin 8045g"
+#: src/xml/xmli18n-tmp.h:7357
+msgid "Savin 8045/8045g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5190
+#: src/xml/xmli18n-tmp.h:7360
 msgid "Savin 8065"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5192
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Savin 8090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5194
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:7370
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5201
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:7373
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:7374
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5205
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5206
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:7379
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5211
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Configurar a Impressora"
 
-#: src/xml/xmli18n-tmp.h:5212
+#: src/xml/xmli18n-tmp.h:7382
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5213
+#: src/xml/xmli18n-tmp.h:7383
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5216
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5221
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5224
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5225
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5227
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5230
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:7404
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5236
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:7409
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:7410
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5244
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5247
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5249
+#: src/xml/xmli18n-tmp.h:7419
+msgid "Canon SELPHY-CP-520"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Canon SELPHY-CP-720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5252
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Canon SELPHY-CP-730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Canon SELPHY-CP-740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Canon SELPHY-CP-750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Canon SELPHY ES1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Canon SELPHY ES2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Canon SELPHY ES20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5258
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5259
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:7434
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:7438
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5268
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Dai Nippon Printing DS40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Dai Nippon Printing DS80"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5269
+#: src/xml/xmli18n-tmp.h:7442
 msgid "RAW DATA 8 bit"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Epson Stylus Offixe TX300F"
+#~ msgstr "Stylus c20sx"
+
 #~ msgid "ISOLatin1"
 #~ msgstr "ISOLatin1"
 
diff --git a/po/ru.gmo b/po/ru.gmo
new file mode 100644
index 0000000..3ce1759
--- /dev/null
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
new file mode 100644
index 0000000..2e5c8dd
--- /dev/null
+++ b/po/ru.po
@@ -0,0 +1,12904 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2009 Robert L. Krawitz (rlk@alum.mit.edu) and Mike Sweet (mike@easysw.com)
+# This file is distributed under the same license as the gutenprint package.
+# Alexandre Prokoudine <alexandre.prokoudine@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gutenprint 5.2.3.99.1\n"
+"Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2009-07-26 19:14-0400\n"
+"PO-Revision-Date: 2009-06-18 07:20+0300\n"
+"Last-Translator: Alexandre Prokoudine <alexandre.prokoudine@gmail.com>\n"
+"Language-Team: Russian <gnu@mx.ru>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\\n\n"
+"X-Poedit-Language: Russian\n"
+"X-Poedit-Country: RUSSIAN FEDERATION\n"
+
+#. TRANSLATORS: "EvenTone" is the proper name, rather than a
+#. descriptive name, of this algorithm.
+#: src/main/dither-main.c:46 src/main/print-color.c:49
+#: src/main/print-escp2.c:2314 src/main/print-pcl.c:1779
+msgid "Default"
+msgstr "По умолчанию"
+
+#: src/main/dither-main.c:47
+msgid "EvenTone"
+msgstr "EvenTone"
+
+#: src/main/dither-main.c:48
+msgid "Hybrid EvenTone"
+msgstr "Гибридный EvenTone"
+
+#. TRANSLATORS: EvenTone, EvenBetter, and UniTone are proper
+#. * names, not descriptive.
+#.
+#: src/main/dither-main.c:53
+msgid "EvenBetter"
+msgstr "EvenBetter"
+
+#: src/main/dither-main.c:54
+msgid "Hybrid EvenBetter"
+msgstr "Гибридный EvenBetter"
+
+#: src/main/dither-main.c:60
+msgid "UniTone"
+msgstr "UniTone"
+
+#: src/main/dither-main.c:61
+msgid "Hybrid UniTone"
+msgstr "Гибридный UniTone"
+
+#: src/main/dither-main.c:63
+msgid "Adaptive Hybrid"
+msgstr "�даптивный гибридный"
+
+#: src/main/dither-main.c:64
+msgid "Ordered"
+msgstr "Упор�доченный"
+
+#: src/main/dither-main.c:65
+#, fuzzy
+msgid "Ordered New"
+msgstr "Упор�доченный"
+
+#: src/main/dither-main.c:66
+msgid "Fast"
+msgstr "Бы�трый"
+
+#: src/main/dither-main.c:67
+msgid "Very Fast"
+msgstr "Очень бы�трый"
+
+#: src/main/dither-main.c:68
+msgid "Hybrid Floyd-Steinberg"
+msgstr "Гибридный Флойда-Штейнберга"
+
+#: src/main/dither-main.c:69
+msgid "Predithered Input"
+msgstr ""
+
+#: src/main/dither-main.c:70
+msgid "Drop Size Segmented"
+msgstr ""
+
+#: src/main/dither-main.c:71
+msgid "Drop Size Segmented New"
+msgstr ""
+
+#: src/main/dither-main.c:91 src/main/print-color.c:56
+msgid "Density"
+msgstr "Плотно�ть"
+
+#: src/main/dither-main.c:91 src/main/print-canon.c:300
+#: src/main/print-canon.c:308 src/main/print-canon.c:316
+#: src/main/print-canon.c:324 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: 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-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:1935
+#: src/main/print-olympus.c:1943 src/main/print-olympus.c:1951
+#: src/main/print-olympus.c:1959 src/main/print-pcl.c:1324
+#: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
+#: src/main/print-pcl.c:1348
+msgid "Output Level Adjustment"
+msgstr "Коррекци� уровней на выводе"
+
+#: src/main/dither-main.c:92
+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 ""
+
+#: src/main/dither-main.c:100
+msgid "Dither Algorithm"
+msgstr "�лгоритм �глаживани� переходов"
+
+#: src/main/dither-main.c:100
+msgid "Screening Adjustment"
+msgstr ""
+
+#: src/main/dither-main.c:101
+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 ""
+
+#: src/main/module.c:52
+msgid "Miscellaneous (unclassified)"
+msgstr ""
+
+#: src/main/module.c:53
+msgid "Family driver"
+msgstr ""
+
+#: src/main/module.c:54
+msgid "Color conversion module"
+msgstr "Модуль преобразовани� цвета"
+
+#: src/main/module.c:55
+msgid "Dither algorithm"
+msgstr "�лгоритм �глаживани� переходов"
+
+#: src/main/print-canon.c:199 src/main/print-escp2.c:165
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1866
+#: src/main/print-pcl.c:1253 src/main/print-ps.c:74
+msgid "Page Size"
+msgstr "Формат �траницы"
+
+#: src/main/print-canon.c:199 src/main/print-canon.c:205
+#: src/main/print-canon.c:211 src/main/print-canon.c:217
+#: src/main/print-canon.c:223 src/main/print-canon.c:229
+#: src/main/print-canon.c:247 src/main/print-canon.c:271
+#: src/main/print-escp2.c:165 src/main/print-escp2.c:171
+#: 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:201 src/main/print-escp2.c:219
+#: src/main/print-escp2.c:236 src/main/print-escp2.c:242
+#: src/main/print-escp2.c:254 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:1866 src/main/print-olympus.c:1872
+#: src/main/print-olympus.c:1878 src/main/print-olympus.c:1884
+#: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
+#: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
+#: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
+#: src/main/print-ps.c:80
+msgid "Basic Printer Setup"
+msgstr "О�новные параметры принтера"
+
+#: src/main/print-canon.c:200 src/main/print-escp2.c:166
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1867
+#: src/main/print-pcl.c:1254 src/main/print-ps.c:75
+msgid "Size of the paper being printed to"
+msgstr ""
+
+#: src/main/print-canon.c:205 src/main/print-escp2.c:171
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1872
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1372 src/cups/genppd.c:2035
+msgid "Media Type"
+msgstr "Тип но�ител�"
+
+#: src/main/print-canon.c:206 src/main/print-escp2.c:172
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1873
+#: src/main/print-pcl.c:1260
+msgid "Type of media (plain paper, photo paper, etc.)"
+msgstr ""
+
+#: src/main/print-canon.c:211 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1878
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1401 src/cups/genppd.c:2054
+msgid "Media Source"
+msgstr "И�точник но�ител�"
+
+#: src/main/print-canon.c:212 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1879
+#: src/main/print-pcl.c:1266
+msgid "Source (input slot) of the media"
+msgstr ""
+
+#: src/main/print-canon.c:217 src/main/print-escp2.c:189
+msgid "CD Hub Size"
+msgstr "Внутренний диаметр CD"
+
+#: src/main/print-canon.c:218 src/main/print-escp2.c:190
+msgid "Print only outside of the hub of the CD, or all the way to the hole"
+msgstr ""
+
+#: src/main/print-canon.c:223 src/main/print-escp2.c:195
+msgid "CD Size (Custom)"
+msgstr "Внешний диаметр CD (заказной)"
+
+#: src/main/print-canon.c:224 src/main/print-escp2.c:196
+msgid "Variable adjustment for the outer diameter of CD"
+msgstr ""
+
+#: src/main/print-canon.c:229 src/main/print-escp2.c:201
+msgid "CD Hub Size (Custom)"
+msgstr "Внутренний диаметр CD (заказной)"
+
+#: src/main/print-canon.c:230 src/main/print-escp2.c:202
+msgid "Variable adjustment to the inner hub of the CD"
+msgstr ""
+
+#: src/main/print-canon.c:235 src/main/print-escp2.c:207
+msgid "CD Horizontal Fine Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:235 src/main/print-canon.c:241
+#: src/main/print-canon.c:253 src/main/print-escp2.c:207
+#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1906
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
+msgid "Advanced Printer Setup"
+msgstr "Ра�ширенна� на�тройка принтера"
+
+#: src/main/print-canon.c:236 src/main/print-canon.c:242
+#: src/main/print-escp2.c:208 src/main/print-escp2.c:214
+msgid "Fine adjustment to horizontal position for CD printing"
+msgstr ""
+
+#: src/main/print-canon.c:241 src/main/print-escp2.c:213
+msgid "CD Vertical Fine Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:247 src/main/print-escp2.c:219
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1884
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1479 src/cups/genppd.c:2090
+msgid "Resolution"
+msgstr "Разрешение"
+
+#: src/main/print-canon.c:248 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1885
+msgid "Resolution and quality of the print"
+msgstr "Разрешение и каче�тво печати"
+
+#: src/main/print-canon.c:253 src/main/print-escp2.c:230
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
+#: src/main/print-pcl.c:1283 src/main/print-raw.c:80
+msgid "Ink Type"
+msgstr "Тип чернил"
+
+#: src/main/print-canon.c:254 src/main/print-escp2.c:231
+#: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
+#: src/main/print-olympus.c:1891 src/main/print-pcl.c:1284
+#: src/main/print-raw.c:81
+msgid "Type of ink in the printer"
+msgstr "Тип чернил принтера"
+
+#: src/main/print-canon.c:259 src/main/print-canon.c:260
+#: src/main/print-escp2.c:314 src/main/print-escp2.c:315
+#: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
+#: src/main/print-pcl.c:1289 src/main/print-pcl.c:1290
+msgid "Ink Channels"
+msgstr ""
+
+#: src/main/print-canon.c:259 src/main/print-escp2.c:107
+#: src/main/print-escp2.c:114 src/main/print-escp2.c:121
+#: 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-escp2.c:320 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:893 src/main/print-escp2.c:901
+#: src/main/print-escp2.c:909 src/main/print-escp2.c:925
+#: src/main/print-escp2.c:933 src/main/print-escp2.c:941
+#: src/main/print-escp2.c:949 src/main/print-escp2.c:957
+#: src/main/print-escp2.c:965 src/main/print-escp2.c:973
+#: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
+msgid "Advanced Printer Functionality"
+msgstr "Дополнительные функции принтера"
+
+#: src/main/print-canon.c:265 src/main/print-escp2.c:332
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1912
+#: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
+msgid "Printing Mode"
+msgstr "Режим печати"
+
+#: src/main/print-canon.c:265 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:332
+#: src/main/print-escp2.c:338 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1912 src/main/print-pcl.c:1295
+#: src/main/print-ps.c:86 src/main/print-raw.c:86
+msgid "Core Parameter"
+msgstr ""
+
+#: src/main/print-canon.c:266 src/main/print-escp2.c:333
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1913
+#: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
+msgid "Printing Output Mode"
+msgstr ""
+
+#: src/main/print-canon.c:271 src/main/print-escp2.c:183
+#: src/main/print-pcl.c:1301
+msgid "Double-Sided Printing"
+msgstr "Двух�торонн�� печать"
+
+#: src/main/print-canon.c:272 src/main/print-escp2.c:184
+#: src/main/print-pcl.c:1302
+msgid "Duplex/Tumble Setting"
+msgstr ""
+
+#: src/main/print-canon.c:277 src/main/print-canon.c:278
+#: src/main/print-escp2.c:159 src/main/print-escp2.c:160
+#: src/main/print-pcl.c:1271 src/main/print-pcl.c:1272
+#: src/main/generic-options.c:62 src/main/generic-options.c:63
+msgid "Print Quality"
+msgstr "Каче�тво печати"
+
+#: src/main/print-canon.c:277 src/main/print-escp2.c:147
+#: src/main/print-escp2.c:159 src/main/print-pcl.c:1271
+#: src/main/generic-options.c:62
+msgid "Basic Output Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:300 src/main/print-escp2.c:445
+#: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
+msgid "Cyan Density"
+msgstr "Плотно�ть голубого"
+
+#: src/main/print-canon.c:301 src/main/print-escp2.c:446
+#: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
+msgid "Adjust the cyan density"
+msgstr "Изменить плотно�ть голубого"
+
+#: src/main/print-canon.c:308 src/main/print-escp2.c:453
+#: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
+msgid "Magenta Density"
+msgstr "Плотно�ть пурпурного"
+
+#: src/main/print-canon.c:309 src/main/print-escp2.c:454
+#: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
+msgid "Adjust the magenta density"
+msgstr "Изменить плотно�ть пурпурного"
+
+#: src/main/print-canon.c:316 src/main/print-escp2.c:461
+#: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
+msgid "Yellow Density"
+msgstr "Плотно�ть желтого"
+
+#: src/main/print-canon.c:317 src/main/print-escp2.c:462
+#: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
+msgid "Adjust the yellow density"
+msgstr "Изменить плотно�ть желтого"
+
+#: src/main/print-canon.c:324 src/main/print-escp2.c:469
+#: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
+msgid "Black Density"
+msgstr "Плотно�ть черного"
+
+#: src/main/print-canon.c:325 src/main/print-escp2.c:470
+#: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
+msgid "Adjust the black density"
+msgstr "Изменить плотно�ть черного"
+
+#: src/main/print-canon.c:332 src/main/print-canon.c:333
+#: src/main/print-escp2.c:541 src/main/print-escp2.c:542
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
+msgid "Light Cyan Transition"
+msgstr ""
+
+#: src/main/print-canon.c:332 src/main/print-canon.c:340
+#: src/main/print-canon.c:348 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:541
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:557
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:573
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:589
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:605
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:621
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:637
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:653
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:669
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:685
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:701
+#: src/main/print-escp2.c:709 src/main/print-escp2.c:717
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:733
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:749
+#: src/main/print-escp2.c:757 src/main/print-escp2.c:765
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:781
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:797
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:813
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:829
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:845
+#: src/main/print-escp2.c:853 src/main/print-escp2.c:861
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1364
+msgid "Advanced Ink Adjustment"
+msgstr ""
+
+#: src/main/print-canon.c:340 src/main/print-canon.c:341
+#: src/main/print-escp2.c:573 src/main/print-escp2.c:574
+#: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
+#: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
+msgid "Light Magenta Transition"
+msgstr ""
+
+#: src/main/print-canon.c:348 src/main/print-canon.c:349
+msgid "Light Yellow Transition"
+msgstr ""
+
+#: src/main/print-canon.c:368 src/main/print-escp2.c:2488
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5851 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5864
+msgid "Off"
+msgstr "Выкл"
+
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2490
+#: src/main/print-pcl.c:1591
+msgid "Long Edge (Standard)"
+msgstr ""
+
+#: src/main/print-canon.c:370 src/main/print-pcl.c:1592
+msgid "Short Edge (Flip)"
+msgstr ""
+
+#: src/main/print-canon.c:646 src/main/print-escp2.c:2210
+#: src/xml/xmli18n-tmp.h:5913
+msgid "CD - 5 inch"
+msgstr "CD - 5 дюймов"
+
+#: src/main/print-canon.c:648 src/main/print-escp2.c:2212
+#: src/xml/xmli18n-tmp.h:5914
+msgid "CD - 3 inch"
+msgstr "CD - 3 дюйма"
+
+#: src/main/print-canon.c:650 src/main/print-escp2.c:2214
+#: src/xml/xmli18n-tmp.h:5915
+msgid "CD - Custom"
+msgstr ""
+
+#: src/main/print-canon.c:673 src/main/print-escp2.c:2239
+#: src/cups/genppd.c:1356 src/cups/genppd.c:1605 src/cups/genppd.c:2022
+#: src/cups/genppd.c:2113
+msgid "Normal"
+msgstr ""
+
+#: src/main/print-canon.c:675 src/main/print-escp2.c:2241
+msgid "Print To Hub"
+msgstr ""
+
+#: src/main/print-canon.c:790 src/main/print-escp2.c:2652
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2167
+#: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
+#: src/gutenprintui2/panel.c:291
+msgid "Color"
+msgstr "Цвет"
+
+#: src/main/print-canon.c:792 src/main/print-escp2.c:2654
+#: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
+#: src/main/print-ps.c:331 src/main/print-raw.c:137
+msgid "Black and White"
+msgstr ""
+
+#: src/main/print-canon.c:831 src/main/print-escp2.c:2294
+#: src/main/print-pcl.c:1797 src/main/generic-options.c:213
+#: src/main/generic-options.c:230
+msgid "Manual Control"
+msgstr "Ручной контроль"
+
+#: src/main/print-canon.c:833 src/main/print-escp2.c:2336
+#: src/main/print-escp2.c:2434 src/main/print-escp2.c:2446
+#: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
+#: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
+#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1627 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3713 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3722 src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5902
+msgid "Standard"
+msgstr "Как обычно"
+
+#: src/main/print-color.c:50
+msgid "High Accuracy"
+msgstr "Вы�ока� точно�ть"
+
+#: src/main/print-color.c:51
+msgid "Bright Colors"
+msgstr "Яркие цвета"
+
+#: src/main/print-color.c:52
+msgid "Correct Hue Only"
+msgstr "Корректировать только тон"
+
+#: src/main/print-color.c:53
+msgid "Uncorrected"
+msgstr "Без коррекции"
+
+#: src/main/print-color.c:54
+msgid "Desaturated"
+msgstr "Обе�цвечивание"
+
+#: src/main/print-color.c:55
+msgid "Threshold"
+msgstr "Порог"
+
+#: src/main/print-color.c:57 src/main/print-color.c:133
+msgid "Raw"
+msgstr "Как е�ть"
+
+#: src/main/print-color.c:58
+msgid "Pre-Dithered"
+msgstr ""
+
+#: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
+#: src/cups/genppd.c:1301 src/cups/genppd.c:2005
+msgid "Grayscale"
+msgstr "Градации �ерого"
+
+#: src/main/print-color.c:123
+msgid "Whitescale"
+msgstr ""
+
+#: 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 src/cups/genppd.c:1332 src/cups/genppd.c:2012
+msgid "CMYK"
+msgstr "CMYK"
+
+#: src/main/print-color.c:131 src/cups/genppd.c:1339 src/cups/genppd.c:2013
+msgid "KCMY"
+msgstr "KCMY"
+
+#: src/main/print-color.c:165 src/main/print-color.c:454
+msgid "Channel "
+msgstr "Канал"
+
+#: src/main/print-color.c:165 src/main/print-color.c:216
+#: src/main/print-color.c:248 src/main/print-color.c:258
+#: src/main/print-color.c:266 src/main/print-color.c:274
+#: 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 "Гамма"
+
+#: src/main/print-color.c:166
+msgid "Gamma for raw channel "
+msgstr "Гамма канала raw"
+
+#: src/main/print-color.c:176
+msgid "Color Correction"
+msgstr "Цветокоррекци�"
+
+#: 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 "Базова� цветокоррекци�"
+
+#: src/main/print-color.c:177
+msgid "Color correction to be applied"
+msgstr "Примен�ема� цветокоррекци�"
+
+#: src/main/print-color.c:184
+msgid "Channel Bit Depth"
+msgstr "Разр�дов на канал"
+
+#: src/main/print-color.c:185
+msgid "Bit depth per channel"
+msgstr "Разр�дов на канал"
+
+#: src/main/print-color.c:192
+msgid "Input Image Type"
+msgstr "Тип изображени� на входе"
+
+#: src/main/print-color.c:193
+msgid "Input image type"
+msgstr "Тип изображени� на входе"
+
+#: src/main/print-color.c:200
+msgid "Output Image Type"
+msgstr "Тип изображени� на выходе"
+
+#: src/main/print-color.c:201
+msgid "Output image type"
+msgstr "Тип изображени� на выходе"
+
+#: src/main/print-color.c:208 src/main/print-color.c:209
+#: src/main/print-escp2.c:338
+msgid "Raw Channels"
+msgstr "Каналы Raw"
+
+#: src/main/print-color.c:216
+msgid "SimpleGamma"
+msgstr ""
+
+#: src/main/print-color.c:217
+msgid "Do not correct for screen gamma"
+msgstr ""
+
+#: src/main/print-color.c:224
+msgid "Brightness"
+msgstr "Ярко�ть"
+
+#: src/main/print-color.c:225
+msgid "Brightness of the print"
+msgstr "Ярко�ть отпечатка"
+
+#: src/main/print-color.c:232
+msgid "Contrast"
+msgstr "Контра�т"
+
+#: src/main/print-color.c:233
+msgid "Contrast of the print (0 is solid gray)"
+msgstr "Контра�тно�ть отпечатка (0 = ровный �ерый)"
+
+#: src/main/print-color.c:240
+msgid "Linear Contrast Adjustment"
+msgstr "Линейна� коррекци� контра�та"
+
+#: src/main/print-color.c:240
+msgid "Advanced Image Control"
+msgstr "Ра�ширенный контроль над изображением"
+
+#: src/main/print-color.c:241
+msgid "Use linear vs. fixed end point contrast adjustment"
+msgstr ""
+
+#: src/main/print-color.c:248
+msgid "Composite Gamma"
+msgstr "Со�тавна� гамма"
+
+#: 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 ""
+
+#: src/main/print-color.c:258
+msgid "AppGamma"
+msgstr ""
+
+#: src/main/print-color.c:259
+msgid "Gamma value assumed by application"
+msgstr ""
+
+#: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
+#: src/escputil/escputil.c:997 src/escputil/escputil.c:1017
+#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2387
+#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2413
+#: src/xml/xmli18n-tmp.h:2426 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2499
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2551
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2575
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2708
+#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2786
+#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2814
+#: src/xml/xmli18n-tmp.h:2829 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2893
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2966
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3005 src/xml/xmli18n-tmp.h:3020
+#: src/xml/xmli18n-tmp.h:3033 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3061 src/xml/xmli18n-tmp.h:3073
+#: src/xml/xmli18n-tmp.h:3085 src/xml/xmli18n-tmp.h:3098
+#: src/xml/xmli18n-tmp.h:3110 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3377
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3616
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3648
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3766 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3775 src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:3794 src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:3805 src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3869 src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:3880 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3902 src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:3913 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:3948 src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:3970 src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:3983 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4023 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4064 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4075 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4088 src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:4103 src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:4118 src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:4143 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:4203 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4275 src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4309 src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4356 src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4421
+#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4449
+#: src/xml/xmli18n-tmp.h:4456 src/xml/xmli18n-tmp.h:4462
+#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4485 src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:4551 src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:4694 src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4717 src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:4818 src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:4829 src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4885 src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4935
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:5041 src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:5052 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:5121 src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5165
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5182 src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:5193 src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:5271 src/xml/xmli18n-tmp.h:5299
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5327 src/xml/xmli18n-tmp.h:5331
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5347
+#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5367 src/xml/xmli18n-tmp.h:5371
+#: src/xml/xmli18n-tmp.h:5383 src/xml/xmli18n-tmp.h:5388
+#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5440
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5461 src/xml/xmli18n-tmp.h:5468
+#: src/xml/xmli18n-tmp.h:5476 src/xml/xmli18n-tmp.h:5486
+#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5514
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5525
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5543
+#: src/xml/xmli18n-tmp.h:5550 src/xml/xmli18n-tmp.h:5556
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5574 src/xml/xmli18n-tmp.h:5582
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5592
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5625
+#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5649
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5662
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5690
+#: src/xml/xmli18n-tmp.h:5694 src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5731
+#: src/xml/xmli18n-tmp.h:5738 src/xml/xmli18n-tmp.h:5742
+#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5759
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5770
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5807
+#: src/xml/xmli18n-tmp.h:5811 src/xml/xmli18n-tmp.h:5817
+#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5828
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5843
+msgid "Cyan"
+msgstr "Голубой (C)"
+
+#: src/main/print-color.c:267
+msgid "Adjust the cyan gamma"
+msgstr ""
+
+#: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
+#: src/escputil/escputil.c:998 src/escputil/escputil.c:1018
+#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2361
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2388
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2414
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2459 src/xml/xmli18n-tmp.h:2474
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2512 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2552
+#: src/xml/xmli18n-tmp.h:2564 src/xml/xmli18n-tmp.h:2576
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2787
+#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2815
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2868
+#: src/xml/xmli18n-tmp.h:2881 src/xml/xmli18n-tmp.h:2894
+#: src/xml/xmli18n-tmp.h:2905 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:2967
+#: src/xml/xmli18n-tmp.h:2979 src/xml/xmli18n-tmp.h:2991
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3062 src/xml/xmli18n-tmp.h:3074
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3099
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3135 src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:3163 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3353
+#: src/xml/xmli18n-tmp.h:3365 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
+#: src/xml/xmli18n-tmp.h:3420 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3542 src/xml/xmli18n-tmp.h:3556
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3600 src/xml/xmli18n-tmp.h:3617
+#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3647
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3751 src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:3784 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3795 src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:3806 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3837 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3903 src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3939 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3960 src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:3972 src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:3984 src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:3999 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:4039 src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:4104 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:4170 src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4194 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:4230 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:4276 src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4311 src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4338 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:4401 src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:4427 src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:4442 src/xml/xmli18n-tmp.h:4451
+#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4464
+#: src/xml/xmli18n-tmp.h:4470 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4486 src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:4511 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:4809 src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4909 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:5007 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5018 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5111 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5123 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5148 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:5240 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5250 src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:5261 src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5301
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5313
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5349
+#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5401
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5441
+#: src/xml/xmli18n-tmp.h:5453 src/xml/xmli18n-tmp.h:5458
+#: src/xml/xmli18n-tmp.h:5463 src/xml/xmli18n-tmp.h:5470
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5496 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5527
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5552 src/xml/xmli18n-tmp.h:5558
+#: src/xml/xmli18n-tmp.h:5564 src/xml/xmli18n-tmp.h:5568
+#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5593
+#: src/xml/xmli18n-tmp.h:5598 src/xml/xmli18n-tmp.h:5616
+#: src/xml/xmli18n-tmp.h:5620 src/xml/xmli18n-tmp.h:5626
+#: src/xml/xmli18n-tmp.h:5631 src/xml/xmli18n-tmp.h:5651
+#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
+#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5674
+#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5720
+#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5733
+#: src/xml/xmli18n-tmp.h:5739 src/xml/xmli18n-tmp.h:5743
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5818
+#: src/xml/xmli18n-tmp.h:5823 src/xml/xmli18n-tmp.h:5829
+#: src/xml/xmli18n-tmp.h:5833 src/xml/xmli18n-tmp.h:5839
+#: src/xml/xmli18n-tmp.h:5844
+msgid "Magenta"
+msgstr "Пурпурный (M)"
+
+#: src/main/print-color.c:275
+msgid "Adjust the magenta gamma"
+msgstr ""
+
+#: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
+#: src/escputil/escputil.c:999 src/escputil/escputil.c:1019
+#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2389
+#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2444
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2475
+#: src/xml/xmli18n-tmp.h:2488 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2513 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2565 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2602
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2762
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2788
+#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2816
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2846
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2906 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3022
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3048
+#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3075
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3124
+#: src/xml/xmli18n-tmp.h:3136 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3175
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3315 src/xml/xmli18n-tmp.h:3329
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3433
+#: src/xml/xmli18n-tmp.h:3455 src/xml/xmli18n-tmp.h:3468
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3497
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3601 src/xml/xmli18n-tmp.h:3618
+#: src/xml/xmli18n-tmp.h:3632 src/xml/xmli18n-tmp.h:3643
+#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3747 src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3834 src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:3844 src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:3867 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:3900 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3910 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3935 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:3967 src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:3979 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4005 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4062 src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4110 src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:4124 src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4167 src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:4272 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:4321 src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:4334 src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4367 src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4471
+#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4505 src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4549 src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:4562 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4580 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4602 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:4678 src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:4691 src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4770 src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4893 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4904 src/xml/xmli18n-tmp.h:4911
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:4971 src/xml/xmli18n-tmp.h:4978
+#: src/xml/xmli18n-tmp.h:5004 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5050 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5071 src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:5097 src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:5142 src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:5169 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5184
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5257 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5318
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5358
+#: src/xml/xmli18n-tmp.h:5364 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5385
+#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5438
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5454
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5465
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5511
+#: src/xml/xmli18n-tmp.h:5516 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5547 src/xml/xmli18n-tmp.h:5554
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5584 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5617 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5632
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5687
+#: src/xml/xmli18n-tmp.h:5692 src/xml/xmli18n-tmp.h:5698
+#: src/xml/xmli18n-tmp.h:5705 src/xml/xmli18n-tmp.h:5713
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5729
+#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
+#: src/xml/xmli18n-tmp.h:5744 src/xml/xmli18n-tmp.h:5756
+#: src/xml/xmli18n-tmp.h:5761 src/xml/xmli18n-tmp.h:5767
+#: src/xml/xmli18n-tmp.h:5774 src/xml/xmli18n-tmp.h:5782
+#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5792
+#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5803
+#: src/xml/xmli18n-tmp.h:5809 src/xml/xmli18n-tmp.h:5813
+#: src/xml/xmli18n-tmp.h:5819 src/xml/xmli18n-tmp.h:5824
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5845
+msgid "Yellow"
+msgstr "Желтый (Y)"
+
+#: src/main/print-color.c:283
+msgid "Adjust the yellow gamma"
+msgstr ""
+
+#: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
+#: src/escputil/escputil.c:1006 src/escputil/escputil.c:1025
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:4041 src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:4056 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4091 src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:4155 src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5155
+msgid "Red"
+msgstr "Кра�ный (R)"
+
+#: src/main/print-color.c:291
+msgid "Adjust the red gamma"
+msgstr ""
+
+#: src/main/print-color.c:298 src/gutenprintui2/panel.c:2390
+msgid "Green"
+msgstr "Зеленый (G)"
+
+#: src/main/print-color.c:299
+msgid "Adjust the green gamma"
+msgstr ""
+
+#: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
+#: src/escputil/escputil.c:1007 src/escputil/escputil.c:1026
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4051 src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:4084 src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:5156
+msgid "Blue"
+msgstr "Синий (B)"
+
+#: src/main/print-color.c:307
+msgid "Adjust the blue gamma"
+msgstr ""
+
+#: src/main/print-color.c:314 src/main/print-lexmark.c:613
+#: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:994
+#: src/escputil/escputil.c:1016 src/escputil/escputil.c:1285
+#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2372
+#: src/xml/xmli18n-tmp.h:2386 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2457
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2510
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2536
+#: src/xml/xmli18n-tmp.h:2550 src/xml/xmli18n-tmp.h:2562
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2599 src/xml/xmli18n-tmp.h:2614
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2639
+#: src/xml/xmli18n-tmp.h:2653 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2965
+#: src/xml/xmli18n-tmp.h:2977 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3019
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3060 src/xml/xmli18n-tmp.h:3072
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3133 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3196
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3526
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3680 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3755 src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:3804 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3819 src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:3831 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3846 src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3873 src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:3924 src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:3943 src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:4022 src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4059 src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:4142 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4164 src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:4179 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:4255 src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4289 src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:4308 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4413 src/xml/xmli18n-tmp.h:4420
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4455
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4507 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:4565 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:4604 src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:4702 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:4733 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:4786 src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4920 src/xml/xmli18n-tmp.h:4926
+#: src/xml/xmli18n-tmp.h:4934 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:4973 src/xml/xmli18n-tmp.h:4981
+#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:4993
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:5047 src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5151
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5186
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5223 src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5270
+#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5284
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5320
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5337
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5375
+#: src/xml/xmli18n-tmp.h:5378 src/xml/xmli18n-tmp.h:5380
+#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5435
+#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5447
+#: src/xml/xmli18n-tmp.h:5449 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5474
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5492
+#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5571
+#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5590
+#: src/xml/xmli18n-tmp.h:5596 src/xml/xmli18n-tmp.h:5602
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5614
+#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5629
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5655
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5680 src/xml/xmli18n-tmp.h:5682
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5700
+#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5716
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5749
+#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5769 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5794
+#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5806
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5836
+#: src/xml/xmli18n-tmp.h:5842
+msgid "Black"
+msgstr "Черный (K)"
+
+#: src/main/print-color.c:315
+msgid "Adjust the black gamma"
+msgstr ""
+
+#: src/main/print-color.c:322 src/main/print-olympus.c:1935
+msgid "Cyan Balance"
+msgstr "Балан� голубого"
+
+#: src/main/print-color.c:322 src/main/print-color.c:330
+#: src/main/print-color.c:338
+msgid "GrayBalance"
+msgstr "Балан� �ерого"
+
+#: src/main/print-color.c:323
+msgid "Adjust the cyan gray balance"
+msgstr ""
+
+#: src/main/print-color.c:330 src/main/print-olympus.c:1943
+msgid "Magenta Balance"
+msgstr "Балан� пурпурного"
+
+#: src/main/print-color.c:331
+msgid "Adjust the magenta gray balance"
+msgstr ""
+
+#: src/main/print-color.c:338 src/main/print-olympus.c:1951
+msgid "Yellow Balance"
+msgstr "Балан� желтого"
+
+#: src/main/print-color.c:339
+msgid "Adjust the yellow gray balance"
+msgstr ""
+
+#: src/main/print-color.c:346
+msgid "Saturation"
+msgstr "�а�ыщенно�ть"
+
+#: src/main/print-color.c:347
+msgid ""
+"Adjust the saturation (color balance) of the print\n"
+"Use zero saturation to produce grayscale output using color and black inks"
+msgstr ""
+
+#: src/main/print-color.c:357
+msgid "Ink Limit"
+msgstr "Предел чернил"
+
+#: src/main/print-color.c:357 src/main/print-color.c:365
+#: src/main/print-color.c:373 src/main/print-color.c:381
+#: src/main/print-color.c:421 src/main/print-color.c:553
+#: src/main/print-escp2.c:344 src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356 src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368 src/main/print-escp2.c:374
+#: src/main/print-escp2.c:869 src/main/print-escp2.c:877
+#: src/main/print-escp2.c:885
+msgid "Advanced Output Control"
+msgstr "Ра�ширенный контроль над выводом"
+
+#: src/main/print-color.c:358
+msgid "Limit the total ink printed to the page"
+msgstr ""
+
+#: src/main/print-color.c:365 src/main/print-escp2.c:869
+msgid "GCR Transition"
+msgstr ""
+
+#: src/main/print-color.c:366 src/main/print-escp2.c:870
+msgid "Adjust the gray component transition rate"
+msgstr ""
+
+#: src/main/print-color.c:373 src/main/print-escp2.c:877
+msgid "GCR Lower Bound"
+msgstr ""
+
+#: src/main/print-color.c:374 src/main/print-escp2.c:878
+msgid "Lower bound of gray component reduction"
+msgstr ""
+
+#: src/main/print-color.c:381 src/main/print-escp2.c:885
+msgid "GCR Upper Bound"
+msgstr ""
+
+#: src/main/print-color.c:382 src/main/print-escp2.c:886
+msgid "Upper bound of gray component reduction"
+msgstr ""
+
+#: src/main/print-color.c:421
+msgid "LUT dump file"
+msgstr ""
+
+#: src/main/print-color.c:422
+msgid "Dump file for LUT for external color adjustment"
+msgstr ""
+
+#: src/main/print-color.c:455 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
+#: src/main/print-color.c:521
+msgid "Output Curves"
+msgstr "Кривые на выходе"
+
+#: src/main/print-color.c:455
+msgid "Curve for raw channel "
+msgstr "Крива� канала raw"
+
+#: src/main/print-color.c:465
+msgid "Cyan Curve"
+msgstr "Крива� Cyan"
+
+#: src/main/print-color.c:466
+msgid "Cyan curve"
+msgstr "Крива� Cyan"
+
+#: src/main/print-color.c:473
+msgid "Magenta Curve"
+msgstr "Крива� Magenta"
+
+#: src/main/print-color.c:474
+msgid "Magenta curve"
+msgstr "Крива� Magenta"
+
+#: src/main/print-color.c:481
+msgid "Yellow Curve"
+msgstr "Крива� Yellow"
+
+#: src/main/print-color.c:482
+msgid "Yellow curve"
+msgstr "Крива� Yellow"
+
+#: src/main/print-color.c:489
+msgid "Black Curve"
+msgstr "Крива� Black"
+
+#: src/main/print-color.c:490
+msgid "Black curve"
+msgstr "Крива� Black"
+
+#: src/main/print-color.c:497
+msgid "Red Curve"
+msgstr ""
+
+#: src/main/print-color.c:498
+msgid "Red curve"
+msgstr ""
+
+#: src/main/print-color.c:505
+msgid "Green Curve"
+msgstr ""
+
+#: src/main/print-color.c:506
+msgid "Green curve"
+msgstr ""
+
+#: src/main/print-color.c:513
+msgid "Blue Curve"
+msgstr ""
+
+#: src/main/print-color.c:514
+msgid "Blue curve"
+msgstr ""
+
+#: src/main/print-color.c:521
+msgid "White Curve"
+msgstr ""
+
+#: src/main/print-color.c:522
+msgid "White curve"
+msgstr ""
+
+#: src/main/print-color.c:529
+msgid "Hue Map"
+msgstr ""
+
+#: src/main/print-color.c:529 src/main/print-color.c:537
+#: src/main/print-color.c:545
+msgid "Advanced HSL Curves"
+msgstr ""
+
+#: src/main/print-color.c:530
+msgid "Hue adjustment curve"
+msgstr "Крива� коррекции тона"
+
+#: src/main/print-color.c:537
+msgid "Saturation Map"
+msgstr ""
+
+#: src/main/print-color.c:538
+msgid "Saturation adjustment curve"
+msgstr "Крива� коррекции на�ыщенно�ти"
+
+#: src/main/print-color.c:545
+msgid "Luminosity Map"
+msgstr ""
+
+#: src/main/print-color.c:546
+msgid "Luminosity adjustment curve"
+msgstr ""
+
+#: src/main/print-color.c:553
+msgid "Gray Component Reduction"
+msgstr ""
+
+#: src/main/print-color.c:554
+msgid "Gray component reduction curve"
+msgstr ""
+
+#: src/main/print-color.c:1743
+msgid "Traditional Gutenprint color conversion"
+msgstr ""
+
+#: src/main/printers.c:549
+#, c-format
+msgid "Value must be set for %s\n"
+msgstr ""
+
+#: src/main/printers.c:562 src/main/printers.c:567
+#, c-format
+msgid "`%s' is not a valid %s\n"
+msgstr ""
+
+#: src/main/printers.c:586
+#, c-format
+msgid "%s must be between %f and %f (is %f)\n"
+msgstr ""
+
+#: src/main/printers.c:608 src/main/printers.c:632
+#, c-format
+msgid "%s must be between %d and %d (is %d)\n"
+msgstr ""
+
+#: src/main/printers.c:663
+#, c-format
+msgid "%s bounds must be between %f and %f\n"
+msgstr ""
+
+#: src/main/printers.c:671
+#, c-format
+msgid "%s wrap mode must be %s\n"
+msgstr ""
+
+#: src/main/printers.c:675
+msgid "no wrap"
+msgstr ""
+
+#: src/main/printers.c:675
+msgid "wrap around"
+msgstr ""
+
+#: src/main/printers.c:719
+#, c-format
+msgid "Unknown type parameter %s (%d)\n"
+msgstr ""
+
+#: src/main/printers.c:732 src/main/printers.c:743
+#, c-format
+msgid "%s out of range (value %d, min %d, max %d)\n"
+msgstr ""
+
+#: src/main/printers.c:803
+msgid "Page size is not valid\n"
+msgstr ""
+
+#: src/main/printers.c:824
+#, c-format
+msgid "Top margin must not be less than %d\n"
+msgstr ""
+
+#: src/main/printers.c:830
+#, c-format
+msgid "Left margin must not be less than %d\n"
+msgstr ""
+
+#: src/main/printers.c:836
+msgid "Height must be greater than zero\n"
+msgstr ""
+
+#: src/main/printers.c:842
+msgid "Width must be greater than zero\n"
+msgstr ""
+
+#: src/main/printers.c:848
+#, 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:855
+#, c-format
+msgid ""
+"Image is too long for the page: top margin is %d, height %d, bottom edge is %"
+"d\n"
+msgstr ""
+
+#: src/main/print-escp2.c:147
+msgid "Automatic Printing Mode"
+msgstr "Режим автоматиче�кой печати"
+
+#: src/main/print-escp2.c:148
+msgid "Automatic printing mode"
+msgstr "Режим автоматиче�кой печати"
+
+#: src/main/print-escp2.c:220 src/main/print-pcl.c:1278
+msgid "Resolution of the print"
+msgstr ""
+
+#: src/main/print-escp2.c:236
+msgid "Enhanced Gloss"
+msgstr ""
+
+#: src/main/print-escp2.c:237
+msgid "Add gloss enhancement"
+msgstr ""
+
+#: src/main/print-escp2.c:242
+msgid "Ink Set"
+msgstr "�абор чернил"
+
+#: src/main/print-escp2.c:248
+msgid "Printing Direction"
+msgstr "�аправление печати"
+
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:260
+msgid "Advanced Output Adjustment"
+msgstr "Ра�ширенна� коррекци� вывода"
+
+#: src/main/print-escp2.c:249
+msgid "Printing direction (unidirectional is higher quality, but slower)"
+msgstr ""
+
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1906
+msgid "Borderless"
+msgstr ""
+
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1907
+msgid "Print without borders"
+msgstr ""
+
+#: src/main/print-escp2.c:260
+msgid "Interleave Method"
+msgstr ""
+
+#: src/main/print-escp2.c:261
+msgid "Interleave pattern to use"
+msgstr ""
+
+#: src/main/print-escp2.c:266 src/main/print-escp2.c:267
+#: src/cups/genppd.c:1600 src/cups/genppd.c:2112
+msgid "Output Order"
+msgstr "Пор�док вывода"
+
+#: src/main/print-escp2.c:272 src/main/print-escp2.c:273
+msgid "Alignment Passes"
+msgstr ""
+
+#: src/main/print-escp2.c:278 src/main/print-escp2.c:279
+msgid "Alignment Choices"
+msgstr ""
+
+#: src/main/print-escp2.c:284 src/main/print-escp2.c:285
+msgid "Ink change command"
+msgstr ""
+
+#: src/main/print-escp2.c:290 src/main/print-escp2.c:291
+msgid "Alternate Alignment Passes"
+msgstr ""
+
+#: src/main/print-escp2.c:296 src/main/print-escp2.c:297
+msgid "Alternate Alignment Choices"
+msgstr ""
+
+#: src/main/print-escp2.c:302
+msgid "Supports Packet Mode"
+msgstr ""
+
+#: src/main/print-escp2.c:303
+msgid "Supports D4 Packet Mode"
+msgstr ""
+
+#: src/main/print-escp2.c:308
+msgid "Has Interchangeable Ink Cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:309
+msgid "Has multiple choices of ink cartridges"
+msgstr ""
+
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:321
+#, fuzzy
+msgid "Raw Channel Names"
+msgstr "Канал"
+
+#: src/main/print-escp2.c:326 src/main/print-escp2.c:327
+#, fuzzy
+msgid "Channel Names"
+msgstr "Канал"
+
+#: src/main/print-escp2.c:339
+msgid "Raw Channel Count"
+msgstr ""
+
+#: src/main/print-escp2.c:344
+msgid "Cyan Map"
+msgstr ""
+
+#: src/main/print-escp2.c:345
+msgid "Adjust the cyan map"
+msgstr ""
+
+#: src/main/print-escp2.c:350
+msgid "Magenta Map"
+msgstr ""
+
+#: src/main/print-escp2.c:351
+msgid "Adjust the magenta map"
+msgstr ""
+
+#: src/main/print-escp2.c:356
+msgid "Yellow Map"
+msgstr ""
+
+#: src/main/print-escp2.c:357
+msgid "Adjust the yellow map"
+msgstr ""
+
+#: src/main/print-escp2.c:362
+msgid "Blue Map"
+msgstr ""
+
+#: src/main/print-escp2.c:363
+msgid "Adjust the blue map"
+msgstr ""
+
+#: src/main/print-escp2.c:368
+msgid "Orange Map"
+msgstr ""
+
+#: src/main/print-escp2.c:369
+#, fuzzy
+msgid "Adjust the orange map"
+msgstr "Изменить плотно�ть пурпурного"
+
+#: src/main/print-escp2.c:374
+msgid "Red Map"
+msgstr ""
+
+#: src/main/print-escp2.c:375
+msgid "Adjust the red map"
+msgstr ""
+
+#: src/main/print-escp2.c:477
+msgid "Red Density"
+msgstr "Плотно�ть кра�ного"
+
+#: src/main/print-escp2.c:478
+msgid "Adjust the red density"
+msgstr ""
+
+#: src/main/print-escp2.c:485
+msgid "Blue Density"
+msgstr "Плотно�ть �инего"
+
+#: src/main/print-escp2.c:486
+msgid "Adjust the blue density"
+msgstr ""
+
+#: src/main/print-escp2.c:493
+#, fuzzy
+msgid "Orange Density"
+msgstr "Плотно�ть голубого"
+
+#: src/main/print-escp2.c:494
+#, fuzzy
+msgid "Adjust the orange density"
+msgstr "Изменить плотно�ть голубого"
+
+#: src/main/print-escp2.c:501
+msgid "Gloss Level"
+msgstr "Плотно�ть гл�нца"
+
+#: src/main/print-escp2.c:502
+msgid "Adjust the gloss level"
+msgstr ""
+
+#: src/main/print-escp2.c:509
+msgid "Drop Size Small"
+msgstr ""
+
+#: src/main/print-escp2.c:510
+#, fuzzy
+msgid "Drop Size 1 (small)"
+msgstr "Внешний диаметр CD (заказной)"
+
+#: src/main/print-escp2.c:517
+msgid "Drop Size Medium"
+msgstr ""
+
+#: src/main/print-escp2.c:518
+#, fuzzy
+msgid "Drop Size 2 (medium)"
+msgstr "Внешний диаметр CD (заказной)"
+
+#: src/main/print-escp2.c:525
+msgid "Drop Size Large"
+msgstr ""
+
+#: src/main/print-escp2.c:526
+msgid "Drop Size 3 (large)"
+msgstr ""
+
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:534
+msgid "Light Cyan Value"
+msgstr ""
+
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:550
+#, fuzzy
+msgid "Light Cyan Density Scale"
+msgstr "Плотно�ть голубого"
+
+#: src/main/print-escp2.c:557 src/main/print-escp2.c:558
+#, fuzzy
+msgid "Light Magenta Value"
+msgstr "Балан� пурпурного"
+
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:566
+#, fuzzy
+msgid "Light Magenta Density Scale"
+msgstr "Плотно�ть пурпурного"
+
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:582
+#, fuzzy
+msgid "Dark Yellow Value"
+msgstr "Балан� желтого"
+
+#: src/main/print-escp2.c:589 src/main/print-escp2.c:590
+msgid "Dark Yellow Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:598
+#, fuzzy
+msgid "Dark Yellow Density Scale"
+msgstr "Плотно�ть желтого"
+
+#: src/main/print-escp2.c:605 src/main/print-escp2.c:606
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:630
+#, fuzzy
+msgid "Gray Value"
+msgstr "Градации �ерого"
+
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:614
+#: src/main/print-escp2.c:637 src/main/print-escp2.c:638
+msgid "Gray Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:621 src/main/print-escp2.c:622
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:646
+#, fuzzy
+msgid "Gray Density Scale"
+msgstr "Градации �ерого"
+
+#: src/main/print-escp2.c:653 src/main/print-escp2.c:654
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:726
+msgid "Light Gray Value"
+msgstr ""
+
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:662
+#: src/main/print-escp2.c:733 src/main/print-escp2.c:734
+msgid "Light Gray Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:669 src/main/print-escp2.c:670
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:742
+msgid "Light Gray Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:678
+msgid "Dark Gray Value"
+msgstr ""
+
+#: src/main/print-escp2.c:685 src/main/print-escp2.c:686
+msgid "Dark Gray Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:694
+msgid "Dark Gray Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:701
+#, fuzzy
+msgid "Mid Gray Value"
+msgstr "Градации �ерого"
+
+#: src/main/print-escp2.c:702
+msgid "Medium Gray Value"
+msgstr ""
+
+#: src/main/print-escp2.c:709
+msgid "Mid Gray Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:710
+msgid "Medium Gray Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:717
+msgid "Mid Gray Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:718
+msgid "Medium Gray Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:749
+msgid "Hextone Gray 5 Value"
+msgstr ""
+
+#: src/main/print-escp2.c:750
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:757
+msgid "Hextone Gray 5 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:758
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:765
+msgid "Hextone Gray 5 Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:766
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:774
+msgid "Hextone Gray 4 Value"
+msgstr ""
+
+#: src/main/print-escp2.c:781 src/main/print-escp2.c:782
+msgid "Hextone Gray 4 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:790
+msgid "Hextone Gray 4 Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:797 src/main/print-escp2.c:798
+msgid "Hextone Gray 3 Value"
+msgstr ""
+
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:806
+msgid "Hextone Gray 3 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:813 src/main/print-escp2.c:814
+msgid "Hextone Gray 3 Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:822
+msgid "Hextone Gray 2 Value"
+msgstr ""
+
+#: src/main/print-escp2.c:829 src/main/print-escp2.c:830
+msgid "Hextone Gray 2 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:838
+msgid "Hextone Gray 2 Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:845
+msgid "Hextone Gray 1 Value"
+msgstr ""
+
+#: src/main/print-escp2.c:846
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:853
+msgid "Hextone Gray 1 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:854
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:861
+msgid "Hextone Gray 1 Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:862
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr ""
+
+#: src/main/print-escp2.c:893
+msgid "Drying Time Per Page"
+msgstr ""
+
+#: src/main/print-escp2.c:894
+msgid "Set drying time per page"
+msgstr ""
+
+#: src/main/print-escp2.c:901
+msgid "Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:902
+msgid "Set drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:909
+msgid "Minimum Drying Time Per Scan"
+msgstr ""
+
+#: src/main/print-escp2.c:910
+msgid "Set minimum drying time per scan"
+msgstr ""
+
+#: src/main/print-escp2.c:925
+msgid "Quality Enhancement"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Enhance print quality by additional passes"
+msgstr ""
+
+#: src/main/print-escp2.c:933
+msgid "Paper Thickness"
+msgstr ""
+
+#: src/main/print-escp2.c:934
+msgid "Set printer paper thickness"
+msgstr ""
+
+#: src/main/print-escp2.c:941
+#, fuzzy
+msgid "Vacuum Intensity"
+msgstr "Плотно�ть черного"
+
+#: src/main/print-escp2.c:942
+msgid "Set vacuum intensity (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:949
+msgid "Feed Sequence"
+msgstr ""
+
+#: src/main/print-escp2.c:950
+msgid "Set paper feed sequence (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:957
+#, fuzzy
+msgid "Print Method"
+msgstr "Режим печати"
+
+#: src/main/print-escp2.c:958
+msgid "Set print method (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:965
+#, fuzzy
+msgid "Platen Gap"
+msgstr "Обычна� бумага"
+
+#: src/main/print-escp2.c:966
+msgid "Set platen gap (printer-specific)"
+msgstr ""
+
+#: src/main/print-escp2.c:973
+#, fuzzy
+msgid "Feed Adjustment"
+msgstr "Коррекци� уровней на выводе"
+
+#: src/main/print-escp2.c:975
+#, no-c-format
+msgid "Set paper feed adjustment (0.01% units)"
+msgstr ""
+
+#: src/main/print-escp2.c:2197
+msgid "Full Manual Control"
+msgstr "Полно�тью ручной контроль"
+
+#: src/main/print-escp2.c:2199
+msgid "Automatic Setting Control"
+msgstr ""
+
+#: src/main/print-escp2.c:2413 src/cups/genppd.c:1517 src/cups/genppd.c:2093
+msgid "Automatic"
+msgstr "�втоматиче�ки"
+
+#: src/main/print-escp2.c:2415
+msgid "Bidirectional"
+msgstr "Двунаправленное"
+
+#: src/main/print-escp2.c:2417
+msgid "Unidirectional"
+msgstr "В�енаправленное"
+
+#: src/main/print-escp2.c:2448
+msgid "Alternate Fill"
+msgstr "Поочередна� заливка"
+
+#: src/main/print-escp2.c:2450
+msgid "Ascending Fill"
+msgstr "Во�ход�ща� заливка"
+
+#: src/main/print-escp2.c:2452
+msgid "Descending Fill"
+msgstr "�и�ход�ща� заливка"
+
+#: src/main/print-escp2.c:2454
+msgid "Ascending Double"
+msgstr ""
+
+#: src/main/print-escp2.c:2456
+msgid "Nearest Neighbor Avoidance"
+msgstr ""
+
+#: src/main/print-escp2.c:2492
+msgid "Short Edge(Flip)"
+msgstr ""
+
+#: src/main/print-escp2.c:3100
+#, c-format
+msgid "This printer does not support raw printer output at depth %d\n"
+msgstr ""
+
+#: src/main/print-escp2.c:4355 src/main/print-olympus.c:2641
+#: src/main/print-raw.c:218
+msgid "Print options not verified; cannot print.\n"
+msgstr ""
+
+#: src/main/print-lexmark.c:577 src/main/print-lexmark.c:653
+msgid "300 DPI x 600 DPI"
+msgstr "300 DPI × 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 "600dpi вы�окое каче�тво"
+
+#: src/main/print-lexmark.c:580 src/main/print-lexmark.c:656
+msgid "600 DPI Unidirectional"
+msgstr ""
+
+#: 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 "1200dpi вы�окое каче�тво"
+
+#: src/main/print-lexmark.c:583 src/main/print-lexmark.c:659
+msgid "1200 DPI highest quality"
+msgstr "1200dpi наивы�шее каче�тво"
+
+#: src/main/print-lexmark.c:584 src/main/print-lexmark.c:660
+msgid "1200 DPI  Unidirectional"
+msgstr ""
+
+#: src/main/print-lexmark.c:585
+msgid "2400 DPI x 1200 DPI"
+msgstr "2400 DPI × 1200 DPI"
+
+#: src/main/print-lexmark.c:586
+msgid "2400 DPI x 1200 DPI high quality"
+msgstr "2400×1200dpi вы�окое каче�тво"
+
+#: src/main/print-lexmark.c:587
+msgid "2400 DPI x 1200 DPI highest quality"
+msgstr "2400×1200dpi наивы�шее каче�тво"
+
+#: src/main/print-lexmark.c:589
+msgid "test print"
+msgstr ""
+
+#: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
+#: src/xml/xmli18n-tmp.h:3754 src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:3809 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3863 src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:4058 src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:4163 src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:4227 src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:4335 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4467 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4594 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:4879 src/xml/xmli18n-tmp.h:4946
+#: src/xml/xmli18n-tmp.h:5000 src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:5243 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5365 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5512 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5667 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5784 src/xml/xmli18n-tmp.h:5805
+#: src/xml/xmli18n-tmp.h:5826
+msgid "Four Color Standard"
+msgstr ""
+
+#: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
+#: src/xml/xmli18n-tmp.h:3759 src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3868 src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:4002 src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:4107 src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4472
+#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4817 src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5181 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5315 src/xml/xmli18n-tmp.h:5370
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5672
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5831
+msgid "Three Color Composite"
+msgstr ""
+
+#: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
+#: src/xml/xmli18n-tmp.h:3741 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4086 src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4933
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5421
+#: src/xml/xmli18n-tmp.h:5499 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5723
+msgid "Six Color Photo"
+msgstr ""
+
+#: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
+#: src/xml/xmli18n-tmp.h:3748 src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:3989 src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:4094 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4267 src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4940
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5661
+#: src/xml/xmli18n-tmp.h:5730
+msgid "Five Color Photo Composite"
+msgstr ""
+
+#: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1050
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1240
+#: src/xml/xmli18n-tmp.h:1335 src/xml/xmli18n-tmp.h:1449
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1580
+#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1862
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2200 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2297
+msgid "Plain Paper"
+msgstr "Обычна� бумага"
+
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:101 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:365 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1160 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1740
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1871
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2136
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2267
+#: src/xml/xmli18n-tmp.h:2303
+msgid "Glossy Film"
+msgstr ""
+
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:845 src/xml/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:965 src/xml/xmli18n-tmp.h:1022
+#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1359
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1550
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1745 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2305
+msgid "Transparencies"
+msgstr ""
+
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:55 src/xml/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:151 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1024
+#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2215
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2307
+msgid "Envelopes"
+msgstr "Конверты"
+
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:1028
+#: src/xml/xmli18n-tmp.h:1085 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1275 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1556
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1665
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1834
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2076
+#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2311
+msgid "Matte Paper"
+msgstr "Матова� бумага"
+
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:167 src/xml/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:569
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1032
+#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1285 src/xml/xmli18n-tmp.h:1389
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1675
+#: src/xml/xmli18n-tmp.h:1770 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1889 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2012 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2227
+#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2315
+msgid "Inkjet Paper"
+msgstr ""
+
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:425 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:512 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1034
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1499 src/xml/xmli18n-tmp.h:1562
+#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1775 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1955
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2088
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2317
+msgid "Photo Quality Inkjet Paper"
+msgstr ""
+
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1036
+#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1200
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1504 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1842
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2233
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2319
+msgid "Photo Paper"
+msgstr "Фотобумага"
+
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:179 src/xml/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:518 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:869 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1038
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1407
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1566
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1622
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1844
+#: src/xml/xmli18n-tmp.h:1898 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2321
+msgid "Premium Glossy Photo Paper"
+msgstr ""
+
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1042
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1419
+#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1570
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2027 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2242
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2325
+msgid "Premium Luster Photo Paper"
+msgstr ""
+
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:91 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:191 src/xml/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:439 src/xml/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:787 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1044
+#: src/xml/xmli18n-tmp.h:1125 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1315 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1854
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2327
+msgid "Photo Quality Glossy Paper"
+msgstr ""
+
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1130
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1320
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1616
+#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1856 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2329
+msgid "Ilford Heavy Paper"
+msgstr ""
+
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:129
+#: src/xml/xmli18n-tmp.h:203 src/xml/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:542 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1048
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1443
+#: src/xml/xmli18n-tmp.h:1539 src/xml/xmli18n-tmp.h:1578
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1720
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1985
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2333
+msgid "Other"
+msgstr ""
+
+#: src/main/print-lexmark.c:1113
+msgid "Auto Sheet Feeder"
+msgstr "�втоподача бумаги"
+
+#: src/main/print-lexmark.c:1114
+msgid "Manual with Pause"
+msgstr ""
+
+#: src/main/print-lexmark.c:1115
+msgid "Manual without Pause"
+msgstr ""
+
+#: src/main/print-olympus.c:281
+msgid "Coated"
+msgstr ""
+
+#: src/main/print-olympus.c:282 src/cups/genppd.c:1718 src/cups/genppd.c:1746
+#: src/cups/genppd.c:1778 src/cups/genppd.c:1833 src/cups/genppd.c:1879
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2194 src/cups/genppd.c:2217
+#: src/cups/genppd.c:2238 src/cups/genppd.c:2255
+msgid "None"
+msgstr ""
+
+#: src/main/print-olympus.c:998 src/main/print-olympus.c:1061
+#: src/main/print-olympus.c:1165
+msgid "Glossy"
+msgstr ""
+
+#: src/main/print-olympus.c:999 src/main/print-olympus.c:1062
+#: src/main/print-olympus.c:1166
+msgid "Texture"
+msgstr ""
+
+#: src/main/print-olympus.c:1063 src/main/print-olympus.c:1167
+msgid "Matte"
+msgstr ""
+
+#. TRANSLATORS: 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.
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1901
+msgid "Laminate Pattern"
+msgstr ""
+
+#: src/main/print-olympus.c:1936
+msgid "Adjust the cyan balance"
+msgstr ""
+
+#: src/main/print-olympus.c:1944
+msgid "Adjust the magenta balance"
+msgstr ""
+
+#: src/main/print-olympus.c:1952
+msgid "Adjust the yellow balance"
+msgstr ""
+
+#: src/main/print-olympus.c:1959
+msgid "Black Balance"
+msgstr ""
+
+#: src/main/print-olympus.c:1960
+msgid "Adjust the black balance"
+msgstr ""
+
+#: src/main/print-pcl.c:184
+msgid "Plain"
+msgstr ""
+
+#: src/main/print-pcl.c:185
+msgid "Bond"
+msgstr ""
+
+#: src/main/print-pcl.c:186
+msgid "Premium"
+msgstr ""
+
+#: src/main/print-pcl.c:187
+msgid "Glossy Photo"
+msgstr ""
+
+#: src/main/print-pcl.c:188
+msgid "Transparency"
+msgstr ""
+
+#: src/main/print-pcl.c:189
+msgid "Quick-dry Photo"
+msgstr ""
+
+#: src/main/print-pcl.c:190
+msgid "Quick-dry Transparency"
+msgstr ""
+
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:5925
+msgid "Manual"
+msgstr ""
+
+#: src/main/print-pcl.c:239
+msgid "Tray 1 - Movable Guides"
+msgstr ""
+
+#: src/main/print-pcl.c:240
+msgid "Tray 1"
+msgstr ""
+
+#: src/main/print-pcl.c:241
+msgid "Tray 2 - Movable Guides"
+msgstr ""
+
+#: src/main/print-pcl.c:242 src/main/print-pcl.c:250
+msgid "Tray 2"
+msgstr ""
+
+#: src/main/print-pcl.c:243
+msgid "Tray 3 - Movable Guides"
+msgstr ""
+
+#: src/main/print-pcl.c:244
+msgid "Tray 3"
+msgstr ""
+
+#: src/main/print-pcl.c:245
+msgid "Tray 4 - Movable Guides"
+msgstr ""
+
+#: src/main/print-pcl.c:246
+msgid "Tray 4"
+msgstr ""
+
+#: src/main/print-pcl.c:247
+msgid "Portable Sheet Feeder"
+msgstr ""
+
+#: src/main/print-pcl.c:248
+msgid "Desktop Sheet Feeder"
+msgstr ""
+
+#: src/main/print-pcl.c:249
+msgid "Tray"
+msgstr "Лоток"
+
+#: src/main/print-pcl.c:251
+msgid "Optional Source"
+msgstr ""
+
+#: src/main/print-pcl.c:252
+msgid "Autoselect"
+msgstr "�втовыбор"
+
+#: src/main/print-pcl.c:266
+msgid "150x150 DPI"
+msgstr "150×150 DPI"
+
+#: src/main/print-pcl.c:267
+msgid "300x300 DPI"
+msgstr "300×300 DPI"
+
+#: src/main/print-pcl.c:268
+msgid "600x300 DPI"
+msgstr "600×300 DPI"
+
+#: src/main/print-pcl.c:269
+msgid "600x600 DPI monochrome"
+msgstr "600×600dpi монохромна� печать"
+
+#: src/main/print-pcl.c:270
+msgid "600x600 DPI"
+msgstr "600×600 DPI"
+
+#: src/main/print-pcl.c:271
+msgid "1200x600 DPI"
+msgstr "1200×600 DPI"
+
+#: src/main/print-pcl.c:272
+msgid "2400x600 DPI"
+msgstr "2400×600 DPI"
+
+#: src/main/print-pcl.c:278 src/main/generic-options.c:35
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5875
+#: src/xml/xmli18n-tmp.h:5884 src/xml/xmli18n-tmp.h:5893
+#: src/xml/xmli18n-tmp.h:5901
+msgid "Draft"
+msgstr "Черновик"
+
+#: src/main/print-pcl.c:280 src/main/generic-options.c:37
+#: src/xml/xmli18n-tmp.h:5870 src/xml/xmli18n-tmp.h:5878
+#: src/xml/xmli18n-tmp.h:5886 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5903
+msgid "High"
+msgstr "Вы�окое"
+
+#: src/main/print-pcl.c:282 src/main/print-pcl.c:283
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5896 src/xml/xmli18n-tmp.h:5904
+msgid "Photo"
+msgstr "Фотографиче�кое"
+
+#: src/main/print-pcl.c:1578
+msgid "Color + Black Cartridges"
+msgstr ""
+
+#: src/main/print-pcl.c:1579
+msgid "Color + Photo Cartridges"
+msgstr ""
+
+#: src/main/print-ps.c:68
+msgid "PPDFile"
+msgstr ""
+
+#: src/main/print-ps.c:69 src/gutenprintui2/panel.c:1970
+msgid "PPD File"
+msgstr "Файл PPD"
+
+#: src/main/print-ps.c:80
+#, fuzzy
+msgid "Model Name"
+msgstr "Им� задачи:"
+
+#: src/main/print-ps.c:81
+msgid "PPD File Model Name"
+msgstr ""
+
+#: src/main/print-ps.c:316
+msgid "None; please provide a PPD file"
+msgstr "�е выбрана; укажите файл PPD "
+
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:5908
+msgid "Letter"
+msgstr "Letter"
+
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:5946
+msgid "A4"
+msgstr "A4"
+
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6061
+msgid "Custom"
+msgstr "Свой вариант"
+
+#: src/main/print-raw.c:225
+msgid "Image dimensions must match paper dimensions"
+msgstr ""
+
+#: src/main/print-weave.c:1511
+msgid "Fatal error!"
+msgstr "Фатальна� ошибка!"
+
+#: src/main/print-weave.c:1547
+msgid ""
+"Please report the above information to gimp-print-devel@lists.sourceforge.net"
+msgstr ""
+
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:5866
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5891
+msgid "Fast Economy"
+msgstr "Бы�тра� �кономна� печать"
+
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5900
+msgid "Economy"
+msgstr "Экономна� печать"
+
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:5872
+#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
+msgid "Super Photo"
+msgstr "Отличное фотографиче�кое"
+
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:5873
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5889
+#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5906
+msgid "Ultra Photo"
+msgstr "Ультравы�окое фотографиче�кое"
+
+#: src/main/generic-options.c:41 src/cups/genppd.c:1359 src/cups/genppd.c:2023
+#: src/xml/xmli18n-tmp.h:5874 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5899
+#: src/xml/xmli18n-tmp.h:5907
+msgid "Best"
+msgstr "�аилучшее"
+
+#: src/main/generic-options.c:46
+msgid "Text"
+msgstr "Тек�т"
+
+#: src/main/generic-options.c:47
+msgid "Graphics"
+msgstr "Графика"
+
+#: src/main/generic-options.c:48
+msgid "Mixed Text and Graphics"
+msgstr "Графика и тек�т"
+
+#: src/main/generic-options.c:49
+msgid "Photograph"
+msgstr "Фотографи�"
+
+#: src/main/generic-options.c:50
+msgid "Line Art"
+msgstr "Штрихова� графика"
+
+#: src/main/generic-options.c:55
+msgid "Page"
+msgstr "Страница"
+
+#: src/main/generic-options.c:56
+msgid "Job"
+msgstr "Задание"
+
+#: src/main/generic-options.c:68
+msgid "Image Type"
+msgstr "Тип изображени�"
+
+#: src/main/generic-options.c:69
+msgid "Type of image being printed"
+msgstr "Тип печатаемого изображени�"
+
+#: src/main/generic-options.c:74 src/main/generic-options.c:80
+msgid "Job Mode"
+msgstr ""
+
+#: src/main/generic-options.c:75
+msgid "Job vs. page mode"
+msgstr ""
+
+#: src/main/generic-options.c:80
+msgid "Page Number"
+msgstr "�омер �траницы"
+
+#: src/main/generic-options.c:81
+msgid "Page number"
+msgstr "�омер �траницы"
+
+#: src/gutenprintui2/curve.c:130
+msgid "Curve type"
+msgstr "Тип кривой"
+
+#: src/gutenprintui2/curve.c:131
+msgid "Is this curve linear, spline interpolated, or free-form"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:139
+msgid "Minimum X"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:140
+msgid "Minimum possible value for X"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:149
+msgid "Maximum X"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:150
+msgid "Maximum possible X value"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:159
+msgid "Minimum Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:160
+msgid "Minimum possible value for Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:169
+msgid "Maximum Y"
+msgstr ""
+
+#: src/gutenprintui2/curve.c:170
+msgid "Maximum possible value for Y"
+msgstr ""
+
+#: src/gutenprintui2/gammacurve.c:418
+msgid "_Gamma value"
+msgstr "Значение _гаммы"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Inch"
+msgstr "дюйм"
+
+#: src/gutenprintui2/panel.c:276
+msgid "Set the base unit of measurement to inches"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:278
+msgid "cm"
+msgstr "�м"
+
+#: src/gutenprintui2/panel.c:278
+msgid "Set the base unit of measurement to centimetres"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:280
+msgid "Points"
+msgstr "пункт"
+
+#: src/gutenprintui2/panel.c:280
+msgid "Set the base unit of measurement to points (1/72\")"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:282
+msgid "mm"
+msgstr "мм"
+
+#: src/gutenprintui2/panel.c:282
+msgid "Set the base unit of measurement to millimetres"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:284
+msgid "Pica"
+msgstr "пайка"
+
+#: src/gutenprintui2/panel.c:284
+msgid "Set the base unit of measurement to picas (1/12\")"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:291
+msgid "Color output"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:293
+msgid "Print in shades of gray using black ink"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:305
+msgid "Standard Command"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:305
+msgid "Use standard print command"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:306
+msgid "Custom Command"
+msgstr "Друга� команда:"
+
+#: src/gutenprintui2/panel.c:306
+msgid "Use custom print command"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:307 src/gutenprintui2/plist.c:710
+#: src/gutenprintui2/plist.c:793
+msgid "File"
+msgstr "Файл:"
+
+#: src/gutenprintui2/panel.c:307
+msgid "Print to a file"
+msgstr "�апечатать в файл"
+
+#: src/gutenprintui2/panel.c:523
+msgid "Edit Curve..."
+msgstr ""
+
+#: src/gutenprintui2/panel.c:534
+msgid "Set Default"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:536
+msgid "Restore Previous"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:538 src/gutenprintui2/panel.c:1735
+#: src/gutenprintui2/panel.c:1989 src/gutenprintui2/panel.c:2021
+msgid "OK"
+msgstr "ОК"
+
+#: src/gutenprintui2/panel.c:540 src/gutenprintui2/panel.c:1400
+#: src/gutenprintui2/panel.c:1737 src/gutenprintui2/panel.c:1991
+msgid "Cancel"
+msgstr "Отменить"
+
+#: src/gutenprintui2/panel.c:642
+#, fuzzy
+msgid "Select File..."
+msgstr "�а�троить принтер..."
+
+#: src/gutenprintui2/panel.c:1028
+msgid "Reset"
+msgstr "Сбро�ить"
+
+#: src/gutenprintui2/panel.c:1383
+#, c-format
+msgid "%s -- Print v%s"
+msgstr "%s -- Печать в v%s"
+
+#: src/gutenprintui2/panel.c:1392
+msgid "About"
+msgstr "О программе"
+
+#: src/gutenprintui2/panel.c:1394
+msgid ""
+"Print and\n"
+"Save Settings"
+msgstr ""
+"�апечатать и\n"
+"запомнить параметры"
+
+#: src/gutenprintui2/panel.c:1396
+msgid ""
+"Save\n"
+"Settings"
+msgstr ""
+"Запомнить\n"
+"параметры"
+
+#: src/gutenprintui2/panel.c:1398
+msgid "Print"
+msgstr "�апечатать"
+
+#: src/gutenprintui2/panel.c:1450
+msgid "Preview"
+msgstr "Предпро�мотр"
+
+#: src/gutenprintui2/panel.c:1475
+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 ""
+
+#: src/gutenprintui2/panel.c:1522
+msgid "Paper Size"
+msgstr "Формат бумаги"
+
+#: src/gutenprintui2/panel.c:1545
+msgid "Show All Paper Sizes"
+msgstr "Показать в�е форматы"
+
+#: src/gutenprintui2/panel.c:1561
+msgid "Dimensions:"
+msgstr "Размеры:"
+
+#: src/gutenprintui2/panel.c:1566 src/gutenprintui2/panel.c:2265
+msgid "Width:"
+msgstr "Ширина:"
+
+#: src/gutenprintui2/panel.c:1567
+msgid "Width of the paper that you wish to print to"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1571 src/gutenprintui2/panel.c:2267
+msgid "Height:"
+msgstr "Вы�ота:"
+
+#: src/gutenprintui2/panel.c:1572
+msgid "Height of the paper that you wish to print to"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1577
+msgid "Automatic Paper Size"
+msgstr "�втоматиче�кий выбор"
+
+#: src/gutenprintui2/panel.c:1594
+msgid "Number of Copies"
+msgstr "Количе�тво копий"
+
+#: src/gutenprintui2/panel.c:1606
+msgid "Select the number of copies to print; a value between 1 and 100"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1638
+msgid "Image Position"
+msgstr "Размещение изображени�"
+
+#: src/gutenprintui2/panel.c:1655
+msgid "Auto"
+msgstr "�вто"
+
+#: src/gutenprintui2/panel.c:1657
+msgid "Portrait"
+msgstr "Портрет"
+
+#: src/gutenprintui2/panel.c:1659
+msgid "Landscape"
+msgstr "�льбом"
+
+#: src/gutenprintui2/panel.c:1661
+msgid "Upside down"
+msgstr "Вверх ногами"
+
+#: src/gutenprintui2/panel.c:1663
+msgid "Seascape"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1667
+msgid ""
+"Select the orientation: portrait, landscape, upside down, or seascape "
+"(upside down landscape)"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1669
+msgid "Orientation:"
+msgstr "Ориентаци�:"
+
+#: src/gutenprintui2/panel.c:1680
+msgid "Left:"
+msgstr "Слева:"
+
+#: src/gutenprintui2/panel.c:1681
+msgid "Distance from the left of the paper to the image"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1684 src/gutenprintui2/panel.c:1688
+msgid "Right:"
+msgstr "Справа:"
+
+#: src/gutenprintui2/panel.c:1685
+msgid "Distance from the left of the paper to the right of the image"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1689
+msgid "Distance from the right of the paper to the image"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1691
+msgid "Top:"
+msgstr "Сверху:"
+
+#: src/gutenprintui2/panel.c:1692
+msgid "Distance from the top of the paper to the image"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1695 src/gutenprintui2/panel.c:1699
+msgid "Bottom:"
+msgstr "Снизу:"
+
+#: src/gutenprintui2/panel.c:1696
+msgid "Distance from the top of the paper to bottom of the image"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1700
+msgid "Distance from the bottom of the paper to the image"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1710
+msgid "Center:"
+msgstr "Центрировать:"
+
+#: src/gutenprintui2/panel.c:1713
+msgid "Horizontal"
+msgstr "По горизонтали"
+
+#: src/gutenprintui2/panel.c:1714
+msgid "Center the image horizontally on the paper"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1716
+msgid "Both"
+msgstr "Везде"
+
+#: src/gutenprintui2/panel.c:1717
+msgid "Center the image on the paper"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1719
+msgid "Vertical"
+msgstr "По вертикали"
+
+#: src/gutenprintui2/panel.c:1720
+msgid "Center the image vertically on the paper"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1733
+msgid "Setup Printer"
+msgstr "�а�тройка принтера"
+
+#: src/gutenprintui2/panel.c:1757
+msgid "Printer Make:"
+msgstr "Производитель:"
+
+#: src/gutenprintui2/panel.c:1768
+msgid "Select the make of your printer"
+msgstr "Укажите производител� принтера"
+
+#: src/gutenprintui2/panel.c:1786 src/gutenprintui2/panel.c:1874
+#: src/gutenprintui2/panel.c:2092
+msgid "Printer Model:"
+msgstr "Модель:"
+
+#: src/gutenprintui2/panel.c:1797
+msgid "Select your printer model"
+msgstr "Укажите модель принтера"
+
+#: src/gutenprintui2/panel.c:1845
+msgid "PPD File:"
+msgstr "Файл PPD:"
+
+#: src/gutenprintui2/panel.c:1861
+msgid "Enter the correct PPD filename for your printer"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1863 src/gutenprintui2/panel.c:1943
+msgid "Browse"
+msgstr "Про�мотреть"
+
+#: src/gutenprintui2/panel.c:1870
+msgid "Choose the correct PPD filename for your printer"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1912
+msgid ""
+"Select the name of the output queue (not the type, or model, of printer) "
+"that you wish to print to"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1914
+msgid "Printer Queue:"
+msgstr "Очередь печати:"
+
+#: src/gutenprintui2/panel.c:1930
+msgid "Enter the correct command to print to your printer. "
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1941
+msgid "Enter the file to print to. "
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1949
+msgid "File to print to"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1957
+msgid "Print To File"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:1987
+msgid "Define New Printer"
+msgstr "Дать название принтеру"
+
+#: src/gutenprintui2/panel.c:2005 src/gutenprintui2/panel.c:2089
+msgid "Printer Name:"
+msgstr "�азвание принтера:"
+
+#: src/gutenprintui2/panel.c:2009
+msgid "Enter the name you wish to give this logical printer"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2019
+msgid "About Gutenprint "
+msgstr "О Gutenprint "
+
+#: src/gutenprintui2/panel.c:2026
+msgid "Gutenprint Version "
+msgstr "Вер�и� Gutenprint"
+
+#: src/gutenprintui2/panel.c:2074
+msgid "Printer Settings"
+msgstr "Параметры принтера"
+
+#: src/gutenprintui2/panel.c:2087
+msgid ""
+"Select the name of the printer (not the type, or model, of printer) that you "
+"wish to print to"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2104
+msgid "Setup Printer..."
+msgstr "�а�троить принтер..."
+
+#: src/gutenprintui2/panel.c:2106
+msgid ""
+"Choose the printer model, PPD file, and command that is used to print to "
+"this printer"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2119
+msgid "New Printer..."
+msgstr "Добавить принтер..."
+
+#: src/gutenprintui2/panel.c:2120
+msgid ""
+"Define a new logical printer. This can be used to name a collection of "
+"settings that you wish to remember for future use."
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2150
+msgid "Set Printer Option Defaults"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2151
+msgid "Set all printer options to their defaults"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2174
+msgid "Image Size"
+msgstr "Размер изображени�"
+
+#: src/gutenprintui2/panel.c:2199
+msgid "Scaling:"
+msgstr "Ма�штаб:"
+
+#: src/gutenprintui2/panel.c:2203
+msgid "Set the scale (size) of the image"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2225
+msgid "Scale by:"
+msgstr "Ма�штабировать по:"
+
+#: src/gutenprintui2/panel.c:2230
+msgid ""
+"Select whether scaling is measured as percent of available page size or "
+"number of output dots per inch"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2233
+msgid "Percent"
+msgstr "процентам"
+
+#: src/gutenprintui2/panel.c:2238
+msgid "Scale the print to the size of the page"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2242
+msgid "PPI"
+msgstr "PPI"
+
+#: src/gutenprintui2/panel.c:2247
+msgid "Scale the print to the number of dots per inch"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2265
+msgid "Set the width of the print"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2267
+msgid "Set the height of the print"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2273
+msgid ""
+"Use Original\n"
+"Image Size"
+msgstr ""
+"И�ходный\n"
+"размер"
+
+#: src/gutenprintui2/panel.c:2279
+msgid "Set the print size to the size of the image"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2303
+msgid "Print Color Adjust"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2306
+msgid "Set Defaults"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2308
+msgid "Close"
+msgstr "Закрыть"
+
+#: src/gutenprintui2/panel.c:2337
+msgid "Image preview"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2351
+msgid "View Output Channels:"
+msgstr "Видимые каналы вывода:"
+
+#: src/gutenprintui2/panel.c:2442
+msgid "Output"
+msgstr "Вывод"
+
+#: src/gutenprintui2/panel.c:2470
+msgid "Output Type:"
+msgstr "Тип вывода:"
+
+#: src/gutenprintui2/panel.c:2474
+msgid "Select the desired output type"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2495
+msgid "Adjust Output..."
+msgstr "Скорректировать вывод..."
+
+#: src/gutenprintui2/panel.c:2504
+msgid ""
+"Adjust color balance, brightness, contrast, saturation, and dither algorithm"
+msgstr ""
+
+#: src/gutenprintui2/panel.c:2523
+msgid "Size Units:"
+msgstr "Единица: "
+
+#: src/gutenprintui2/panel.c:2526
+msgid " "
+msgstr " "
+
+#: src/gutenprintui2/panel.c:2550
+msgid "Units:"
+msgstr "Единицы измерени�:"
+
+#: src/gutenprintui2/panel.c:2555
+msgid "Select the base unit of measurement for printing"
+msgstr ""
+
+#: src/gutenprintui2/plist.c:92 src/gutenprintui2/plist.c:101
+msgid "System V lp"
+msgstr "System V lp"
+
+#: src/gutenprintui2/plist.c:98
+msgid "CUPS"
+msgstr "CUPS"
+
+#: src/gutenprintui2/plist.c:104
+msgid "Berkeley lpd (/etc/lpc)"
+msgstr ""
+
+#: src/gutenprintui2/plist.c:107
+msgid "Berkeley lpd (/usr/bsd/lpc)"
+msgstr ""
+
+#: src/gutenprintui2/plist.c:110
+msgid "Berkeley lpd (/usr/etc/lpc"
+msgstr ""
+
+#: src/gutenprintui2/plist.c:113
+msgid "Berkeley lpd (/usr/libexec/lpc)"
+msgstr ""
+
+#: src/gutenprintui2/plist.c:116
+msgid "Berkeley lpd (/usr/sbin/lpc)"
+msgstr ""
+
+#: src/gutenprintui2/plist.c:1060
+msgid "Printer"
+msgstr "Принтер"
+
+#: src/gutenprintui2/plist.c:1253
+msgid "(Default Printer)"
+msgstr ""
+
+#: src/cups/genppd.c:144
+msgid "Printer Features"
+msgstr ""
+
+#: src/cups/genppd.c:145
+msgid "Output Control"
+msgstr "Контроль вывода"
+
+#: src/cups/genppd.c:150
+msgid "Common"
+msgstr ""
+
+#: src/cups/genppd.c:151
+msgid "Extra 1"
+msgstr ""
+
+#: src/cups/genppd.c:152
+msgid "Extra 2"
+msgstr ""
+
+#: src/cups/genppd.c:153
+msgid "Extra 3"
+msgstr ""
+
+#: src/cups/genppd.c:154
+msgid "Extra 4"
+msgstr ""
+
+#: src/cups/genppd.c:155
+msgid "Extra 5"
+msgstr ""
+
+#. TRANSLATORS: Specify the language of the PPD translation.
+#. * Use the English name of your language here, e.g. "Swedish" instead of
+#. * "Svenska".
+#: src/cups/genppd.c:993
+msgid "English"
+msgstr ""
+
+#: src/cups/genppd.c:1192 src/cups/genppd.c:1208 src/cups/genppd.c:1968
+#: src/cups/genppd.c:1969
+#, fuzzy
+msgid "Media Size"
+msgstr "И�точник но�ител�"
+
+#: src/cups/genppd.c:1281 src/cups/genppd.c:2004
+msgid "Color Model"
+msgstr "Цветова� модель"
+
+#: src/cups/genppd.c:1308 src/cups/genppd.c:2006
+#, fuzzy
+msgid "Inverted Grayscale"
+msgstr "Градации �ерого"
+
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2010
+#, fuzzy
+msgid "RGB Color"
+msgstr "Цвет"
+
+#: src/cups/genppd.c:1325 src/cups/genppd.c:2011
+#, fuzzy
+msgid "CMY Color"
+msgstr "Цвет"
+
+#: src/cups/genppd.c:1350 src/cups/genppd.c:2021
+msgid "Color Precision"
+msgstr "Точно�ть цветопередачи"
+
+#: src/cups/genppd.c:1606 src/cups/genppd.c:2114
+msgid "Reverse"
+msgstr ""
+
+#: src/cups/genppd.c:1623 src/cups/genppd.c:2130
+msgid "2-Sided Printing"
+msgstr ""
+
+#: src/cups/genppd.c:1648 src/cups/genppd.c:2147
+msgid "Shrink Page If Necessary to Fit Borders"
+msgstr ""
+
+#: src/cups/genppd.c:1653 src/cups/genppd.c:2148
+msgid "Shrink (print the whole page)"
+msgstr ""
+
+#: src/cups/genppd.c:1654 src/cups/genppd.c:2149
+msgid "Crop (preserve dimensions)"
+msgstr ""
+
+#: src/cups/genppd.c:1655 src/cups/genppd.c:2150
+msgid "Expand (use maximum page area)"
+msgstr ""
+
+#: src/cups/genppd.c:1749 src/cups/genppd.c:2196
+msgid "No"
+msgstr "�ет"
+
+#: src/cups/genppd.c:1751 src/cups/genppd.c:2198
+msgid "Yes"
+msgstr "Да"
+
+#: src/cups/genppd.c:1790 src/cups/genppd.c:1853 src/cups/genppd.c:1897
+#: src/cups/genppd.c:2219 src/cups/genppd.c:2249 src/cups/genppd.c:2266
+msgid "Value"
+msgstr "Значение"
+
+#: src/cups/genppd.c:1795 src/cups/genppd.c:2223
+msgid "Fine Adjustment"
+msgstr ""
+
+#: src/cups/genppd.c:1838 src/cups/genppd.c:2243
+#, c-format
+msgid "%.1f mm"
+msgstr ""
+
+#: src/escputil/escputil.c:70
+msgid "Escputil version "
+msgstr ""
+
+#: src/escputil/escputil.c:76
+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 ""
+
+#: 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"
+"    -m|--model         Specify the printer model.\n"
+"    -u|--new           The printer is a new printer (Stylus Color 740 or\n"
+"                       newer).  Only needed when not using a raw device or\n"
+"                       when the model is not specified.\n"
+"    -q|--quiet         Suppress the banner.\n"
+"    -S|--short-name    Print the short name of the printer with --identify.\n"
+"    -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:162
+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:341 src/escputil/escputil.c:349
+#, c-format
+msgid "You may only specify one printer or raw device."
+msgstr ""
+
+#: src/escputil/escputil.c:357
+#, c-format
+msgid "You may only specify one printer model."
+msgstr ""
+
+#: src/escputil/escputil.c:381
+#, c-format
+msgid "Alignment choices must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:388
+#, c-format
+msgid "Alignment passes must be at least 1."
+msgstr ""
+
+#: src/escputil/escputil.c:393
+#, c-format
+msgid "Unknown option %c\n"
+msgstr ""
+
+#: src/escputil/escputil.c:401
+#, c-format
+msgid "Usage: %s [OPTIONS] command\n"
+msgstr ""
+
+#: src/escputil/escputil.c:403
+#, c-format
+msgid "Type `%s --help' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:405
+#, c-format
+msgid "Type `%s -h' for more information.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:471
+#, c-format
+msgid "Cannot open device %s: %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:494
+#, c-format
+msgid "Cannot print to printer %s with %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:510 src/escputil/escputil.c:520
+#, c-format
+msgid "Unable to send command to printer\n"
+msgstr ""
+
+#: src/escputil/escputil.c:580
+#, c-format
+msgid "Read from printer timed out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:585
+#, c-format
+msgid "Cannot read from %s: %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:737
+#, c-format
+msgid "Please specify a raw device\n"
+msgstr ""
+
+#: src/escputil/escputil.c:744
+#, c-format
+msgid "Cannot open %s read/write: %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:791
+#, c-format
+msgid "Unknown printer %s!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:846 src/escputil/escputil.c:1459
+#, c-format
+msgid "Cannot write to %s: %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:897 src/escputil/escputil.c:1438
+#: src/escputil/escputil.c:1545
+#, c-format
+msgid ""
+"\n"
+"Cannot write to %s: %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:926
+#, c-format
+msgid ""
+"\n"
+"Cannot detect printer type.\n"
+"Please use -m to specify your printer model.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2001
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2010 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2025
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:4085 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4612 src/xml/xmli18n-tmp.h:5481
+msgid "Photo Black"
+msgstr ""
+
+#: src/escputil/escputil.c:996 src/escputil/escputil.c:1002
+#: src/escputil/escputil.c:1003 src/escputil/escputil.c:1256
+#: src/escputil/escputil.c:1321 src/escputil/escputil.c:1347
+msgid "Unknown"
+msgstr ""
+
+#: src/escputil/escputil.c:1000 src/escputil/escputil.c:1289
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2461 src/xml/xmli18n-tmp.h:2526
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2683 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2711 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3101 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3661
+#: src/xml/xmli18n-tmp.h:3678 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3750 src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:3782 src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:3932 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3964 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4388 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:4639 src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:4875 src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4936
+#: src/xml/xmli18n-tmp.h:4942 src/xml/xmli18n-tmp.h:4968
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5339 src/xml/xmli18n-tmp.h:5348
+#: src/xml/xmli18n-tmp.h:5355 src/xml/xmli18n-tmp.h:5361
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5417
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5430
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5477 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5502
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5536 src/xml/xmli18n-tmp.h:5544
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5557
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5657 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5719
+#: src/xml/xmli18n-tmp.h:5726 src/xml/xmli18n-tmp.h:5732
+#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5779
+msgid "Light Cyan"
+msgstr ""
+
+#: src/escputil/escputil.c:1001 src/escputil/escputil.c:1290
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2446
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2527
+#: src/xml/xmli18n-tmp.h:2541 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2644
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2698
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2751
+#: src/xml/xmli18n-tmp.h:2803 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2956 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2994
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3381
+#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3662
+#: src/xml/xmli18n-tmp.h:3746 src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:3778 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3934 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3966 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:4265 src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:4390 src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:4428 src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4452
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4465
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4512 src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4586 src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:4641 src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4903
+#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4970
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:5044 src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5168
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5241 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5334
+#: src/xml/xmli18n-tmp.h:5341 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5363
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5419
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5471
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5504
+#: src/xml/xmli18n-tmp.h:5510 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5652
+#: src/xml/xmli18n-tmp.h:5659 src/xml/xmli18n-tmp.h:5665
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5721
+#: src/xml/xmli18n-tmp.h:5728 src/xml/xmli18n-tmp.h:5734
+#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5781
+msgid "Light Magenta"
+msgstr ""
+
+#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3679 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4409 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:4566 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4605 src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4664 src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5376 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5450
+#: src/xml/xmli18n-tmp.h:5475 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5533 src/xml/xmli18n-tmp.h:5542
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5678 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5717
+#: src/xml/xmli18n-tmp.h:5747 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5777
+msgid "Light Black"
+msgstr ""
+
+#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:508 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:532 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:538 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:562 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:568 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
+#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
+#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
+#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
+#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
+#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
+#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
+#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
+#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
+#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
+#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
+#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2011 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2026
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2032
+#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2038
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:4044 src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:5530
+msgid "Matte Black"
+msgstr ""
+
+#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3995 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4006 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4020 src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:4106 src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4148
+msgid "Gloss Optimizer"
+msgstr ""
+
+#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3676
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4616 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5534 src/xml/xmli18n-tmp.h:5573
+msgid "Light Light Black"
+msgstr ""
+
+#: src/escputil/escputil.c:1010 src/escputil/escputil.c:1029
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:4099 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4189
+#, fuzzy
+msgid "Orange"
+msgstr "Страница"
+
+#: src/escputil/escputil.c:1041
+#, c-format
+msgid "Status: Error\n"
+msgstr "Стату�: ошибка\n"
+
+#: src/escputil/escputil.c:1044
+#, c-format
+msgid "Status: Self-Printing\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1047
+#, c-format
+msgid "Status: Busy\n"
+msgstr "Стату�: зан�т\n"
+
+#: src/escputil/escputil.c:1050
+#, c-format
+msgid "Status: Waiting\n"
+msgstr "Стату�: ожидани�\n"
+
+#: src/escputil/escputil.c:1053
+#, c-format
+msgid "Status: Idle\n"
+msgstr "Стату�: про�той\n"
+
+#: src/escputil/escputil.c:1056
+#, c-format
+msgid "Status: Paused\n"
+msgstr "Стату�: пауза\n"
+
+#: src/escputil/escputil.c:1059
+#, c-format
+msgid "Status: Cleaning\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1062
+#, c-format
+msgid "Status: Factory shipment\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1065
+#, c-format
+msgid "Status: Shutting down\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1068
+#, c-format
+msgid "Status: Unknown (%d)\n"
+msgstr "Стату�: неизве�тен (%d)\n"
+
+#: src/escputil/escputil.c:1079
+#, c-format
+msgid "Error: Fatal Error\n"
+msgstr "Ошибка: фатальна� ошибка\n"
+
+#: src/escputil/escputil.c:1082
+#, c-format
+msgid "Error: Other interface is selected\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1085
+#, c-format
+msgid "Error: Cover Open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1088
+#, c-format
+msgid "Error: Paper jam\n"
+msgstr "Ошибка: бумага за�тр�ла\n"
+
+#: src/escputil/escputil.c:1091
+#, c-format
+msgid "Error: Ink out\n"
+msgstr "Ошибка: кончили�ь чернила\n"
+
+#: src/escputil/escputil.c:1094
+#, c-format
+msgid "Error: Paper out\n"
+msgstr "Ошибка: кончила�ь бумага\n"
+
+#: src/escputil/escputil.c:1097
+#, c-format
+msgid "Error: Miscellaneous paper error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1100
+#, c-format
+msgid "Error: Maintenance cartridge overflow\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1103
+#, c-format
+msgid "Error: Wait return from the tear-off position\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1106
+#, c-format
+msgid "Error: Double feed error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1109
+#, c-format
+msgid ""
+"Error: Ink cartridge lever released\n"
+"\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1112
+#, c-format
+msgid "Error: Unrecoverable cutter error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1115
+#, c-format
+msgid "Error: Recoverable cutter jam\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1118
+#, c-format
+msgid "Error: No maintenance cartridge present\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1121
+#, fuzzy, c-format
+msgid "Error: Rear cover open\n"
+msgstr "Ошибка: кончила�ь бумага\n"
+
+#: src/escputil/escputil.c:1124
+#, c-format
+msgid "Error: CD Tray Out\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1127
+#, c-format
+msgid "Error: Card loading error\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1130
+#, c-format
+msgid "Error: Tray cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1133
+#, c-format
+msgid "Error: Maintenance cartridge cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1136
+#, c-format
+msgid "Error: Front cover open\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1139
+#, c-format
+msgid "Error: Maintenance request\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1142
+#, c-format
+msgid "Error: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1154
+#, c-format
+msgid "Warning: %s Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1157
+#, c-format
+msgid "Warning: Channel %d Ink Low\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1163
+#, c-format
+msgid "Warning: %s Cleaning Disabled\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1166
+#, c-format
+msgid "Warning: Channel %d Cleaning \n"
+msgstr ""
+
+#: src/escputil/escputil.c:1173
+#, c-format
+msgid "Warning: Maintenance cartridge near full\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1176
+#, c-format
+msgid "Warning: Maintenance request pending\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1179
+#, c-format
+msgid "Warning: Unknown (%d)\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1191
+#, c-format
+msgid "Printing nozzle self-test\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1255 src/escputil/escputil.c:1320
+#, c-format
+msgid "Printer Name: %s\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1294 src/escputil/escputil.c:1333
+#, c-format
+msgid "Ink Levels:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1295 src/escputil/escputil.c:1334
+msgid "Ink color"
+msgstr ""
+
+#: src/escputil/escputil.c:1295 src/escputil/escputil.c:1334
+#: src/escputil/escputil.c:1607 src/escputil/escputil.c:1631
+#: src/escputil/escputil.c:1651
+msgid "Percent remaining"
+msgstr ""
+
+#: src/escputil/escputil.c:1377
+#, c-format
+msgid "Job Name: "
+msgstr "Им� задачи:"
+
+#: src/escputil/escputil.c:1406
+msgid "ink levels"
+msgstr ""
+
+#: src/escputil/escputil.c:1409
+msgid "status"
+msgstr "�тату�"
+
+#: src/escputil/escputil.c:1414
+#, c-format
+msgid "Obtaining %s requires using a raw device.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1500
+#, c-format
+msgid "Obtaining extended ink information requires using a raw device.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1607 src/escputil/escputil.c:1631
+#: src/escputil/escputil.c:1651
+msgid "Ink cartridge"
+msgstr ""
+
+#: src/escputil/escputil.c:1607 src/escputil/escputil.c:1631
+#: src/escputil/escputil.c:1651
+msgid "Part number"
+msgstr ""
+
+#: src/escputil/escputil.c:1608 src/escputil/escputil.c:1632
+#: src/escputil/escputil.c:1652
+msgid "Date"
+msgstr ""
+
+#: src/escputil/escputil.c:1680
+#, c-format
+msgid "Printer identification requires using a raw device.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1698
+#, c-format
+msgid "Cannot identify printer model.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1720
+#, c-format
+msgid "Cleaning heads...\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1737
+#, c-format
+msgid "Running nozzle check, please ensure paper is in the printer.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1741
+#, 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:1776
+#, 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:1820
+#, c-format
+msgid "Unable to send command to the printer, exiting.\n"
+msgstr "�евозможно по�лать команду принтеру, выход.\n"
+
+#: src/escputil/escputil.c:1834 src/escputil/escputil.c:2003
+#, c-format
+msgid "Exiting\n"
+msgstr "Выход\n"
+
+#: src/escputil/escputil.c:1837
+#, 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 ""
+
+#: src/escputil/escputil.c:1845 src/escputil/escputil.c:1854
+#: src/escputil/escputil.c:1869 src/escputil/escputil.c:1887
+#: src/escputil/escputil.c:2007
+msgid "> "
+msgstr ""
+
+#: src/escputil/escputil.c:1852
+#, c-format
+msgid ""
+"Please confirm by typing 'q' again that you wish to quit without saving:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1859
+#, 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:1866
+#, c-format
+msgid ""
+"Please confirm by typing 'r' again that you wish to repeat the\n"
+"alignment process:\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1874
+#, c-format
+msgid "Repeating the alignment process.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1880
+#, 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:1892
+#, c-format
+msgid "About to save settings..."
+msgstr ""
+
+#: src/escputil/escputil.c:1898
+#, c-format
+msgid "failed!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1899
+#, c-format
+msgid ""
+"Your settings were not saved successfully.  You must repeat the\n"
+"alignment procedure.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1903
+#, c-format
+msgid "succeeded!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1904
+#, c-format
+msgid "Your alignment settings have been saved to the printer.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1909
+#, c-format
+msgid "Unrecognized command.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1912
+#, c-format
+msgid "Final command was not confirmed.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1917
+#, c-format
+msgid ""
+"This procedure assumes that your printer is an %s.\n"
+"If this is not your printer model, please type control-C now and\n"
+"choose your actual printer model.\n"
+"\n"
+"Please place a sheet of paper in your printer to begin the head\n"
+"alignment procedure.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:1986 src/escputil/escputil.c:2017
+#: src/escputil/escputil.c:2060
+msgid "Press enter to continue > "
+msgstr ""
+
+#: src/escputil/escputil.c:1993
+#, 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 ""
+
+#: src/escputil/escputil.c:2006
+#, c-format
+msgid "Pass #%d"
+msgstr ""
+
+#: src/escputil/escputil.c:2014 src/escputil/escputil.c:2059
+#, c-format
+msgid "Please insert a fresh sheet of paper.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2033
+#, c-format
+msgid "Number out of range!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2038
+#, c-format
+msgid "I cannot understand what you typed!\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2044
+#, c-format
+msgid "The best pair of lines should be numbered between 1 and %d.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2051
+#, c-format
+msgid "Attempting to set alignment..."
+msgstr ""
+
+#: src/escputil/escputil.c:2054
+#, c-format
+msgid "succeeded.\n"
+msgstr ""
+
+#: src/escputil/escputil.c:2055
+#, 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:2101
+#, c-format
+msgid "Error in input\n"
+msgstr ""
+
+#: src/gimp2/print-image-gimp.c:225
+msgid "Printing..."
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2 src/xml/xmli18n-tmp.h:4 src/xml/xmli18n-tmp.h:6
+#: src/xml/xmli18n-tmp.h:8 src/xml/xmli18n-tmp.h:10 src/xml/xmli18n-tmp.h:12
+#: src/xml/xmli18n-tmp.h:14 src/xml/xmli18n-tmp.h:16 src/xml/xmli18n-tmp.h:18
+#: src/xml/xmli18n-tmp.h:20 src/xml/xmli18n-tmp.h:22 src/xml/xmli18n-tmp.h:24
+#: src/xml/xmli18n-tmp.h:26 src/xml/xmli18n-tmp.h:28 src/xml/xmli18n-tmp.h:30
+#: src/xml/xmli18n-tmp.h:32 src/xml/xmli18n-tmp.h:34 src/xml/xmli18n-tmp.h:36
+#: src/xml/xmli18n-tmp.h:38 src/xml/xmli18n-tmp.h:40 src/xml/xmli18n-tmp.h:42
+#: src/xml/xmli18n-tmp.h:44 src/xml/xmli18n-tmp.h:46 src/xml/xmli18n-tmp.h:48
+#: src/xml/xmli18n-tmp.h:50 src/xml/xmli18n-tmp.h:52 src/xml/xmli18n-tmp.h:54
+#: src/xml/xmli18n-tmp.h:56 src/xml/xmli18n-tmp.h:58 src/xml/xmli18n-tmp.h:60
+#: src/xml/xmli18n-tmp.h:62 src/xml/xmli18n-tmp.h:64 src/xml/xmli18n-tmp.h:66
+#: src/xml/xmli18n-tmp.h:68 src/xml/xmli18n-tmp.h:70 src/xml/xmli18n-tmp.h:72
+#: src/xml/xmli18n-tmp.h:74 src/xml/xmli18n-tmp.h:76 src/xml/xmli18n-tmp.h:78
+#: src/xml/xmli18n-tmp.h:80 src/xml/xmli18n-tmp.h:82 src/xml/xmli18n-tmp.h:84
+#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:92 src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:102 src/xml/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:106 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:114 src/xml/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:118 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:126 src/xml/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:130 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:136 src/xml/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:144 src/xml/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:168 src/xml/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:192 src/xml/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:216 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:232 src/xml/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:240 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:256 src/xml/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:264 src/xml/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:304 src/xml/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:312 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:320 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:328 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:336 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:344 src/xml/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:352 src/xml/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:384 src/xml/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:408 src/xml/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:412 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:432 src/xml/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:444 src/xml/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:448 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:468 src/xml/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:484 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:642 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:698 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:714 src/xml/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:722 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:738 src/xml/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:746 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:764 src/xml/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:780 src/xml/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:804 src/xml/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:814
+#: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:818
+#: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:822
+#: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:826
+#: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:830
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:1017
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1025
+#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1035 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1047 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1056
+#: src/xml/xmli18n-tmp.h:1061 src/xml/xmli18n-tmp.h:1066
+#: src/xml/xmli18n-tmp.h:1071 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1086
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1096
+#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1116
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1126
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1136
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1161 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1181 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1206
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1216
+#: src/xml/xmli18n-tmp.h:1221 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1236
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1246
+#: src/xml/xmli18n-tmp.h:1251 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1261 src/xml/xmli18n-tmp.h:1266
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1281 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1291 src/xml/xmli18n-tmp.h:1296
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1311 src/xml/xmli18n-tmp.h:1316
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1326
+#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1336
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1378 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1414 src/xml/xmli18n-tmp.h:1420
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1432
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1450 src/xml/xmli18n-tmp.h:1455
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1465
+#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1480 src/xml/xmli18n-tmp.h:1485
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1540 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1551 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1583 src/xml/xmli18n-tmp.h:1585
+#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1603 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1607 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1646
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1666
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1676
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1716
+#: src/xml/xmli18n-tmp.h:1721 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1736
+#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1835
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1843
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1851
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:2049
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2057
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2065
+#: src/xml/xmli18n-tmp.h:2069 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2113
+#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2129
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2137
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2153
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2161
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2185
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2264
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2272
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2276
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2282 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2286 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2296
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2300
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2308
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2314 src/xml/xmli18n-tmp.h:2316
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2324
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:3787 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3895 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:4223 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5579
+#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5825
+msgid "EPSON Standard Inks"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:405
+#, fuzzy
+msgid "Bright White Paper"
+msgstr "Матова� бумага"
+
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:139 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:959 src/xml/xmli18n-tmp.h:1018
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1155
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1546
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1931
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:5912
+msgid "Postcard"
+msgstr "Открытка"
+
+#: src/xml/xmli18n-tmp.h:13 src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:155 src/xml/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:415 src/xml/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:851 src/xml/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1026
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1175
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1554
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1832
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2309
+msgid "Back Light Film"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:419 src/xml/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:857 src/xml/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1030
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1383
+#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1558
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2313
+msgid "Matte Paper Heavyweight"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:421
+msgid "Premium Presentation Paper Matte"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:431
+#, fuzzy
+msgid "Ultra Glossy Photo Paper"
+msgstr "Фотобумага"
+
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1210
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1413
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1568
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1695
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1964
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2176 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2287 src/xml/xmli18n-tmp.h:2323
+msgid "Premium Semigloss Photo Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:437
+msgid "Ultra Premium Photo Paper Luster"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:37
+msgid "CD or DVD"
+msgstr "CD или DVD"
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:93 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1230
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1437
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2331
+msgid "ColorLife Paper"
+msgstr "Бумага ColorLife"
+
+#: src/xml/xmli18n-tmp.h:73
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:75
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:81
+msgid "Premium Semigloss Photo Paper 170 wt"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:83
+msgid "Premium Semigloss Photo Paper 250 wt"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:87
+msgid "Premium Luster Photo Paper 250 wt"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:133 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:149 src/xml/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:173 src/xml/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:197 src/xml/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:205 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:221 src/xml/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:229 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:245 src/xml/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:253 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:261 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:269 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:277 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:285 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:293 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:301 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:309 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:317 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:325 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:333 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:341 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:349 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:357 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:619 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:643 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:667 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:691 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:707 src/xml/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:715 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:731 src/xml/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:739 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:755 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1062
+#: src/xml/xmli18n-tmp.h:1067 src/xml/xmli18n-tmp.h:1072
+#: src/xml/xmli18n-tmp.h:1077 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1092
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1102
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1112
+#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1122
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1132
+#: src/xml/xmli18n-tmp.h:1137 src/xml/xmli18n-tmp.h:1142
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1157 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1177 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1192
+#: src/xml/xmli18n-tmp.h:1197 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1212
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1222
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1242
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1252
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1272
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1287 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1297 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1327 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1385 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1445 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1461
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1516 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1647
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1657
+#: src/xml/xmli18n-tmp.h:1662 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1677
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1687
+#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1742 src/xml/xmli18n-tmp.h:1747
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1767
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1807
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2090 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2098 src/xml/xmli18n-tmp.h:2102
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2118
+#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2126
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2162 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2190
+#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:3884 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:4779 src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:4845 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4919
+#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4980
+#: src/xml/xmli18n-tmp.h:4986 src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5209 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5276
+#: src/xml/xmli18n-tmp.h:5277 src/xml/xmli18n-tmp.h:5283
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5607 src/xml/xmli18n-tmp.h:5633
+#: src/xml/xmli18n-tmp.h:5634 src/xml/xmli18n-tmp.h:5640
+msgid "Quadtone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:142 src/xml/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:150 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:174 src/xml/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:198 src/xml/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:214 src/xml/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:222 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:238 src/xml/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:246 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:262 src/xml/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:302 src/xml/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:310 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:318 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:326 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:334 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:342 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:350 src/xml/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:636 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:660 src/xml/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:708 src/xml/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:716 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:732 src/xml/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:756 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1103
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1123
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1158 src/xml/xmli18n-tmp.h:1163
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1183
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1193
+#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1213
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1223
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1238 src/xml/xmli18n-tmp.h:1243
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1253
+#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1283
+#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1313
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1333
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1362 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1374 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1462
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1472
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1487 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1502
+#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:1532
+#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1542
+#: src/xml/xmli18n-tmp.h:1633 src/xml/xmli18n-tmp.h:1638
+#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1648
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1658
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1713 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1728
+#: src/xml/xmli18n-tmp.h:1733 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1768
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2071
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2095
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2115 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2123 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2139 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2183
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2191
+#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2199
+msgid "MISQuadtone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1150 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2299
+msgid "Plain Paper Fast Load"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1970 src/xml/xmli18n-tmp.h:2030
+#: src/xml/xmli18n-tmp.h:2245
+msgid "Archival Matte Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:881 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2248
+msgid "Watercolor Paper - Radiant White"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:1863
+#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1881
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1893
+#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1905
+#: src/xml/xmli18n-tmp.h:1908 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1923
+#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:1950 src/xml/xmli18n-tmp.h:1953
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1968 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1983
+#: src/xml/xmli18n-tmp.h:1986 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2204 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2255
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5645
+msgid "UltraChrome Photo Black"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:835 src/xml/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:841 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1879 src/xml/xmli18n-tmp.h:1882
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1894
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1909 src/xml/xmli18n-tmp.h:1912
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1924
+#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1954
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1969 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1984
+#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2208
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2229 src/xml/xmli18n-tmp.h:2232
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2238
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2244
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2253 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2259 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5714
+msgid "UltraChrome Matte Black"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1139
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1154 src/xml/xmli18n-tmp.h:1159
+#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1179
+#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1199
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1214 src/xml/xmli18n-tmp.h:1219
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1229
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1244 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1259
+#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1274 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1289
+#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1309
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1329
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1423
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1429
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1447
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1634
+#: src/xml/xmli18n-tmp.h:1639 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1664
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1764
+#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1784
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1799 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1819
+msgid "MIS Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1463 src/xml/xmli18n-tmp.h:1468
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1478
+#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1508
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1533 src/xml/xmli18n-tmp.h:1538
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4858 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:5289
+msgid "Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2489 src/xml/xmli18n-tmp.h:2578
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2713 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2752
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2885 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:3051 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3665
+msgid "360 x 90 DPI Fast Economy"
+msgstr "360×90dpi бы�трый �кономный режим"
+
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2699
+#: src/xml/xmli18n-tmp.h:2714 src/xml/xmli18n-tmp.h:2727
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2886
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:3052
+msgid "180 DPI Economy"
+msgstr "180dpi �кономный режим"
+
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2404
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2658
+#: src/xml/xmli18n-tmp.h:2672 src/xml/xmli18n-tmp.h:2700
+#: src/xml/xmli18n-tmp.h:2715 src/xml/xmli18n-tmp.h:2728
+#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2754
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2919 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3053
+#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3125
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3292
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3530
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3649
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3684
+msgid "360 x 180 DPI Draft"
+msgstr "360×180dpi черновик"
+
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2392 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2418 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2479 src/xml/xmli18n-tmp.h:2492
+#: src/xml/xmli18n-tmp.h:2581 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2862 src/xml/xmli18n-tmp.h:2934
+msgid "360 DPI High Quality"
+msgstr "360dpi вы�окое каче�тво"
+
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2369 src/xml/xmli18n-tmp.h:2380
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2406
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2493
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2544
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
+#: src/xml/xmli18n-tmp.h:2582 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2729
+#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2806
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2836
+#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
+#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3012
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3040
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3184 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3424 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3485 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3573
+#: src/xml/xmli18n-tmp.h:3587 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3650 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3685
+msgid "360 DPI"
+msgstr "360 DPI"
+
+#: src/xml/xmli18n-tmp.h:2344 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2452 src/xml/xmli18n-tmp.h:2468
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2494
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2557 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:2594
+#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2648
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2674
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2807
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2837
+#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
+#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3013
+#: src/xml/xmli18n-tmp.h:3026 src/xml/xmli18n-tmp.h:3041
+#: src/xml/xmli18n-tmp.h:3055 src/xml/xmli18n-tmp.h:3066
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3140
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3170
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3229
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3333
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3358
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3385
+#: src/xml/xmli18n-tmp.h:3397 src/xml/xmli18n-tmp.h:3409
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3442
+#: src/xml/xmli18n-tmp.h:3459 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3574
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3637
+#: src/xml/xmli18n-tmp.h:3651 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3686
+msgid "720 x 360 DPI"
+msgstr "720 × 360 DPI"
+
+#: src/xml/xmli18n-tmp.h:2345 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2469
+#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2546
+#: src/xml/xmli18n-tmp.h:2558 src/xml/xmli18n-tmp.h:2570
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2595
+#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2622
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2675
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2731
+#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2808
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2838
+#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2890
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2922 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3014
+#: src/xml/xmli18n-tmp.h:3027 src/xml/xmli18n-tmp.h:3042
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3067
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3186 src/xml/xmli18n-tmp.h:3201
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3334
+#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3359
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3444
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3475
+#: src/xml/xmli18n-tmp.h:3489 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3533 src/xml/xmli18n-tmp.h:3547
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3652 src/xml/xmli18n-tmp.h:3669
+#: src/xml/xmli18n-tmp.h:3687
+msgid "720 DPI"
+msgstr "720 DPI"
+
+#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2554
+#: src/xml/xmli18n-tmp.h:2566 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2804 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2834 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3076
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3382
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3586 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3634
+msgid "360 x 120 DPI Economy"
+msgstr "360×120dpi �кономный режим"
+
+#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2555
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2632
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3077
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3211
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3383
+#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3635
+msgid "360 x 240 DPI Draft"
+msgstr "360×240dpi черновик"
+
+#: src/xml/xmli18n-tmp.h:2383 src/xml/xmli18n-tmp.h:2396
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2422
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2470 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2507 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2704 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:3057 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3118 src/xml/xmli18n-tmp.h:3445
+#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3514
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3609
+msgid "720 DPI High Quality"
+msgstr "720dpi вы�окое каче�тво"
+
+#: src/xml/xmli18n-tmp.h:2384 src/xml/xmli18n-tmp.h:2397
+#: src/xml/xmli18n-tmp.h:2410 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2548 src/xml/xmli18n-tmp.h:2560
+#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2691 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2794 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2839
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2923 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3105
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3129
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3231 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3311
+#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3335
+#: src/xml/xmli18n-tmp.h:3348 src/xml/xmli18n-tmp.h:3360
+#: src/xml/xmli18n-tmp.h:3372 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3427 src/xml/xmli18n-tmp.h:3446
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3576 src/xml/xmli18n-tmp.h:3593
+#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3688
+msgid "1440 x 720 DPI"
+msgstr "1440 × 720 DPI"
+
+#: src/xml/xmli18n-tmp.h:2385 src/xml/xmli18n-tmp.h:2398
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2535
+#: src/xml/xmli18n-tmp.h:2549 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2782
+#: src/xml/xmli18n-tmp.h:2795 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3388
+msgid "1440 x 720 DPI Highest Quality"
+msgstr "1440×720dpi наивы�шее каче�тво"
+
+#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2902
+msgid "720 DPI Highest Quality"
+msgstr "720dpi наивы�шее каче�тво"
+
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2796 src/xml/xmli18n-tmp.h:2811
+#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3216 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3412
+msgid "2880 x 720 DPI"
+msgstr "2880 × 720 DPI"
+
+#: src/xml/xmli18n-tmp.h:2771 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2812
+#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:3160 src/xml/xmli18n-tmp.h:3390
+msgid "2880 x 720 DPI Highest Quality"
+msgstr "2880×720dpi наивы�шее каче�тво"
+
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2963
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3070
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3106
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3297 src/xml/xmli18n-tmp.h:3313
+#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
+#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3401
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3492
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3577 src/xml/xmli18n-tmp.h:3594
+#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3671 src/xml/xmli18n-tmp.h:3689
+msgid "1440 x 1440 DPI"
+msgstr "1440 × 1440 DPI"
+
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3071
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3107
+#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3251
+#: src/xml/xmli18n-tmp.h:3266 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3298 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3324 src/xml/xmli18n-tmp.h:3337
+#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3374 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3463
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3535 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3563 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3612
+#: src/xml/xmli18n-tmp.h:3626 src/xml/xmli18n-tmp.h:3641
+#: src/xml/xmli18n-tmp.h:3655 src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:3690
+msgid "2880 x 1440 DPI"
+msgstr "2880 × 1440 DPI"
+
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:4374
+msgid "Dark Yellow"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3108
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3267
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3495
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3614
+#: src/xml/xmli18n-tmp.h:3628 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3692
+msgid "2880 x 2880 DPI"
+msgstr "2880 × 2880 DPI"
+
+#: src/xml/xmli18n-tmp.h:3190 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3234 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3325 src/xml/xmli18n-tmp.h:3338
+#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3362
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3505
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3613
+#: src/xml/xmli18n-tmp.h:3627 src/xml/xmli18n-tmp.h:3642
+#: src/xml/xmli18n-tmp.h:3656 src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:3691
+msgid "5760 x 1440 DPI"
+msgstr "5760 × 1440 DPI"
+
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3301 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3496
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3615
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
+msgid "5760 x 2880 DPI"
+msgstr "5760 × 2880 DPI"
+
+#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3502
+msgid "1440 x 720 DPI Transposed"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:3607
+msgid "720 x 360 DPI Enhanced"
+msgstr "720×360dpi улучшенный"
+
+#: src/xml/xmli18n-tmp.h:3479
+#, fuzzy
+msgid "Black 1"
+msgstr "Черный (K)"
+
+#: src/xml/xmli18n-tmp.h:3480
+#, fuzzy
+msgid "Black 2"
+msgstr "Черный (K)"
+
+#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3605
+msgid "360 DPI Enhanced"
+msgstr "360dpi улучшенный"
+
+#: src/xml/xmli18n-tmp.h:3516
+msgid "1440 x 720 DPI High Quality"
+msgstr "1440×720dpi вы�окое каче�тво"
+
+#: src/xml/xmli18n-tmp.h:3677
+msgid "Vivid Light Magenta"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3682
+#, fuzzy
+msgid "Vivid Magenta"
+msgstr "Пурпурный (M)"
+
+#: src/xml/xmli18n-tmp.h:3694
+msgid "Main Tray"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3695
+msgid "Photo Tray"
+msgstr "Лоток дл� фотобумаги"
+
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3725 src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:3732
+msgid "Print to CD"
+msgstr "Печать на CD"
+
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:3730
+msgid "Rear Tray"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:3731
+msgid "Front Tray"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3705
+msgid "Manual Feed"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3709
+msgid "Roll Feed (cut each page)"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3710
+msgid "Roll Feed (do not cut)"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3716 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3739
+msgid "Roll Feed"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3714 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3723
+msgid "Manual Sheet Guide"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3715 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3724
+msgid "Manual Feed (Front)"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3733
+msgid "Photo Board"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3734
+msgid "Cut Sheet Bin 1"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3735
+msgid "Cut Sheet Bin 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3736
+msgid "Cut Sheet Autoselect"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3737
+msgid "Manual Selection"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3763 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3872 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:4067 src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4172 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4236 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:4754 src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5102 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5679 src/xml/xmli18n-tmp.h:5748
+#: src/xml/xmli18n-tmp.h:5793 src/xml/xmli18n-tmp.h:5814
+#: src/xml/xmli18n-tmp.h:5835
+msgid "One Color Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3765 src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4484 src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:4756 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5321
+#: src/xml/xmli18n-tmp.h:5382 src/xml/xmli18n-tmp.h:5451
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5795 src/xml/xmli18n-tmp.h:5816
+#: src/xml/xmli18n-tmp.h:5837
+msgid "Three Color Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:3824 src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5325
+#: src/xml/xmli18n-tmp.h:5386 src/xml/xmli18n-tmp.h:5455
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5757
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5841
+msgid "Four Color Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4424 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:5066 src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:5196 src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5391
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5762
+msgid "Five Color Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3780 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:4078 src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:4430 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4972
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5150 src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5336
+#: src/xml/xmli18n-tmp.h:5397 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5768
+msgid "Six Color Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3919 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:4781 src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:4795 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4921
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:4996
+#: src/xml/xmli18n-tmp.h:5023 src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:5226 src/xml/xmli18n-tmp.h:5279
+#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5603 src/xml/xmli18n-tmp.h:5609
+#: src/xml/xmli18n-tmp.h:5636 src/xml/xmli18n-tmp.h:5642
+msgid "Gray 3"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4782 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4796 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4916 src/xml/xmli18n-tmp.h:4922
+#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4983
+#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5286 src/xml/xmli18n-tmp.h:5294
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5643
+msgid "Gray 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3855 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:4856 src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:4931 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4998
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:5214 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5611
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5644
+msgid "Gray 1"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4985 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5606 src/xml/xmli18n-tmp.h:5639
+msgid "MIS Quadtone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4114
+msgid "One Color Raw Enhanced Gloss"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4016 src/xml/xmli18n-tmp.h:4121
+msgid "Three Color Raw Gloss"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4021 src/xml/xmli18n-tmp.h:4126
+msgid "Four Color Raw Gloss"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4132
+msgid "Six Color Enhanced Gloss Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4035 src/xml/xmli18n-tmp.h:4140
+msgid "Seven Color Enhanced Gloss Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4141
+#, fuzzy
+msgid "MatteBlack"
+msgstr "Черный (K)"
+
+#: src/xml/xmli18n-tmp.h:4224
+#, fuzzy
+msgid "Default Black"
+msgstr "По умолчанию"
+
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4446 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4573 src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:5344
+#: src/xml/xmli18n-tmp.h:5413 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5715
+msgid "Seven Color Photo"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4315
+msgid "Six Color Enhanced Composite"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4368 src/xml/xmli18n-tmp.h:4437
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:5404
+#: src/xml/xmli18n-tmp.h:5473 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5775
+msgid "Seven Color Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5745
+msgid "Two Level Grayscale"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4412 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5448
+#: src/xml/xmli18n-tmp.h:5681 src/xml/xmli18n-tmp.h:5750
+msgid "Two Color Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5531
+msgid "Eight Color Photo"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:4652 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5570
+msgid "Eight Color Raw"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:5288
+msgid "MIS Six Tone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:4994
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5291
+msgid "Gray 5"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:4928 src/xml/xmli18n-tmp.h:4995
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5292
+msgid "Gray 4"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5145
+msgid "Four Color Photo"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5852
+#: src/xml/xmli18n-tmp.h:5858
+msgid "Interleave"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5848 src/xml/xmli18n-tmp.h:5853
+#: src/xml/xmli18n-tmp.h:5859
+msgid "Full Overlap"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5849 src/xml/xmli18n-tmp.h:5854
+#: src/xml/xmli18n-tmp.h:5860
+msgid "Four Pass"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5855
+#: src/xml/xmli18n-tmp.h:5861
+msgid "Full Overlap 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:5862
+msgid "Interleave 2"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5863
+msgid "Eight Pass"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5865
+msgid "On"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5909
+msgid "Legal"
+msgstr "Legal"
+
+#: src/xml/xmli18n-tmp.h:5910
+msgid "Tabloid"
+msgstr "Tabloid"
+
+#: src/xml/xmli18n-tmp.h:5911
+msgid "Executive"
+msgstr "Executive"
+
+#: src/xml/xmli18n-tmp.h:5916
+msgid "3x5"
+msgstr "3×5"
+
+#: src/xml/xmli18n-tmp.h:5917
+msgid "3 1/2 x5"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5918
+msgid "4x6"
+msgstr "4×6"
+
+#: src/xml/xmli18n-tmp.h:5919
+msgid "Epson 4x6 Photo Paper (tear-off borders)"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5920
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5921
+msgid "5x7"
+msgstr "5×7"
+
+#: src/xml/xmli18n-tmp.h:5922
+msgid "5x8"
+msgstr "5×8"
+
+#: src/xml/xmli18n-tmp.h:5923
+msgid "6x8"
+msgstr "6×8"
+
+#: src/xml/xmli18n-tmp.h:5924
+msgid "8x10"
+msgstr "8×10"
+
+#: src/xml/xmli18n-tmp.h:5926
+msgid "12x18"
+msgstr "12×18"
+
+#: src/xml/xmli18n-tmp.h:5927
+msgid "Super B 13x19"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5928
+msgid "Engineering C 17x22"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5929
+msgid "8x12"
+msgstr "8×12"
+
+#: src/xml/xmli18n-tmp.h:5930
+msgid "11x14"
+msgstr "11×14"
+
+#: src/xml/xmli18n-tmp.h:5931
+msgid "16x20"
+msgstr "16×20"
+
+#: src/xml/xmli18n-tmp.h:5932
+msgid "16x24"
+msgstr "16×24"
+
+#: src/xml/xmli18n-tmp.h:5933
+msgid "20x24"
+msgstr "20×24"
+
+#: src/xml/xmli18n-tmp.h:5934
+msgid "20x30"
+msgstr "20×30"
+
+#: src/xml/xmli18n-tmp.h:5935
+msgid "22x30"
+msgstr "22×30"
+
+#: src/xml/xmli18n-tmp.h:5936
+msgid "24x30"
+msgstr "24×30"
+
+#: src/xml/xmli18n-tmp.h:5937
+msgid "Super A1 24x36"
+msgstr "Super A1 24×36"
+
+#: src/xml/xmli18n-tmp.h:5938
+msgid "30x40"
+msgstr "30×40"
+
+#: src/xml/xmli18n-tmp.h:5939
+msgid "4A"
+msgstr "4A"
+
+#: src/xml/xmli18n-tmp.h:5940
+msgid "2A"
+msgstr "2A"
+
+#: src/xml/xmli18n-tmp.h:5941
+msgid "Super A0"
+msgstr "Super A0"
+
+#: src/xml/xmli18n-tmp.h:5942
+msgid "A0"
+msgstr "A0"
+
+#: src/xml/xmli18n-tmp.h:5943
+msgid "A1"
+msgstr "A1"
+
+#: src/xml/xmli18n-tmp.h:5944
+msgid "A2"
+msgstr "A2"
+
+#: src/xml/xmli18n-tmp.h:5945
+msgid "A3"
+msgstr "A3"
+
+#: src/xml/xmli18n-tmp.h:5947
+msgid "A5"
+msgstr "A5"
+
+#: src/xml/xmli18n-tmp.h:5948
+msgid "A6"
+msgstr "A6"
+
+#: src/xml/xmli18n-tmp.h:5949
+msgid "A7"
+msgstr "A7"
+
+#: src/xml/xmli18n-tmp.h:5950
+msgid "A8"
+msgstr "A8"
+
+#: src/xml/xmli18n-tmp.h:5951
+msgid "A9"
+msgstr "A9"
+
+#: src/xml/xmli18n-tmp.h:5952
+msgid "A10"
+msgstr "A10"
+
+#: src/xml/xmli18n-tmp.h:5953
+msgid "RA0"
+msgstr "RA0"
+
+#: src/xml/xmli18n-tmp.h:5954
+msgid "RA1"
+msgstr "RA1"
+
+#: src/xml/xmli18n-tmp.h:5955
+msgid "RA2"
+msgstr "RA2"
+
+#: src/xml/xmli18n-tmp.h:5956
+msgid "RA3"
+msgstr "RA3"
+
+#: src/xml/xmli18n-tmp.h:5957
+msgid "RA4"
+msgstr "RA4"
+
+#: src/xml/xmli18n-tmp.h:5958
+msgid "SRA0"
+msgstr "SRA0"
+
+#: src/xml/xmli18n-tmp.h:5959
+msgid "SRA1"
+msgstr "SRA1"
+
+#: src/xml/xmli18n-tmp.h:5960
+msgid "SRA2"
+msgstr "SRA2"
+
+#: src/xml/xmli18n-tmp.h:5961
+msgid "SRA3"
+msgstr "SRA3"
+
+#: src/xml/xmli18n-tmp.h:5962
+msgid "SRA4"
+msgstr "SRA4"
+
+#: src/xml/xmli18n-tmp.h:5963
+msgid "4B ISO"
+msgstr "4B ISO"
+
+#: src/xml/xmli18n-tmp.h:5964
+msgid "2B ISO"
+msgstr "2B ISO"
+
+#: src/xml/xmli18n-tmp.h:5965
+msgid "B0 ISO"
+msgstr "B0 ISO"
+
+#: src/xml/xmli18n-tmp.h:5966
+msgid "B1 ISO"
+msgstr "B1 ISO"
+
+#: src/xml/xmli18n-tmp.h:5967
+msgid "B2 ISO"
+msgstr "B2 ISO"
+
+#: src/xml/xmli18n-tmp.h:5968
+msgid "B3 ISO"
+msgstr "B3 ISO"
+
+#: src/xml/xmli18n-tmp.h:5969
+msgid "B4 ISO"
+msgstr "B4 ISO"
+
+#: src/xml/xmli18n-tmp.h:5970
+msgid "B5 ISO"
+msgstr "B5 ISO"
+
+#: src/xml/xmli18n-tmp.h:5971
+msgid "B6 ISO"
+msgstr "B6 ISO"
+
+#: src/xml/xmli18n-tmp.h:5972
+msgid "B7 ISO"
+msgstr "B7 ISO"
+
+#: src/xml/xmli18n-tmp.h:5973
+msgid "B8 ISO"
+msgstr "B8 ISO"
+
+#: src/xml/xmli18n-tmp.h:5974
+msgid "B9 ISO"
+msgstr "B9 ISO"
+
+#: src/xml/xmli18n-tmp.h:5975
+msgid "B10 ISO"
+msgstr "B10 ISO"
+
+#: src/xml/xmli18n-tmp.h:5976
+msgid "Super B0 JIS"
+msgstr "Super B0 JIS"
+
+#: src/xml/xmli18n-tmp.h:5977
+msgid "B0 JIS"
+msgstr "B0 JIS"
+
+#: src/xml/xmli18n-tmp.h:5978
+msgid "B1 JIS"
+msgstr "B1 JIS"
+
+#: src/xml/xmli18n-tmp.h:5979
+msgid "B2 JIS"
+msgstr "B2 JIS"
+
+#: src/xml/xmli18n-tmp.h:5980
+msgid "B3 JIS"
+msgstr "B3 JIS"
+
+#: src/xml/xmli18n-tmp.h:5981
+msgid "B4 JIS"
+msgstr "B4 JIS"
+
+#: src/xml/xmli18n-tmp.h:5982
+msgid "B5 JIS"
+msgstr "B5 JIS"
+
+#: src/xml/xmli18n-tmp.h:5983
+msgid "B6 JIS"
+msgstr "B6 JIS"
+
+#: src/xml/xmli18n-tmp.h:5984
+msgid "B7 JIS"
+msgstr "B7 JIS"
+
+#: src/xml/xmli18n-tmp.h:5985
+msgid "B8 JIS"
+msgstr "B8 JIS"
+
+#: src/xml/xmli18n-tmp.h:5986
+msgid "B9 JIS"
+msgstr "B9 JIS"
+
+#: src/xml/xmli18n-tmp.h:5987
+msgid "B10 JIS"
+msgstr "B10 JIS"
+
+#: src/xml/xmli18n-tmp.h:5988
+msgid "C0"
+msgstr "C0"
+
+#: src/xml/xmli18n-tmp.h:5989
+msgid "C0 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5990
+msgid "C1"
+msgstr "C1"
+
+#: src/xml/xmli18n-tmp.h:5991
+msgid "C1 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5992
+msgid "C2"
+msgstr "C2"
+
+#: src/xml/xmli18n-tmp.h:5993
+msgid "C2 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5994
+msgid "C3"
+msgstr "C3"
+
+#: src/xml/xmli18n-tmp.h:5995
+msgid "C3 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5996
+msgid "C4"
+msgstr "C4"
+
+#: src/xml/xmli18n-tmp.h:5997
+msgid "C4 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:5998
+msgid "C5"
+msgstr "C5"
+
+#: src/xml/xmli18n-tmp.h:5999
+msgid "C5 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6000
+msgid "B6-C4"
+msgstr "B6-C4"
+
+#: src/xml/xmli18n-tmp.h:6001
+msgid "B6-C4 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6002
+msgid "C6"
+msgstr "C6"
+
+#: src/xml/xmli18n-tmp.h:6003
+msgid "C6 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6004
+msgid "DL"
+msgstr "DL"
+
+#: src/xml/xmli18n-tmp.h:6005
+msgid "DL landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6006
+msgid "C7-6"
+msgstr "C7-6"
+
+#: src/xml/xmli18n-tmp.h:6007
+msgid "C7-6 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6008
+msgid "C7"
+msgstr "C7"
+
+#: src/xml/xmli18n-tmp.h:6009
+msgid "C7 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6010
+msgid "C8"
+msgstr "C8"
+
+#: src/xml/xmli18n-tmp.h:6011
+msgid "C8 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6012
+msgid "C9"
+msgstr "C9"
+
+#: src/xml/xmli18n-tmp.h:6013
+msgid "C9 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6014
+msgid "C10"
+msgstr "C10"
+
+#: src/xml/xmli18n-tmp.h:6015
+msgid "C10 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6016
+msgid "ArchA"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6017
+msgid "ArchA transposed"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6018
+msgid "ArchB"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6019
+msgid "ArchB transposed"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6020
+msgid "ArchC"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6021
+msgid "ArchC transposed"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6022
+msgid "ArchD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6023
+msgid "ArchD transposed"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6024
+msgid "ArchE"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6025
+msgid "ArchE transposed"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6026
+msgid "American foolscap"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6027
+msgid "European foolscap"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6028
+msgid "Crown Quarto"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6029
+msgid "Large Crown Quarto"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6030
+msgid "Demy Quarto"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6031
+msgid "Royal Quarto"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6032
+msgid "Crown Octavo"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6033
+msgid "Large Crown Octavo"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6034
+msgid "Demy Octavo"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6035
+msgid "Royal Octavo"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6036
+msgid "Small paperback"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6037
+msgid "Penguin small paperback"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6038
+msgid "Penguin large paperback"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6039
+msgid "10cm x 15cm"
+msgstr "10×15 �м"
+
+#: src/xml/xmli18n-tmp.h:6040
+msgid "Hagaki Card"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6041
+msgid "Oufuku Card"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6042
+msgid "Japanese long envelope #3"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6043
+msgid "Japanese long envelope #3 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6044
+msgid "Japanese long envelope #4"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6045
+msgid "Japanese long envelope #4 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6046
+msgid "Japanese Kaku envelope #4"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6047
+msgid "Japanese Kaku envelope #4 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6048
+msgid "Commercial 10"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6049
+msgid "Commercial 10 landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6050
+msgid "A2 Invitation"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6051
+msgid "Monarch Envelope"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6052
+msgid "Monarch Envelope landscape"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6053
+msgid "4x5 3/8"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6054
+msgid "4x7"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6055
+msgid "CP_L"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6056
+msgid "Card"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6057
+msgid "Wide Postcard"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6058
+msgid "Chilean Office"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6059
+msgid "Chilean Double Letter"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6060
+msgid "Chilean Double Office"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6062
+msgid "89 mm Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6063
+msgid "4 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6064
+msgid "5 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6065
+msgid "210 mm Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6066
+msgid "13 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6067
+msgid "17 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6068
+msgid "22 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6069
+msgid "24 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6070
+msgid "36 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6071
+msgid "44 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6072
+msgid "60 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6073
+msgid "64 Inch Roll Paper"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6074
+msgid "PostScript Level 1"
+msgstr "PostScript Level 1"
+
+#: src/xml/xmli18n-tmp.h:6075
+msgid "PostScript Level 2"
+msgstr "PostScript Level 2"
+
+#: src/xml/xmli18n-tmp.h:6076
+msgid "Canon BJ-30"
+msgstr "Canon BJ-30"
+
+#: src/xml/xmli18n-tmp.h:6077
+msgid "Canon BJC-50"
+msgstr "Canon BJC-50"
+
+#: src/xml/xmli18n-tmp.h:6078
+msgid "Canon BJC-55"
+msgstr "Canon BJC-55"
+
+#: src/xml/xmli18n-tmp.h:6079
+msgid "Canon BJC-80"
+msgstr "Canon BJC-80"
+
+#: src/xml/xmli18n-tmp.h:6080
+msgid "Canon BJC-85"
+msgstr "Canon BJC-85"
+
+#: src/xml/xmli18n-tmp.h:6081
+msgid "Canon BJC-210"
+msgstr "Canon BJC-210"
+
+#: src/xml/xmli18n-tmp.h:6082
+msgid "Canon BJC-240"
+msgstr "Canon BJC-240"
+
+#: src/xml/xmli18n-tmp.h:6083
+msgid "Canon BJC-250"
+msgstr "Canon BJC-250"
+
+#: src/xml/xmli18n-tmp.h:6084
+msgid "Canon BJC-1000"
+msgstr "Canon BJC-1000"
+
+#: src/xml/xmli18n-tmp.h:6085
+msgid "Canon BJC-2000"
+msgstr "Canon BJC-2000"
+
+#: src/xml/xmli18n-tmp.h:6086
+msgid "Canon BJC-2010"
+msgstr "Canon BJC-2010"
+
+#: src/xml/xmli18n-tmp.h:6087
+msgid "Canon BJC-2100"
+msgstr "Canon BJC-2100"
+
+#: src/xml/xmli18n-tmp.h:6088
+msgid "Canon BJC-2110"
+msgstr "Canon BJC-2110"
+
+#: src/xml/xmli18n-tmp.h:6089
+msgid "Canon BJC-3000"
+msgstr "Canon BJC-3000"
+
+#: src/xml/xmli18n-tmp.h:6090
+msgid "Canon BJC-4000"
+msgstr "Canon BJC-4000"
+
+#: src/xml/xmli18n-tmp.h:6091
+msgid "Canon BJC-4300"
+msgstr "Canon BJC-4300"
+
+#: src/xml/xmli18n-tmp.h:6092
+msgid "Canon BJC-4400"
+msgstr "Canon BJC-4400"
+
+#: src/xml/xmli18n-tmp.h:6093
+msgid "Canon BJC-5100"
+msgstr "Canon BJC-5100"
+
+#: src/xml/xmli18n-tmp.h:6094
+msgid "Canon BJC-5500"
+msgstr "Canon BJC-5500"
+
+#: src/xml/xmli18n-tmp.h:6095
+msgid "Canon BJC-6000"
+msgstr "Canon BJC-6000"
+
+#: src/xml/xmli18n-tmp.h:6096
+msgid "Canon BJC-6100"
+msgstr "Canon BJC-6100"
+
+#: src/xml/xmli18n-tmp.h:6097
+msgid "Canon BJC-6200"
+msgstr "Canon BJC-6200"
+
+#: src/xml/xmli18n-tmp.h:6098
+msgid "Canon BJC-6500"
+msgstr "Canon BJC-6500"
+
+#: src/xml/xmli18n-tmp.h:6099
+msgid "Canon BJC-7000"
+msgstr "Canon BJC-7000"
+
+#: src/xml/xmli18n-tmp.h:6100
+msgid "Canon BJC-7100"
+msgstr "Canon BJC-7100"
+
+#: src/xml/xmli18n-tmp.h:6101
+msgid "Canon BJC-8200"
+msgstr "Canon BJC-8200"
+
+#: src/xml/xmli18n-tmp.h:6102
+msgid "Canon BJC-8500"
+msgstr "Canon BJC-8500"
+
+#: src/xml/xmli18n-tmp.h:6103
+msgid "Canon S100"
+msgstr "Canon S100"
+
+#: src/xml/xmli18n-tmp.h:6104
+msgid "Canon S200"
+msgstr "Canon S200"
+
+#: src/xml/xmli18n-tmp.h:6105
+msgid "Canon S300"
+msgstr "Canon S300"
+
+#: src/xml/xmli18n-tmp.h:6106
+msgid "Canon S400"
+msgstr "Canon S400"
+
+#: src/xml/xmli18n-tmp.h:6107
+msgid "Canon S450"
+msgstr "Canon S450"
+
+#: src/xml/xmli18n-tmp.h:6108
+msgid "Canon S500"
+msgstr "Canon S500"
+
+#: src/xml/xmli18n-tmp.h:6109
+msgid "Canon S600"
+msgstr "Canon S600"
+
+#: src/xml/xmli18n-tmp.h:6110
+msgid "Canon S630"
+msgstr "Canon S630"
+
+#: src/xml/xmli18n-tmp.h:6111
+msgid "Canon S800"
+msgstr "Canon S800"
+
+#: src/xml/xmli18n-tmp.h:6112
+msgid "Canon S4500"
+msgstr "Canon S4500"
+
+#: src/xml/xmli18n-tmp.h:6113
+msgid "Canon PIXMA iP2000"
+msgstr "Canon PIXMA iP2000"
+
+#: src/xml/xmli18n-tmp.h:6114
+msgid "Canon PIXMA iP3000"
+msgstr "Canon PIXMA iP3000"
+
+#: src/xml/xmli18n-tmp.h:6115
+msgid "Canon PIXMA iP3100"
+msgstr "Canon PIXMA iP3100"
+
+#: src/xml/xmli18n-tmp.h:6116
+msgid "Canon PIXMA iP4000"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6117
+msgid "Canon PIXMA iP4100"
+msgstr "Canon PIXMA iP4100"
+
+#: src/xml/xmli18n-tmp.h:6118
+msgid "Canon PIXMA iP4200"
+msgstr "Canon PIXMA iP4200"
+
+#: src/xml/xmli18n-tmp.h:6119
+msgid "Canon PIXMA iP4300"
+msgstr "Canon PIXMA iP4300"
+
+#: src/xml/xmli18n-tmp.h:6120
+msgid "Canon PIXMA iP4500"
+msgstr "Canon PIXMA iP4500"
+
+#: src/xml/xmli18n-tmp.h:6121
+msgid "Canon PIXMA iP4600"
+msgstr "Canon PIXMA iP4600"
+
+#: src/xml/xmli18n-tmp.h:6122
+msgid "Canon PIXMA iP5000"
+msgstr "Canon PIXMA iP5000"
+
+#: src/xml/xmli18n-tmp.h:6123
+msgid "Canon PIXMA iP5200"
+msgstr "Canon PIXMA iP5200"
+
+#: src/xml/xmli18n-tmp.h:6124
+msgid "Canon PIXMA iP5300"
+msgstr "Canon PIXMA iP5300"
+
+#: src/xml/xmli18n-tmp.h:6125
+msgid "Canon PIXMA iP6000D"
+msgstr "Canon PIXMA iP6000D"
+
+#: src/xml/xmli18n-tmp.h:6126
+msgid "Canon PIXMA iP6700"
+msgstr "Canon PIXMA iP6700"
+
+#: src/xml/xmli18n-tmp.h:6127
+msgid "Canon PIXMA iP8500"
+msgstr "Canon PIXMA iP8500"
+
+#: src/xml/xmli18n-tmp.h:6128
+#, fuzzy
+msgid "Canon PIXMA iX4000"
+msgstr "Canon PIXMA iP4000"
+
+#: src/xml/xmli18n-tmp.h:6129
+msgid "Canon PIXMA iX5000"
+msgstr "Canon PIXMA iX5000"
+
+#: src/xml/xmli18n-tmp.h:6130
+msgid "Canon PIXMA Pro9500"
+msgstr "Canon PIXMA Pro9500"
+
+#: src/xml/xmli18n-tmp.h:6131
+msgid "Canon PIXMA MP150"
+msgstr "Canon PIXMA MP150"
+
+#: src/xml/xmli18n-tmp.h:6132
+msgid "Canon PIXMA MP160"
+msgstr "Canon PIXMA MP160"
+
+#: src/xml/xmli18n-tmp.h:6133
+msgid "Canon PIXMA MP170"
+msgstr "Canon PIXMA MP170"
+
+#: src/xml/xmli18n-tmp.h:6134
+msgid "Canon PIXMA MP180"
+msgstr "Canon PIXMA MP180"
+
+#: src/xml/xmli18n-tmp.h:6135
+msgid "Canon PIXMA MP220"
+msgstr "Canon PIXMA MP220"
+
+#: src/xml/xmli18n-tmp.h:6136
+msgid "Canon PIXMA MP500"
+msgstr "Canon PIXMA MP500"
+
+#: src/xml/xmli18n-tmp.h:6137
+msgid "Canon PIXMA MP520"
+msgstr "Canon PIXMA MP520"
+
+#: src/xml/xmli18n-tmp.h:6138
+msgid "Canon PIXMA MP610"
+msgstr "Canon PIXMA MP610"
+
+#: src/xml/xmli18n-tmp.h:6139
+msgid "Canon PIXMA MP700"
+msgstr "Canon PIXMA MP700"
+
+#: src/xml/xmli18n-tmp.h:6140
+msgid "Canon PIXMA MP710"
+msgstr "Canon PIXMA MP710"
+
+#: src/xml/xmli18n-tmp.h:6141
+msgid "Canon PIXMA MP730"
+msgstr "Canon PIXMA MP730"
+
+#: src/xml/xmli18n-tmp.h:6142
+msgid "Canon PIXMA MP740"
+msgstr "Canon PIXMA MP740"
+
+#: src/xml/xmli18n-tmp.h:6143
+msgid "Canon PIXMA MP750"
+msgstr "Canon PIXMA MP750"
+
+#: src/xml/xmli18n-tmp.h:6144
+msgid "Canon PIXMA MP760"
+msgstr "Canon PIXMA MP760"
+
+#: src/xml/xmli18n-tmp.h:6145
+msgid "Canon PIXMA MP770"
+msgstr "Canon PIXMA MP770"
+
+#: src/xml/xmli18n-tmp.h:6146
+msgid "Canon PIXMA MP780"
+msgstr "Canon PIXMA MP780"
+
+#: src/xml/xmli18n-tmp.h:6147
+msgid "Canon PIXMA MP790"
+msgstr "Canon PIXMA MP790"
+
+#: src/xml/xmli18n-tmp.h:6148
+msgid "Canon PIXMA MP830"
+msgstr "Canon PIXMA MP830"
+
+#: src/xml/xmli18n-tmp.h:6149
+msgid "Canon PIXUS iP3100"
+msgstr "Canon PIXUS iP3100"
+
+#: src/xml/xmli18n-tmp.h:6150
+msgid "Canon PIXUS iP4100"
+msgstr "Canon PIXUS iP4100"
+
+#: src/xml/xmli18n-tmp.h:6151
+msgid "Canon i80"
+msgstr "Canon i80"
+
+#: src/xml/xmli18n-tmp.h:6152
+msgid "Canon i560"
+msgstr "Canon i560"
+
+#: src/xml/xmli18n-tmp.h:6153
+msgid "Canon i850"
+msgstr "Canon i850"
+
+#: src/xml/xmli18n-tmp.h:6154
+msgid "Canon i860"
+msgstr "Canon i860"
+
+#: src/xml/xmli18n-tmp.h:6155
+msgid "Canon i865"
+msgstr "Canon i865"
+
+#: src/xml/xmli18n-tmp.h:6156
+msgid "Epson Artisan 700"
+msgstr "Epson Artisan 700"
+
+#: src/xml/xmli18n-tmp.h:6157
+msgid "Epson Artisan 800"
+msgstr "Epson Artisan 800"
+
+#: src/xml/xmli18n-tmp.h:6158
+msgid "Epson B-300"
+msgstr "Epson B-300"
+
+#: src/xml/xmli18n-tmp.h:6159
+msgid "Epson B-308"
+msgstr "Epson B-308"
+
+#: src/xml/xmli18n-tmp.h:6160
+msgid "Epson B-500DN"
+msgstr "Epson B-500DN"
+
+#: src/xml/xmli18n-tmp.h:6161
+msgid "Epson B-508DN"
+msgstr "Epson B-508DN"
+
+#: src/xml/xmli18n-tmp.h:6162
+msgid "Epson Stylus C20"
+msgstr "Epson Stylus C20"
+
+#: src/xml/xmli18n-tmp.h:6163
+msgid "Epson Stylus C20SX"
+msgstr "Epson Stylus C20SX"
+
+#: src/xml/xmli18n-tmp.h:6164
+msgid "Epson Stylus C20UX"
+msgstr "Epson Stylus C20UX"
+
+#: src/xml/xmli18n-tmp.h:6165
+msgid "Epson Stylus C40"
+msgstr "Epson Stylus C40"
+
+#: src/xml/xmli18n-tmp.h:6166
+msgid "Epson Stylus C40SX"
+msgstr "Epson Stylus C40SX"
+
+#: src/xml/xmli18n-tmp.h:6167
+msgid "Epson Stylus C40UX"
+msgstr "Epson Stylus C40UX"
+
+#: src/xml/xmli18n-tmp.h:6168
+msgid "Epson Stylus C41"
+msgstr "Epson Stylus C41"
+
+#: src/xml/xmli18n-tmp.h:6169
+msgid "Epson Stylus C41SX"
+msgstr "Epson Stylus C41SX"
+
+#: src/xml/xmli18n-tmp.h:6170
+msgid "Epson Stylus C41UX"
+msgstr "Epson Stylus C41UX"
+
+#: src/xml/xmli18n-tmp.h:6171
+msgid "Epson Stylus C42"
+msgstr "Epson Stylus C42"
+
+#: src/xml/xmli18n-tmp.h:6172
+msgid "Epson Stylus C42SX"
+msgstr "Epson Stylus C42SX"
+
+#: src/xml/xmli18n-tmp.h:6173
+msgid "Epson Stylus C42UX"
+msgstr "Epson Stylus C42UX"
+
+#: src/xml/xmli18n-tmp.h:6174
+msgid "Epson Stylus C43"
+msgstr "Epson Stylus C43"
+
+#: src/xml/xmli18n-tmp.h:6175
+msgid "Epson Stylus C43SX"
+msgstr "Epson Stylus C43SX"
+
+#: src/xml/xmli18n-tmp.h:6176
+msgid "Epson Stylus C43UX"
+msgstr "Epson Stylus C43UX"
+
+#: src/xml/xmli18n-tmp.h:6177
+msgid "Epson Stylus C44"
+msgstr "Epson Stylus C44"
+
+#: src/xml/xmli18n-tmp.h:6178
+msgid "Epson Stylus C44SX"
+msgstr "Epson Stylus C44SX"
+
+#: src/xml/xmli18n-tmp.h:6179
+msgid "Epson Stylus C44UX"
+msgstr "Epson Stylus C44UX"
+
+#: src/xml/xmli18n-tmp.h:6180
+msgid "Epson Stylus C45"
+msgstr "Epson Stylus C45"
+
+#: src/xml/xmli18n-tmp.h:6181
+msgid "Epson Stylus C46"
+msgstr "Epson Stylus C46"
+
+#: src/xml/xmli18n-tmp.h:6182
+msgid "Epson Stylus C48"
+msgstr "Epson Stylus C48"
+
+#: src/xml/xmli18n-tmp.h:6183
+msgid "Epson Stylus C50"
+msgstr "Epson Stylus C50"
+
+#: src/xml/xmli18n-tmp.h:6184
+msgid "Epson Stylus C60"
+msgstr "Epson Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6185
+msgid "Epson Stylus C61"
+msgstr "Epson Stylus C61"
+
+#: src/xml/xmli18n-tmp.h:6186
+msgid "Epson Stylus C62"
+msgstr "Epson Stylus C62"
+
+#: src/xml/xmli18n-tmp.h:6187
+msgid "Epson Stylus C63"
+msgstr "Epson Stylus C63"
+
+#: src/xml/xmli18n-tmp.h:6188
+msgid "Epson Stylus C64"
+msgstr "Epson Stylus C64"
+
+#: src/xml/xmli18n-tmp.h:6189
+msgid "Epson Stylus C65"
+msgstr "Epson Stylus C65"
+
+#: src/xml/xmli18n-tmp.h:6190
+msgid "Epson Stylus C66"
+msgstr "Epson Stylus C66"
+
+#: src/xml/xmli18n-tmp.h:6191
+msgid "Epson Stylus C68"
+msgstr "Epson Stylus C68"
+
+#: src/xml/xmli18n-tmp.h:6192
+msgid "Epson Stylus C70"
+msgstr "Epson Stylus C70"
+
+#: src/xml/xmli18n-tmp.h:6193
+msgid "Epson Stylus C79"
+msgstr "Epson Stylus C79"
+
+#: src/xml/xmli18n-tmp.h:6194
+msgid "Epson Stylus C80"
+msgstr "Epson Stylus C80"
+
+#: src/xml/xmli18n-tmp.h:6195
+msgid "Epson Stylus C82"
+msgstr "Epson Stylus C82"
+
+#: src/xml/xmli18n-tmp.h:6196
+msgid "Epson Stylus C83"
+msgstr "Epson Stylus C83"
+
+#: src/xml/xmli18n-tmp.h:6197
+msgid "Epson Stylus C84"
+msgstr "Epson Stylus C84"
+
+#: src/xml/xmli18n-tmp.h:6198
+msgid "Epson Stylus C85"
+msgstr "Epson Stylus C85"
+
+#: src/xml/xmli18n-tmp.h:6199
+msgid "Epson Stylus C86"
+msgstr "Epson Stylus C86"
+
+#: src/xml/xmli18n-tmp.h:6200
+msgid "Epson Stylus C87"
+msgstr "Epson Stylus C87"
+
+#: src/xml/xmli18n-tmp.h:6201
+msgid "Epson Stylus C88"
+msgstr "Epson Stylus C88"
+
+#: src/xml/xmli18n-tmp.h:6202
+msgid "Epson Stylus C110"
+msgstr "Epson Stylus C110"
+
+#: src/xml/xmli18n-tmp.h:6203
+msgid "Epson Stylus C120"
+msgstr "Epson Stylus C120"
+
+#: src/xml/xmli18n-tmp.h:6204
+msgid "Epson Stylus Color"
+msgstr "Epson Stylus Color"
+
+#: src/xml/xmli18n-tmp.h:6205
+msgid "Epson Stylus Color I"
+msgstr "Epson Stylus Color I"
+
+#: src/xml/xmli18n-tmp.h:6206
+msgid "Epson Stylus Color II"
+msgstr "Epson Stylus Color II"
+
+#: src/xml/xmli18n-tmp.h:6207
+msgid "Epson Stylus Color IIs"
+msgstr "Epson Stylus Color IIs"
+
+#: src/xml/xmli18n-tmp.h:6208
+msgid "Epson Stylus Color PRO"
+msgstr "Epson Stylus Color PRO"
+
+#: src/xml/xmli18n-tmp.h:6209
+msgid "Epson Stylus Pro XL"
+msgstr "Epson Stylus Pro XL"
+
+#: src/xml/xmli18n-tmp.h:6210
+msgid "Epson Stylus Color 400"
+msgstr "Epson Stylus Color 400"
+
+#: src/xml/xmli18n-tmp.h:6211
+msgid "Epson Stylus Color 440"
+msgstr "Epson Stylus Color 440"
+
+#: src/xml/xmli18n-tmp.h:6212
+msgid "Epson Stylus Color 460"
+msgstr "Epson Stylus Color 460"
+
+#: src/xml/xmli18n-tmp.h:6213
+msgid "Epson Stylus Color 480"
+msgstr "Epson Stylus Color 480"
+
+#: src/xml/xmli18n-tmp.h:6214
+msgid "Epson Stylus Color 500"
+msgstr "Epson Stylus Color 500"
+
+#: src/xml/xmli18n-tmp.h:6215
+msgid "Epson Stylus Color 580"
+msgstr "Epson Stylus Color 580"
+
+#: src/xml/xmli18n-tmp.h:6216
+msgid "Epson Stylus Color 600"
+msgstr "Epson Stylus Color 600"
+
+#: src/xml/xmli18n-tmp.h:6217
+msgid "Epson Stylus Color 640"
+msgstr "Epson Stylus Color 640"
+
+#: src/xml/xmli18n-tmp.h:6218
+msgid "Epson Stylus Color 660"
+msgstr "Epson Stylus Color 660"
+
+#: src/xml/xmli18n-tmp.h:6219
+msgid "Epson Stylus Color 670"
+msgstr "Epson Stylus Color 670"
+
+#: src/xml/xmli18n-tmp.h:6220
+msgid "Epson Stylus Color 680"
+msgstr "Epson Stylus Color 680"
+
+#: src/xml/xmli18n-tmp.h:6221
+msgid "Epson Stylus Color 740"
+msgstr "Epson Stylus Color 740"
+
+#: src/xml/xmli18n-tmp.h:6222
+msgid "Epson Stylus Color 760"
+msgstr "Epson Stylus Color 760"
+
+#: src/xml/xmli18n-tmp.h:6223
+msgid "Epson Stylus Color 777"
+msgstr "Epson Stylus Color 777"
+
+#: src/xml/xmli18n-tmp.h:6224
+msgid "Epson Stylus Color 800"
+msgstr "Epson Stylus Color 800"
+
+#: src/xml/xmli18n-tmp.h:6225
+msgid "Epson Stylus Color 850"
+msgstr "Epson Stylus Color 850"
+
+#: src/xml/xmli18n-tmp.h:6226
+msgid "Epson Stylus Color 860"
+msgstr "Epson Stylus Color 860"
+
+#: src/xml/xmli18n-tmp.h:6227
+msgid "Epson Stylus Color 880"
+msgstr "Epson Stylus Color 880"
+
+#: src/xml/xmli18n-tmp.h:6228
+msgid "Epson Stylus Color 8 3"
+msgstr "Epson Stylus Color 8 3"
+
+#: src/xml/xmli18n-tmp.h:6229
+msgid "Epson Stylus Color 900"
+msgstr "Epson Stylus Color 900"
+
+#: src/xml/xmli18n-tmp.h:6230
+msgid "Epson Stylus Color 980"
+msgstr "Epson Stylus Color 980"
+
+#: src/xml/xmli18n-tmp.h:6231
+msgid "Epson Stylus Color 1160"
+msgstr "Epson Stylus Color 1160"
+
+#: src/xml/xmli18n-tmp.h:6232
+msgid "Epson Stylus Color 1500"
+msgstr "Epson Stylus Color 1500"
+
+#: src/xml/xmli18n-tmp.h:6233
+msgid "Epson Stylus Color 1520"
+msgstr "Epson Stylus Color 1520"
+
+#: src/xml/xmli18n-tmp.h:6234
+msgid "Epson Stylus Color 3000"
+msgstr "Epson Stylus Color 3000"
+
+#: src/xml/xmli18n-tmp.h:6235
+msgid "Epson Stylus Office B30"
+msgstr "Epson Stylus Office B30"
+
+#: src/xml/xmli18n-tmp.h:6236
+msgid "Epson Stylus Office B33"
+msgstr "Epson Stylus Office B33"
+
+#: src/xml/xmli18n-tmp.h:6237
+msgid "Epson Stylus Office B40W"
+msgstr "Epson Stylus Office B40W"
+
+#: src/xml/xmli18n-tmp.h:6238
+msgid "Epson Stylus Office T30"
+msgstr "Epson Stylus Office T30"
+
+#: src/xml/xmli18n-tmp.h:6239
+msgid "Epson Stylus Office T33"
+msgstr "Epson Stylus Office T33"
+
+#: src/xml/xmli18n-tmp.h:6240
+msgid "Epson Stylus Office T40W"
+msgstr "Epson Stylus Office T40W"
+
+#: src/xml/xmli18n-tmp.h:6241
+msgid "Epson Stylus Office BX300F"
+msgstr "Epson Stylus Office BX300F"
+
+#: src/xml/xmli18n-tmp.h:6242
+msgid "Epson Stylus Office BX600FW"
+msgstr "Epson Stylus Office BX600FW"
+
+#: src/xml/xmli18n-tmp.h:6243
+msgid "Epson Stylus Office SX600FW"
+msgstr "Epson Stylus Office SX600FW"
+
+#: src/xml/xmli18n-tmp.h:6244
+msgid "Epson Stylus Office TX300F"
+msgstr "Epson Stylus Office TX300F"
+
+#: src/xml/xmli18n-tmp.h:6245
+msgid "Epson Stylus Office TX600FW"
+msgstr "Epson Stylus Office TX600FW"
+
+#: src/xml/xmli18n-tmp.h:6246
+msgid "Epson Stylus Photo"
+msgstr "Epson Stylus Photo"
+
+#: src/xml/xmli18n-tmp.h:6247
+msgid "Epson Stylus Photo 700"
+msgstr "Epson Stylus Photo 700"
+
+#: src/xml/xmli18n-tmp.h:6248
+msgid "Epson Stylus Photo EX"
+msgstr "Epson Stylus Photo EX"
+
+#: src/xml/xmli18n-tmp.h:6249
+msgid "Epson Stylus Photo EX3"
+msgstr "Epson Stylus Photo EX3"
+
+#: src/xml/xmli18n-tmp.h:6250
+msgid "Epson Stylus Photo 720"
+msgstr "Epson Stylus Photo 720"
+
+#: src/xml/xmli18n-tmp.h:6251
+msgid "Epson Stylus Photo 750"
+msgstr "Epson Stylus Photo 750"
+
+#: src/xml/xmli18n-tmp.h:6252
+msgid "Epson Stylus Photo 780"
+msgstr "Epson Stylus Photo 780"
+
+#: src/xml/xmli18n-tmp.h:6253
+msgid "Epson Stylus Photo 785"
+msgstr "Epson Stylus Photo 785"
+
+#: src/xml/xmli18n-tmp.h:6254
+msgid "Epson Stylus Photo 790"
+msgstr "Epson Stylus Photo 790"
+
+#: src/xml/xmli18n-tmp.h:6255
+msgid "Epson Stylus Photo 810"
+msgstr "Epson Stylus Photo 810"
+
+#: src/xml/xmli18n-tmp.h:6256
+msgid "Epson Stylus Photo 820"
+msgstr "Epson Stylus Photo 820"
+
+#: src/xml/xmli18n-tmp.h:6257
+msgid "Epson Stylus Photo 825"
+msgstr "Epson Stylus Photo 825"
+
+#: src/xml/xmli18n-tmp.h:6258
+msgid "Epson Stylus Photo 830"
+msgstr "Epson Stylus Photo 830"
+
+#: src/xml/xmli18n-tmp.h:6259
+msgid "Epson Stylus Photo 830U"
+msgstr "Epson Stylus Photo 830U"
+
+#: src/xml/xmli18n-tmp.h:6260
+msgid "Epson Stylus Photo 870"
+msgstr "Epson Stylus Photo 870"
+
+#: src/xml/xmli18n-tmp.h:6261
+msgid "Epson Stylus Photo 875"
+msgstr "Epson Stylus Photo 875"
+
+#: src/xml/xmli18n-tmp.h:6262
+msgid "Epson Stylus Photo 890"
+msgstr "Epson Stylus Photo 890"
+
+#: src/xml/xmli18n-tmp.h:6263
+msgid "Epson Stylus Photo 895"
+msgstr "Epson Stylus Photo 895"
+
+#: src/xml/xmli18n-tmp.h:6264
+msgid "Epson Stylus Photo 900"
+msgstr "Epson Stylus Photo 900"
+
+#: src/xml/xmli18n-tmp.h:6265
+msgid "Epson Stylus Photo 915"
+msgstr "Epson Stylus Photo 915"
+
+#: src/xml/xmli18n-tmp.h:6266
+msgid "Epson Stylus Photo 925"
+msgstr "Epson Stylus Photo 925"
+
+#: src/xml/xmli18n-tmp.h:6267
+msgid "Epson Stylus Photo 935"
+msgstr "Epson Stylus Photo 935"
+
+#: src/xml/xmli18n-tmp.h:6268
+msgid "Epson Stylus Photo 950"
+msgstr "Epson Stylus Photo 950"
+
+#: src/xml/xmli18n-tmp.h:6269
+msgid "Epson Stylus Photo 960"
+msgstr "Epson Stylus Photo 960"
+
+#: src/xml/xmli18n-tmp.h:6270
+msgid "Epson Stylus Photo 1200"
+msgstr "Epson Stylus Photo 1200"
+
+#: src/xml/xmli18n-tmp.h:6271
+msgid "Epson Stylus Photo 1270"
+msgstr "Epson Stylus Photo 1270"
+
+#: src/xml/xmli18n-tmp.h:6272
+msgid "Epson Stylus Photo 1280"
+msgstr "Epson Stylus Photo 1280"
+
+#: src/xml/xmli18n-tmp.h:6273
+msgid "Epson Stylus Photo 1290"
+msgstr "Epson Stylus Photo 1290"
+
+#: src/xml/xmli18n-tmp.h:6274
+msgid "Epson Stylus Photo 1400"
+msgstr "Epson Stylus Photo 1400"
+
+#: src/xml/xmli18n-tmp.h:6275
+msgid "Epson Stylus Photo 1410"
+msgstr "Epson Stylus Photo 1410"
+
+#: src/xml/xmli18n-tmp.h:6276
+msgid "Epson Stylus Photo 2000P"
+msgstr "Epson Stylus Photo 2000P"
+
+#: src/xml/xmli18n-tmp.h:6277
+msgid "Epson Stylus Photo 2100"
+msgstr "Epson Stylus Photo 2100"
+
+#: src/xml/xmli18n-tmp.h:6278
+msgid "Epson Stylus Photo 2200"
+msgstr "Epson Stylus Photo 2200"
+
+#: src/xml/xmli18n-tmp.h:6279
+msgid "Epson Stylus Photo R200"
+msgstr "Epson Stylus Photo R200"
+
+#: src/xml/xmli18n-tmp.h:6280
+msgid "Epson Stylus Photo R210"
+msgstr "Epson Stylus Photo R210"
+
+#: src/xml/xmli18n-tmp.h:6281
+msgid "Epson Stylus Photo R220"
+msgstr "Epson Stylus Photo R220"
+
+#: src/xml/xmli18n-tmp.h:6282
+msgid "Epson Stylus Photo R230"
+msgstr "Epson Stylus Photo R230"
+
+#: src/xml/xmli18n-tmp.h:6283
+msgid "Epson Stylus Photo R240"
+msgstr "Epson Stylus Photo R240"
+
+#: src/xml/xmli18n-tmp.h:6284
+msgid "Epson Stylus Photo R245"
+msgstr "Epson Stylus Photo R245"
+
+#: src/xml/xmli18n-tmp.h:6285
+msgid "Epson Stylus Photo R260"
+msgstr "Epson Stylus Photo R260"
+
+#: src/xml/xmli18n-tmp.h:6286
+msgid "Epson Stylus Photo R265"
+msgstr "Epson Stylus Photo R265"
+
+#: src/xml/xmli18n-tmp.h:6287
+msgid "Epson Stylus Photo R270"
+msgstr "Epson Stylus Photo R270"
+
+#: src/xml/xmli18n-tmp.h:6288
+msgid "Epson Stylus Photo R280"
+msgstr "Epson Stylus Photo R280"
+
+#: src/xml/xmli18n-tmp.h:6289
+msgid "Epson Stylus Photo R285"
+msgstr "Epson Stylus Photo R285"
+
+#: src/xml/xmli18n-tmp.h:6290
+msgid "Epson Stylus Photo R290"
+msgstr "Epson Stylus Photo R290"
+
+#: src/xml/xmli18n-tmp.h:6291
+msgid "Epson Stylus Photo R300"
+msgstr "Epson Stylus Photo R300"
+
+#: src/xml/xmli18n-tmp.h:6292
+msgid "Epson Stylus Photo R310"
+msgstr "Epson Stylus Photo R310"
+
+#: src/xml/xmli18n-tmp.h:6293
+msgid "Epson Stylus Photo R320"
+msgstr "Epson Stylus Photo R320"
+
+#: src/xml/xmli18n-tmp.h:6294
+msgid "Epson Stylus Photo R340"
+msgstr "Epson Stylus Photo R340"
+
+#: src/xml/xmli18n-tmp.h:6295
+msgid "Epson Stylus Photo R350"
+msgstr "Epson Stylus Photo R350"
+
+#: src/xml/xmli18n-tmp.h:6296
+msgid "Epson Stylus Photo R360"
+msgstr "Epson Stylus Photo R360"
+
+#: src/xml/xmli18n-tmp.h:6297
+msgid "Epson Stylus Photo R380"
+msgstr "Epson Stylus Photo R380"
+
+#: src/xml/xmli18n-tmp.h:6298
+msgid "Epson Stylus Photo R390"
+msgstr "Epson Stylus Photo R390"
+
+#: src/xml/xmli18n-tmp.h:6299
+msgid "Epson Stylus Photo R800"
+msgstr "Epson Stylus Photo R800"
+
+#: src/xml/xmli18n-tmp.h:6300
+msgid "Epson Stylus Photo R1800"
+msgstr "Epson Stylus Photo R1800"
+
+#: src/xml/xmli18n-tmp.h:6301
+msgid "Epson Stylus Photo R1900"
+msgstr "Epson Stylus Photo R1900"
+
+#: src/xml/xmli18n-tmp.h:6302
+msgid "Epson Stylus Photo R2400"
+msgstr "Epson Stylus Photo R2400"
+
+#: src/xml/xmli18n-tmp.h:6303
+msgid "Epson Stylus Photo R2880"
+msgstr "Epson Stylus Photo R2880"
+
+#: src/xml/xmli18n-tmp.h:6304
+msgid "Epson Stylus Photo RX400"
+msgstr "Epson Stylus Photo RX400"
+
+#: src/xml/xmli18n-tmp.h:6305
+msgid "Epson Stylus Photo RX420"
+msgstr "Epson Stylus Photo RX420"
+
+#: src/xml/xmli18n-tmp.h:6306
+msgid "Epson Stylus Photo RX425"
+msgstr "Epson Stylus Photo RX425"
+
+#: src/xml/xmli18n-tmp.h:6307
+msgid "Epson Stylus Photo RX430"
+msgstr "Epson Stylus Photo RX430"
+
+#: src/xml/xmli18n-tmp.h:6308
+msgid "Epson Stylus Photo RX500"
+msgstr "Epson Stylus Photo RX500"
+
+#: src/xml/xmli18n-tmp.h:6309
+msgid "Epson Stylus Photo RX510"
+msgstr "Epson Stylus Photo RX510"
+
+#: src/xml/xmli18n-tmp.h:6310
+msgid "Epson Stylus Photo RX560"
+msgstr "Epson Stylus Photo RX560"
+
+#: src/xml/xmli18n-tmp.h:6311
+msgid "Epson Stylus Photo RX580"
+msgstr "Epson Stylus Photo RX580"
+
+#: src/xml/xmli18n-tmp.h:6312
+msgid "Epson Stylus Photo RX585"
+msgstr "Epson Stylus Photo RX585"
+
+#: src/xml/xmli18n-tmp.h:6313
+msgid "Epson Stylus Photo RX590"
+msgstr "Epson Stylus Photo RX590"
+
+#: src/xml/xmli18n-tmp.h:6314
+msgid "Epson Stylus Photo RX595"
+msgstr "Epson Stylus Photo RX595"
+
+#: src/xml/xmli18n-tmp.h:6315
+msgid "Epson Stylus Photo RX600"
+msgstr "Epson Stylus Photo RX600"
+
+#: src/xml/xmli18n-tmp.h:6316
+msgid "Epson Stylus Photo RX610"
+msgstr "Epson Stylus Photo RX610"
+
+#: src/xml/xmli18n-tmp.h:6317
+msgid "Epson Stylus Photo RX620"
+msgstr "Epson Stylus Photo RX620"
+
+#: src/xml/xmli18n-tmp.h:6318
+msgid "Epson Stylus Photo RX630"
+msgstr "Epson Stylus Photo RX630"
+
+#: src/xml/xmli18n-tmp.h:6319
+msgid "Epson Stylus Photo RX640"
+msgstr "Epson Stylus Photo RX640"
+
+#: src/xml/xmli18n-tmp.h:6320
+msgid "Epson Stylus Photo RX680"
+msgstr "Epson Stylus Photo RX680"
+
+#: src/xml/xmli18n-tmp.h:6321
+msgid "Epson Stylus Photo RX685"
+msgstr "Epson Stylus Photo RX685"
+
+#: src/xml/xmli18n-tmp.h:6322
+msgid "Epson Stylus Photo RX690"
+msgstr "Epson Stylus Photo RX690"
+
+#: src/xml/xmli18n-tmp.h:6323
+msgid "Epson Stylus Photo RX700"
+msgstr "Epson Stylus Photo RX700"
+
+#: src/xml/xmli18n-tmp.h:6324
+msgid "Epson Stylus Photo TX700W"
+msgstr "Epson Stylus Photo TX700W"
+
+#: src/xml/xmli18n-tmp.h:6325
+msgid "Epson Stylus Photo TX800FW"
+msgstr "Epson Stylus Photo TX800FW"
+
+#: src/xml/xmli18n-tmp.h:6326
+msgid "Epson Stylus Pro 5000"
+msgstr "Epson Stylus Pro 5000"
+
+#: src/xml/xmli18n-tmp.h:6327
+msgid "Epson Stylus Pro 5500"
+msgstr "Epson Stylus Pro 5500"
+
+#: src/xml/xmli18n-tmp.h:6328
+msgid "Epson Stylus Pro 7000"
+msgstr "Epson Stylus Pro 7000"
+
+#: src/xml/xmli18n-tmp.h:6329
+msgid "Epson Stylus Pro 7500"
+msgstr "Epson Stylus Pro 7500"
+
+#: src/xml/xmli18n-tmp.h:6330
+msgid "Epson Stylus Pro 7600"
+msgstr "Epson Stylus Pro 7600"
+
+#: src/xml/xmli18n-tmp.h:6331
+msgid "Epson Stylus Pro 7800"
+msgstr "Epson Stylus Pro 7800"
+
+#: src/xml/xmli18n-tmp.h:6332
+msgid "Epson Stylus Pro 7880"
+msgstr "Epson Stylus Pro 7880"
+
+#: src/xml/xmli18n-tmp.h:6333
+msgid "Epson Stylus Pro 9000"
+msgstr "Epson Stylus Pro 9000"
+
+#: src/xml/xmli18n-tmp.h:6334
+msgid "Epson Stylus Pro 9500"
+msgstr "Epson Stylus Pro 9500"
+
+#: src/xml/xmli18n-tmp.h:6335
+msgid "Epson Stylus Pro 9600"
+msgstr "Epson Stylus Pro 9600"
+
+#: src/xml/xmli18n-tmp.h:6336
+msgid "Epson Stylus Pro 9800"
+msgstr "Epson Stylus Pro 9800"
+
+#: src/xml/xmli18n-tmp.h:6337
+msgid "Epson Stylus Pro 9880"
+msgstr "Epson Stylus Pro 9880"
+
+#: src/xml/xmli18n-tmp.h:6338
+msgid "Epson Stylus Pro 10000"
+msgstr "Epson Stylus Pro 10000"
+
+#: src/xml/xmli18n-tmp.h:6339
+msgid "Epson Stylus Pro 11880"
+msgstr "Epson Stylus Pro 11880"
+
+#: src/xml/xmli18n-tmp.h:6340
+msgid "Epson Stylus Scan 2000"
+msgstr "Epson Stylus Scan 2000"
+
+#: src/xml/xmli18n-tmp.h:6341
+msgid "Epson Stylus Scan 2500"
+msgstr "Epson Stylus Scan 2500"
+
+#: src/xml/xmli18n-tmp.h:6342
+msgid "Epson Stylus CX1500"
+msgstr "Epson Stylus CX1500"
+
+#: src/xml/xmli18n-tmp.h:6343
+msgid "Epson Stylus CX3100"
+msgstr "Epson Stylus CX3100"
+
+#: src/xml/xmli18n-tmp.h:6344
+msgid "Epson Stylus CX3200"
+msgstr "Epson Stylus CX3200"
+
+#: src/xml/xmli18n-tmp.h:6345
+msgid "Epson Stylus CX3500"
+msgstr "Epson Stylus CX3500"
+
+#: src/xml/xmli18n-tmp.h:6346
+msgid "Epson Stylus CX3600"
+msgstr "Epson Stylus CX3600"
+
+#: src/xml/xmli18n-tmp.h:6347
+msgid "Epson Stylus CX3650"
+msgstr "Epson Stylus CX3650"
+
+#: src/xml/xmli18n-tmp.h:6348
+msgid "Epson Stylus CX3700"
+msgstr "Epson Stylus CX3700"
+
+#: src/xml/xmli18n-tmp.h:6349
+msgid "Epson Stylus CX3800"
+msgstr "Epson Stylus CX3800"
+
+#: src/xml/xmli18n-tmp.h:6350
+msgid "Epson Stylus CX3805"
+msgstr "Epson Stylus CX3805"
+
+#: src/xml/xmli18n-tmp.h:6351
+msgid "Epson Stylus CX3810"
+msgstr "Epson Stylus CX3810"
+
+#: src/xml/xmli18n-tmp.h:6352
+msgid "Epson Stylus CX4100"
+msgstr "Epson Stylus CX4100"
+
+#: src/xml/xmli18n-tmp.h:6353
+msgid "Epson Stylus CX4200"
+msgstr "Epson Stylus CX4200"
+
+#: src/xml/xmli18n-tmp.h:6354
+msgid "Epson Stylus CX4400"
+msgstr "Epson Stylus CX4400"
+
+#: src/xml/xmli18n-tmp.h:6355
+msgid "Epson Stylus CX4500"
+msgstr "Epson Stylus CX4500"
+
+#: src/xml/xmli18n-tmp.h:6356
+msgid "Epson Stylus CX4600"
+msgstr "Epson Stylus CX4600"
+
+#: src/xml/xmli18n-tmp.h:6357
+msgid "Epson Stylus CX4700"
+msgstr "Epson Stylus CX4700"
+
+#: src/xml/xmli18n-tmp.h:6358
+msgid "Epson Stylus CX4800"
+msgstr "Epson Stylus CX4800"
+
+#: src/xml/xmli18n-tmp.h:6359
+msgid "Epson Stylus CX4900"
+msgstr "Epson Stylus CX4900"
+
+#: src/xml/xmli18n-tmp.h:6360
+msgid "Epson Stylus CX5000"
+msgstr "Epson Stylus CX5000"
+
+#: src/xml/xmli18n-tmp.h:6361
+msgid "Epson Stylus CX5000F"
+msgstr "Epson Stylus CX5000F"
+
+#: src/xml/xmli18n-tmp.h:6362
+msgid "Epson Stylus CX5100"
+msgstr "Epson Stylus CX5100"
+
+#: src/xml/xmli18n-tmp.h:6363
+msgid "Epson Stylus CX5200"
+msgstr "Epson Stylus CX5200"
+
+#: src/xml/xmli18n-tmp.h:6364
+msgid "Epson Stylus CX5300"
+msgstr "Epson Stylus CX5300"
+
+#: src/xml/xmli18n-tmp.h:6365
+msgid "Epson Stylus CX5400"
+msgstr "Epson Stylus CX5400"
+
+#: src/xml/xmli18n-tmp.h:6366
+msgid "Epson Stylus CX5500"
+msgstr "Epson Stylus CX5500"
+
+#: src/xml/xmli18n-tmp.h:6367
+msgid "Epson Stylus CX5600"
+msgstr "Epson Stylus CX5600"
+
+#: src/xml/xmli18n-tmp.h:6368
+msgid "Epson Stylus CX5700"
+msgstr "Epson Stylus CX5700"
+
+#: src/xml/xmli18n-tmp.h:6369
+msgid "Epson Stylus CX5800"
+msgstr "Epson Stylus CX5800"
+
+#: src/xml/xmli18n-tmp.h:6370
+msgid "Epson Stylus CX6000"
+msgstr "Epson Stylus CX6000"
+
+#: src/xml/xmli18n-tmp.h:6371
+msgid "Epson Stylus CX6300"
+msgstr "Epson Stylus CX6300"
+
+#: src/xml/xmli18n-tmp.h:6372
+msgid "Epson Stylus CX6400"
+msgstr "Epson Stylus CX6400"
+
+#: src/xml/xmli18n-tmp.h:6373
+msgid "Epson Stylus CX6500"
+msgstr "Epson Stylus CX6500"
+
+#: src/xml/xmli18n-tmp.h:6374
+msgid "Epson Stylus CX6600"
+msgstr "Epson Stylus CX6600"
+
+#: src/xml/xmli18n-tmp.h:6375
+msgid "Epson Stylus CX7000F"
+msgstr "Epson Stylus CX7000F"
+
+#: src/xml/xmli18n-tmp.h:6376
+msgid "Epson Stylus CX7400"
+msgstr "Epson Stylus CX7400"
+
+#: src/xml/xmli18n-tmp.h:6377
+msgid "Epson Stylus CX7700"
+msgstr "Epson Stylus CX7700"
+
+#: src/xml/xmli18n-tmp.h:6378
+msgid "Epson Stylus CX7800"
+msgstr "Epson Stylus CX7800"
+
+#: src/xml/xmli18n-tmp.h:6379
+msgid "Epson Stylus CX8300"
+msgstr "Epson Stylus CX8300"
+
+#: src/xml/xmli18n-tmp.h:6380
+msgid "Epson Stylus CX8400"
+msgstr "Epson Stylus CX8400"
+
+#: src/xml/xmli18n-tmp.h:6381
+msgid "Epson Stylus CX9300F"
+msgstr "Epson Stylus CX9300F"
+
+#: src/xml/xmli18n-tmp.h:6382
+msgid "Epson Stylus CX9400"
+msgstr "Epson Stylus CX9400"
+
+#: src/xml/xmli18n-tmp.h:6383
+msgid "Epson Stylus CX9400F"
+msgstr "Epson Stylus CX9400F"
+
+#: src/xml/xmli18n-tmp.h:6384
+msgid "Epson Stylus CX9475F"
+msgstr "Epson Stylus CX9475F"
+
+#: src/xml/xmli18n-tmp.h:6385
+msgid "Epson Stylus D68"
+msgstr "Epson Stylus D68"
+
+#: src/xml/xmli18n-tmp.h:6386
+msgid "Epson Stylus D88"
+msgstr "Epson Stylus D88"
+
+#: src/xml/xmli18n-tmp.h:6387
+msgid "Epson Stylus D92"
+msgstr "Epson Stylus D92"
+
+#: src/xml/xmli18n-tmp.h:6388
+msgid "Epson Stylus D120"
+msgstr "Epson Stylus D120"
+
+#: src/xml/xmli18n-tmp.h:6389
+msgid "Epson Stylus DX3800"
+msgstr "Epson Stylus DX3800"
+
+#: src/xml/xmli18n-tmp.h:6390
+msgid "Epson Stylus DX3850"
+msgstr "Epson Stylus DX3850"
+
+#: src/xml/xmli18n-tmp.h:6391
+msgid "Epson Stylus DX4000"
+msgstr "Epson Stylus DX4000"
+
+#: src/xml/xmli18n-tmp.h:6392
+msgid "Epson Stylus DX4050"
+msgstr "Epson Stylus DX4050"
+
+#: src/xml/xmli18n-tmp.h:6393
+msgid "Epson Stylus DX4200"
+msgstr "Epson Stylus DX4200"
+
+#: src/xml/xmli18n-tmp.h:6394
+msgid "Epson Stylus DX4250"
+msgstr "Epson Stylus DX4250"
+
+#: src/xml/xmli18n-tmp.h:6395
+msgid "Epson Stylus DX4400"
+msgstr "Epson Stylus DX4400"
+
+#: src/xml/xmli18n-tmp.h:6396
+msgid "Epson Stylus DX4450"
+msgstr "Epson Stylus DX4450"
+
+#: src/xml/xmli18n-tmp.h:6397
+msgid "Epson Stylus DX4800"
+msgstr "Epson Stylus DX4800"
+
+#: src/xml/xmli18n-tmp.h:6398
+msgid "Epson Stylus DX4850"
+msgstr "Epson Stylus DX4850"
+
+#: src/xml/xmli18n-tmp.h:6399
+msgid "Epson Stylus DX7000F"
+msgstr "Epson Stylus DX7000F"
+
+#: src/xml/xmli18n-tmp.h:6400
+msgid "Epson Stylus DX7400"
+msgstr "Epson Stylus DX7400"
+
+#: src/xml/xmli18n-tmp.h:6401
+msgid "Epson Stylus DX7450"
+msgstr "Epson Stylus DX7450"
+
+#: src/xml/xmli18n-tmp.h:6402
+msgid "Epson Stylus DX8400"
+msgstr "Epson Stylus DX8400"
+
+#: src/xml/xmli18n-tmp.h:6403
+msgid "Epson Stylus DX8450"
+msgstr "Epson Stylus DX8450"
+
+#: src/xml/xmli18n-tmp.h:6404
+msgid "Epson Stylus DX9400F"
+msgstr "Epson Stylus DX9400F"
+
+#: src/xml/xmli18n-tmp.h:6405
+msgid "Epson Stylus NX100"
+msgstr "Epson Stylus NX100"
+
+#: src/xml/xmli18n-tmp.h:6406
+msgid "Epson Stylus NX105"
+msgstr "Epson Stylus NX105"
+
+#: src/xml/xmli18n-tmp.h:6407
+msgid "Epson Stylus NX200"
+msgstr "Epson Stylus NX200"
+
+#: src/xml/xmli18n-tmp.h:6408
+msgid "Epson Stylus NX300"
+msgstr "Epson Stylus NX300"
+
+#: src/xml/xmli18n-tmp.h:6409
+msgid "Epson Stylus NX400"
+msgstr "Epson Stylus NX400"
+
+#: src/xml/xmli18n-tmp.h:6410
+msgid "Epson Stylus PX700W"
+msgstr "Epson Stylus PX700W"
+
+#: src/xml/xmli18n-tmp.h:6411
+msgid "Epson Stylus PX800FW"
+msgstr "Epson Stylus PX800FW"
+
+#: src/xml/xmli18n-tmp.h:6412
+msgid "Epson Stylus S20"
+msgstr "Epson Stylus S20"
+
+#: src/xml/xmli18n-tmp.h:6413
+msgid "Epson Stylus SX100"
+msgstr "Epson Stylus SX100"
+
+#: src/xml/xmli18n-tmp.h:6414
+msgid "Epson Stylus SX105"
+msgstr "Epson Stylus SX105"
+
+#: src/xml/xmli18n-tmp.h:6415
+msgid "Epson Stylus SX200"
+msgstr "Epson Stylus SX200"
+
+#: src/xml/xmli18n-tmp.h:6416
+msgid "Epson Stylus SX205"
+msgstr "Epson Stylus SX205"
+
+#: src/xml/xmli18n-tmp.h:6417
+msgid "Epson Stylus SX400"
+msgstr "Epson Stylus SX400"
+
+#: src/xml/xmli18n-tmp.h:6418
+msgid "Epson Stylus SX405"
+msgstr "Epson Stylus SX405"
+
+#: src/xml/xmli18n-tmp.h:6419
+msgid "Epson Stylus T20"
+msgstr "Epson Stylus T20"
+
+#: src/xml/xmli18n-tmp.h:6420
+msgid "Epson Stylus TX100"
+msgstr "Epson Stylus TX100"
+
+#: src/xml/xmli18n-tmp.h:6421
+msgid "Epson Stylus TX101"
+msgstr "Epson Stylus TX101"
+
+#: src/xml/xmli18n-tmp.h:6422
+msgid "Epson Stylus TX102"
+msgstr "Epson Stylus TX102"
+
+#: src/xml/xmli18n-tmp.h:6423
+msgid "Epson Stylus TX103"
+msgstr "Epson Stylus TX103"
+
+#: src/xml/xmli18n-tmp.h:6424
+msgid "Epson Stylus TX104"
+msgstr "Epson Stylus TX104"
+
+#: src/xml/xmli18n-tmp.h:6425
+msgid "Epson Stylus TX105"
+msgstr "Epson Stylus TX105"
+
+#: src/xml/xmli18n-tmp.h:6426
+msgid "Epson Stylus TX106"
+msgstr "Epson Stylus TX106"
+
+#: src/xml/xmli18n-tmp.h:6427
+msgid "Epson Stylus TX109"
+msgstr "Epson Stylus TX109"
+
+#: src/xml/xmli18n-tmp.h:6428
+msgid "Epson Stylus TX200"
+msgstr "Epson Stylus TX200"
+
+#: src/xml/xmli18n-tmp.h:6429
+msgid "Epson Stylus TX400"
+msgstr "Epson Stylus TX400"
+
+#: src/xml/xmli18n-tmp.h:6430
+msgid "Epson PictureMate"
+msgstr "Epson PictureMate"
+
+#: src/xml/xmli18n-tmp.h:6431
+msgid "Epson PictureMate Dash"
+msgstr "Epson PictureMate Dash"
+
+#: src/xml/xmli18n-tmp.h:6432
+msgid "Epson PictureMate Deluxe"
+msgstr "Epson PictureMate Deluxe"
+
+#: src/xml/xmli18n-tmp.h:6433
+msgid "Epson PictureMate Flash"
+msgstr "Epson PictureMate Flash"
+
+#: src/xml/xmli18n-tmp.h:6434
+msgid "Epson PictureMate Pal"
+msgstr "Epson PictureMate Pal"
+
+#: src/xml/xmli18n-tmp.h:6435
+msgid "Epson PictureMate Snap"
+msgstr "Epson PictureMate Snap"
+
+#: src/xml/xmli18n-tmp.h:6436
+msgid "Epson PictureMate 100"
+msgstr "Epson PictureMate 100"
+
+#: src/xml/xmli18n-tmp.h:6437
+msgid "Epson PictureMate 200"
+msgstr "Epson PictureMate 200"
+
+#: src/xml/xmli18n-tmp.h:6438
+msgid "Epson PictureMate 210"
+msgstr "Epson PictureMate 210"
+
+#: src/xml/xmli18n-tmp.h:6439
+msgid "Epson PictureMate 215"
+msgstr "Epson PictureMate 215"
+
+#: src/xml/xmli18n-tmp.h:6440
+msgid "Epson PictureMate 240"
+msgstr "Epson PictureMate 240"
+
+#: src/xml/xmli18n-tmp.h:6441
+msgid "Epson PictureMate 250"
+msgstr "Epson PictureMate 250"
+
+#: src/xml/xmli18n-tmp.h:6442
+msgid "Epson PictureMate 260"
+msgstr "Epson PictureMate 260"
+
+#: src/xml/xmli18n-tmp.h:6443
+msgid "Epson PictureMate 270"
+msgstr "Epson PictureMate 270"
+
+#: src/xml/xmli18n-tmp.h:6444
+msgid "Epson PictureMate 280"
+msgstr "Epson PictureMate 280"
+
+#: src/xml/xmli18n-tmp.h:6445
+msgid "Epson PictureMate 290"
+msgstr "Epson PictureMate 290"
+
+#: src/xml/xmli18n-tmp.h:6446
+msgid "Epson PictureMate 500"
+msgstr "Epson PictureMate 500"
+
+#: src/xml/xmli18n-tmp.h:6447
+msgid "Epson PictureMate 2005"
+msgstr "Epson PictureMate 2005"
+
+#: src/xml/xmli18n-tmp.h:6448
+msgid "Epson WorkForce 30"
+msgstr "Epson WorkForce 30"
+
+#: src/xml/xmli18n-tmp.h:6449
+msgid "Epson WorkForce 40"
+msgstr "Epson WorkForce 40"
+
+#: src/xml/xmli18n-tmp.h:6450
+msgid "Epson WorkForce 500"
+msgstr "Epson WorkForce 500"
+
+#: src/xml/xmli18n-tmp.h:6451
+msgid "Epson WorkForce 600"
+msgstr "Epson WorkForce 600"
+
+#: src/xml/xmli18n-tmp.h:6452
+msgid "Epson CL 700"
+msgstr "Epson CL 700"
+
+#: src/xml/xmli18n-tmp.h:6453
+msgid "Epson CL 750"
+msgstr "Epson CL 750"
+
+#: src/xml/xmli18n-tmp.h:6454
+msgid "Epson CL 760"
+msgstr "Epson CL 760"
+
+#: src/xml/xmli18n-tmp.h:6455
+msgid "Epson E 100"
+msgstr "Epson E 100"
+
+#: src/xml/xmli18n-tmp.h:6456
+msgid "Epson E 150"
+msgstr "Epson E 150"
+
+#: src/xml/xmli18n-tmp.h:6457
+msgid "Epson E 200"
+msgstr "Epson E 200"
+
+#: src/xml/xmli18n-tmp.h:6458
+msgid "Epson E 300"
+msgstr "Epson E 300"
+
+#: src/xml/xmli18n-tmp.h:6459
+msgid "Epson E 500"
+msgstr "Epson E 500"
+
+#: src/xml/xmli18n-tmp.h:6460
+msgid "Epson E 520"
+msgstr "Epson E 520"
+
+#: src/xml/xmli18n-tmp.h:6461
+msgid "Epson E 700"
+msgstr "Epson E 700"
+
+#: src/xml/xmli18n-tmp.h:6462
+msgid "Epson E 720"
+msgstr "Epson E 720"
+
+#: src/xml/xmli18n-tmp.h:6463
+msgid "Epson EM 900C"
+msgstr "Epson EM 900C"
+
+#: src/xml/xmli18n-tmp.h:6464
+msgid "Epson EM 930C"
+msgstr "Epson EM 930C"
+
+#: src/xml/xmli18n-tmp.h:6465
+msgid "Epson EP 801A"
+msgstr "Epson EP 801A"
+
+#: src/xml/xmli18n-tmp.h:6466
+msgid "Epson EP 901A"
+msgstr "Epson EP 901A"
+
+#: src/xml/xmli18n-tmp.h:6467
+msgid "Epson EP 901F"
+msgstr "Epson EP 901F"
+
+#: src/xml/xmli18n-tmp.h:6468
+msgid "Epson MC 2000"
+msgstr "Epson MC 2000"
+
+#: src/xml/xmli18n-tmp.h:6469
+msgid "Epson MC 5000"
+msgstr "Epson MC 5000"
+
+#: src/xml/xmli18n-tmp.h:6470
+msgid "Epson MC 7000"
+msgstr "Epson MC 7000"
+
+#: src/xml/xmli18n-tmp.h:6471
+msgid "Epson MC 9000"
+msgstr "Epson MC 9000"
+
+#: src/xml/xmli18n-tmp.h:6472
+msgid "Epson MC 10000"
+msgstr "Epson MC 10000"
+
+#: src/xml/xmli18n-tmp.h:6473
+msgid "Epson ME 300"
+msgstr "Epson ME 300"
+
+#: src/xml/xmli18n-tmp.h:6474
+msgid "Epson ME Office 70"
+msgstr "Epson ME Office 70"
+
+#: src/xml/xmli18n-tmp.h:6475
+msgid "Epson ME Office 80W"
+msgstr "Epson ME Office 80W"
+
+#: src/xml/xmli18n-tmp.h:6476
+msgid "Epson ME Office 360"
+msgstr "Epson ME Office 360"
+
+#: src/xml/xmli18n-tmp.h:6477
+msgid "Epson ME Office 700FW"
+msgstr "Epson ME Office 700FW"
+
+#: src/xml/xmli18n-tmp.h:6478
+msgid "Epson MJ 930C"
+msgstr "Epson MJ 930C"
+
+#: src/xml/xmli18n-tmp.h:6479
+msgid "Epson MJ 5100C"
+msgstr "Epson MJ 5100C"
+
+#: src/xml/xmli18n-tmp.h:6480
+msgid "Epson MJ 6000C"
+msgstr "Epson MJ 6000C"
+
+#: src/xml/xmli18n-tmp.h:6481
+msgid "Epson MJ 8000C"
+msgstr "Epson MJ 8000C"
+
+#: src/xml/xmli18n-tmp.h:6482
+msgid "Epson PM 670C"
+msgstr "Epson PM 670C"
+
+#: src/xml/xmli18n-tmp.h:6483
+msgid "Epson PM 700C"
+msgstr "Epson PM 700C"
+
+#: src/xml/xmli18n-tmp.h:6484
+msgid "Epson PM 730C"
+msgstr "Epson PM 730C"
+
+#: src/xml/xmli18n-tmp.h:6485
+msgid "Epson PM 740C"
+msgstr "Epson PM 740C"
+
+#: src/xml/xmli18n-tmp.h:6486
+msgid "Epson PM 750C"
+msgstr "Epson PM 750C"
+
+#: src/xml/xmli18n-tmp.h:6487
+msgid "Epson PM 760C"
+msgstr "Epson PM 760C"
+
+#: src/xml/xmli18n-tmp.h:6488
+msgid "Epson PM 770C"
+msgstr "Epson PM 770C"
+
+#: src/xml/xmli18n-tmp.h:6489
+msgid "Epson PM 780C"
+msgstr "Epson PM 780C"
+
+#: src/xml/xmli18n-tmp.h:6490
+msgid "Epson PM 790PT"
+msgstr "Epson PM 790PT"
+
+#: src/xml/xmli18n-tmp.h:6491
+msgid "Epson PM 800C"
+msgstr "Epson PM 800C"
+
+#: src/xml/xmli18n-tmp.h:6492
+msgid "Epson PM 850PT"
+msgstr "Epson PM 850PT"
+
+#: src/xml/xmli18n-tmp.h:6493
+msgid "Epson PM 870C"
+msgstr "Epson PM 870C"
+
+#: src/xml/xmli18n-tmp.h:6494
+msgid "Epson PM 880C"
+msgstr "Epson PM 880C"
+
+#: src/xml/xmli18n-tmp.h:6495
+msgid "Epson PM 930C"
+msgstr "Epson PM 930C"
+
+#: src/xml/xmli18n-tmp.h:6496
+msgid "Epson PM 940C"
+msgstr "Epson PM 940C"
+
+#: src/xml/xmli18n-tmp.h:6497
+msgid "Epson PM 950C"
+msgstr "Epson PM 950C"
+
+#: src/xml/xmli18n-tmp.h:6498
+msgid "Epson PM 970C"
+msgstr "Epson PM 970C"
+
+#: src/xml/xmli18n-tmp.h:6499
+msgid "Epson PM 980C"
+msgstr "Epson PM 980C"
+
+#: src/xml/xmli18n-tmp.h:6500
+msgid "Epson PM 2000C"
+msgstr "Epson PM 2000C"
+
+#: src/xml/xmli18n-tmp.h:6501
+msgid "Epson PM 2200C"
+msgstr "Epson PM 2200C"
+
+#: src/xml/xmli18n-tmp.h:6502
+msgid "Epson PM 3000C"
+msgstr "Epson PM 3000C"
+
+#: src/xml/xmli18n-tmp.h:6503
+msgid "Epson PM 3300C"
+msgstr "Epson PM 3300C"
+
+#: src/xml/xmli18n-tmp.h:6504
+msgid "Epson PM 3500C"
+msgstr "Epson PM 3500C"
+
+#: src/xml/xmli18n-tmp.h:6505
+msgid "Epson PM 3700C"
+msgstr "Epson PM 3700C"
+
+#: src/xml/xmli18n-tmp.h:6506
+msgid "Epson PM 4000PX"
+msgstr "Epson PM 4000PX"
+
+#: src/xml/xmli18n-tmp.h:6507
+msgid "Epson PM 5000C"
+msgstr "Epson PM 5000C"
+
+#: src/xml/xmli18n-tmp.h:6508
+msgid "Epson PM 7000C"
+msgstr "Epson PM 7000C"
+
+#: src/xml/xmli18n-tmp.h:6509
+msgid "Epson PM 9000C"
+msgstr "Epson PM 9000C"
+
+#: src/xml/xmli18n-tmp.h:6510
+msgid "Epson PM 10000"
+msgstr "Epson PM 10000"
+
+#: src/xml/xmli18n-tmp.h:6511
+msgid "Epson PM A650"
+msgstr "Epson PM A650"
+
+#: src/xml/xmli18n-tmp.h:6512
+msgid "Epson PM A750"
+msgstr "Epson PM A750"
+
+#: src/xml/xmli18n-tmp.h:6513
+msgid "Epson PM A820"
+msgstr "Epson PM A820"
+
+#: src/xml/xmli18n-tmp.h:6514
+msgid "Epson PM A890"
+msgstr "Epson PM A890"
+
+#: src/xml/xmli18n-tmp.h:6515
+msgid "Epson PM A900"
+msgstr "Epson PM A900"
+
+#: src/xml/xmli18n-tmp.h:6516
+msgid "Epson PM A940"
+msgstr "Epson PM A940"
+
+#: src/xml/xmli18n-tmp.h:6517
+msgid "Epson PM A950"
+msgstr "Epson PM A950"
+
+#: src/xml/xmli18n-tmp.h:6518
+msgid "Epson PM D600"
+msgstr "Epson PM D600"
+
+#: src/xml/xmli18n-tmp.h:6519
+msgid "Epson PM D750"
+msgstr "Epson PM D750"
+
+#: src/xml/xmli18n-tmp.h:6520
+msgid "Epson PM D770"
+msgstr "Epson PM D770"
+
+#: src/xml/xmli18n-tmp.h:6521
+msgid "Epson PM D800"
+msgstr "Epson PM D800"
+
+#: src/xml/xmli18n-tmp.h:6522
+msgid "Epson PM D870"
+msgstr "Epson PM D870"
+
+#: src/xml/xmli18n-tmp.h:6523
+msgid "Epson PM D1000"
+msgstr "Epson PM D1000"
+
+#: src/xml/xmli18n-tmp.h:6524
+msgid "Epson PM G700"
+msgstr "Epson PM G700"
+
+#: src/xml/xmli18n-tmp.h:6525
+msgid "Epson PM G720"
+msgstr "Epson PM G720"
+
+#: src/xml/xmli18n-tmp.h:6526
+msgid "Epson PM G730"
+msgstr "Epson PM G730"
+
+#: src/xml/xmli18n-tmp.h:6527
+msgid "Epson PM G800"
+msgstr "Epson PM G800"
+
+#: src/xml/xmli18n-tmp.h:6528
+msgid "Epson PM G820"
+msgstr "Epson PM G820"
+
+#: src/xml/xmli18n-tmp.h:6529
+msgid "Epson PM G850"
+msgstr "Epson PM G850"
+
+#: src/xml/xmli18n-tmp.h:6530
+msgid "Epson PM T960"
+msgstr "Epson PM T960"
+
+#: src/xml/xmli18n-tmp.h:6531
+msgid "Epson PM G4500"
+msgstr "Epson PM G4500"
+
+#: src/xml/xmli18n-tmp.h:6532
+msgid "Epson PX A650"
+msgstr "Epson PX A650"
+
+#: src/xml/xmli18n-tmp.h:6533
+msgid "Epson Offirio PX B300"
+msgstr "Epson Offirio PX B300"
+
+#: src/xml/xmli18n-tmp.h:6534
+msgid "Epson Offirio PX B500"
+msgstr "Epson Offirio PX B500"
+
+#: src/xml/xmli18n-tmp.h:6535
+msgid "Epson PX 101"
+msgstr "Epson PX 101"
+
+#: src/xml/xmli18n-tmp.h:6536
+msgid "Epson PX 201"
+msgstr "Epson PX 201"
+
+#: src/xml/xmli18n-tmp.h:6537
+msgid "Epson PX 401A"
+msgstr "Epson PX 401A"
+
+#: src/xml/xmli18n-tmp.h:6538
+msgid "Epson PX 601F"
+msgstr "Epson PX 601F"
+
+#: src/xml/xmli18n-tmp.h:6539
+msgid "Epson PX G900"
+msgstr "Epson PX G900"
+
+#: src/xml/xmli18n-tmp.h:6540
+msgid "Epson PX G920"
+msgstr "Epson PX G920"
+
+#: src/xml/xmli18n-tmp.h:6541
+msgid "Epson PX G5000"
+msgstr "Epson PX G5000"
+
+#: src/xml/xmli18n-tmp.h:6542
+msgid "Epson PX G5300"
+msgstr "Epson PX G5300"
+
+#: src/xml/xmli18n-tmp.h:6543
+msgid "Epson PX V500"
+msgstr "Epson PX V500"
+
+#: src/xml/xmli18n-tmp.h:6544
+msgid "Epson PX V600"
+msgstr "Epson PX V600"
+
+#: src/xml/xmli18n-tmp.h:6545
+msgid "Epson PX V630"
+msgstr "Epson PX V630"
+
+#: src/xml/xmli18n-tmp.h:6546
+msgid "Epson PX V780"
+msgstr "Epson PX V780"
+
+#: src/xml/xmli18n-tmp.h:6547
+msgid "Epson PX 5500"
+msgstr "Epson PX 5500"
+
+#: src/xml/xmli18n-tmp.h:6548
+msgid "Epson PX G5600"
+msgstr "Epson PX G5600"
+
+#: src/xml/xmli18n-tmp.h:6549
+msgid "Epson PX 7000"
+msgstr "Epson PX 7000"
+
+#: src/xml/xmli18n-tmp.h:6550
+msgid "Epson PX 9000"
+msgstr "Epson PX 9000"
+
+#: src/xml/xmli18n-tmp.h:6551
+msgid "Apollo P-2100"
+msgstr "Apollo P-2100"
+
+#: src/xml/xmli18n-tmp.h:6552
+msgid "Apollo P-2150"
+msgstr "Apollo P-2150"
+
+#: src/xml/xmli18n-tmp.h:6553
+msgid "Apollo P-2200"
+msgstr "Apollo P-2200"
+
+#: src/xml/xmli18n-tmp.h:6554
+msgid "Apollo P-2250"
+msgstr "Apollo P-2250"
+
+#: src/xml/xmli18n-tmp.h:6555
+msgid "Apollo P-2500"
+msgstr "Apollo P-2500"
+
+#: src/xml/xmli18n-tmp.h:6556
+msgid "Apollo P-2550"
+msgstr "Apollo P-2550"
+
+#: src/xml/xmli18n-tmp.h:6557
+msgid "Apollo P-2600"
+msgstr "Apollo P-2600"
+
+#: src/xml/xmli18n-tmp.h:6558
+msgid "Apollo P-2650"
+msgstr "Apollo P-2650"
+
+#: src/xml/xmli18n-tmp.h:6559
+msgid "Apple Color StyleWriter 4100"
+msgstr "Apple Color StyleWriter 4100"
+
+#: src/xml/xmli18n-tmp.h:6560
+msgid "Apple Color StyleWriter 4500"
+msgstr "Apple Color StyleWriter 4500"
+
+#: src/xml/xmli18n-tmp.h:6561
+msgid "Apple Color StyleWriter 6500"
+msgstr "Apple Color StyleWriter 6500"
+
+#: src/xml/xmli18n-tmp.h:6562
+msgid "Apple LaserWriter Select 360"
+msgstr "Apple LaserWriter Select 360"
+
+#: src/xml/xmli18n-tmp.h:6563
+msgid "Brother DCP-1200"
+msgstr "Brother DCP-1200"
+
+#: src/xml/xmli18n-tmp.h:6564
+msgid "Brother DCP-8045D"
+msgstr "Brother DCP-8045D"
+
+#: src/xml/xmli18n-tmp.h:6565
+msgid "Brother HL-1040"
+msgstr "Brother HL-1040"
+
+#: src/xml/xmli18n-tmp.h:6566
+msgid "Brother HL-1050"
+msgstr "Brother HL-1050"
+
+#: src/xml/xmli18n-tmp.h:6567
+msgid "Brother HL-1060"
+msgstr "Brother HL-1060"
+
+#: src/xml/xmli18n-tmp.h:6568
+msgid "Brother HL-1070"
+msgstr "Brother HL-1070"
+
+#: src/xml/xmli18n-tmp.h:6569
+msgid "Brother HL-10V"
+msgstr "Brother HL-10V"
+
+#: src/xml/xmli18n-tmp.h:6570
+msgid "Brother HL-10h"
+msgstr "Brother HL-10h"
+
+#: src/xml/xmli18n-tmp.h:6571
+msgid "Brother HL-1240"
+msgstr "Brother HL-1240"
+
+#: src/xml/xmli18n-tmp.h:6572
+msgid "Brother HL-1250"
+msgstr "Brother HL-1250"
+
+#: src/xml/xmli18n-tmp.h:6573
+msgid "Brother HL-1260"
+msgstr "Brother HL-1260"
+
+#: src/xml/xmli18n-tmp.h:6574
+msgid "Brother HL-1270N"
+msgstr "Brother HL-1270N"
+
+#: src/xml/xmli18n-tmp.h:6575
+msgid "Brother HL-1430"
+msgstr "Brother HL-1430"
+
+#: src/xml/xmli18n-tmp.h:6576
+msgid "Brother HL-1440"
+msgstr "Brother HL-1440"
+
+#: src/xml/xmli18n-tmp.h:6577
+msgid "Brother HL-1450"
+msgstr "Brother HL-1450"
+
+#: src/xml/xmli18n-tmp.h:6578
+msgid "Brother HL-1470N"
+msgstr "Brother HL-1470N"
+
+#: src/xml/xmli18n-tmp.h:6579
+msgid "Brother HL-1650"
+msgstr "Brother HL-1650"
+
+#: src/xml/xmli18n-tmp.h:6580
+msgid "Brother HL-1660e"
+msgstr "Brother HL-1660e"
+
+#: src/xml/xmli18n-tmp.h:6581
+msgid "Brother HL-1670N"
+msgstr "Brother HL-1670N"
+
+#: src/xml/xmli18n-tmp.h:6582
+msgid "Brother HL-1850"
+msgstr "Brother HL-1850"
+
+#: src/xml/xmli18n-tmp.h:6583
+msgid "Brother HL-1870N"
+msgstr "Brother HL-1870N"
+
+#: src/xml/xmli18n-tmp.h:6584
+msgid "Brother HL-2060"
+msgstr "Brother HL-2060"
+
+#: src/xml/xmli18n-tmp.h:6585
+msgid "Brother HL-2460"
+msgstr "Brother HL-2460"
+
+#: src/xml/xmli18n-tmp.h:6586
+msgid "Brother HL-2460N"
+msgstr "Brother HL-2460N"
+
+#: src/xml/xmli18n-tmp.h:6587
+msgid "Brother HL-4Ve"
+msgstr "Brother HL-4Ve"
+
+#: src/xml/xmli18n-tmp.h:6588
+msgid "Brother HL-5030"
+msgstr "Brother HL-5030"
+
+#: src/xml/xmli18n-tmp.h:6589
+msgid "Brother HL-5040"
+msgstr "Brother HL-5040"
+
+#: src/xml/xmli18n-tmp.h:6590
+msgid "Brother HL-5050"
+msgstr "Brother HL-5050"
+
+#: src/xml/xmli18n-tmp.h:6591
+msgid "Brother HL-5070N"
+msgstr "Brother HL-5070N"
+
+#: src/xml/xmli18n-tmp.h:6592
+msgid "Brother HL-5140"
+msgstr "Brother HL-5140"
+
+#: src/xml/xmli18n-tmp.h:6593
+msgid "Brother HL-5150D"
+msgstr "Brother HL-5150D"
+
+#: src/xml/xmli18n-tmp.h:6594
+msgid "Brother HL-5170DN"
+msgstr "Brother HL-5170DN"
+
+#: src/xml/xmli18n-tmp.h:6595
+msgid "Brother HL-630"
+msgstr "Brother HL-630"
+
+#: src/xml/xmli18n-tmp.h:6596
+msgid "Brother HL-660"
+msgstr "Brother HL-660"
+
+#: src/xml/xmli18n-tmp.h:6597
+msgid "Brother HL-7050"
+msgstr "Brother HL-7050"
+
+#: src/xml/xmli18n-tmp.h:6598
+msgid "Brother HL-7050N"
+msgstr "Brother HL-7050N"
+
+#: src/xml/xmli18n-tmp.h:6599
+msgid "Brother HL-760"
+msgstr "Brother HL-760"
+
+#: src/xml/xmli18n-tmp.h:6600
+msgid "Brother HL-960"
+msgstr "Brother HL-960"
+
+#: src/xml/xmli18n-tmp.h:6601
+msgid "Brother MFC-6550MC"
+msgstr "Brother MFC-6550MC"
+
+#: src/xml/xmli18n-tmp.h:6602
+msgid "Brother MFC-8300"
+msgstr "Brother MFC-8300"
+
+#: src/xml/xmli18n-tmp.h:6603
+msgid "Brother MFC-9500"
+msgstr "Brother MFC-9500"
+
+#: src/xml/xmli18n-tmp.h:6604
+msgid "Brother MFC-9600"
+msgstr "Brother MFC-9600"
+
+#: src/xml/xmli18n-tmp.h:6605
+msgid "Canon GP 335"
+msgstr "Canon GP 335"
+
+#: src/xml/xmli18n-tmp.h:6606
+msgid "Canon LBP-4sx"
+msgstr "Canon LBP-4sx"
+
+#: src/xml/xmli18n-tmp.h:6607
+msgid "Canon LBP-430"
+msgstr "Canon LBP-430"
+
+#: src/xml/xmli18n-tmp.h:6608
+msgid "Canon LBP-1000"
+msgstr "Canon LBP-1000"
+
+#: src/xml/xmli18n-tmp.h:6609
+msgid "Canon LBP-1260"
+msgstr "Canon LBP-1260"
+
+#: src/xml/xmli18n-tmp.h:6610
+msgid "Canon LBP-1760"
+msgstr "Canon LBP-1760"
+
+#: src/xml/xmli18n-tmp.h:6611
+msgid "Canon imageRunner 330s"
+msgstr "Canon imageRunner 330s"
+
+#: src/xml/xmli18n-tmp.h:6612
+msgid "Citizen ProJet II"
+msgstr "Citizen ProJet II"
+
+#: src/xml/xmli18n-tmp.h:6613
+msgid "DEC 1800"
+msgstr "DEC 1800"
+
+#: src/xml/xmli18n-tmp.h:6614
+msgid "DEC LN17"
+msgstr "DEC LN17"
+
+#: src/xml/xmli18n-tmp.h:6615
+msgid "Epson ActionLaser 1100"
+msgstr "Epson ActionLaser 1100"
+
+#: src/xml/xmli18n-tmp.h:6616
+msgid "Epson ActionLaser II"
+msgstr "Epson ActionLaser II"
+
+#: src/xml/xmli18n-tmp.h:6617
+msgid "Epson AcuLaser C2000"
+msgstr "Epson AcuLaser C2000"
+
+#: src/xml/xmli18n-tmp.h:6618
+msgid "Epson AcuLaser C2000PS"
+msgstr "Epson AcuLaser C2000PS"
+
+#: src/xml/xmli18n-tmp.h:6619
+msgid "Epson AcuLaser C8500"
+msgstr "Epson AcuLaser C8500"
+
+#: src/xml/xmli18n-tmp.h:6620
+msgid "Epson AcuLaser C8500PS"
+msgstr "Epson AcuLaser C8500PS"
+
+#: src/xml/xmli18n-tmp.h:6621
+msgid "Epson AcuLaser C8600"
+msgstr "Epson AcuLaser C8600"
+
+#: src/xml/xmli18n-tmp.h:6622
+msgid "Epson AcuLaser C8600PS"
+msgstr "Epson AcuLaser C8600PS"
+
+#: src/xml/xmli18n-tmp.h:6623
+msgid "Epson EPL-5200"
+msgstr "Epson EPL-5200"
+
+#: src/xml/xmli18n-tmp.h:6624
+msgid "Epson EPL-5200+"
+msgstr "Epson EPL-5200+"
+
+#: src/xml/xmli18n-tmp.h:6625
+msgid "Epson EPL-5700"
+msgstr "Epson EPL-5700"
+
+#: src/xml/xmli18n-tmp.h:6626
+msgid "Epson EPL-5700PS"
+msgstr "Epson EPL-5700PS"
+
+#: src/xml/xmli18n-tmp.h:6627
+msgid "Epson EPL-5800"
+msgstr "Epson EPL-5800"
+
+#: src/xml/xmli18n-tmp.h:6628
+msgid "Epson EPL-5800PS"
+msgstr "Epson EPL-5800PS"
+
+#: src/xml/xmli18n-tmp.h:6629
+msgid "Epson EPL-5900"
+msgstr "Epson EPL-5900"
+
+#: src/xml/xmli18n-tmp.h:6630
+msgid "Epson EPL-5900PS"
+msgstr "Epson EPL-5900PS"
+
+#: src/xml/xmli18n-tmp.h:6631
+msgid "Epson EPL-6100"
+msgstr "Epson EPL-6100"
+
+#: src/xml/xmli18n-tmp.h:6632
+msgid "Epson EPL-6100PS"
+msgstr "Epson EPL-6100PS"
+
+#: src/xml/xmli18n-tmp.h:6633
+msgid "Epson EPL-7100"
+msgstr "Epson EPL-7100"
+
+#: src/xml/xmli18n-tmp.h:6634
+msgid "Epson EPL-N2050"
+msgstr "Epson EPL-N2050"
+
+#: src/xml/xmli18n-tmp.h:6635
+msgid "Epson EPL-N2050+"
+msgstr "Epson EPL-N2050+"
+
+#: src/xml/xmli18n-tmp.h:6636
+msgid "Epson EPL-N2050PS"
+msgstr "Epson EPL-N2050PS"
+
+#: src/xml/xmli18n-tmp.h:6637
+msgid "Epson EPL-N2050PS+"
+msgstr "Epson EPL-N2050PS+"
+
+#: src/xml/xmli18n-tmp.h:6638
+msgid "Epson EPL-N2120"
+msgstr "Epson EPL-N2120"
+
+#: src/xml/xmli18n-tmp.h:6639
+msgid "Epson EPL-N2500"
+msgstr "Epson EPL-N2500"
+
+#: src/xml/xmli18n-tmp.h:6640
+msgid "Epson EPL-N2500PS"
+msgstr "Epson EPL-N2500PS"
+
+#: src/xml/xmli18n-tmp.h:6641
+msgid "Epson EPL-N2750"
+msgstr "Epson EPL-N2750"
+
+#: src/xml/xmli18n-tmp.h:6642
+msgid "Epson EPL-N2750PS"
+msgstr "Epson EPL-N2750PS"
+
+#: src/xml/xmli18n-tmp.h:6643
+msgid "Fujitsu PrintPartner 10V"
+msgstr "Fujitsu PrintPartner 10V"
+
+#: src/xml/xmli18n-tmp.h:6644
+msgid "Fujitsu PrintPartner 16DV"
+msgstr "Fujitsu PrintPartner 16DV"
+
+#: src/xml/xmli18n-tmp.h:6645
+msgid "Fujitsu PrintPartner 20W"
+msgstr "Fujitsu PrintPartner 20W"
+
+#: src/xml/xmli18n-tmp.h:6646
+msgid "Fujitsu PrintPartner 8000"
+msgstr "Fujitsu PrintPartner 8000"
+
+#: src/xml/xmli18n-tmp.h:6647
+msgid "Generic PCL 4 Printer"
+msgstr "Типовой принтер PCL 4"
+
+#: src/xml/xmli18n-tmp.h:6648
+msgid "Generic PCL 4 LF Printer"
+msgstr "Типовой принтер PCL 4 LF"
+
+#: src/xml/xmli18n-tmp.h:6649
+msgid "Generic PCL 5 Printer"
+msgstr "Типовой принтер PCL 5"
+
+#: src/xml/xmli18n-tmp.h:6650
+msgid "Generic PCL 5 LF Printer"
+msgstr "Типовой принтер PCL 5 LF"
+
+#: src/xml/xmli18n-tmp.h:6651
+msgid "Generic PCL 5c Printer"
+msgstr "Типовой принтер PCL 5c"
+
+#: src/xml/xmli18n-tmp.h:6652
+msgid "Generic PCL 5c LF Printer"
+msgstr "Типовой принтер PCL 5c LF"
+
+#: src/xml/xmli18n-tmp.h:6653
+msgid "Generic PCL 5e Printer"
+msgstr "Типовой принтер PCL 5e"
+
+#: src/xml/xmli18n-tmp.h:6654
+msgid "Generic PCL 5e LF Printer"
+msgstr "Типовой принтер Generic PCL 5e LF"
+
+#: src/xml/xmli18n-tmp.h:6655
+msgid "Generic PCL 6/PCL XL Printer"
+msgstr "Типовой принтер PCL 6/PCL XL"
+
+#: src/xml/xmli18n-tmp.h:6656
+msgid "Generic PCL 6/PCL XL LF Printer"
+msgstr "Типовой принтер PCL 6/PCL XL LF"
+
+#: src/xml/xmli18n-tmp.h:6657
+msgid "Gestetner 10512"
+msgstr "Gestetner 10512"
+
+#: src/xml/xmli18n-tmp.h:6658
+msgid "Gestetner 2212"
+msgstr "Gestetner 2212"
+
+#: src/xml/xmli18n-tmp.h:6659
+msgid "Gestetner 2712"
+msgstr "Gestetner 2712"
+
+#: src/xml/xmli18n-tmp.h:6660
+msgid "Gestetner 3212"
+msgstr "Gestetner 3212"
+
+#: src/xml/xmli18n-tmp.h:6661
+msgid "Gestetner 3502"
+msgstr "Gestetner 3502"
+
+#: src/xml/xmli18n-tmp.h:6662
+msgid "Gestetner 3532/4235g"
+msgstr "Gestetner 3532/4235g"
+
+#: src/xml/xmli18n-tmp.h:6663
+msgid "Gestetner 4502"
+msgstr "Gestetner 4502"
+
+#: src/xml/xmli18n-tmp.h:6664
+msgid "Gestetner 4532/4245g"
+msgstr "Gestetner 4532/4245g"
+
+#: src/xml/xmli18n-tmp.h:6665
+msgid "Gestetner 6002"
+msgstr "Gestetner 6002"
+
+#: src/xml/xmli18n-tmp.h:6666
+msgid "Gestetner 7502"
+msgstr "Gestetner 7502"
+
+#: src/xml/xmli18n-tmp.h:6667
+msgid "Gestetner 9002"
+msgstr "Gestetner 9002"
+
+#: src/xml/xmli18n-tmp.h:6668
+msgid "Gestetner DSm415"
+msgstr "Gestetner DSm415"
+
+#: src/xml/xmli18n-tmp.h:6669
+msgid "Gestetner DSm615"
+msgstr "Gestetner DSm615"
+
+#: src/xml/xmli18n-tmp.h:6670
+msgid "Gestetner DSm616"
+msgstr "Gestetner DSm616"
+
+#: src/xml/xmli18n-tmp.h:6671
+msgid "Gestetner DSm618"
+msgstr "Gestetner DSm618"
+
+#: src/xml/xmli18n-tmp.h:6672
+msgid "Gestetner DSm618d"
+msgstr "Gestetner DSm618d"
+
+#: src/xml/xmli18n-tmp.h:6673
+msgid "Gestetner DSm620"
+msgstr "Gestetner DSm620"
+
+#: src/xml/xmli18n-tmp.h:6674
+msgid "Gestetner DSm620d"
+msgstr "Gestetner DSm620d"
+
+#: src/xml/xmli18n-tmp.h:6675
+msgid "Gestetner DSm622"
+msgstr "Gestetner DSm622"
+
+#: src/xml/xmli18n-tmp.h:6676
+msgid "Gestetner DSm627"
+msgstr "Gestetner DSm627"
+
+#: src/xml/xmli18n-tmp.h:6677
+msgid "Gestetner DSm635/635G"
+msgstr "Gestetner DSm635/635G"
+
+#: src/xml/xmli18n-tmp.h:6678
+msgid "Gestetner DSm645/645G"
+msgstr "Gestetner DSm645/645G"
+
+#: src/xml/xmli18n-tmp.h:6679
+msgid "Gestetner DSm651"
+msgstr "Gestetner DSm651"
+
+#: src/xml/xmli18n-tmp.h:6680
+msgid "Gestetner DSm660"
+msgstr "Gestetner DSm660"
+
+#: src/xml/xmli18n-tmp.h:6681
+msgid "Gestetner DSm675"
+msgstr "Gestetner DSm675"
+
+#: src/xml/xmli18n-tmp.h:6682
+msgid "Gestetner DSm725"
+msgstr "Gestetner DSm725"
+
+#: src/xml/xmli18n-tmp.h:6683
+msgid "Gestetner DSm730"
+msgstr "Gestetner DSm730"
+
+#: src/xml/xmli18n-tmp.h:6684
+msgid "Gestetner DSm735/735G"
+msgstr "Gestetner DSm735/735G"
+
+#: src/xml/xmli18n-tmp.h:6685
+msgid "Gestetner DSm745/745G"
+msgstr "Gestetner DSm745/745G"
+
+#: src/xml/xmli18n-tmp.h:6686
+msgid "Gestetner MP1100/DSm7110"
+msgstr "Gestetner MP1100/DSm7110"
+
+#: src/xml/xmli18n-tmp.h:6687
+msgid "Gestetner MP1350/DSm7135"
+msgstr "Gestetner MP1350/DSm7135"
+
+#: src/xml/xmli18n-tmp.h:6688
+msgid "Gestetner MP1600/DSm716"
+msgstr "Gestetner MP1600/DSm716"
+
+#: src/xml/xmli18n-tmp.h:6689
+msgid "Gestetner MP2000/DSm721d"
+msgstr "Gestetner MP2000/DSm721d"
+
+#: src/xml/xmli18n-tmp.h:6690
+msgid "Gestetner MP2500/DSm625"
+msgstr "Gestetner MP2500/DSm625"
+
+#: src/xml/xmli18n-tmp.h:6691
+msgid "Gestetner MP3500/DSm735e"
+msgstr "Gestetner MP3500/DSm735e"
+
+#: src/xml/xmli18n-tmp.h:6692
+msgid "Gestetner MP4500/DSm745e"
+msgstr "Gestetner MP4500/DSm745e"
+
+#: src/xml/xmli18n-tmp.h:6693
+msgid "Gestetner MP5500/DSm755"
+msgstr "Gestetner MP5500/DSm755"
+
+#: src/xml/xmli18n-tmp.h:6694
+msgid "Gestetner MP6500/DSm765"
+msgstr "Gestetner MP6500/DSm765"
+
+#: src/xml/xmli18n-tmp.h:6695
+msgid "Gestetner MP7500/DSm775"
+msgstr "Gestetner MP7500/DSm775"
+
+#: src/xml/xmli18n-tmp.h:6696
+msgid "Gestetner MP9000/DSm790"
+msgstr "Gestetner MP9000/DSm790"
+
+#: src/xml/xmli18n-tmp.h:6697
+msgid "Gestetner MP 161/DSm416"
+msgstr "Gestetner MP 161/DSm416"
+
+#: src/xml/xmli18n-tmp.h:6698
+msgid "Gestetner MP 2510/DSm725e"
+msgstr "Gestetner MP 2510/DSm725e"
+
+#: src/xml/xmli18n-tmp.h:6699
+msgid "Gestetner MP 2550"
+msgstr "Gestetner MP 2550"
+
+#: src/xml/xmli18n-tmp.h:6700
+msgid "Gestetner MP 2550B"
+msgstr "Gestetner MP 2550B"
+
+#: src/xml/xmli18n-tmp.h:6701
+msgid "Gestetner MP 3010/DSm730e"
+msgstr "Gestetner MP 3010/DSm730e"
+
+#: src/xml/xmli18n-tmp.h:6702
+msgid "Gestetner MP 3350"
+msgstr "Gestetner MP 3350"
+
+#: src/xml/xmli18n-tmp.h:6703
+msgid "Gestetner MP 3350B"
+msgstr "Gestetner MP 3350B"
+
+#: src/xml/xmli18n-tmp.h:6704
+msgid "Gestetner MP 4000"
+msgstr "Gestetner MP 4000"
+
+#: src/xml/xmli18n-tmp.h:6705
+msgid "Gestetner MP 4000B"
+msgstr "Gestetner MP 4000B"
+
+#: src/xml/xmli18n-tmp.h:6706
+msgid "Gestetner MP 5000"
+msgstr "Gestetner MP 5000"
+
+#: src/xml/xmli18n-tmp.h:6707
+msgid "Gestetner MP 5000B"
+msgstr "Gestetner MP 5000B"
+
+#: src/xml/xmli18n-tmp.h:6708
+msgid "HP Business Inkjet 2200"
+msgstr "HP Business Inkjet 2200"
+
+#: src/xml/xmli18n-tmp.h:6709
+msgid "HP Business Inkjet 2230"
+msgstr "HP Business Inkjet 2230"
+
+#: src/xml/xmli18n-tmp.h:6710
+msgid "HP Business Inkjet 2250"
+msgstr "HP Business Inkjet 2250"
+
+#: src/xml/xmli18n-tmp.h:6711
+msgid "HP Business Inkjet 2250TN"
+msgstr "HP Business Inkjet 2250TN"
+
+#: src/xml/xmli18n-tmp.h:6712
+msgid "HP Business Inkjet 2280"
+msgstr "HP Business Inkjet 2280"
+
+#: src/xml/xmli18n-tmp.h:6713
+msgid "HP Color Inkjet Printer CP1160"
+msgstr "HP Color Inkjet Printer CP1160"
+
+#: src/xml/xmli18n-tmp.h:6714
+msgid "HP Color Inkjet Printer CP1700"
+msgstr "HP Color Inkjet Printer CP1700"
+
+#: src/xml/xmli18n-tmp.h:6715
+msgid "HP Color LaserJet 2500"
+msgstr "HP Color LaserJet 2500"
+
+#: src/xml/xmli18n-tmp.h:6716
+msgid "HP Color LaserJet 4500"
+msgstr "HP Color LaserJet 4500"
+
+#: src/xml/xmli18n-tmp.h:6717
+msgid "HP Color LaserJet 4550"
+msgstr "HP Color LaserJet 4550"
+
+#: src/xml/xmli18n-tmp.h:6718
+msgid "HP Color LaserJet 4600"
+msgstr "HP Color LaserJet 4600"
+
+#: src/xml/xmli18n-tmp.h:6719
+msgid "HP Color LaserJet 5"
+msgstr "HP Color LaserJet 5"
+
+#: src/xml/xmli18n-tmp.h:6720
+msgid "HP Color LaserJet 5000"
+msgstr "HP Color LaserJet 5000"
+
+#: src/xml/xmli18n-tmp.h:6721
+msgid "HP Color LaserJet 5500"
+msgstr "HP Color LaserJet 5500"
+
+#: src/xml/xmli18n-tmp.h:6722
+msgid "HP Color LaserJet 8550GN"
+msgstr "HP Color LaserJet 8550GN"
+
+#: src/xml/xmli18n-tmp.h:6723
+msgid "HP DesignJet 230"
+msgstr "HP DesignJet 230"
+
+#: src/xml/xmli18n-tmp.h:6724
+msgid "HP DesignJet 250C"
+msgstr "HP DesignJet 250C"
+
+#: src/xml/xmli18n-tmp.h:6725
+msgid "HP DesignJet 430"
+msgstr "HP DesignJet 430"
+
+#: src/xml/xmli18n-tmp.h:6726
+msgid "HP DesignJet 450C"
+msgstr "HP DesignJet 450C"
+
+#: src/xml/xmli18n-tmp.h:6727
+msgid "HP DesignJet 455CA"
+msgstr "HP DesignJet 455CA"
+
+#: src/xml/xmli18n-tmp.h:6728
+msgid "HP DesignJet 488CA"
+msgstr "HP DesignJet 488CA"
+
+#: src/xml/xmli18n-tmp.h:6729
+msgid "HP DesignJet 700"
+msgstr "HP DesignJet 700"
+
+#: src/xml/xmli18n-tmp.h:6730
+msgid "HP DesignJet 750C Plus"
+msgstr "HP DesignJet 750C Plus"
+
+#: src/xml/xmli18n-tmp.h:6731
+msgid "HP DesignJet 750C"
+msgstr "HP DesignJet 750C"
+
+#: src/xml/xmli18n-tmp.h:6732
+msgid "HP DesignJet 2500CP"
+msgstr "HP DesignJet 2500CP"
+
+#: src/xml/xmli18n-tmp.h:6733
+msgid "HP DesignJet 3500CP"
+msgstr "HP DesignJet 3500CP"
+
+#: src/xml/xmli18n-tmp.h:6734
+msgid "HP DesignJet ColorPro CAD"
+msgstr "HP DesignJet ColorPro CAD"
+
+#: src/xml/xmli18n-tmp.h:6735
+msgid "HP DeskJet 400"
+msgstr "HP DeskJet 400"
+
+#: src/xml/xmli18n-tmp.h:6736
+msgid "HP DeskJet 420C"
+msgstr "HP DeskJet 420C"
+
+#: src/xml/xmli18n-tmp.h:6737
+msgid "HP DeskJet 450"
+msgstr "HP DeskJet 450"
+
+#: src/xml/xmli18n-tmp.h:6738
+msgid "HP DeskJet 500"
+msgstr "HP DeskJet 500"
+
+#: src/xml/xmli18n-tmp.h:6739
+msgid "HP DeskJet 500C"
+msgstr "HP DeskJet 500C"
+
+#: src/xml/xmli18n-tmp.h:6740
+msgid "HP DeskJet 505J Plus"
+msgstr "HP DeskJet 505J Plus"
+
+#: src/xml/xmli18n-tmp.h:6741
+msgid "HP DeskJet 510"
+msgstr "HP DeskJet 510"
+
+#: src/xml/xmli18n-tmp.h:6742
+msgid "HP DeskJet 520"
+msgstr "HP DeskJet 520"
+
+#: src/xml/xmli18n-tmp.h:6743
+msgid "HP DeskJet 540C"
+msgstr "HP DeskJet 540C"
+
+#: src/xml/xmli18n-tmp.h:6744
+msgid "HP DeskJet 550C"
+msgstr "HP DeskJet 550C"
+
+#: src/xml/xmli18n-tmp.h:6745
+msgid "HP DeskJet 5550"
+msgstr "HP DeskJet 5550"
+
+#: src/xml/xmli18n-tmp.h:6746
+msgid "HP DeskJet 5551"
+msgstr "HP DeskJet 5551"
+
+#: src/xml/xmli18n-tmp.h:6747
+msgid "HP DeskJet 560C"
+msgstr "HP DeskJet 560C"
+
+#: src/xml/xmli18n-tmp.h:6748
+msgid "HP DeskJet 600"
+msgstr "HP DeskJet 600"
+
+#: src/xml/xmli18n-tmp.h:6749
+msgid "HP DeskJet 600C"
+msgstr "HP DeskJet 600C"
+
+#: src/xml/xmli18n-tmp.h:6750
+msgid "HP DeskJet 610C"
+msgstr "HP DeskJet 610C"
+
+#: src/xml/xmli18n-tmp.h:6751
+msgid "HP DeskJet 610CL"
+msgstr "HP DeskJet 610CL"
+
+#: src/xml/xmli18n-tmp.h:6752
+msgid "HP DeskJet 6122"
+msgstr "HP DeskJet 6122"
+
+#: src/xml/xmli18n-tmp.h:6753
+msgid "HP DeskJet 6127"
+msgstr "HP DeskJet 6127"
+
+#: src/xml/xmli18n-tmp.h:6754
+msgid "HP DeskJet 612C"
+msgstr "HP DeskJet 612C"
+
+#: src/xml/xmli18n-tmp.h:6755
+msgid "HP DeskJet 640C"
+msgstr "HP DeskJet 640C"
+
+#: src/xml/xmli18n-tmp.h:6756
+msgid "HP DeskJet 648C"
+msgstr "HP DeskJet 648C"
+
+#: src/xml/xmli18n-tmp.h:6757
+msgid "HP DeskJet 660C"
+msgstr "HP DeskJet 660C"
+
+#: src/xml/xmli18n-tmp.h:6758
+msgid "HP DeskJet 670C"
+msgstr "HP DeskJet 670C"
+
+#: src/xml/xmli18n-tmp.h:6759
+msgid "HP DeskJet 670TV"
+msgstr "HP DeskJet 670TV"
+
+#: src/xml/xmli18n-tmp.h:6760
+msgid "HP DeskJet 672C"
+msgstr "HP DeskJet 672C"
+
+#: src/xml/xmli18n-tmp.h:6761
+msgid "HP DeskJet 680C"
+msgstr "HP DeskJet 680C"
+
+#: src/xml/xmli18n-tmp.h:6762
+msgid "HP DeskJet 682C"
+msgstr "HP DeskJet 682C"
+
+#: src/xml/xmli18n-tmp.h:6763
+msgid "HP DeskJet 690C"
+msgstr "HP DeskJet 690C"
+
+#: src/xml/xmli18n-tmp.h:6764
+msgid "HP DeskJet 692C"
+msgstr "HP DeskJet 692C"
+
+#: src/xml/xmli18n-tmp.h:6765
+msgid "HP DeskJet 693C"
+msgstr "HP DeskJet 693C"
+
+#: src/xml/xmli18n-tmp.h:6766
+msgid "HP DeskJet 694C"
+msgstr "HP DeskJet 694C"
+
+#: src/xml/xmli18n-tmp.h:6767
+msgid "HP DeskJet 695C"
+msgstr "HP DeskJet 695C"
+
+#: src/xml/xmli18n-tmp.h:6768
+msgid "HP DeskJet 697C"
+msgstr "HP DeskJet 697C"
+
+#: src/xml/xmli18n-tmp.h:6769
+msgid "HP DeskJet 810C"
+msgstr "HP DeskJet 810C"
+
+#: src/xml/xmli18n-tmp.h:6770
+msgid "HP DeskJet 812C"
+msgstr "HP DeskJet 812C"
+
+#: src/xml/xmli18n-tmp.h:6771
+msgid "HP DeskJet 815C"
+msgstr "HP DeskJet 815C"
+
+#: src/xml/xmli18n-tmp.h:6772
+msgid "HP DeskJet 816C"
+msgstr "HP DeskJet 816C"
+
+#: src/xml/xmli18n-tmp.h:6773
+msgid "HP DeskJet 825C"
+msgstr "HP DeskJet 825C"
+
+#: src/xml/xmli18n-tmp.h:6774
+msgid "HP DeskJet 830C"
+msgstr "HP DeskJet 830C"
+
+#: src/xml/xmli18n-tmp.h:6775
+msgid "HP DeskJet 832C"
+msgstr "HP DeskJet 832C"
+
+#: src/xml/xmli18n-tmp.h:6776
+msgid "HP DeskJet 840C"
+msgstr "HP DeskJet 840C"
+
+#: src/xml/xmli18n-tmp.h:6777
+msgid "HP DeskJet 841C"
+msgstr "HP DeskJet 841C"
+
+#: src/xml/xmli18n-tmp.h:6778
+msgid "HP DeskJet 842C"
+msgstr "HP DeskJet 842C"
+
+#: src/xml/xmli18n-tmp.h:6779
+msgid "HP DeskJet 843C"
+msgstr "HP DeskJet 843C"
+
+#: src/xml/xmli18n-tmp.h:6780
+msgid "HP DeskJet 845C"
+msgstr "HP DeskJet 845C"
+
+#: src/xml/xmli18n-tmp.h:6781
+msgid "HP DeskJet 850C"
+msgstr "HP DeskJet 850C"
+
+#: src/xml/xmli18n-tmp.h:6782
+msgid "HP DeskJet 855C"
+msgstr "HP DeskJet 855C"
+
+#: src/xml/xmli18n-tmp.h:6783
+msgid "HP DeskJet 870C"
+msgstr "HP DeskJet 870C"
+
+#: src/xml/xmli18n-tmp.h:6784
+msgid "HP DeskJet 880C"
+msgstr "HP DeskJet 880C"
+
+#: src/xml/xmli18n-tmp.h:6785
+msgid "HP DeskJet 882C"
+msgstr "HP DeskJet 882C"
+
+#: src/xml/xmli18n-tmp.h:6786
+msgid "HP DeskJet 890C"
+msgstr "HP DeskJet 890C"
+
+#: src/xml/xmli18n-tmp.h:6787
+msgid "HP DeskJet 895C"
+msgstr "HP DeskJet 895C"
+
+#: src/xml/xmli18n-tmp.h:6788
+msgid "HP DeskJet 916C"
+msgstr "HP DeskJet 916C"
+
+#: src/xml/xmli18n-tmp.h:6789
+msgid "HP DeskJet 920C"
+msgstr "HP DeskJet 920C"
+
+#: src/xml/xmli18n-tmp.h:6790
+msgid "HP DeskJet 9300"
+msgstr "HP DeskJet 9300"
+
+#: src/xml/xmli18n-tmp.h:6791
+msgid "HP DeskJet 930C"
+msgstr "HP DeskJet 930C"
+
+#: src/xml/xmli18n-tmp.h:6792
+msgid "HP DeskJet 932C"
+msgstr "HP DeskJet 932C"
+
+#: src/xml/xmli18n-tmp.h:6793
+msgid "HP DeskJet 933C"
+msgstr "HP DeskJet 933C"
+
+#: src/xml/xmli18n-tmp.h:6794
+msgid "HP DeskJet 934C"
+msgstr "HP DeskJet 934C"
+
+#: src/xml/xmli18n-tmp.h:6795
+msgid "HP DeskJet 935C"
+msgstr "HP DeskJet 935C"
+
+#: src/xml/xmli18n-tmp.h:6796
+msgid "HP DeskJet 940C"
+msgstr "HP DeskJet 940C"
+
+#: src/xml/xmli18n-tmp.h:6797
+msgid "HP DeskJet 948C"
+msgstr "HP DeskJet 948C"
+
+#: src/xml/xmli18n-tmp.h:6798
+msgid "HP DeskJet 950C"
+msgstr "HP DeskJet 950C"
+
+#: src/xml/xmli18n-tmp.h:6799
+msgid "HP DeskJet 952C"
+msgstr "HP DeskJet 952C"
+
+#: src/xml/xmli18n-tmp.h:6800
+msgid "HP DeskJet 955C"
+msgstr "HP DeskJet 955C"
+
+#: src/xml/xmli18n-tmp.h:6801
+msgid "HP DeskJet 957C"
+msgstr "HP DeskJet 957C"
+
+#: src/xml/xmli18n-tmp.h:6802
+msgid "HP DeskJet 959C"
+msgstr "HP DeskJet 959C"
+
+#: src/xml/xmli18n-tmp.h:6803
+msgid "HP DeskJet 960C"
+msgstr "HP DeskJet 960C"
+
+#: src/xml/xmli18n-tmp.h:6804
+msgid "HP DeskJet 970C"
+msgstr "HP DeskJet 970C"
+
+#: src/xml/xmli18n-tmp.h:6805
+msgid "HP DeskJet 975C"
+msgstr "HP DeskJet 975C"
+
+#: src/xml/xmli18n-tmp.h:6806
+msgid "HP DeskJet 980C"
+msgstr "HP DeskJet 980C"
+
+#: src/xml/xmli18n-tmp.h:6807
+msgid "HP DeskJet 990C"
+msgstr "HP DeskJet 990C"
+
+#: src/xml/xmli18n-tmp.h:6808
+msgid "HP DeskJet 995C"
+msgstr "HP DeskJet 995C"
+
+#: src/xml/xmli18n-tmp.h:6809
+msgid "HP DeskJet 1100C"
+msgstr "HP DeskJet 1100C"
+
+#: src/xml/xmli18n-tmp.h:6810
+msgid "HP DeskJet 1120C"
+msgstr "HP DeskJet 1120C"
+
+#: src/xml/xmli18n-tmp.h:6811
+msgid "HP DeskJet 1125C"
+msgstr "HP DeskJet 1125C"
+
+#: src/xml/xmli18n-tmp.h:6812
+msgid "HP DeskJet 1200C"
+msgstr "HP DeskJet 1200C"
+
+#: src/xml/xmli18n-tmp.h:6813
+msgid "HP DeskJet 1220C"
+msgstr "HP DeskJet 1220C"
+
+#: src/xml/xmli18n-tmp.h:6814
+msgid "HP DeskJet 1600C"
+msgstr "HP DeskJet 1600C"
+
+#: src/xml/xmli18n-tmp.h:6815
+msgid "HP DeskJet 1600CM"
+msgstr "HP DeskJet 1600CM"
+
+#: src/xml/xmli18n-tmp.h:6816
+msgid "HP DeskJet 2000"
+msgstr "HP DeskJet 2000"
+
+#: src/xml/xmli18n-tmp.h:6817
+msgid "HP DeskJet 2500"
+msgstr "HP DeskJet 2500"
+
+#: src/xml/xmli18n-tmp.h:6818
+msgid "HP DeskJet 2500CM"
+msgstr "HP DeskJet 2500CM"
+
+#: src/xml/xmli18n-tmp.h:6819
+msgid "HP DeskJet 340C"
+msgstr "HP DeskJet 340C"
+
+#: src/xml/xmli18n-tmp.h:6820
+msgid "HP DeskJet 3810"
+msgstr "HP DeskJet 3810"
+
+#: src/xml/xmli18n-tmp.h:6821
+msgid "HP DeskJet 3816"
+msgstr "HP DeskJet 3816"
+
+#: src/xml/xmli18n-tmp.h:6822
+msgid "HP DeskJet 3820"
+msgstr "HP DeskJet 3820"
+
+#: src/xml/xmli18n-tmp.h:6823
+msgid "HP DeskJet 3822"
+msgstr "HP DeskJet 3822"
+
+#: src/xml/xmli18n-tmp.h:6824
+msgid "HP LaserJet 2"
+msgstr "HP LaserJet 2"
+
+#: src/xml/xmli18n-tmp.h:6825
+msgid "HP LaserJet 2D"
+msgstr "HP LaserJet 2D"
+
+#: src/xml/xmli18n-tmp.h:6826
+msgid "HP LaserJet 2P Plus"
+msgstr "HP LaserJet 2P Plus"
+
+#: src/xml/xmli18n-tmp.h:6827
+msgid "HP LaserJet 2P"
+msgstr "HP LaserJet 2P"
+
+#: src/xml/xmli18n-tmp.h:6828
+msgid "HP LaserJet 3"
+msgstr "HP LaserJet 3"
+
+#: src/xml/xmli18n-tmp.h:6829
+msgid "HP LaserJet 3D"
+msgstr "HP LaserJet 3D"
+
+#: src/xml/xmli18n-tmp.h:6830
+msgid "HP LaserJet 3P w/ PCL5"
+msgstr "HP LaserJet 3P w/ PCL5"
+
+#: src/xml/xmli18n-tmp.h:6831
+msgid "HP LaserJet 3P w/PS"
+msgstr "HP LaserJet 3P w/PS"
+
+#: src/xml/xmli18n-tmp.h:6832
+msgid "HP LaserJet 4 Plus"
+msgstr "HP LaserJet 4 Plus"
+
+#: src/xml/xmli18n-tmp.h:6833
+msgid "HP LaserJet 4"
+msgstr "HP LaserJet 4"
+
+#: src/xml/xmli18n-tmp.h:6834
+msgid "HP LaserJet 4L"
+msgstr "HP LaserJet 4L"
+
+#: src/xml/xmli18n-tmp.h:6835
+msgid "HP LaserJet 4M"
+msgstr "HP LaserJet 4M"
+
+#: src/xml/xmli18n-tmp.h:6836
+msgid "HP LaserJet 4ML"
+msgstr "HP LaserJet 4ML"
+
+#: src/xml/xmli18n-tmp.h:6837
+msgid "HP LaserJet 4P"
+msgstr "HP LaserJet 4P"
+
+#: src/xml/xmli18n-tmp.h:6838
+msgid "HP LaserJet 4Si"
+msgstr "HP LaserJet 4Si"
+
+#: src/xml/xmli18n-tmp.h:6839
+msgid "HP LaserJet 4V"
+msgstr "HP LaserJet 4V"
+
+#: src/xml/xmli18n-tmp.h:6840
+msgid "HP LaserJet 5"
+msgstr "HP LaserJet 5"
+
+#: src/xml/xmli18n-tmp.h:6841
+msgid "HP LaserJet 5L"
+msgstr "HP LaserJet 5L"
+
+#: src/xml/xmli18n-tmp.h:6842
+msgid "HP LaserJet 5M"
+msgstr "HP LaserJet 5M"
+
+#: src/xml/xmli18n-tmp.h:6843
+msgid "HP LaserJet 5MP"
+msgstr "HP LaserJet 5MP"
+
+#: src/xml/xmli18n-tmp.h:6844
+msgid "HP LaserJet 5P"
+msgstr "HP LaserJet 5P"
+
+#: src/xml/xmli18n-tmp.h:6845
+msgid "HP LaserJet 5Si"
+msgstr "HP LaserJet 5Si"
+
+#: src/xml/xmli18n-tmp.h:6846
+msgid "HP LaserJet 6"
+msgstr "HP LaserJet 6"
+
+#: src/xml/xmli18n-tmp.h:6847
+msgid "HP LaserJet 6L"
+msgstr "HP LaserJet 6L"
+
+#: src/xml/xmli18n-tmp.h:6848
+msgid "HP LaserJet 6MP"
+msgstr "HP LaserJet 6MP"
+
+#: src/xml/xmli18n-tmp.h:6849
+msgid "HP LaserJet 6P"
+msgstr "HP LaserJet 6P"
+
+#: src/xml/xmli18n-tmp.h:6850
+msgid "HP LaserJet 1010"
+msgstr "HP LaserJet 1010"
+
+#: src/xml/xmli18n-tmp.h:6851
+msgid "HP LaserJet 1012"
+msgstr "HP LaserJet 1012"
+
+#: src/xml/xmli18n-tmp.h:6852
+msgid "HP LaserJet 1015"
+msgstr "HP LaserJet 1015"
+
+#: src/xml/xmli18n-tmp.h:6853
+msgid "HP LaserJet 1022"
+msgstr "HP LaserJet 1022"
+
+#: src/xml/xmli18n-tmp.h:6854
+msgid "HP LaserJet 1100"
+msgstr "HP LaserJet 1100"
+
+#: src/xml/xmli18n-tmp.h:6855
+msgid "HP LaserJet 1100A"
+msgstr "HP LaserJet 1100A"
+
+#: src/xml/xmli18n-tmp.h:6856
+msgid "HP LaserJet 1150"
+msgstr "HP LaserJet 1150"
+
+#: src/xml/xmli18n-tmp.h:6857
+msgid "HP LaserJet 1160"
+msgstr "HP LaserJet 1160"
+
+#: src/xml/xmli18n-tmp.h:6858
+msgid "HP LaserJet 1200"
+msgstr "HP LaserJet 1200"
+
+#: src/xml/xmli18n-tmp.h:6859
+msgid "HP LaserJet 1220"
+msgstr "HP LaserJet 1220"
+
+#: src/xml/xmli18n-tmp.h:6860
+msgid "HP LaserJet 1300"
+msgstr "HP LaserJet 1300"
+
+#: src/xml/xmli18n-tmp.h:6861
+msgid "HP LaserJet 1320"
+msgstr "HP LaserJet 1320"
+
+#: src/xml/xmli18n-tmp.h:6862
+msgid "HP LaserJet 2100"
+msgstr "HP LaserJet 2100"
+
+#: src/xml/xmli18n-tmp.h:6863
+msgid "HP LaserJet 2100M"
+msgstr "HP LaserJet 2100M"
+
+#: src/xml/xmli18n-tmp.h:6864
+msgid "HP LaserJet 2200"
+msgstr "HP LaserJet 2200"
+
+#: src/xml/xmli18n-tmp.h:6865
+msgid "HP LaserJet 2300"
+msgstr "HP LaserJet 2300"
+
+#: src/xml/xmli18n-tmp.h:6866
+msgid "HP LaserJet 2410"
+msgstr "HP LaserJet 2410"
+
+#: src/xml/xmli18n-tmp.h:6867
+msgid "HP LaserJet 2420"
+msgstr "HP LaserJet 2420"
+
+#: src/xml/xmli18n-tmp.h:6868
+msgid "HP LaserJet 2430"
+msgstr "HP LaserJet 2430"
+
+#: src/xml/xmli18n-tmp.h:6869
+msgid "HP LaserJet 3015"
+msgstr "HP LaserJet 3015"
+
+#: src/xml/xmli18n-tmp.h:6870
+msgid "HP LaserJet 3020"
+msgstr "HP LaserJet 3020"
+
+#: src/xml/xmli18n-tmp.h:6871
+msgid "HP LaserJet 3030"
+msgstr "HP LaserJet 3030"
+
+#: src/xml/xmli18n-tmp.h:6872
+msgid "HP LaserJet 3050"
+msgstr "HP LaserJet 3050"
+
+#: src/xml/xmli18n-tmp.h:6873
+msgid "HP LaserJet 3052"
+msgstr "HP LaserJet 3052"
+
+#: src/xml/xmli18n-tmp.h:6874
+msgid "HP LaserJet 3055"
+msgstr "HP LaserJet 3055"
+
+#: src/xml/xmli18n-tmp.h:6875
+msgid "HP LaserJet 3200"
+msgstr "HP LaserJet 3200"
+
+#: src/xml/xmli18n-tmp.h:6876
+msgid "HP LaserJet 3200m"
+msgstr "HP LaserJet 3200m"
+
+#: src/xml/xmli18n-tmp.h:6877
+msgid "HP LaserJet 3200se"
+msgstr "HP LaserJet 3200se"
+
+#: src/xml/xmli18n-tmp.h:6878
+msgid "HP LaserJet 3300 MFP"
+msgstr "HP LaserJet 3300 MFP"
+
+#: src/xml/xmli18n-tmp.h:6879
+msgid "HP LaserJet 3310 MFP"
+msgstr "HP LaserJet 3310 MFP"
+
+#: src/xml/xmli18n-tmp.h:6880
+msgid "HP LaserJet 3320 MFP"
+msgstr "HP LaserJet 3320 MFP"
+
+#: src/xml/xmli18n-tmp.h:6881
+msgid "HP LaserJet 3320N MFP"
+msgstr "HP LaserJet 3320N MFP"
+
+#: src/xml/xmli18n-tmp.h:6882
+msgid "HP LaserJet 3330 MFP"
+msgstr "HP LaserJet 3330 MFP"
+
+#: src/xml/xmli18n-tmp.h:6883
+msgid "HP LaserJet 3380"
+msgstr "HP LaserJet 3380"
+
+#: src/xml/xmli18n-tmp.h:6884
+msgid "HP LaserJet 3390"
+msgstr "HP LaserJet 3390"
+
+#: src/xml/xmli18n-tmp.h:6885
+msgid "HP LaserJet 3392"
+msgstr "HP LaserJet 3392"
+
+#: src/xml/xmli18n-tmp.h:6886
+msgid "HP LaserJet 4000"
+msgstr "HP LaserJet 4000"
+
+#: src/xml/xmli18n-tmp.h:6887
+msgid "HP LaserJet 4050"
+msgstr "HP LaserJet 4050"
+
+#: src/xml/xmli18n-tmp.h:6888
+msgid "HP LaserJet 4100"
+msgstr "HP LaserJet 4100"
+
+#: src/xml/xmli18n-tmp.h:6889
+msgid "HP LaserJet 4200"
+msgstr "HP LaserJet 4200"
+
+#: src/xml/xmli18n-tmp.h:6890
+msgid "HP LaserJet 4240"
+msgstr "HP LaserJet 4240"
+
+#: src/xml/xmli18n-tmp.h:6891
+msgid "HP LaserJet 4250"
+msgstr "HP LaserJet 4250"
+
+#: src/xml/xmli18n-tmp.h:6892
+msgid "HP LaserJet 4300"
+msgstr "HP LaserJet 4300"
+
+#: src/xml/xmli18n-tmp.h:6893
+msgid "HP LaserJet 4345 mfp"
+msgstr "HP LaserJet 4345 mfp"
+
+#: src/xml/xmli18n-tmp.h:6894
+msgid "HP LaserJet 4350"
+msgstr "HP LaserJet 4350"
+
+#: src/xml/xmli18n-tmp.h:6895
+msgid "HP LaserJet 5000"
+msgstr "HP LaserJet 5000"
+
+#: src/xml/xmli18n-tmp.h:6896
+msgid "HP LaserJet 5100"
+msgstr "HP LaserJet 5100"
+
+#: src/xml/xmli18n-tmp.h:6897
+msgid "HP LaserJet 5200"
+msgstr "HP LaserJet 5200"
+
+#: src/xml/xmli18n-tmp.h:6898
+msgid "HP LaserJet 5200L"
+msgstr "HP LaserJet 5200L"
+
+#: src/xml/xmli18n-tmp.h:6899
+msgid "HP LaserJet 8000"
+msgstr "HP LaserJet 8000"
+
+#: src/xml/xmli18n-tmp.h:6900
+msgid "HP LaserJet 8100"
+msgstr "HP LaserJet 8100"
+
+#: src/xml/xmli18n-tmp.h:6901
+msgid "HP LaserJet 8150"
+msgstr "HP LaserJet 8150"
+
+#: src/xml/xmli18n-tmp.h:6902
+msgid "HP LaserJet 9000"
+msgstr "HP LaserJet 9000"
+
+#: src/xml/xmli18n-tmp.h:6903
+msgid "HP LaserJet 9040"
+msgstr "HP LaserJet 9040"
+
+#: src/xml/xmli18n-tmp.h:6904
+msgid "HP LaserJet 9040 MFP"
+msgstr "HP LaserJet 9040 MFP"
+
+#: src/xml/xmli18n-tmp.h:6905
+msgid "HP LaserJet 9050"
+msgstr "HP LaserJet 9050"
+
+#: src/xml/xmli18n-tmp.h:6906
+msgid "HP LaserJet 9050 MFP"
+msgstr "HP LaserJet 9050 MFP"
+
+#: src/xml/xmli18n-tmp.h:6907
+msgid "HP LaserJet M3027 MFP"
+msgstr "HP LaserJet M3027 MFP"
+
+#: src/xml/xmli18n-tmp.h:6908
+msgid "HP LaserJet M3035 MFP"
+msgstr "HP LaserJet M3035 MFP"
+
+#: src/xml/xmli18n-tmp.h:6909
+msgid "HP LaserJet M4345 MFP"
+msgstr "HP LaserJet M4345 MFP"
+
+#: src/xml/xmli18n-tmp.h:6910
+msgid "HP LaserJet M5025 MFP"
+msgstr "HP LaserJet M5025 MFP"
+
+#: src/xml/xmli18n-tmp.h:6911
+msgid "HP LaserJet M5035 MFP"
+msgstr "HP LaserJet M5035 MFP"
+
+#: src/xml/xmli18n-tmp.h:6912
+msgid "HP LaserJet P2010"
+msgstr "HP LaserJet P2010"
+
+#: src/xml/xmli18n-tmp.h:6913
+msgid "HP LaserJet P2015"
+msgstr "HP LaserJet P2015"
+
+#: src/xml/xmli18n-tmp.h:6914
+msgid "HP LaserJet P3004"
+msgstr "HP LaserJet P3004"
+
+#: src/xml/xmli18n-tmp.h:6915
+msgid "HP LaserJet P3005"
+msgstr "HP LaserJet P3005"
+
+#: src/xml/xmli18n-tmp.h:6916
+msgid "HP Mopier 240"
+msgstr "HP Mopier 240"
+
+#: src/xml/xmli18n-tmp.h:6917
+msgid "HP Mopier 320"
+msgstr "HP Mopier 320"
+
+#: src/xml/xmli18n-tmp.h:6918
+msgid "HP OfficeJet 300"
+msgstr "HP OfficeJet 300"
+
+#: src/xml/xmli18n-tmp.h:6919
+msgid "HP OfficeJet 330"
+msgstr "HP OfficeJet 330"
+
+#: src/xml/xmli18n-tmp.h:6920
+msgid "HP OfficeJet 350"
+msgstr "HP OfficeJet 350"
+
+#: src/xml/xmli18n-tmp.h:6921
+msgid "HP OfficeJet 500"
+msgstr "HP OfficeJet 500"
+
+#: src/xml/xmli18n-tmp.h:6922
+msgid "HP OfficeJet 520"
+msgstr "HP OfficeJet 520"
+
+#: src/xml/xmli18n-tmp.h:6923
+msgid "HP OfficeJet 570"
+msgstr "HP OfficeJet 570"
+
+#: src/xml/xmli18n-tmp.h:6924
+msgid "HP OfficeJet 580"
+msgstr "HP OfficeJet 580"
+
+#: src/xml/xmli18n-tmp.h:6925
+msgid "HP OfficeJet 590"
+msgstr "HP OfficeJet 590"
+
+#: src/xml/xmli18n-tmp.h:6926
+msgid "HP OfficeJet 600"
+msgstr "HP OfficeJet 600"
+
+#: src/xml/xmli18n-tmp.h:6927
+msgid "HP OfficeJet 610"
+msgstr "HP OfficeJet 610"
+
+#: src/xml/xmli18n-tmp.h:6928
+msgid "HP OfficeJet 625"
+msgstr "HP OfficeJet 625"
+
+#: src/xml/xmli18n-tmp.h:6929
+msgid "HP OfficeJet 630"
+msgstr "HP OfficeJet 630"
+
+#: src/xml/xmli18n-tmp.h:6930
+msgid "HP OfficeJet 635"
+msgstr "HP OfficeJet 635"
+
+#: src/xml/xmli18n-tmp.h:6931
+msgid "HP OfficeJet 700"
+msgstr "HP OfficeJet 700"
+
+#: src/xml/xmli18n-tmp.h:6932
+msgid "HP OfficeJet 710"
+msgstr "HP OfficeJet 710"
+
+#: src/xml/xmli18n-tmp.h:6933
+msgid "HP OfficeJet 720"
+msgstr "HP OfficeJet 720"
+
+#: src/xml/xmli18n-tmp.h:6934
+msgid "HP OfficeJet 725"
+msgstr "HP OfficeJet 725"
+
+#: src/xml/xmli18n-tmp.h:6935
+msgid "HP OfficeJet 5105"
+msgstr "HP OfficeJet 5105"
+
+#: src/xml/xmli18n-tmp.h:6936
+msgid "HP OfficeJet 5110"
+msgstr "HP OfficeJet 5110"
+
+#: src/xml/xmli18n-tmp.h:6937
+msgid "HP OfficeJet 5110xi"
+msgstr "HP OfficeJet 5110xi"
+
+#: src/xml/xmli18n-tmp.h:6938
+msgid "HP OfficeJet 6105"
+msgstr "HP OfficeJet 6105"
+
+#: src/xml/xmli18n-tmp.h:6939
+msgid "HP OfficeJet 6110"
+msgstr "HP OfficeJet 6110"
+
+#: src/xml/xmli18n-tmp.h:6940
+msgid "HP OfficeJet 7110"
+msgstr "HP OfficeJet 7110"
+
+#: src/xml/xmli18n-tmp.h:6941
+msgid "HP OfficeJet 7130"
+msgstr "HP OfficeJet 7130"
+
+#: src/xml/xmli18n-tmp.h:6942
+msgid "HP OfficeJet 7140"
+msgstr "HP OfficeJet 7140"
+
+#: src/xml/xmli18n-tmp.h:6943
+msgid "HP OfficeJet D125"
+msgstr "HP OfficeJet D125"
+
+#: src/xml/xmli18n-tmp.h:6944
+msgid "HP OfficeJet D135"
+msgstr "HP OfficeJet D135"
+
+#: src/xml/xmli18n-tmp.h:6945
+msgid "HP OfficeJet D145"
+msgstr "HP OfficeJet D145"
+
+#: src/xml/xmli18n-tmp.h:6946
+msgid "HP OfficeJet D155"
+msgstr "HP OfficeJet D155"
+
+#: src/xml/xmli18n-tmp.h:6947
+msgid "HP OfficeJet G55"
+msgstr "HP OfficeJet G55"
+
+#: src/xml/xmli18n-tmp.h:6948
+msgid "HP OfficeJet G85"
+msgstr "HP OfficeJet G85"
+
+#: src/xml/xmli18n-tmp.h:6949
+msgid "HP OfficeJet G95"
+msgstr "HP OfficeJet G95"
+
+#: src/xml/xmli18n-tmp.h:6950
+msgid "HP OfficeJet K60"
+msgstr "HP OfficeJet K60"
+
+#: src/xml/xmli18n-tmp.h:6951
+msgid "HP OfficeJet K60xi"
+msgstr "HP OfficeJet K60xi"
+
+#: src/xml/xmli18n-tmp.h:6952
+msgid "HP OfficeJet K80"
+msgstr "HP OfficeJet K80"
+
+#: src/xml/xmli18n-tmp.h:6953
+msgid "HP OfficeJet K80xi"
+msgstr "HP OfficeJet K80xi"
+
+#: src/xml/xmli18n-tmp.h:6954
+msgid "HP OfficeJet LX"
+msgstr "HP OfficeJet LX"
+
+#: src/xml/xmli18n-tmp.h:6955
+msgid "HP OfficeJet Pro 1150C"
+msgstr "HP OfficeJet Pro 1150C"
+
+#: src/xml/xmli18n-tmp.h:6956
+msgid "HP OfficeJet Pro 1170C"
+msgstr "HP OfficeJet Pro 1170C"
+
+#: src/xml/xmli18n-tmp.h:6957
+msgid "HP OfficeJet Pro 1175C"
+msgstr "HP OfficeJet Pro 1175C"
+
+#: src/xml/xmli18n-tmp.h:6958
+msgid "HP OfficeJet R40"
+msgstr "HP OfficeJet R40"
+
+#: src/xml/xmli18n-tmp.h:6959
+msgid "HP OfficeJet R45"
+msgstr "HP OfficeJet R45"
+
+#: src/xml/xmli18n-tmp.h:6960
+msgid "HP OfficeJet R60"
+msgstr "HP OfficeJet R60"
+
+#: src/xml/xmli18n-tmp.h:6961
+msgid "HP OfficeJet R65"
+msgstr "HP OfficeJet R65"
+
+#: src/xml/xmli18n-tmp.h:6962
+msgid "HP OfficeJet R80"
+msgstr "HP OfficeJet R80"
+
+#: src/xml/xmli18n-tmp.h:6963
+msgid "HP OfficeJet T45"
+msgstr "HP OfficeJet T45"
+
+#: src/xml/xmli18n-tmp.h:6964
+msgid "HP OfficeJet T65"
+msgstr "HP OfficeJet T65"
+
+#: src/xml/xmli18n-tmp.h:6965
+msgid "HP OfficeJet V40"
+msgstr "HP OfficeJet V40"
+
+#: src/xml/xmli18n-tmp.h:6966
+msgid "HP OfficeJet V40xi"
+msgstr "HP OfficeJet V40xi"
+
+#: src/xml/xmli18n-tmp.h:6967
+msgid "HP OfficeJet"
+msgstr "HP OfficeJet"
+
+#: src/xml/xmli18n-tmp.h:6968
+msgid "HP PSC 370"
+msgstr "HP PSC 370"
+
+#: src/xml/xmli18n-tmp.h:6969
+msgid "HP PSC 380"
+msgstr "HP PSC 380"
+
+#: src/xml/xmli18n-tmp.h:6970
+msgid "HP PSC 500"
+msgstr "HP PSC 500"
+
+#: src/xml/xmli18n-tmp.h:6971
+msgid "HP PSC 750"
+msgstr "HP PSC 750"
+
+#: src/xml/xmli18n-tmp.h:6972
+msgid "HP PSC 950"
+msgstr "HP PSC 950"
+
+#: src/xml/xmli18n-tmp.h:6973
+msgid "HP PSC 950xi"
+msgstr "HP PSC 950xi"
+
+#: src/xml/xmli18n-tmp.h:6974
+msgid "HP PSC 2110"
+msgstr "HP PSC 2110"
+
+#: src/xml/xmli18n-tmp.h:6975
+msgid "HP PSC 2150"
+msgstr "HP PSC 2150"
+
+#: src/xml/xmli18n-tmp.h:6976
+msgid "HP PSC 2210"
+msgstr "HP PSC 2210"
+
+#: src/xml/xmli18n-tmp.h:6977
+msgid "HP PhotoSmart 7150"
+msgstr "HP PhotoSmart 7150"
+
+#: src/xml/xmli18n-tmp.h:6978
+msgid "HP PhotoSmart 7345"
+msgstr "HP PhotoSmart 7345"
+
+#: src/xml/xmli18n-tmp.h:6979
+msgid "HP PhotoSmart 7350"
+msgstr "HP PhotoSmart 7350"
+
+#: src/xml/xmli18n-tmp.h:6980
+msgid "HP PhotoSmart 7550"
+msgstr "HP PhotoSmart 7550"
+
+#: src/xml/xmli18n-tmp.h:6981
+msgid "HP PhotoSmart P100"
+msgstr "HP PhotoSmart P100"
+
+#: src/xml/xmli18n-tmp.h:6982
+msgid "HP PhotoSmart P130"
+msgstr "HP PhotoSmart P130"
+
+#: src/xml/xmli18n-tmp.h:6983
+msgid "HP PhotoSmart P230"
+msgstr "HP PhotoSmart P230"
+
+#: src/xml/xmli18n-tmp.h:6984
+msgid "HP PhotoSmart P1000"
+msgstr "HP PhotoSmart P1000"
+
+#: src/xml/xmli18n-tmp.h:6985
+msgid "HP PhotoSmart P1100"
+msgstr "HP PhotoSmart P1100"
+
+#: src/xml/xmli18n-tmp.h:6986
+msgid "HP PhotoSmart P1115"
+msgstr "HP PhotoSmart P1115"
+
+#: src/xml/xmli18n-tmp.h:6987
+msgid "HP PhotoSmart P1215"
+msgstr "HP PhotoSmart P1215"
+
+#: src/xml/xmli18n-tmp.h:6988
+msgid "HP PhotoSmart P1218"
+msgstr "HP PhotoSmart P1218"
+
+#: src/xml/xmli18n-tmp.h:6989
+msgid "HP PhotoSmart P1315"
+msgstr "HP PhotoSmart P1315"
+
+#: src/xml/xmli18n-tmp.h:6990
+msgid "HP e-printer e20"
+msgstr "HP e-printer e20"
+
+#: src/xml/xmli18n-tmp.h:6991
+msgid "IBM 4019"
+msgstr "IBM 4019"
+
+#: src/xml/xmli18n-tmp.h:6992
+msgid "IBM 4029 030 LaserPrinter 10"
+msgstr "IBM 4029 030 LaserPrinter 10"
+
+#: src/xml/xmli18n-tmp.h:6993
+msgid "IBM 4312"
+msgstr "IBM 4312"
+
+#: src/xml/xmli18n-tmp.h:6994
+msgid "IBM Infoprint 12"
+msgstr "IBM Infoprint 12"
+
+#: src/xml/xmli18n-tmp.h:6995
+msgid "IBM Page Printer 3112"
+msgstr "IBM Page Printer 3112"
+
+#: src/xml/xmli18n-tmp.h:6996
+msgid "Infotec 4353 MF"
+msgstr "Infotec 4353 MF"
+
+#: src/xml/xmli18n-tmp.h:6997
+msgid "Infotec 4452 MF"
+msgstr "Infotec 4452 MF"
+
+#: src/xml/xmli18n-tmp.h:6998
+msgid "Infotec 4651 MF"
+msgstr "Infotec 4651 MF"
+
+#: src/xml/xmli18n-tmp.h:6999
+msgid "Infotec IS2022"
+msgstr "Infotec IS2022"
+
+#: src/xml/xmli18n-tmp.h:7000
+msgid "Infotec IS2027"
+msgstr "Infotec IS2027"
+
+#: src/xml/xmli18n-tmp.h:7001
+msgid "Infotec IS2032"
+msgstr "Infotec IS2032"
+
+#: src/xml/xmli18n-tmp.h:7002
+msgid "Infotec IS2035"
+msgstr "Infotec IS2035"
+
+#: src/xml/xmli18n-tmp.h:7003
+msgid "Infotec IS2045"
+msgstr "Infotec IS2045"
+
+#: src/xml/xmli18n-tmp.h:7004
+msgid "Infotec IS2090"
+msgstr "Infotec IS2090"
+
+#: src/xml/xmli18n-tmp.h:7005
+msgid "Infotec IS2105"
+msgstr "Infotec IS2105"
+
+#: src/xml/xmli18n-tmp.h:7006
+msgid "Infotec IS 2015"
+msgstr "Infotec IS 2015"
+
+#: src/xml/xmli18n-tmp.h:7007
+msgid "Infotec IS 2018"
+msgstr "Infotec IS 2018"
+
+#: src/xml/xmli18n-tmp.h:7008
+msgid "Infotec IS 2018D"
+msgstr "Infotec IS 2018D"
+
+#: src/xml/xmli18n-tmp.h:7009
+msgid "Infotec IS 2060"
+msgstr "Infotec IS 2060"
+
+#: src/xml/xmli18n-tmp.h:7010
+msgid "Infotec IS 2075"
+msgstr "Infotec IS 2075"
+
+#: src/xml/xmli18n-tmp.h:7011
+msgid "Infotec IS 2122"
+msgstr "Infotec IS 2122"
+
+#: src/xml/xmli18n-tmp.h:7012
+msgid "Infotec IS 2127"
+msgstr "Infotec IS 2127"
+
+#: src/xml/xmli18n-tmp.h:7013
+msgid "Infotec IS 2132"
+msgstr "Infotec IS 2132"
+
+#: src/xml/xmli18n-tmp.h:7014
+msgid "Infotec IS 2135"
+msgstr "Infotec IS 2135"
+
+#: src/xml/xmli18n-tmp.h:7015
+msgid "Infotec IS 2145"
+msgstr "Infotec IS 2145"
+
+#: src/xml/xmli18n-tmp.h:7016
+msgid "Infotec IS 2151"
+msgstr "Infotec IS 2151"
+
+#: src/xml/xmli18n-tmp.h:7017
+msgid "Infotec IS 2160"
+msgstr "Infotec IS 2160"
+
+#: src/xml/xmli18n-tmp.h:7018
+msgid "Infotec IS 2175"
+msgstr "Infotec IS 2175"
+
+#: src/xml/xmli18n-tmp.h:7019
+msgid "Infotec IS 2215"
+msgstr "Infotec IS 2215"
+
+#: src/xml/xmli18n-tmp.h:7020
+msgid "Infotec IS 2216"
+msgstr "Infotec IS 2216"
+
+#: src/xml/xmli18n-tmp.h:7021
+msgid "Infotec IS 2220"
+msgstr "Infotec IS 2220"
+
+#: src/xml/xmli18n-tmp.h:7022
+msgid "Infotec IS 2220D"
+msgstr "Infotec IS 2220D"
+
+#: src/xml/xmli18n-tmp.h:7023
+msgid "Infotec IS 2225"
+msgstr "Infotec IS 2225"
+
+#: src/xml/xmli18n-tmp.h:7024
+msgid "Infotec IS 2230"
+msgstr "Infotec IS 2230"
+
+#: src/xml/xmli18n-tmp.h:7025
+msgid "Infotec IS 2235"
+msgstr "Infotec IS 2235"
+
+#: src/xml/xmli18n-tmp.h:7026
+msgid "Infotec IS 2245"
+msgstr "Infotec IS 2245"
+
+#: src/xml/xmli18n-tmp.h:7027
+msgid "Infotec IS 2255"
+msgstr "Infotec IS 2255"
+
+#: src/xml/xmli18n-tmp.h:7028
+msgid "Infotec IS 2265"
+msgstr "Infotec IS 2265"
+
+#: src/xml/xmli18n-tmp.h:7029
+msgid "Infotec IS 2275"
+msgstr "Infotec IS 2275"
+
+#: src/xml/xmli18n-tmp.h:7030
+msgid "Infotec IS 2316"
+msgstr "Infotec IS 2316"
+
+#: src/xml/xmli18n-tmp.h:7031
+msgid "Infotec IS 2320"
+msgstr "Infotec IS 2320"
+
+#: src/xml/xmli18n-tmp.h:7032
+msgid "Infotec IS 2325"
+msgstr "Infotec IS 2325"
+
+#: src/xml/xmli18n-tmp.h:7033
+msgid "Infotec IS 2416"
+msgstr "Infotec IS 2416"
+
+#: src/xml/xmli18n-tmp.h:7034
+msgid "Infotec IS 2425"
+msgstr "Infotec IS 2425"
+
+#: src/xml/xmli18n-tmp.h:7035
+msgid "Infotec IS 2430"
+msgstr "Infotec IS 2430"
+
+#: src/xml/xmli18n-tmp.h:7036
+msgid "Infotec IS 2435"
+msgstr "Infotec IS 2435"
+
+#: src/xml/xmli18n-tmp.h:7037
+msgid "Infotec IS 2445"
+msgstr "Infotec IS 2445"
+
+#: src/xml/xmli18n-tmp.h:7038
+msgid "Infotec IS 3090"
+msgstr "Infotec IS 3090"
+
+#: src/xml/xmli18n-tmp.h:7039
+msgid "Infotec IS 3110"
+msgstr "Infotec IS 3110"
+
+#: src/xml/xmli18n-tmp.h:7040
+msgid "Infotec IS 3135"
+msgstr "Infotec IS 3135"
+
+#: src/xml/xmli18n-tmp.h:7041
+msgid "Infotec MP 2550"
+msgstr "Infotec MP 2550"
+
+#: src/xml/xmli18n-tmp.h:7042
+msgid "Infotec MP 2550B"
+msgstr "Infotec MP 2550B"
+
+#: src/xml/xmli18n-tmp.h:7043
+msgid "Infotec MP 3350"
+msgstr "Infotec MP 3350"
+
+#: src/xml/xmli18n-tmp.h:7044
+msgid "Infotec MP 3350B"
+msgstr "Infotec MP 3350B"
+
+#: src/xml/xmli18n-tmp.h:7045
+msgid "Infotec MP 4000"
+msgstr "Infotec MP 4000"
+
+#: src/xml/xmli18n-tmp.h:7046
+msgid "Infotec MP 4000B"
+msgstr "Infotec MP 4000B"
+
+#: src/xml/xmli18n-tmp.h:7047
+msgid "Infotec MP 5000"
+msgstr "Infotec MP 5000"
+
+#: src/xml/xmli18n-tmp.h:7048
+msgid "Infotec MP 5000B"
+msgstr "Infotec MP 5000B"
+
+#: src/xml/xmli18n-tmp.h:7049
+msgid "Kyocera F-1010"
+msgstr "Kyocera F-1010"
+
+#: src/xml/xmli18n-tmp.h:7050
+msgid "Kyocera FS-600 - KPDL-2"
+msgstr "Kyocera FS-600 - KPDL-2"
+
+#: src/xml/xmli18n-tmp.h:7051
+msgid "Kyocera FS-600"
+msgstr "Kyocera FS-600"
+
+#: src/xml/xmli18n-tmp.h:7052
+msgid "Kyocera FS-680"
+msgstr "Kyocera FS-680"
+
+#: src/xml/xmli18n-tmp.h:7053
+msgid "Kyocera FS-800"
+msgstr "Kyocera FS-800"
+
+#: src/xml/xmli18n-tmp.h:7054
+msgid "Kyocera FS-1000"
+msgstr "Kyocera FS-1000"
+
+#: src/xml/xmli18n-tmp.h:7055
+msgid "Kyocera FS-1000+"
+msgstr "Kyocera FS-1000+"
+
+#: src/xml/xmli18n-tmp.h:7056
+msgid "Kyocera FS-1010"
+msgstr "Kyocera FS-1010"
+
+#: src/xml/xmli18n-tmp.h:7057
+msgid "Kyocera FS-1050"
+msgstr "Kyocera FS-1050"
+
+#: src/xml/xmli18n-tmp.h:7058
+msgid "Kyocera FS-1200"
+msgstr "Kyocera FS-1200"
+
+#: src/xml/xmli18n-tmp.h:7059
+msgid "Kyocera FS-1600"
+msgstr "Kyocera FS-1600"
+
+#: src/xml/xmli18n-tmp.h:7060
+msgid "Kyocera FS-1600+"
+msgstr "Kyocera FS-1600+"
+
+#: src/xml/xmli18n-tmp.h:7061
+msgid "Kyocera FS-1700"
+msgstr "Kyocera FS-1700"
+
+#: src/xml/xmli18n-tmp.h:7062
+msgid "Kyocera FS-1700+"
+msgstr "Kyocera FS-1700+"
+
+#: src/xml/xmli18n-tmp.h:7063
+msgid "Kyocera FS-1750"
+msgstr "Kyocera FS-1750"
+
+#: src/xml/xmli18n-tmp.h:7064
+msgid "Kyocera FS-1800"
+msgstr "Kyocera FS-1800"
+
+#: src/xml/xmli18n-tmp.h:7065
+msgid "Kyocera FS-1800+"
+msgstr "Kyocera FS-1800+"
+
+#: src/xml/xmli18n-tmp.h:7066
+msgid "Kyocera FS-1900"
+msgstr "Kyocera FS-1900"
+
+#: src/xml/xmli18n-tmp.h:7067
+msgid "Kyocera FS-3500"
+msgstr "Kyocera FS-3500"
+
+#: src/xml/xmli18n-tmp.h:7068
+msgid "Kyocera FS-3600"
+msgstr "Kyocera FS-3600"
+
+#: src/xml/xmli18n-tmp.h:7069
+msgid "Kyocera FS-3600+"
+msgstr "Kyocera FS-3600+"
+
+#: src/xml/xmli18n-tmp.h:7070
+msgid "Kyocera FS-3700"
+msgstr "Kyocera FS-3700"
+
+#: src/xml/xmli18n-tmp.h:7071
+msgid "Kyocera FS-3700+"
+msgstr "Kyocera FS-3700+"
+
+#: src/xml/xmli18n-tmp.h:7072
+msgid "Kyocera FS-3750"
+msgstr "Kyocera FS-3750"
+
+#: src/xml/xmli18n-tmp.h:7073
+msgid "Kyocera FS-3800"
+msgstr "Kyocera FS-3800"
+
+#: src/xml/xmli18n-tmp.h:7074
+msgid "Kyocera FS-5800C"
+msgstr "Kyocera FS-5800C"
+
+#: src/xml/xmli18n-tmp.h:7075
+msgid "Kyocera FS-5900C"
+msgstr "Kyocera FS-5900C"
+
+#: src/xml/xmli18n-tmp.h:7076
+msgid "Kyocera FS-6500"
+msgstr "Kyocera FS-6500"
+
+#: src/xml/xmli18n-tmp.h:7077
+msgid "Kyocera FS-6500+"
+msgstr "Kyocera FS-6500+"
+
+#: src/xml/xmli18n-tmp.h:7078
+msgid "Kyocera FS-6700"
+msgstr "Kyocera FS-6700"
+
+#: src/xml/xmli18n-tmp.h:7079
+msgid "Kyocera FS-7000"
+msgstr "Kyocera FS-7000"
+
+#: src/xml/xmli18n-tmp.h:7080
+msgid "Kyocera FS-7000+"
+msgstr "Kyocera FS-7000+"
+
+#: src/xml/xmli18n-tmp.h:7081
+msgid "Kyocera FS-8000C"
+msgstr "Kyocera FS-8000C"
+
+#: src/xml/xmli18n-tmp.h:7082
+msgid "Kyocera FS-9000"
+msgstr "Kyocera FS-9000"
+
+#: src/xml/xmli18n-tmp.h:7083
+msgid "Kyocera FS-9100DN"
+msgstr "Kyocera FS-9100DN"
+
+#: src/xml/xmli18n-tmp.h:7084
+msgid "Kyocera FS-9500DN"
+msgstr "Kyocera FS-9500DN"
+
+#: src/xml/xmli18n-tmp.h:7085
+msgid "Kyocera KM-1530"
+msgstr "Kyocera KM-1530"
+
+#: src/xml/xmli18n-tmp.h:7086
+msgid "Kyocera KM-1810"
+msgstr "Kyocera KM-1810"
+
+#: src/xml/xmli18n-tmp.h:7087
+msgid "Kyocera KM-2030"
+msgstr "Kyocera KM-2030"
+
+#: src/xml/xmli18n-tmp.h:7088
+msgid "Kyocera KM-2530"
+msgstr "Kyocera KM-2530"
+
+#: src/xml/xmli18n-tmp.h:7089
+msgid "Kyocera KM-3530"
+msgstr "Kyocera KM-3530"
+
+#: src/xml/xmli18n-tmp.h:7090
+msgid "Kyocera KM-4230"
+msgstr "Kyocera KM-4230"
+
+#: src/xml/xmli18n-tmp.h:7091
+msgid "Kyocera KM-4530"
+msgstr "Kyocera KM-4530"
+
+#: src/xml/xmli18n-tmp.h:7092
+msgid "Kyocera KM-5230"
+msgstr "Kyocera KM-5230"
+
+#: src/xml/xmli18n-tmp.h:7093
+msgid "Kyocera KM-5530"
+msgstr "Kyocera KM-5530"
+
+#: src/xml/xmli18n-tmp.h:7094
+msgid "Kyocera KM-6230"
+msgstr "Kyocera KM-6230"
+
+#: src/xml/xmli18n-tmp.h:7095
+msgid "Lanier 5622"
+msgstr "Lanier 5622"
+
+#: src/xml/xmli18n-tmp.h:7096
+msgid "Lanier 5627"
+msgstr "Lanier 5627"
+
+#: src/xml/xmli18n-tmp.h:7097
+msgid "Lanier 5632"
+msgstr "Lanier 5632"
+
+#: src/xml/xmli18n-tmp.h:7098
+msgid "Lanier 5635"
+msgstr "Lanier 5635"
+
+#: src/xml/xmli18n-tmp.h:7099
+msgid "Lanier 5645"
+msgstr "Lanier 5645"
+
+#: src/xml/xmli18n-tmp.h:7100
+msgid "Lanier LD0105"
+msgstr "Lanier LD0105"
+
+#: src/xml/xmli18n-tmp.h:7101
+msgid "Lanier LD015"
+msgstr "Lanier LD015"
+
+#: src/xml/xmli18n-tmp.h:7102
+msgid "Lanier LD035"
+msgstr "Lanier LD035"
+
+#: src/xml/xmli18n-tmp.h:7103
+msgid "Lanier LD045"
+msgstr "Lanier LD045"
+
+#: src/xml/xmli18n-tmp.h:7104
+msgid "Lanier LD060"
+msgstr "Lanier LD060"
+
+#: src/xml/xmli18n-tmp.h:7105
+msgid "Lanier LD075"
+msgstr "Lanier LD075"
+
+#: src/xml/xmli18n-tmp.h:7106
+msgid "Lanier LD090"
+msgstr "Lanier LD090"
+
+#: src/xml/xmli18n-tmp.h:7107
+msgid "Lanier LD115"
+msgstr "Lanier LD115"
+
+#: src/xml/xmli18n-tmp.h:7108
+msgid "Lanier LD116"
+msgstr "Lanier LD116"
+
+#: src/xml/xmli18n-tmp.h:7109
+msgid "Lanier LD118"
+msgstr "Lanier LD118"
+
+#: src/xml/xmli18n-tmp.h:7110
+msgid "Lanier LD118d"
+msgstr "Lanier LD118d"
+
+#: src/xml/xmli18n-tmp.h:7111
+msgid "Lanier LD120"
+msgstr "Lanier LD120"
+
+#: src/xml/xmli18n-tmp.h:7112
+msgid "Lanier LD120d"
+msgstr "Lanier LD120d"
+
+#: src/xml/xmli18n-tmp.h:7113
+msgid "Lanier LD122"
+msgstr "Lanier LD122"
+
+#: src/xml/xmli18n-tmp.h:7114
+msgid "Lanier LD127"
+msgstr "Lanier LD127"
+
+#: src/xml/xmli18n-tmp.h:7115
+msgid "Lanier LD132"
+msgstr "Lanier LD132"
+
+#: src/xml/xmli18n-tmp.h:7116
+msgid "Lanier LD135"
+msgstr "Lanier LD135"
+
+#: src/xml/xmli18n-tmp.h:7117
+msgid "Lanier LD145"
+msgstr "Lanier LD145"
+
+#: src/xml/xmli18n-tmp.h:7118
+msgid "Lanier LD151"
+msgstr "Lanier LD151"
+
+#: src/xml/xmli18n-tmp.h:7119
+msgid "Lanier LD160"
+msgstr "Lanier LD160"
+
+#: src/xml/xmli18n-tmp.h:7120
+msgid "Lanier LD175"
+msgstr "Lanier LD175"
+
+#: src/xml/xmli18n-tmp.h:7121
+msgid "Lanier LD225"
+msgstr "Lanier LD225"
+
+#: src/xml/xmli18n-tmp.h:7122
+msgid "Lanier LD230"
+msgstr "Lanier LD230"
+
+#: src/xml/xmli18n-tmp.h:7123
+msgid "Lanier LD235"
+msgstr "Lanier LD235"
+
+#: src/xml/xmli18n-tmp.h:7124
+msgid "Lanier LD245"
+msgstr "Lanier LD245"
+
+#: src/xml/xmli18n-tmp.h:7125
+msgid "Lanier MP2500/LD125"
+msgstr "Lanier MP2500/LD125"
+
+#: src/xml/xmli18n-tmp.h:7126
+msgid "Lanier MP 1100/LD1100"
+msgstr "Lanier MP 1100/LD1100"
+
+#: src/xml/xmli18n-tmp.h:7127
+msgid "Lanier MP 1350/LD1135"
+msgstr "Lanier MP 1350/LD1135"
+
+#: src/xml/xmli18n-tmp.h:7128
+msgid "Lanier MP 1600/LD316"
+msgstr "Lanier MP 1600/LD316"
+
+#: src/xml/xmli18n-tmp.h:7129
+msgid "Lanier MP 161/LD016"
+msgstr "Lanier MP 161/LD016"
+
+#: src/xml/xmli18n-tmp.h:7130
+msgid "Lanier MP 2000/LD320d"
+msgstr "Lanier MP 2000/LD320d"
+
+#: src/xml/xmli18n-tmp.h:7131
+msgid "Lanier MP 2510/LD325"
+msgstr "Lanier MP 2510/LD325"
+
+#: src/xml/xmli18n-tmp.h:7132
+msgid "Lanier MP 2550B/LD425B"
+msgstr "Lanier MP 2550B/LD425B"
+
+#: src/xml/xmli18n-tmp.h:7133
+msgid "Lanier MP 2550/LD425"
+msgstr "Lanier MP 2550/LD425"
+
+#: src/xml/xmli18n-tmp.h:7134
+msgid "Lanier MP 3010/LD330"
+msgstr "Lanier MP 3010/LD330"
+
+#: src/xml/xmli18n-tmp.h:7135
+msgid "Lanier MP 3350B/LD433B"
+msgstr "Lanier MP 3350B/LD433B"
+
+#: src/xml/xmli18n-tmp.h:7136
+msgid "Lanier MP 3350/LD433"
+msgstr "Lanier MP 3350/LD433"
+
+#: src/xml/xmli18n-tmp.h:7137
+msgid "Lanier MP 3500/LD335"
+msgstr "Lanier MP 3500/LD335"
+
+#: src/xml/xmli18n-tmp.h:7138
+msgid "Lanier MP 4000B/LD040B"
+msgstr "Lanier MP 4000B/LD040B"
+
+#: src/xml/xmli18n-tmp.h:7139
+msgid "Lanier MP 4000/LD040"
+msgstr "Lanier MP 4000/LD040"
+
+#: src/xml/xmli18n-tmp.h:7140
+msgid "Lanier MP 4500/LD345"
+msgstr "Lanier MP 4500/LD345"
+
+#: src/xml/xmli18n-tmp.h:7141
+msgid "Lanier MP 5000B/LD050B"
+msgstr "Lanier MP 5000B/LD050B"
+
+#: src/xml/xmli18n-tmp.h:7142
+msgid "Lanier MP 5000/LD050"
+msgstr "Lanier MP 5000/LD050"
+
+#: src/xml/xmli18n-tmp.h:7143
+msgid "Lanier MP 5500/LD255"
+msgstr "Lanier MP 5500/LD255"
+
+#: src/xml/xmli18n-tmp.h:7144
+msgid "Lanier MP 6500/LD265"
+msgstr "Lanier MP 6500/LD265"
+
+#: src/xml/xmli18n-tmp.h:7145
+msgid "Lanier MP 7500/LD275"
+msgstr "Lanier MP 7500/LD275"
+
+#: src/xml/xmli18n-tmp.h:7146
+msgid "Lanier MP 9000/LD190"
+msgstr "Lanier MP 9000/LD190"
+
+#: src/xml/xmli18n-tmp.h:7147
+msgid "Lexmark 4076"
+msgstr "Lexmark 4076"
+
+#: src/xml/xmli18n-tmp.h:7148
+msgid "Lexmark Optra E"
+msgstr "Lexmark Optra E"
+
+#: src/xml/xmli18n-tmp.h:7149
+msgid "Lexmark Optra E+"
+msgstr "Lexmark Optra E+"
+
+#: src/xml/xmli18n-tmp.h:7150
+msgid "Lexmark Optra E220"
+msgstr "Lexmark Optra E220"
+
+#: src/xml/xmli18n-tmp.h:7151
+msgid "Lexmark Optra E321"
+msgstr "Lexmark Optra E321"
+
+#: src/xml/xmli18n-tmp.h:7152
+msgid "Lexmark Optra E323"
+msgstr "Lexmark Optra E323"
+
+#: src/xml/xmli18n-tmp.h:7153
+msgid "Lexmark Valuewriter 300"
+msgstr "Lexmark Valuewriter 300"
+
+#: src/xml/xmli18n-tmp.h:7154
+msgid "Minolta PagePro 6"
+msgstr "Minolta PagePro 6"
+
+#: src/xml/xmli18n-tmp.h:7155
+msgid "Minolta PagePro 6e"
+msgstr "Minolta PagePro 6e"
+
+#: src/xml/xmli18n-tmp.h:7156
+msgid "Minolta PagePro 6ex"
+msgstr "Minolta PagePro 6ex"
+
+#: src/xml/xmli18n-tmp.h:7157
+msgid "Minolta PagePro 8"
+msgstr "Minolta PagePro 8"
+
+#: src/xml/xmli18n-tmp.h:7158
+msgid "Minolta PagePro 8L"
+msgstr "Minolta PagePro 8L"
+
+#: src/xml/xmli18n-tmp.h:7159
+msgid "Minolta PagePro 1100"
+msgstr "Minolta PagePro 1100"
+
+#: src/xml/xmli18n-tmp.h:7160
+msgid "NEC SuperScript 660i"
+msgstr "NEC SuperScript 660i"
+
+#: src/xml/xmli18n-tmp.h:7161
+msgid "NEC SuperScript 860"
+msgstr "NEC SuperScript 860"
+
+#: src/xml/xmli18n-tmp.h:7162
+msgid "NEC SuperScript 870"
+msgstr "NEC SuperScript 870"
+
+#: src/xml/xmli18n-tmp.h:7163
+msgid "NEC SuperScript 1260"
+msgstr "NEC SuperScript 1260"
+
+#: src/xml/xmli18n-tmp.h:7164
+msgid "NEC SuperScript 1400"
+msgstr "NEC SuperScript 1400"
+
+#: src/xml/xmli18n-tmp.h:7165
+msgid "NEC SuperScript 1800"
+msgstr "NEC SuperScript 1800"
+
+#: src/xml/xmli18n-tmp.h:7166
+msgid "NRG 10515/10518/10512"
+msgstr "NRG 10515/10518/10512"
+
+#: src/xml/xmli18n-tmp.h:7167
+msgid "NRG 2205/2238/2212"
+msgstr "NRG 2205/2238/2212"
+
+#: src/xml/xmli18n-tmp.h:7168
+msgid "NRG 2705/2738/2712"
+msgstr "NRG 2705/2738/2712"
+
+#: src/xml/xmli18n-tmp.h:7169
+msgid "NRG 3205/3238/3212"
+msgstr "NRG 3205/3238/3212"
+
+#: src/xml/xmli18n-tmp.h:7170
+msgid "NRG 3525/3508/3502"
+msgstr "NRG 3525/3508/3502"
+
+#: src/xml/xmli18n-tmp.h:7171
+msgid "NRG 3545/3518/3532"
+msgstr "NRG 3545/3518/3532"
+
+#: src/xml/xmli18n-tmp.h:7172
+msgid "NRG 4525/4508/4502"
+msgstr "NRG 4525/4508/4502"
+
+#: src/xml/xmli18n-tmp.h:7173
+msgid "NRG 4545/4518/4532"
+msgstr "NRG 4545/4518/4532"
+
+#: src/xml/xmli18n-tmp.h:7174
+msgid "NRG 6002/6005/6008"
+msgstr "NRG 6002/6005/6008"
+
+#: src/xml/xmli18n-tmp.h:7175
+msgid "NRG 7502/7505/7508"
+msgstr "NRG 7502/7505/7508"
+
+#: src/xml/xmli18n-tmp.h:7176
+msgid "NRG 9005/9008/9002"
+msgstr "NRG 9005/9008/9002"
+
+#: src/xml/xmli18n-tmp.h:7177
+msgid "NRG DSm415"
+msgstr "NRG DSm415"
+
+#: src/xml/xmli18n-tmp.h:7178
+msgid "NRG DSm615"
+msgstr "NRG DSm615"
+
+#: src/xml/xmli18n-tmp.h:7179
+msgid "NRG DSm616"
+msgstr "NRG DSm616"
+
+#: src/xml/xmli18n-tmp.h:7180
+msgid "NRG DSm618"
+msgstr "NRG DSm618"
+
+#: src/xml/xmli18n-tmp.h:7181
+msgid "NRG DSm618d"
+msgstr "NRG DSm618d"
+
+#: src/xml/xmli18n-tmp.h:7182
+msgid "NRG DSm620"
+msgstr "NRG DSm620"
+
+#: src/xml/xmli18n-tmp.h:7183
+msgid "NRG DSm620d"
+msgstr "NRG DSm620d"
+
+#: src/xml/xmli18n-tmp.h:7184
+msgid "NRG DSm622"
+msgstr "NRG DSm622"
+
+#: src/xml/xmli18n-tmp.h:7185
+msgid "NRG DSm627"
+msgstr "NRG DSm627"
+
+#: src/xml/xmli18n-tmp.h:7186
+msgid "NRG DSm632"
+msgstr "NRG DSm632"
+
+#: src/xml/xmli18n-tmp.h:7187
+msgid "NRG DSm635"
+msgstr "NRG DSm635"
+
+#: src/xml/xmli18n-tmp.h:7188
+msgid "NRG DSm645"
+msgstr "NRG DSm645"
+
+#: src/xml/xmli18n-tmp.h:7189
+msgid "NRG DSm651"
+msgstr "NRG DSm651"
+
+#: src/xml/xmli18n-tmp.h:7190
+msgid "NRG DSm660"
+msgstr "NRG DSm660"
+
+#: src/xml/xmli18n-tmp.h:7191
+msgid "NRG DSm675"
+msgstr "NRG DSm675"
+
+#: src/xml/xmli18n-tmp.h:7192
+msgid "NRG DSm725"
+msgstr "NRG DSm725"
+
+#: src/xml/xmli18n-tmp.h:7193
+msgid "NRG DSm730"
+msgstr "NRG DSm730"
+
+#: src/xml/xmli18n-tmp.h:7194
+msgid "NRG DSm735"
+msgstr "NRG DSm735"
+
+#: src/xml/xmli18n-tmp.h:7195
+msgid "NRG DSm745"
+msgstr "NRG DSm745"
+
+#: src/xml/xmli18n-tmp.h:7196
+msgid "NRG MP 1100"
+msgstr "NRG MP 1100"
+
+#: src/xml/xmli18n-tmp.h:7197
+msgid "NRG MP 1350"
+msgstr "NRG MP 1350"
+
+#: src/xml/xmli18n-tmp.h:7198
+msgid "NRG MP 1600"
+msgstr "NRG MP 1600"
+
+#: src/xml/xmli18n-tmp.h:7199
+msgid "NRG MP 161"
+msgstr "NRG MP 161"
+
+#: src/xml/xmli18n-tmp.h:7200
+msgid "NRG MP 2000"
+msgstr "NRG MP 2000"
+
+#: src/xml/xmli18n-tmp.h:7201
+msgid "NRG MP 2500"
+msgstr "NRG MP 2500"
+
+#: src/xml/xmli18n-tmp.h:7202
+msgid "NRG MP 2510"
+msgstr "NRG MP 2510"
+
+#: src/xml/xmli18n-tmp.h:7203
+msgid "NRG MP 2550"
+msgstr "NRG MP 2550"
+
+#: src/xml/xmli18n-tmp.h:7204
+msgid "NRG MP 2550B"
+msgstr "NRG MP 2550B"
+
+#: src/xml/xmli18n-tmp.h:7205
+msgid "NRG MP 3010"
+msgstr "NRG MP 3010"
+
+#: src/xml/xmli18n-tmp.h:7206
+msgid "NRG MP 3350"
+msgstr "NRG MP 3350"
+
+#: src/xml/xmli18n-tmp.h:7207
+msgid "NRG MP 3350B"
+msgstr "NRG MP 3350B"
+
+#: src/xml/xmli18n-tmp.h:7208
+msgid "NRG MP 3500"
+msgstr "NRG MP 3500"
+
+#: src/xml/xmli18n-tmp.h:7209
+msgid "NRG MP 4000"
+msgstr "NRG MP 4000"
+
+#: src/xml/xmli18n-tmp.h:7210
+msgid "NRG MP 4000B"
+msgstr "NRG MP 4000B"
+
+#: src/xml/xmli18n-tmp.h:7211
+msgid "NRG MP 4500"
+msgstr "NRG MP 4500"
+
+#: src/xml/xmli18n-tmp.h:7212
+msgid "NRG MP 5000"
+msgstr "NRG MP 5000"
+
+#: src/xml/xmli18n-tmp.h:7213
+msgid "NRG MP 5000B"
+msgstr "NRG MP 5000B"
+
+#: src/xml/xmli18n-tmp.h:7214
+msgid "NRG MP 5500"
+msgstr "NRG MP 5500"
+
+#: src/xml/xmli18n-tmp.h:7215
+msgid "NRG MP 6500"
+msgstr "NRG MP 6500"
+
+#: src/xml/xmli18n-tmp.h:7216
+msgid "NRG MP 7500"
+msgstr "NRG MP 7500"
+
+#: src/xml/xmli18n-tmp.h:7217
+msgid "NRG MP 9000"
+msgstr "NRG MP 9000"
+
+#: src/xml/xmli18n-tmp.h:7218
+msgid "Oki OL400"
+msgstr "Oki OL400"
+
+#: src/xml/xmli18n-tmp.h:7219
+msgid "Oki OL400e"
+msgstr "Oki OL400e"
+
+#: src/xml/xmli18n-tmp.h:7220
+msgid "Oki OL400ex"
+msgstr "Oki OL400ex"
+
+#: src/xml/xmli18n-tmp.h:7221
+msgid "Oki OL410e"
+msgstr "Oki OL410e"
+
+#: src/xml/xmli18n-tmp.h:7222
+msgid "Oki OL600e"
+msgstr "Oki OL600e"
+
+#: src/xml/xmli18n-tmp.h:7223
+msgid "Oki OL610e/S"
+msgstr "Oki OL610e/S"
+
+#: src/xml/xmli18n-tmp.h:7224
+msgid "Oki OL800"
+msgstr "Oki OL800"
+
+#: src/xml/xmli18n-tmp.h:7225
+msgid "Oki OL810ex"
+msgstr "Oki OL810ex"
+
+#: src/xml/xmli18n-tmp.h:7226
+msgid "Oki Okipage 6e"
+msgstr "Oki Okipage 6e"
+
+#: src/xml/xmli18n-tmp.h:7227
+msgid "Oki Okipage 6ex"
+msgstr "Oki Okipage 6ex"
+
+#: src/xml/xmli18n-tmp.h:7228
+msgid "Oki Okipage 8p"
+msgstr "Oki Okipage 8p"
+
+#: src/xml/xmli18n-tmp.h:7229
+msgid "Oki Okipage 10e"
+msgstr "Oki Okipage 10e"
+
+#: src/xml/xmli18n-tmp.h:7230
+msgid "Oki Okipage 10ex"
+msgstr "Oki Okipage 10ex"
+
+#: src/xml/xmli18n-tmp.h:7231
+msgid "Oki Okipage 14ex"
+msgstr "Oki Okipage 14ex"
+
+#: src/xml/xmli18n-tmp.h:7232
+msgid "Oki Super 6e"
+msgstr "Oki Super 6e"
+
+#: src/xml/xmli18n-tmp.h:7233
+msgid "Olivetti JP350S"
+msgstr "Olivetti JP350S"
+
+#: src/xml/xmli18n-tmp.h:7234
+msgid "Olivetti PG 306"
+msgstr "Olivetti PG 306"
+
+#: src/xml/xmli18n-tmp.h:7235
+msgid "PCPI 1030"
+msgstr "PCPI 1030"
+
+#: src/xml/xmli18n-tmp.h:7236
+msgid "Panasonic KX-P4410"
+msgstr "Panasonic KX-P4410"
+
+#: src/xml/xmli18n-tmp.h:7237
+msgid "Panasonic KX-P4450"
+msgstr "Panasonic KX-P4450"
+
+#: src/xml/xmli18n-tmp.h:7238
+msgid "Panasonic KX-P6150"
+msgstr "Panasonic KX-P6150"
+
+#: src/xml/xmli18n-tmp.h:7239
+msgid "Panasonic KX-P6500"
+msgstr "Panasonic KX-P6500"
+
+#: src/xml/xmli18n-tmp.h:7240
+msgid "Raven LP-410"
+msgstr "Raven LP-410"
+
+#: src/xml/xmli18n-tmp.h:7241
+msgid "Ricoh Aficio 1022"
+msgstr "Ricoh Aficio 1022"
+
+#: src/xml/xmli18n-tmp.h:7242
+msgid "Ricoh Aficio 1027"
+msgstr "Ricoh Aficio 1027"
+
+#: src/xml/xmli18n-tmp.h:7243
+msgid "Ricoh Aficio 1032"
+msgstr "Ricoh Aficio 1032"
+
+#: src/xml/xmli18n-tmp.h:7244
+msgid "Ricoh Aficio 1035"
+msgstr "Ricoh Aficio 1035"
+
+#: src/xml/xmli18n-tmp.h:7245
+msgid "Ricoh Aficio 1045"
+msgstr "Ricoh Aficio 1045"
+
+#: src/xml/xmli18n-tmp.h:7246
+msgid "Ricoh Aficio 1060"
+msgstr "Ricoh Aficio 1060"
+
+#: src/xml/xmli18n-tmp.h:7247
+msgid "Ricoh Aficio 1075"
+msgstr "Ricoh Aficio 1075"
+
+#: src/xml/xmli18n-tmp.h:7248
+msgid "Ricoh Aficio 1515"
+msgstr "Ricoh Aficio 1515"
+
+#: src/xml/xmli18n-tmp.h:7249
+msgid "Ricoh Aficio 2015"
+msgstr "Ricoh Aficio 2015"
+
+#: src/xml/xmli18n-tmp.h:7250
+msgid "Ricoh Aficio 2016"
+msgstr "Ricoh Aficio 2016"
+
+#: src/xml/xmli18n-tmp.h:7251
+msgid "Ricoh Aficio 2018"
+msgstr "Ricoh Aficio 2018"
+
+#: src/xml/xmli18n-tmp.h:7252
+msgid "Ricoh Aficio 2018D"
+msgstr "Ricoh Aficio 2018D"
+
+#: src/xml/xmli18n-tmp.h:7253
+msgid "Ricoh Aficio 2020"
+msgstr "Ricoh Aficio 2020"
+
+#: src/xml/xmli18n-tmp.h:7254
+msgid "Ricoh Aficio 2020D"
+msgstr "Ricoh Aficio 2020D"
+
+#: src/xml/xmli18n-tmp.h:7255
+msgid "Ricoh Aficio 2022"
+msgstr "Ricoh Aficio 2022"
+
+#: src/xml/xmli18n-tmp.h:7256
+msgid "Ricoh Aficio 2027"
+msgstr "Ricoh Aficio 2027"
+
+#: src/xml/xmli18n-tmp.h:7257
+msgid "Ricoh Aficio 2032"
+msgstr "Ricoh Aficio 2032"
+
+#: src/xml/xmli18n-tmp.h:7258
+msgid "Ricoh Aficio 2035"
+msgstr "Ricoh Aficio 2035"
+
+#: src/xml/xmli18n-tmp.h:7259
+msgid "Ricoh Aficio 2035e"
+msgstr "Ricoh Aficio 2035e"
+
+#: src/xml/xmli18n-tmp.h:7260
+msgid "Ricoh Aficio 2045"
+msgstr "Ricoh Aficio 2045"
+
+#: src/xml/xmli18n-tmp.h:7261
+msgid "Ricoh Aficio 2045e"
+msgstr "Ricoh Aficio 2045e"
+
+#: src/xml/xmli18n-tmp.h:7262
+msgid "Ricoh Aficio 2051"
+msgstr "Ricoh Aficio 2051"
+
+#: src/xml/xmli18n-tmp.h:7263
+msgid "Ricoh Aficio 2060"
+msgstr "Ricoh Aficio 2060"
+
+#: src/xml/xmli18n-tmp.h:7264
+msgid "Ricoh Aficio 2075"
+msgstr "Ricoh Aficio 2075"
+
+#: src/xml/xmli18n-tmp.h:7265
+msgid "Ricoh Aficio 2090"
+msgstr "Ricoh Aficio 2090"
+
+#: src/xml/xmli18n-tmp.h:7266
+msgid "Ricoh Aficio 2105"
+msgstr "Ricoh Aficio 2105"
+
+#: src/xml/xmli18n-tmp.h:7267
+msgid "Ricoh Aficio 220"
+msgstr "Ricoh Aficio 220"
+
+#: src/xml/xmli18n-tmp.h:7268
+msgid "Ricoh Aficio 3025"
+msgstr "Ricoh Aficio 3025"
+
+#: src/xml/xmli18n-tmp.h:7269
+msgid "Ricoh Aficio 3030"
+msgstr "Ricoh Aficio 3030"
+
+#: src/xml/xmli18n-tmp.h:7270
+msgid "Ricoh Aficio 3035"
+msgstr "Ricoh Aficio 3035"
+
+#: src/xml/xmli18n-tmp.h:7271
+msgid "Ricoh Aficio 3045"
+msgstr "Ricoh Aficio 3045"
+
+#: src/xml/xmli18n-tmp.h:7272
+msgid "Ricoh Aficio 401"
+msgstr "Ricoh Aficio 401"
+
+#: src/xml/xmli18n-tmp.h:7273
+msgid "Ricoh Aficio 700"
+msgstr "Ricoh Aficio 700"
+
+#: src/xml/xmli18n-tmp.h:7274
+msgid "Ricoh Aficio MP 1100"
+msgstr "Ricoh Aficio MP 1100"
+
+#: src/xml/xmli18n-tmp.h:7275
+msgid "Ricoh Aficio MP 1350"
+msgstr "Ricoh Aficio MP 1350"
+
+#: src/xml/xmli18n-tmp.h:7276
+msgid "Ricoh Aficio MP 1600"
+msgstr "Ricoh Aficio MP 1600"
+
+#: src/xml/xmli18n-tmp.h:7277
+msgid "Ricoh Aficio MP 161"
+msgstr "Ricoh Aficio MP 161"
+
+#: src/xml/xmli18n-tmp.h:7278
+msgid "Ricoh Aficio MP 2000"
+msgstr "Ricoh Aficio MP 2000"
+
+#: src/xml/xmli18n-tmp.h:7279
+msgid "Ricoh Aficio MP 2500"
+msgstr "Ricoh Aficio MP 2500"
+
+#: src/xml/xmli18n-tmp.h:7280
+msgid "Ricoh Aficio MP 2510"
+msgstr "Ricoh Aficio MP 2510"
+
+#: src/xml/xmli18n-tmp.h:7281
+msgid "Ricoh Aficio MP 2550"
+msgstr "Ricoh Aficio MP 2550"
+
+#: src/xml/xmli18n-tmp.h:7282
+msgid "Ricoh Aficio MP 2550B"
+msgstr "Ricoh Aficio MP 2550B"
+
+#: src/xml/xmli18n-tmp.h:7283
+msgid "Ricoh Aficio MP 3010"
+msgstr "Ricoh Aficio MP 3010"
+
+#: src/xml/xmli18n-tmp.h:7284
+msgid "Ricoh Aficio MP 3350"
+msgstr "Ricoh Aficio MP 3350"
+
+#: src/xml/xmli18n-tmp.h:7285
+msgid "Ricoh Aficio MP 3350B"
+msgstr "Ricoh Aficio MP 3350B"
+
+#: src/xml/xmli18n-tmp.h:7286
+msgid "Ricoh Aficio MP 3500"
+msgstr "Ricoh Aficio MP 3500"
+
+#: src/xml/xmli18n-tmp.h:7287
+msgid "Ricoh Aficio MP 4000"
+msgstr "Ricoh Aficio MP 4000"
+
+#: src/xml/xmli18n-tmp.h:7288
+msgid "Ricoh Aficio MP 4000B"
+msgstr "Ricoh Aficio MP 4000B"
+
+#: src/xml/xmli18n-tmp.h:7289
+msgid "Ricoh Aficio MP 4500"
+msgstr "Ricoh Aficio MP 4500"
+
+#: src/xml/xmli18n-tmp.h:7290
+msgid "Ricoh Aficio MP 5000"
+msgstr "Ricoh Aficio MP 5000"
+
+#: src/xml/xmli18n-tmp.h:7291
+msgid "Ricoh Aficio MP 5000B"
+msgstr "Ricoh Aficio MP 5000B"
+
+#: src/xml/xmli18n-tmp.h:7292
+msgid "Ricoh Aficio MP 5500"
+msgstr "Ricoh Aficio MP 5500"
+
+#: src/xml/xmli18n-tmp.h:7293
+msgid "Ricoh Aficio MP 6500"
+msgstr "Ricoh Aficio MP 6500"
+
+#: src/xml/xmli18n-tmp.h:7294
+msgid "Ricoh Aficio MP 7500"
+msgstr "Ricoh Aficio MP 7500"
+
+#: src/xml/xmli18n-tmp.h:7295
+msgid "Ricoh Aficio MP 9000"
+msgstr "Ricoh Aficio MP 9000"
+
+#: src/xml/xmli18n-tmp.h:7296
+msgid "Samsung ML-85"
+msgstr "Samsung ML-85"
+
+#: src/xml/xmli18n-tmp.h:7297
+msgid "Samsung ML-1250"
+msgstr "Samsung ML-1250"
+
+#: src/xml/xmli18n-tmp.h:7298
+msgid "Samsung ML-1450"
+msgstr "Samsung ML-1450"
+
+#: src/xml/xmli18n-tmp.h:7299
+msgid "Samsung ML-1450PS"
+msgstr "Samsung ML-1450PS"
+
+#: src/xml/xmli18n-tmp.h:7300
+msgid "Samsung ML-1650"
+msgstr "Samsung ML-1650"
+
+#: src/xml/xmli18n-tmp.h:7301
+msgid "Samsung ML-1651N"
+msgstr "Samsung ML-1651N"
+
+#: src/xml/xmli18n-tmp.h:7302
+msgid "Samsung ML-1750"
+msgstr "Samsung ML-1750"
+
+#: src/xml/xmli18n-tmp.h:7303
+msgid "Samsung ML-2150"
+msgstr "Samsung ML-2150"
+
+#: src/xml/xmli18n-tmp.h:7304
+msgid "Samsung ML-2150PS"
+msgstr "Samsung ML-2150PS"
+
+#: src/xml/xmli18n-tmp.h:7305
+msgid "Samsung ML-2151N"
+msgstr "Samsung ML-2151N"
+
+#: src/xml/xmli18n-tmp.h:7306
+msgid "Samsung ML-2151NPS"
+msgstr "Samsung ML-2151NPS"
+
+#: src/xml/xmli18n-tmp.h:7307
+msgid "Samsung ML-2152W"
+msgstr "Samsung ML-2152W"
+
+#: src/xml/xmli18n-tmp.h:7308
+msgid "Samsung ML-2152WPS"
+msgstr "Samsung ML-2152WPS"
+
+#: src/xml/xmli18n-tmp.h:7309
+msgid "Samsung ML-2250"
+msgstr "Samsung ML-2250"
+
+#: src/xml/xmli18n-tmp.h:7310
+msgid "Samsung ML-2550"
+msgstr "Samsung ML-2550"
+
+#: src/xml/xmli18n-tmp.h:7311
+msgid "Samsung ML-2551N"
+msgstr "Samsung ML-2551N"
+
+#: src/xml/xmli18n-tmp.h:7312
+msgid "Samsung ML-2552W"
+msgstr "Samsung ML-2552W"
+
+#: src/xml/xmli18n-tmp.h:7313
+msgid "Samsung ML-4600"
+msgstr "Samsung ML-4600"
+
+#: src/xml/xmli18n-tmp.h:7314
+msgid "Samsung ML-5000a"
+msgstr "Samsung ML-5000a"
+
+#: src/xml/xmli18n-tmp.h:7315
+msgid "Samsung ML-6000"
+msgstr "Samsung ML-6000"
+
+#: src/xml/xmli18n-tmp.h:7316
+msgid "Samsung ML-6100"
+msgstr "Samsung ML-6100"
+
+#: src/xml/xmli18n-tmp.h:7317
+msgid "Samsung ML-7000"
+msgstr "Samsung ML-7000"
+
+#: src/xml/xmli18n-tmp.h:7318
+msgid "Samsung ML-7000N"
+msgstr "Samsung ML-7000N"
+
+#: src/xml/xmli18n-tmp.h:7319
+msgid "Samsung ML-7000P"
+msgstr "Samsung ML-7000P"
+
+#: src/xml/xmli18n-tmp.h:7320
+msgid "Samsung ML-7050"
+msgstr "Samsung ML-7050"
+
+#: src/xml/xmli18n-tmp.h:7321
+msgid "Samsung ML-7300"
+msgstr "Samsung ML-7300"
+
+#: src/xml/xmli18n-tmp.h:7322
+msgid "Samsung ML-7300N"
+msgstr "Samsung ML-7300N"
+
+#: src/xml/xmli18n-tmp.h:7323
+msgid "Samsung QL-5100A"
+msgstr "Samsung QL-5100A"
+
+#: src/xml/xmli18n-tmp.h:7324
+msgid "Samsung QL-6050"
+msgstr "Samsung QL-6050"
+
+#: src/xml/xmli18n-tmp.h:7325
+msgid "Savin 2522"
+msgstr "Savin 2522"
+
+#: src/xml/xmli18n-tmp.h:7326
+msgid "Savin 2527"
+msgstr "Savin 2527"
+
+#: src/xml/xmli18n-tmp.h:7327
+msgid "Savin 2532"
+msgstr "Savin 2532"
+
+#: src/xml/xmli18n-tmp.h:7328
+msgid "Savin 2535/2235"
+msgstr "Savin 2535/2235"
+
+#: src/xml/xmli18n-tmp.h:7329
+msgid "Savin 2545/2245"
+msgstr "Savin 2545/2245"
+
+#: src/xml/xmli18n-tmp.h:7330
+msgid "Savin 2560"
+msgstr "Savin 2560"
+
+#: src/xml/xmli18n-tmp.h:7331
+msgid "Savin 2575"
+msgstr "Savin 2575"
+
+#: src/xml/xmli18n-tmp.h:7332
+msgid "Savin 3515"
+msgstr "Savin 3515"
+
+#: src/xml/xmli18n-tmp.h:7333
+msgid "Savin 40105"
+msgstr "Savin 40105"
+
+#: src/xml/xmli18n-tmp.h:7334
+msgid "Savin 4015"
+msgstr "Savin 4015"
+
+#: src/xml/xmli18n-tmp.h:7335
+msgid "Savin 4018"
+msgstr "Savin 4018"
+
+#: src/xml/xmli18n-tmp.h:7336
+msgid "Savin 4018d"
+msgstr "Savin 4018d"
+
+#: src/xml/xmli18n-tmp.h:7337
+msgid "Savin 4022"
+msgstr "Savin 4022"
+
+#: src/xml/xmli18n-tmp.h:7338
+msgid "Savin 4027"
+msgstr "Savin 4027"
+
+#: src/xml/xmli18n-tmp.h:7339
+msgid "Savin 4035/4135g"
+msgstr "Savin 4035/4135g"
+
+#: src/xml/xmli18n-tmp.h:7340
+msgid "Savin 4035e/4135eG"
+msgstr "Savin 4035e/4135eG"
+
+#: src/xml/xmli18n-tmp.h:7341
+msgid "Savin 4045/4145g"
+msgstr "Savin 4045/4145g"
+
+#: src/xml/xmli18n-tmp.h:7342
+msgid "Savin 4045e/4145eG"
+msgstr "Savin 4045e/4145eG"
+
+#: src/xml/xmli18n-tmp.h:7343
+msgid "Savin 4051"
+msgstr "Savin 4051"
+
+#: src/xml/xmli18n-tmp.h:7344
+msgid "Savin 4060"
+msgstr "Savin 4060"
+
+#: src/xml/xmli18n-tmp.h:7345
+msgid "Savin 4075"
+msgstr "Savin 4075"
+
+#: src/xml/xmli18n-tmp.h:7346
+msgid "Savin 4090"
+msgstr "Savin 4090"
+
+#: src/xml/xmli18n-tmp.h:7347
+msgid "Savin 7025"
+msgstr "Savin 7025"
+
+#: src/xml/xmli18n-tmp.h:7348
+msgid "Savin 8016"
+msgstr "Savin 8016"
+
+#: src/xml/xmli18n-tmp.h:7349
+msgid "Savin 8020"
+msgstr "Savin 8020"
+
+#: src/xml/xmli18n-tmp.h:7350
+msgid "Savin 8020d"
+msgstr "Savin 8020d"
+
+#: src/xml/xmli18n-tmp.h:7351
+msgid "Savin 8025"
+msgstr "Savin 8025"
+
+#: src/xml/xmli18n-tmp.h:7352
+msgid "Savin 8025e"
+msgstr "Savin 8025e"
+
+#: src/xml/xmli18n-tmp.h:7353
+msgid "Savin 8030"
+msgstr "Savin 8030"
+
+#: src/xml/xmli18n-tmp.h:7354
+msgid "Savin 8030e"
+msgstr "Savin 8030e"
+
+#: src/xml/xmli18n-tmp.h:7355
+msgid "Savin 8035/8035g"
+msgstr "Savin 8035/8035g"
+
+#: src/xml/xmli18n-tmp.h:7356
+msgid "Savin 8035e"
+msgstr "Savin 8035e"
+
+#: src/xml/xmli18n-tmp.h:7357
+msgid "Savin 8045/8045g"
+msgstr "Savin 8045/8045g"
+
+#: src/xml/xmli18n-tmp.h:7358
+msgid "Savin 8045e"
+msgstr "Savin 8045e"
+
+#: src/xml/xmli18n-tmp.h:7359
+msgid "Savin 8055"
+msgstr "Savin 8055"
+
+#: src/xml/xmli18n-tmp.h:7360
+msgid "Savin 8065"
+msgstr "Savin 8065"
+
+#: src/xml/xmli18n-tmp.h:7361
+msgid "Savin 8075"
+msgstr "Savin 8075"
+
+#: src/xml/xmli18n-tmp.h:7362
+msgid "Savin 8090"
+msgstr "Savin 8090"
+
+#: src/xml/xmli18n-tmp.h:7363
+msgid "Savin 8110"
+msgstr "Savin 8110"
+
+#: src/xml/xmli18n-tmp.h:7364
+msgid "Savin 8135"
+msgstr "Savin 8135"
+
+#: src/xml/xmli18n-tmp.h:7365
+msgid "Savin 816"
+msgstr "Savin 816"
+
+#: src/xml/xmli18n-tmp.h:7366
+msgid "Savin 9016"
+msgstr "Savin 9016"
+
+#: src/xml/xmli18n-tmp.h:7367
+msgid "Savin 9021d"
+msgstr "Savin 9021d"
+
+#: src/xml/xmli18n-tmp.h:7368
+msgid "Savin 9025"
+msgstr "Savin 9025"
+
+#: src/xml/xmli18n-tmp.h:7369
+msgid "Savin 9025b"
+msgstr "Savin 9025b"
+
+#: src/xml/xmli18n-tmp.h:7370
+msgid "Savin 9033"
+msgstr "Savin 9033"
+
+#: src/xml/xmli18n-tmp.h:7371
+msgid "Savin 9033b"
+msgstr "Savin 9033b"
+
+#: src/xml/xmli18n-tmp.h:7372
+msgid "Savin 9040"
+msgstr "Savin 9040"
+
+#: src/xml/xmli18n-tmp.h:7373
+msgid "Savin 9040b"
+msgstr "Savin 9040b"
+
+#: src/xml/xmli18n-tmp.h:7374
+msgid "Savin 9050"
+msgstr "Savin 9050"
+
+#: src/xml/xmli18n-tmp.h:7375
+msgid "Savin 9050b"
+msgstr "Savin 9050b"
+
+#: src/xml/xmli18n-tmp.h:7376
+msgid "Seiko SpeedJET 200"
+msgstr "Seiko SpeedJET 200"
+
+#: src/xml/xmli18n-tmp.h:7377
+msgid "Sharp AR-161"
+msgstr "Sharp AR-161"
+
+#: src/xml/xmli18n-tmp.h:7378
+msgid "Sharp AR-M257"
+msgstr "Sharp AR-M257"
+
+#: src/xml/xmli18n-tmp.h:7379
+msgid "Sony IJP-V100"
+msgstr "Sony IJP-V100"
+
+#: src/xml/xmli18n-tmp.h:7380
+msgid "Star LS-04"
+msgstr "Star LS-04"
+
+#: src/xml/xmli18n-tmp.h:7381
+msgid "Star LaserPrinter 8"
+msgstr "Star LaserPrinter 8"
+
+#: src/xml/xmli18n-tmp.h:7382
+msgid "Tally MT908"
+msgstr "Tally MT908"
+
+#: src/xml/xmli18n-tmp.h:7383
+msgid "Xerox Able 1406"
+msgstr "Xerox Able 1406"
+
+#: src/xml/xmli18n-tmp.h:7384
+msgid "Xerox DocuPrint 4508"
+msgstr "Xerox DocuPrint 4508"
+
+#: src/xml/xmli18n-tmp.h:7385
+msgid "Xerox DocuPrint C20"
+msgstr "Xerox DocuPrint C20"
+
+#: src/xml/xmli18n-tmp.h:7386
+msgid "Xerox DocuPrint N4512"
+msgstr "Xerox DocuPrint N4512"
+
+#: src/xml/xmli18n-tmp.h:7387
+msgid "Xerox DocuPrint N4512PS"
+msgstr "Xerox DocuPrint N4512PS"
+
+#: src/xml/xmli18n-tmp.h:7388
+msgid "Xerox DocuPrint P12"
+msgstr "Xerox DocuPrint P12"
+
+#: src/xml/xmli18n-tmp.h:7389
+msgid "Xerox DocuPrint P1202"
+msgstr "Xerox DocuPrint P1202"
+
+#: src/xml/xmli18n-tmp.h:7390
+msgid "Xerox DocuPrint P8e"
+msgstr "Xerox DocuPrint P8e"
+
+#: src/xml/xmli18n-tmp.h:7391
+msgid "Xerox Document Centre 400"
+msgstr "Xerox Document Centre 400"
+
+#: src/xml/xmli18n-tmp.h:7392
+msgid "Xerox WorkCentre M118"
+msgstr "Xerox WorkCentre M118"
+
+#: src/xml/xmli18n-tmp.h:7393
+msgid "Compaq IJ1200"
+msgstr "Compaq IJ1200"
+
+#: src/xml/xmli18n-tmp.h:7394
+msgid "Lexmark X73"
+msgstr "Lexmark X73"
+
+#: src/xml/xmli18n-tmp.h:7395
+msgid "Lexmark Z42"
+msgstr "Lexmark Z42"
+
+#: src/xml/xmli18n-tmp.h:7396
+msgid "Lexmark Z43"
+msgstr "Lexmark Z43"
+
+#: src/xml/xmli18n-tmp.h:7397
+msgid "Lexmark Z52"
+msgstr "Lexmark Z52"
+
+#: src/xml/xmli18n-tmp.h:7398
+msgid "Lexmark Z53"
+msgstr "Lexmark Z53"
+
+#: src/xml/xmli18n-tmp.h:7399
+msgid "Olympus P-10"
+msgstr "Olympus P-10"
+
+#: src/xml/xmli18n-tmp.h:7400
+msgid "Olympus P-11"
+msgstr "Olympus P-11"
+
+#: src/xml/xmli18n-tmp.h:7401
+msgid "Olympus P-200"
+msgstr "Olympus P-200"
+
+#: src/xml/xmli18n-tmp.h:7402
+msgid "Olympus P-300"
+msgstr "Olympus P-300"
+
+#: src/xml/xmli18n-tmp.h:7403
+msgid "Olympus P-300E"
+msgstr "Olympus P-300E"
+
+#: src/xml/xmli18n-tmp.h:7404
+msgid "Olympus P-300U"
+msgstr "Olympus P-300U"
+
+#: src/xml/xmli18n-tmp.h:7405
+msgid "Olympus P-330E"
+msgstr "Olympus P-330E"
+
+#: src/xml/xmli18n-tmp.h:7406
+msgid "Olympus P-330NE"
+msgstr "Olympus P-330NE"
+
+#: src/xml/xmli18n-tmp.h:7407
+msgid "Olympus P-400"
+msgstr "Olympus P-400"
+
+#: src/xml/xmli18n-tmp.h:7408
+msgid "Olympus P-440"
+msgstr "Olympus P-440"
+
+#: src/xml/xmli18n-tmp.h:7409
+msgid "Olympus P-S100"
+msgstr "Olympus P-S100"
+
+#: src/xml/xmli18n-tmp.h:7410
+msgid "Canon CP-10"
+msgstr "Canon CP-10"
+
+#: src/xml/xmli18n-tmp.h:7411
+msgid "Canon CP-100"
+msgstr "Canon CP-100"
+
+#: src/xml/xmli18n-tmp.h:7412
+msgid "Canon CP-200"
+msgstr "Canon CP-200"
+
+#: src/xml/xmli18n-tmp.h:7413
+msgid "Canon CP-220"
+msgstr "Canon CP-220"
+
+#: src/xml/xmli18n-tmp.h:7414
+msgid "Canon CP-300"
+msgstr "Canon CP-300"
+
+#: src/xml/xmli18n-tmp.h:7415
+msgid "Canon CP-330"
+msgstr "Canon CP-330"
+
+#: src/xml/xmli18n-tmp.h:7416
+msgid "Canon SELPHY-CP-400"
+msgstr "Canon SELPHY-CP-400"
+
+#: src/xml/xmli18n-tmp.h:7417
+msgid "Canon SELPHY-CP-500"
+msgstr "Canon SELPHY-CP-500"
+
+#: src/xml/xmli18n-tmp.h:7418
+msgid "Canon SELPHY-CP-510"
+msgstr "Canon SELPHY-CP-510"
+
+#: src/xml/xmli18n-tmp.h:7419
+msgid "Canon SELPHY-CP-520"
+msgstr "Canon SELPHY-CP-520"
+
+#: src/xml/xmli18n-tmp.h:7420
+msgid "Canon SELPHY-CP-600"
+msgstr "Canon SELPHY-CP-600"
+
+#: src/xml/xmli18n-tmp.h:7421
+msgid "Canon SELPHY-CP-710"
+msgstr "Canon SELPHY-CP-710"
+
+#: src/xml/xmli18n-tmp.h:7422
+msgid "Canon SELPHY-CP-720"
+msgstr "Canon SELPHY-CP-720"
+
+#: src/xml/xmli18n-tmp.h:7423
+msgid "Canon SELPHY-CP-730"
+msgstr "Canon SELPHY-CP-730"
+
+#: src/xml/xmli18n-tmp.h:7424
+msgid "Canon SELPHY-CP-740"
+msgstr "Canon SELPHY-CP-740"
+
+#: src/xml/xmli18n-tmp.h:7425
+msgid "Canon SELPHY-CP-750"
+msgstr "Canon SELPHY-CP-750"
+
+#: src/xml/xmli18n-tmp.h:7426
+msgid "Canon SELPHY ES1"
+msgstr "Canon SELPHY ES1"
+
+#: src/xml/xmli18n-tmp.h:7427
+msgid "Canon SELPHY ES2"
+msgstr "Canon SELPHY ES2"
+
+#: src/xml/xmli18n-tmp.h:7428
+msgid "Canon SELPHY ES20"
+msgstr "Canon SELPHY ES20"
+
+#: src/xml/xmli18n-tmp.h:7429
+msgid "Sony DPP-EX5"
+msgstr "Sony DPP-EX5"
+
+#: src/xml/xmli18n-tmp.h:7430
+msgid "Sony DPP-EX7"
+msgstr "Sony DPP-EX7"
+
+#: src/xml/xmli18n-tmp.h:7431
+msgid "Sony UP-DP10"
+msgstr "Sony UP-DP10"
+
+#: src/xml/xmli18n-tmp.h:7432
+msgid "Sony UP-DR100"
+msgstr "Sony UP-DR100"
+
+#: src/xml/xmli18n-tmp.h:7433
+msgid "Sony UP-DR150"
+msgstr "Sony UP-DR150"
+
+#: src/xml/xmli18n-tmp.h:7434
+msgid "Fujifilm Printpix-CX-400"
+msgstr "Fujifilm Printpix-CX-400"
+
+#: src/xml/xmli18n-tmp.h:7435
+msgid "Fujifilm Printpix-CX-550"
+msgstr "Fujifilm Printpix-CX-550"
+
+#: src/xml/xmli18n-tmp.h:7436
+msgid "Fujifilm FinePix-NX-500"
+msgstr "Fujifilm FinePix-NX-500"
+
+#: src/xml/xmli18n-tmp.h:7437
+msgid "Kodak Easyshare-Printer-Dock"
+msgstr "Kodak Easyshare-Printer-Dock"
+
+#: src/xml/xmli18n-tmp.h:7438
+msgid "Shinko CHC-S9045"
+msgstr "Shinko CHC-S9045"
+
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Dai Nippon Printing DS40"
+msgstr "Dai Nippon Printing DS40"
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Dai Nippon Printing DS80"
+msgstr "Dai Nippon Printing DS80"
+
+#: src/xml/xmli18n-tmp.h:7441
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7442
+msgid "RAW DATA 8 bit"
+msgstr ""
diff --git a/po/sk.gmo b/po/sk.gmo
index 1e866de..1181cbf 100644
--- a/po/sk.gmo
+++ b/po/sk.gmo
diff --git a/po/sk.po b/po/sk.po
index 48f6ff7..a6cc025 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: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-21 22:25-0500\n"
+"POT-Creation-Date: 2009-07-26 19:14-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"
@@ -19,7 +19,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2109 src/main/print-pcl.c:1779
+#: src/main/print-escp2.c:2314 src/main/print-pcl.c:1779
 #, fuzzy
 msgid "Default"
 msgstr "Nastavi» ¹tandardné"
@@ -100,15 +100,15 @@ msgstr "Hustota:"
 
 #: src/main/dither-main.c:91 src/main/print-canon.c:300
 #: src/main/print-canon.c:308 src/main/print-canon.c:316
-#: src/main/print-canon.c:324 src/main/print-escp2.c:439
-#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
-#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-canon.c:324 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: 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-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:1769
-#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
-#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1935
+#: src/main/print-olympus.c:1943 src/main/print-olympus.c:1951
+#: src/main/print-olympus.c:1959 src/main/print-pcl.c:1324
 #: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
 #: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
@@ -170,7 +170,7 @@ msgid "Dither algorithm"
 msgstr "Algoritmus rozptylu"
 
 #: src/main/print-canon.c:199 src/main/print-escp2.c:165
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1866
 #: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 #, fuzzy
 msgid "Page Size"
@@ -188,8 +188,8 @@ msgstr "Veµkos»"
 #: src/main/print-escp2.c:254 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:1704 src/main/print-olympus.c:1710
-#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-olympus.c:1866 src/main/print-olympus.c:1872
+#: src/main/print-olympus.c:1878 src/main/print-olympus.c:1884
 #: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
 #: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
 #: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
@@ -199,32 +199,32 @@ msgid "Basic Printer Setup"
 msgstr "Nastavenie tlaèiarne"
 
 #: src/main/print-canon.c:200 src/main/print-escp2.c:166
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1867
 #: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Veµkos» papiera, na ktorý chcete tlaèi»"
 
 #: src/main/print-canon.c:205 src/main/print-escp2.c:171
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1259 src/cups/genppd.c:1339 src/cups/genppd.c:2001
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1872
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1372 src/cups/genppd.c:2035
 msgid "Media Type"
 msgstr "Typ média"
 
 #: src/main/print-canon.c:206 src/main/print-escp2.c:172
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1873
 #: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
 #: src/main/print-canon.c:211 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
-#: src/main/print-pcl.c:1265 src/cups/genppd.c:1368 src/cups/genppd.c:2020
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1878
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1401 src/cups/genppd.c:2054
 msgid "Media Source"
 msgstr "Zdroj média"
 
 #: src/main/print-canon.c:212 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1879
 #: src/main/print-pcl.c:1266
 #, fuzzy
 msgid "Source (input slot) of the media"
@@ -262,8 +262,8 @@ msgstr ""
 #: src/main/print-canon.c:235 src/main/print-canon.c:241
 #: src/main/print-canon.c:253 src/main/print-escp2.c:207
 #: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1906
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
@@ -278,25 +278,25 @@ msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:247 src/main/print-escp2.c:219
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
-#: src/main/print-pcl.c:1277 src/cups/genppd.c:1446 src/cups/genppd.c:2056
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1884
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1479 src/cups/genppd.c:2090
 msgid "Resolution"
 msgstr "Rozlí¹enie"
 
 #: src/main/print-canon.c:248 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1723
+#: src/main/print-olympus.c:1885
 msgid "Resolution and quality of the print"
 msgstr "Rozlí¹enie a kvalita tlaèe"
 
 #: src/main/print-canon.c:253 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Typ atramentu"
 
 #: src/main/print-canon.c:254 src/main/print-escp2.c:231
 #: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
+#: src/main/print-olympus.c:1891 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Typ atramentu tlaèiarne"
@@ -314,17 +314,18 @@ msgstr ""
 #: 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-escp2.c:320 src/main/print-escp2.c:767
-#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
-#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
-#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
-#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:893 src/main/print-escp2.c:901
+#: src/main/print-escp2.c:909 src/main/print-escp2.c:925
+#: src/main/print-escp2.c:933 src/main/print-escp2.c:941
+#: src/main/print-escp2.c:949 src/main/print-escp2.c:957
+#: src/main/print-escp2.c:965 src/main/print-escp2.c:973
 #: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:265 src/main/print-escp2.c:326
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-canon.c:265 src/main/print-escp2.c:332
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1912
 #: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
@@ -332,16 +333,16 @@ msgstr "Model tlaèiarne:"
 
 #: src/main/print-canon.c:265 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:326
-#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-color.c:208 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1912 src/main/print-pcl.c:1295
 #: src/main/print-ps.c:86 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Obyèajný papier"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:327
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-canon.c:266 src/main/print-escp2.c:333
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1913
 #: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
@@ -370,56 +371,56 @@ msgstr "720 DPI Najvy¹¹ia kvalita"
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:300 src/main/print-escp2.c:439
+#: src/main/print-canon.c:300 src/main/print-escp2.c:445
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:301 src/main/print-escp2.c:446
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-canon.c:308 src/main/print-escp2.c:447
+#: src/main/print-canon.c:308 src/main/print-escp2.c:453
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Purpurová"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:309 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
-#: src/main/print-canon.c:316 src/main/print-escp2.c:455
+#: src/main/print-canon.c:316 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:317 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-canon.c:324 src/main/print-escp2.c:463
+#: src/main/print-canon.c:324 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 #, fuzzy
 msgid "Black Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:325 src/main/print-escp2.c:464
+#: src/main/print-canon.c:325 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:333
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:541 src/main/print-escp2.c:542
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 #, fuzzy
@@ -427,29 +428,36 @@ msgid "Light Cyan Transition"
 msgstr "Jasná azúrová"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:340
-#: src/main/print-canon.c:348 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
-#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
-#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
-#: src/main/print-pcl.c:1364
+#: src/main/print-canon.c:348 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:541
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:557
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:573
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:589
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:605
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:621
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:637
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:653
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:669
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:685
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:701
+#: src/main/print-escp2.c:709 src/main/print-escp2.c:717
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:733
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:749
+#: src/main/print-escp2.c:757 src/main/print-escp2.c:765
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:781
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:797
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:813
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:829
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:845
+#: src/main/print-escp2.c:853 src/main/print-escp2.c:861
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:340 src/main/print-canon.c:341
-#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
+#: src/main/print-escp2.c:573 src/main/print-escp2.c:574
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #, fuzzy
@@ -461,14 +469,14 @@ msgstr "Jasná purpurová"
 msgid "Light Yellow Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-canon.c:368 src/main/print-escp2.c:2283
-#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3609
-#: src/xml/xmli18n-tmp.h:3614 src/xml/xmli18n-tmp.h:3620
-#: src/xml/xmli18n-tmp.h:3627
+#: src/main/print-canon.c:368 src/main/print-escp2.c:2488
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5851 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5864
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:369 src/main/print-escp2.c:2285
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2490
 #: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
@@ -477,67 +485,68 @@ msgstr ""
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:646 src/main/print-escp2.c:2005
-#: src/xml/xmli18n-tmp.h:3676
+#: src/main/print-canon.c:646 src/main/print-escp2.c:2210
+#: src/xml/xmli18n-tmp.h:5913
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-canon.c:648 src/main/print-escp2.c:2007
-#: src/xml/xmli18n-tmp.h:3677
+#: src/main/print-canon.c:648 src/main/print-escp2.c:2212
+#: src/xml/xmli18n-tmp.h:5914
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-canon.c:650 src/main/print-escp2.c:2009
-#: src/xml/xmli18n-tmp.h:3678
+#: src/main/print-canon.c:650 src/main/print-escp2.c:2214
+#: src/xml/xmli18n-tmp.h:5915
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Vlastný"
 
-#: src/main/print-canon.c:673 src/main/print-escp2.c:2034
-#: src/cups/genppd.c:1323 src/cups/genppd.c:1572 src/cups/genppd.c:1988
-#: src/cups/genppd.c:2079
+#: src/main/print-canon.c:673 src/main/print-escp2.c:2239
+#: src/cups/genppd.c:1356 src/cups/genppd.c:1605 src/cups/genppd.c:2022
+#: src/cups/genppd.c:2113
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:675 src/main/print-escp2.c:2036
+#: src/main/print-canon.c:675 src/main/print-escp2.c:2241
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Tlaèi» do súboru?"
 
-#: src/main/print-canon.c:790 src/main/print-escp2.c:2447
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-canon.c:790 src/main/print-escp2.c:2652
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2167
 #: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
 #: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Farebne"
 
-#: src/main/print-canon.c:792 src/main/print-escp2.c:2449
+#: src/main/print-canon.c:792 src/main/print-escp2.c:2654
 #: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
 #: src/main/print-ps.c:331 src/main/print-raw.c:137
 #, fuzzy
 msgid "Black and White"
 msgstr "Èiernobielo"
 
-#: src/main/print-canon.c:831 src/main/print-escp2.c:2089
+#: src/main/print-canon.c:831 src/main/print-escp2.c:2294
 #: src/main/print-pcl.c:1797 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Typ výstupu:"
 
-#: src/main/print-canon.c:833 src/main/print-escp2.c:2131
-#: src/main/print-escp2.c:2229 src/main/print-escp2.c:2241
+#: src/main/print-canon.c:833 src/main/print-escp2.c:2336
+#: src/main/print-escp2.c:2434 src/main/print-escp2.c:2446
 #: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
 #: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
-#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1215
-#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1219
-#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
-#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3170
-#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3177
-#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3461
-#: src/xml/xmli18n-tmp.h:3464 src/xml/xmli18n-tmp.h:3632
-#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3648
-#: src/xml/xmli18n-tmp.h:3657 src/xml/xmli18n-tmp.h:3665
+#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1627 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3713 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3722 src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5902
 msgid "Standard"
 msgstr "©tandardný"
 
@@ -576,7 +585,7 @@ msgid "Pre-Dithered"
 msgstr "Tlaèi»"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1268 src/cups/genppd.c:1971
+#: src/cups/genppd.c:1301 src/cups/genppd.c:2005
 msgid "Grayscale"
 msgstr "V odtieòoch ¹edej"
 
@@ -593,11 +602,11 @@ msgstr ""
 msgid "CMY"
 msgstr ""
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1299 src/cups/genppd.c:1978
+#: src/main/print-color.c:129 src/cups/genppd.c:1332 src/cups/genppd.c:2012
 msgid "CMYK"
 msgstr ""
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1306 src/cups/genppd.c:1979
+#: src/main/print-color.c:131 src/cups/genppd.c:1339 src/cups/genppd.c:2013
 msgid "KCMY"
 msgstr ""
 
@@ -663,7 +672,7 @@ msgid "Output image type"
 msgstr "Typ výstupu:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338
 msgid "Raw Channels"
 msgstr ""
 
@@ -733,56 +742,208 @@ msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
 #: src/escputil/escputil.c:997 src/escputil/escputil.c:1017
-#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:1812
-#: src/xml/xmli18n-tmp.h:1823 src/xml/xmli18n-tmp.h:1836
-#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1863
-#: src/xml/xmli18n-tmp.h:1876 src/xml/xmli18n-tmp.h:1889
-#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1918
-#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1949
-#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1975
-#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:1999
-#: src/xml/xmli18n-tmp.h:2013 src/xml/xmli18n-tmp.h:2027
-#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2051
-#: src/xml/xmli18n-tmp.h:2064 src/xml/xmli18n-tmp.h:2076
-#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2102
-#: src/xml/xmli18n-tmp.h:2116 src/xml/xmli18n-tmp.h:2130
-#: src/xml/xmli18n-tmp.h:2143 src/xml/xmli18n-tmp.h:2156
-#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2184
-#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2210
-#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2236
-#: src/xml/xmli18n-tmp.h:2249 src/xml/xmli18n-tmp.h:2262
-#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2290
-#: src/xml/xmli18n-tmp.h:2305 src/xml/xmli18n-tmp.h:2320
-#: src/xml/xmli18n-tmp.h:2332 src/xml/xmli18n-tmp.h:2343
-#: src/xml/xmli18n-tmp.h:2356 src/xml/xmli18n-tmp.h:2369
-#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2392
-#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2415
-#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2442
-#: src/xml/xmli18n-tmp.h:2454 src/xml/xmli18n-tmp.h:2466
-#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2496
-#: src/xml/xmli18n-tmp.h:2509 src/xml/xmli18n-tmp.h:2522
-#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
-#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2574
-#: src/xml/xmli18n-tmp.h:2586 src/xml/xmli18n-tmp.h:2598
-#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2623
-#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2653
-#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2683
-#: src/xml/xmli18n-tmp.h:2697 src/xml/xmli18n-tmp.h:2715
-#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2745
-#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
-#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2803
-#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2828
-#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2854
-#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2881
-#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2915
-#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2943
-#: src/xml/xmli18n-tmp.h:2959 src/xml/xmli18n-tmp.h:2976
-#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:3004
-#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3032
-#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3062
-#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3093
-#: src/xml/xmli18n-tmp.h:3107 src/xml/xmli18n-tmp.h:3125
-#: src/xml/xmli18n-tmp.h:3141
+#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2387
+#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2413
+#: src/xml/xmli18n-tmp.h:2426 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2499
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2551
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2575
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2708
+#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2786
+#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2814
+#: src/xml/xmli18n-tmp.h:2829 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2893
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2966
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3005 src/xml/xmli18n-tmp.h:3020
+#: src/xml/xmli18n-tmp.h:3033 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3061 src/xml/xmli18n-tmp.h:3073
+#: src/xml/xmli18n-tmp.h:3085 src/xml/xmli18n-tmp.h:3098
+#: src/xml/xmli18n-tmp.h:3110 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3377
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3616
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3648
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3766 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3775 src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:3794 src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:3805 src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3869 src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:3880 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3902 src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:3913 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:3948 src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:3970 src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:3983 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4023 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4064 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4075 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4088 src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:4103 src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:4118 src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:4143 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:4203 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4275 src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4309 src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4356 src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4421
+#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4449
+#: src/xml/xmli18n-tmp.h:4456 src/xml/xmli18n-tmp.h:4462
+#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4485 src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:4551 src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:4694 src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4717 src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:4818 src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:4829 src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4885 src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4935
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:5041 src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:5052 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:5121 src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5165
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5182 src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:5193 src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:5271 src/xml/xmli18n-tmp.h:5299
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5327 src/xml/xmli18n-tmp.h:5331
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5347
+#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5367 src/xml/xmli18n-tmp.h:5371
+#: src/xml/xmli18n-tmp.h:5383 src/xml/xmli18n-tmp.h:5388
+#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5440
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5461 src/xml/xmli18n-tmp.h:5468
+#: src/xml/xmli18n-tmp.h:5476 src/xml/xmli18n-tmp.h:5486
+#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5514
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5525
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5543
+#: src/xml/xmli18n-tmp.h:5550 src/xml/xmli18n-tmp.h:5556
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5574 src/xml/xmli18n-tmp.h:5582
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5592
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5625
+#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5649
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5662
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5690
+#: src/xml/xmli18n-tmp.h:5694 src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5731
+#: src/xml/xmli18n-tmp.h:5738 src/xml/xmli18n-tmp.h:5742
+#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5759
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5770
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5807
+#: src/xml/xmli18n-tmp.h:5811 src/xml/xmli18n-tmp.h:5817
+#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5828
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5843
 msgid "Cyan"
 msgstr "Azúrová"
 
@@ -793,56 +954,208 @@ msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
 #: src/escputil/escputil.c:998 src/escputil/escputil.c:1018
-#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:1813
-#: src/xml/xmli18n-tmp.h:1824 src/xml/xmli18n-tmp.h:1837
-#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1864
-#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1890
-#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1919
-#: src/xml/xmli18n-tmp.h:1935 src/xml/xmli18n-tmp.h:1950
-#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1976
-#: src/xml/xmli18n-tmp.h:1988 src/xml/xmli18n-tmp.h:2000
-#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2028
-#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2052
-#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2077
-#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2103
-#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2131
-#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2157
-#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2185
-#: src/xml/xmli18n-tmp.h:2198 src/xml/xmli18n-tmp.h:2211
-#: src/xml/xmli18n-tmp.h:2224 src/xml/xmli18n-tmp.h:2237
-#: src/xml/xmli18n-tmp.h:2250 src/xml/xmli18n-tmp.h:2263
-#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2291
-#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2321
-#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2344
-#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2370
-#: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2393
-#: src/xml/xmli18n-tmp.h:2405 src/xml/xmli18n-tmp.h:2416
-#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2443
-#: src/xml/xmli18n-tmp.h:2455 src/xml/xmli18n-tmp.h:2467
-#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2497
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2523
-#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2575
-#: src/xml/xmli18n-tmp.h:2587 src/xml/xmli18n-tmp.h:2599
-#: src/xml/xmli18n-tmp.h:2611 src/xml/xmli18n-tmp.h:2624
-#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
-#: src/xml/xmli18n-tmp.h:2670 src/xml/xmli18n-tmp.h:2684
-#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2714
-#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2747
-#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2780
-#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
-#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2829
-#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2855
-#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2882
-#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2914
-#: src/xml/xmli18n-tmp.h:2931 src/xml/xmli18n-tmp.h:2944
-#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2975
-#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:3005
-#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3033
-#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3060
-#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3094
-#: src/xml/xmli18n-tmp.h:3108 src/xml/xmli18n-tmp.h:3124
-#: src/xml/xmli18n-tmp.h:3140
+#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2361
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2388
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2414
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2459 src/xml/xmli18n-tmp.h:2474
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2512 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2552
+#: src/xml/xmli18n-tmp.h:2564 src/xml/xmli18n-tmp.h:2576
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2787
+#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2815
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2868
+#: src/xml/xmli18n-tmp.h:2881 src/xml/xmli18n-tmp.h:2894
+#: src/xml/xmli18n-tmp.h:2905 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:2967
+#: src/xml/xmli18n-tmp.h:2979 src/xml/xmli18n-tmp.h:2991
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3062 src/xml/xmli18n-tmp.h:3074
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3099
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3135 src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:3163 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3353
+#: src/xml/xmli18n-tmp.h:3365 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
+#: src/xml/xmli18n-tmp.h:3420 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3542 src/xml/xmli18n-tmp.h:3556
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3600 src/xml/xmli18n-tmp.h:3617
+#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3647
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3751 src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:3784 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3795 src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:3806 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3837 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3903 src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3939 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3960 src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:3972 src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:3984 src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:3999 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:4039 src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:4104 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:4170 src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4194 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:4230 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:4276 src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4311 src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4338 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:4401 src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:4427 src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:4442 src/xml/xmli18n-tmp.h:4451
+#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4464
+#: src/xml/xmli18n-tmp.h:4470 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4486 src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:4511 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:4809 src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4909 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:5007 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5018 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5111 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5123 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5148 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:5240 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5250 src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:5261 src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5301
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5313
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5349
+#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5401
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5441
+#: src/xml/xmli18n-tmp.h:5453 src/xml/xmli18n-tmp.h:5458
+#: src/xml/xmli18n-tmp.h:5463 src/xml/xmli18n-tmp.h:5470
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5496 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5527
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5552 src/xml/xmli18n-tmp.h:5558
+#: src/xml/xmli18n-tmp.h:5564 src/xml/xmli18n-tmp.h:5568
+#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5593
+#: src/xml/xmli18n-tmp.h:5598 src/xml/xmli18n-tmp.h:5616
+#: src/xml/xmli18n-tmp.h:5620 src/xml/xmli18n-tmp.h:5626
+#: src/xml/xmli18n-tmp.h:5631 src/xml/xmli18n-tmp.h:5651
+#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
+#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5674
+#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5720
+#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5733
+#: src/xml/xmli18n-tmp.h:5739 src/xml/xmli18n-tmp.h:5743
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5818
+#: src/xml/xmli18n-tmp.h:5823 src/xml/xmli18n-tmp.h:5829
+#: src/xml/xmli18n-tmp.h:5833 src/xml/xmli18n-tmp.h:5839
+#: src/xml/xmli18n-tmp.h:5844
 msgid "Magenta"
 msgstr "Purpurová"
 
@@ -853,56 +1166,208 @@ msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
 #: src/escputil/escputil.c:999 src/escputil/escputil.c:1019
-#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:1814
-#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
-#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1865
-#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1891
-#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1920
-#: src/xml/xmli18n-tmp.h:1936 src/xml/xmli18n-tmp.h:1951
-#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1977
-#: src/xml/xmli18n-tmp.h:1989 src/xml/xmli18n-tmp.h:2001
-#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2029
-#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2053
-#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2078
-#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2104
-#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
-#: src/xml/xmli18n-tmp.h:2145 src/xml/xmli18n-tmp.h:2158
-#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2186
-#: src/xml/xmli18n-tmp.h:2199 src/xml/xmli18n-tmp.h:2212
-#: src/xml/xmli18n-tmp.h:2225 src/xml/xmli18n-tmp.h:2238
-#: src/xml/xmli18n-tmp.h:2251 src/xml/xmli18n-tmp.h:2264
-#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2292
-#: src/xml/xmli18n-tmp.h:2307 src/xml/xmli18n-tmp.h:2322
-#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
-#: src/xml/xmli18n-tmp.h:2358 src/xml/xmli18n-tmp.h:2371
-#: src/xml/xmli18n-tmp.h:2382 src/xml/xmli18n-tmp.h:2394
-#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2417
-#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2444
-#: src/xml/xmli18n-tmp.h:2456 src/xml/xmli18n-tmp.h:2468
-#: src/xml/xmli18n-tmp.h:2483 src/xml/xmli18n-tmp.h:2498
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2524
-#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2551
-#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2576
-#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
-#: src/xml/xmli18n-tmp.h:2612 src/xml/xmli18n-tmp.h:2625
-#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2651
-#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2685
-#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2713
-#: src/xml/xmli18n-tmp.h:2734 src/xml/xmli18n-tmp.h:2749
-#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2779
-#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2805
-#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2830
-#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2856
-#: src/xml/xmli18n-tmp.h:2871 src/xml/xmli18n-tmp.h:2883
-#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2910
-#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2945
-#: src/xml/xmli18n-tmp.h:2960 src/xml/xmli18n-tmp.h:2974
-#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3006
-#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3034
-#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3061
-#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3095
-#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3120
-#: src/xml/xmli18n-tmp.h:3136
+#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2389
+#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2444
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2475
+#: src/xml/xmli18n-tmp.h:2488 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2513 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2565 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2602
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2762
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2788
+#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2816
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2846
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2906 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3022
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3048
+#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3075
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3124
+#: src/xml/xmli18n-tmp.h:3136 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3175
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3315 src/xml/xmli18n-tmp.h:3329
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3433
+#: src/xml/xmli18n-tmp.h:3455 src/xml/xmli18n-tmp.h:3468
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3497
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3601 src/xml/xmli18n-tmp.h:3618
+#: src/xml/xmli18n-tmp.h:3632 src/xml/xmli18n-tmp.h:3643
+#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3747 src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3834 src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:3844 src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:3867 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:3900 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3910 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3935 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:3967 src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:3979 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4005 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4062 src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4110 src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:4124 src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4167 src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:4272 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:4321 src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:4334 src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4367 src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4471
+#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4505 src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4549 src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:4562 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4580 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4602 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:4678 src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:4691 src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4770 src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4893 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4904 src/xml/xmli18n-tmp.h:4911
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:4971 src/xml/xmli18n-tmp.h:4978
+#: src/xml/xmli18n-tmp.h:5004 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5050 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5071 src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:5097 src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:5142 src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:5169 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5184
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5257 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5318
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5358
+#: src/xml/xmli18n-tmp.h:5364 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5385
+#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5438
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5454
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5465
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5511
+#: src/xml/xmli18n-tmp.h:5516 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5547 src/xml/xmli18n-tmp.h:5554
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5584 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5617 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5632
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5687
+#: src/xml/xmli18n-tmp.h:5692 src/xml/xmli18n-tmp.h:5698
+#: src/xml/xmli18n-tmp.h:5705 src/xml/xmli18n-tmp.h:5713
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5729
+#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
+#: src/xml/xmli18n-tmp.h:5744 src/xml/xmli18n-tmp.h:5756
+#: src/xml/xmli18n-tmp.h:5761 src/xml/xmli18n-tmp.h:5767
+#: src/xml/xmli18n-tmp.h:5774 src/xml/xmli18n-tmp.h:5782
+#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5792
+#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5803
+#: src/xml/xmli18n-tmp.h:5809 src/xml/xmli18n-tmp.h:5813
+#: src/xml/xmli18n-tmp.h:5819 src/xml/xmli18n-tmp.h:5824
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5845
 msgid "Yellow"
 msgstr "®ltá"
 
@@ -913,9 +1378,17 @@ msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
 #: src/escputil/escputil.c:1006 src/escputil/escputil.c:1025
-#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2700
-#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2795
-#: src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:4041 src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:4056 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4091 src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:4155 src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5155
 msgid "Red"
 msgstr ""
 
@@ -935,8 +1408,13 @@ msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
 #: src/escputil/escputil.c:1007 src/escputil/escputil.c:1026
-#: src/xml/xmli18n-tmp.h:2657 src/xml/xmli18n-tmp.h:2701
-#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4051 src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:4084 src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:5156
 msgid "Blue"
 msgstr ""
 
@@ -948,53 +1426,183 @@ msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
 #: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1016 src/escputil/escputil.c:1285
-#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
-#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
-#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1875
-#: src/xml/xmli18n-tmp.h:1888 src/xml/xmli18n-tmp.h:1901
-#: src/xml/xmli18n-tmp.h:1917 src/xml/xmli18n-tmp.h:1933
-#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1961
-#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1986
-#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2012
-#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2038
-#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2063
-#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2090
-#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2115
-#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2142
-#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2169
-#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
-#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
-#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2248
-#: src/xml/xmli18n-tmp.h:2261 src/xml/xmli18n-tmp.h:2274
-#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2304
-#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2331
-#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
-#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
-#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2403
-#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2420
-#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2441
-#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2465
-#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2495
-#: src/xml/xmli18n-tmp.h:2508 src/xml/xmli18n-tmp.h:2521
-#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
-#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2573
-#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2597
-#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2622
-#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2672
-#: src/xml/xmli18n-tmp.h:2682 src/xml/xmli18n-tmp.h:2731
-#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2764
-#: src/xml/xmli18n-tmp.h:2781 src/xml/xmli18n-tmp.h:2794
-#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2815
-#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2839
-#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2868
-#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2894
-#: src/xml/xmli18n-tmp.h:2911 src/xml/xmli18n-tmp.h:2929
-#: src/xml/xmli18n-tmp.h:2942 src/xml/xmli18n-tmp.h:2977
-#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:3003
-#: src/xml/xmli18n-tmp.h:3017 src/xml/xmli18n-tmp.h:3031
-#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3079
-#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3110
-#: src/xml/xmli18n-tmp.h:3121 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2372
+#: src/xml/xmli18n-tmp.h:2386 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2457
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2510
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2536
+#: src/xml/xmli18n-tmp.h:2550 src/xml/xmli18n-tmp.h:2562
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2599 src/xml/xmli18n-tmp.h:2614
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2639
+#: src/xml/xmli18n-tmp.h:2653 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2965
+#: src/xml/xmli18n-tmp.h:2977 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3019
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3060 src/xml/xmli18n-tmp.h:3072
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3133 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3196
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3526
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3680 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3755 src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:3804 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3819 src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:3831 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3846 src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3873 src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:3924 src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:3943 src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:4022 src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4059 src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:4142 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4164 src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:4179 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:4255 src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4289 src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:4308 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4413 src/xml/xmli18n-tmp.h:4420
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4455
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4507 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:4565 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:4604 src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:4702 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:4733 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:4786 src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4920 src/xml/xmli18n-tmp.h:4926
+#: src/xml/xmli18n-tmp.h:4934 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:4973 src/xml/xmli18n-tmp.h:4981
+#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:4993
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:5047 src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5151
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5186
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5223 src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5270
+#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5284
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5320
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5337
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5375
+#: src/xml/xmli18n-tmp.h:5378 src/xml/xmli18n-tmp.h:5380
+#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5435
+#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5447
+#: src/xml/xmli18n-tmp.h:5449 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5474
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5492
+#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5571
+#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5590
+#: src/xml/xmli18n-tmp.h:5596 src/xml/xmli18n-tmp.h:5602
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5614
+#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5629
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5655
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5680 src/xml/xmli18n-tmp.h:5682
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5700
+#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5716
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5749
+#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5769 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5794
+#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5806
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5836
+#: src/xml/xmli18n-tmp.h:5842
 msgid "Black"
 msgstr "Èierna"
 
@@ -1003,7 +1611,7 @@ msgstr "Èierna"
 msgid "Adjust the black gamma"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1769
+#: src/main/print-color.c:322 src/main/print-olympus.c:1935
 msgid "Cyan Balance"
 msgstr ""
 
@@ -1018,7 +1626,7 @@ msgstr "V odtieòoch ¹edej"
 msgid "Adjust the cyan gray balance"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1777
+#: src/main/print-color.c:330 src/main/print-olympus.c:1943
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Purpurová"
@@ -1028,7 +1636,7 @@ msgstr "Purpurová"
 msgid "Adjust the magenta gray balance"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1785
+#: src/main/print-color.c:338 src/main/print-olympus.c:1951
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
@@ -1060,11 +1668,11 @@ msgstr "Typ atramentu"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
-#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
-#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
-#: src/main/print-escp2.c:759
+#: src/main/print-escp2.c:344 src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356 src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368 src/main/print-escp2.c:374
+#: src/main/print-escp2.c:869 src/main/print-escp2.c:877
+#: src/main/print-escp2.c:885
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Typ výstupu:"
@@ -1073,27 +1681,27 @@ msgstr "Typ výstupu:"
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:743
+#: src/main/print-color.c:365 src/main/print-escp2.c:869
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:744
+#: src/main/print-color.c:366 src/main/print-escp2.c:870
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:751
+#: src/main/print-color.c:373 src/main/print-escp2.c:877
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:752
+#: src/main/print-color.c:374 src/main/print-escp2.c:878
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:759
+#: src/main/print-color.c:381 src/main/print-escp2.c:885
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:760
+#: src/main/print-color.c:382 src/main/print-escp2.c:886
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -1364,11 +1972,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1906
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1907
 msgid "Print without borders"
 msgstr ""
 
@@ -1381,7 +1989,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:266 src/main/print-escp2.c:267
-#: src/cups/genppd.c:1567 src/cups/genppd.c:2078
+#: src/cups/genppd.c:1600 src/cups/genppd.c:2112
 #, fuzzy
 msgid "Output Order"
 msgstr "Typ výstupu:"
@@ -1426,382 +2034,498 @@ msgstr ""
 
 #: src/main/print-escp2.c:320 src/main/print-escp2.c:321
 #, fuzzy
+msgid "Raw Channel Names"
+msgstr "Storno"
+
+#: src/main/print-escp2.c:326 src/main/print-escp2.c:327
+#, fuzzy
 msgid "Channel Names"
 msgstr "Storno"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:339
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:344
 #, fuzzy
 msgid "Cyan Map"
 msgstr "Azúrová"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:345
 #, fuzzy
 msgid "Adjust the cyan map"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350
 #, fuzzy
 msgid "Magenta Map"
 msgstr "Purpurová"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:351
 #, fuzzy
 msgid "Adjust the magenta map"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356
 #, fuzzy
 msgid "Yellow Map"
 msgstr "®ltá"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:357
 #, fuzzy
 msgid "Adjust the yellow map"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362
 #, fuzzy
 msgid "Blue Map"
 msgstr "Èiernobielo"
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:363
 #, fuzzy
 msgid "Adjust the blue map"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368
 #, fuzzy
 msgid "Orange Map"
 msgstr "Azúrová"
 
-#: src/main/print-escp2.c:363
+#: src/main/print-escp2.c:369
 #, fuzzy
 msgid "Adjust the orange map"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:374
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:369
+#: src/main/print-escp2.c:375
 #, fuzzy
 msgid "Adjust the red map"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-escp2.c:471
+#: src/main/print-escp2.c:477
 #, fuzzy
 msgid "Red Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:478
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:485
 #, fuzzy
 msgid "Blue Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:486
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:493
 #, fuzzy
 msgid "Orange Density"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:488
+#: src/main/print-escp2.c:494
 #, fuzzy
 msgid "Adjust the orange density"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:501
 #, fuzzy
 msgid "Gloss Level"
 msgstr "Lesklý film"
 
-#: src/main/print-escp2.c:496
+#: src/main/print-escp2.c:502
 #, fuzzy
 msgid "Adjust the gloss level"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:509
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:504
+#: src/main/print-escp2.c:510
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:517
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:512
+#: src/main/print-escp2.c:518
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:525
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:520
+#: src/main/print-escp2.c:526
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:534
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:550
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
+#: src/main/print-escp2.c:557 src/main/print-escp2.c:558
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "Jasná purpurová"
 
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:566
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "Jasná purpurová"
 
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:582
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "®ltá"
 
-#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
+#: src/main/print-escp2.c:589 src/main/print-escp2.c:590
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:598
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "®ltá"
 
-#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
+#: src/main/print-escp2.c:605 src/main/print-escp2.c:606
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:630
 #, fuzzy
 msgid "Gray Value"
 msgstr "V odtieòoch ¹edej"
 
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
-#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:614
+#: src/main/print-escp2.c:637 src/main/print-escp2.c:638
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
+#: src/main/print-escp2.c:621 src/main/print-escp2.c:622
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:646
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "V odtieòoch ¹edej"
 
-#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
+#: src/main/print-escp2.c:653 src/main/print-escp2.c:654
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:726
 #, fuzzy
 msgid "Light Gray Value"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
-#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:662
+#: src/main/print-escp2.c:733 src/main/print-escp2.c:734
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
-#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
+#: src/main/print-escp2.c:669 src/main/print-escp2.c:670
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:742
 #, fuzzy
 msgid "Light Gray Density Scale"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:678
 #, fuzzy
 msgid "Dark Gray Value"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
+#: src/main/print-escp2.c:685 src/main/print-escp2.c:686
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:694
 #, fuzzy
 msgid "Dark Gray Density Scale"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:701
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "V odtieòoch ¹edej"
 
-#: src/main/print-escp2.c:696
+#: src/main/print-escp2.c:702
 #, fuzzy
 msgid "Medium Gray Value"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:709
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:704
+#: src/main/print-escp2.c:710
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:717
 #, fuzzy
 msgid "Mid Gray Density Scale"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:712
+#: src/main/print-escp2.c:718
 #, fuzzy
 msgid "Medium Gray Density Scale"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:767
+#: src/main/print-escp2.c:749
+#, fuzzy
+msgid "Hextone Gray 5 Value"
+msgstr "V odtieòoch ¹edej"
+
+#: src/main/print-escp2.c:750
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:757
+#, fuzzy
+msgid "Hextone Gray 5 Transition"
+msgstr "Jasná azúrová"
+
+#: src/main/print-escp2.c:758
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr "Jasná azúrová"
+
+#: src/main/print-escp2.c:765
+#, fuzzy
+msgid "Hextone Gray 5 Density Scale"
+msgstr "V odtieòoch ¹edej"
+
+#: src/main/print-escp2.c:766
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr "Jasná azúrová"
+
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:774
+#, fuzzy
+msgid "Hextone Gray 4 Value"
+msgstr "V odtieòoch ¹edej"
+
+#: src/main/print-escp2.c:781 src/main/print-escp2.c:782
+#, fuzzy
+msgid "Hextone Gray 4 Transition"
+msgstr "Jasná azúrová"
+
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:790
+#, fuzzy
+msgid "Hextone Gray 4 Density Scale"
+msgstr "V odtieòoch ¹edej"
+
+#: src/main/print-escp2.c:797 src/main/print-escp2.c:798
+#, fuzzy
+msgid "Hextone Gray 3 Value"
+msgstr "V odtieòoch ¹edej"
+
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:806
+#, fuzzy
+msgid "Hextone Gray 3 Transition"
+msgstr "Jasná azúrová"
+
+#: src/main/print-escp2.c:813 src/main/print-escp2.c:814
+#, fuzzy
+msgid "Hextone Gray 3 Density Scale"
+msgstr "V odtieòoch ¹edej"
+
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:822
+#, fuzzy
+msgid "Hextone Gray 2 Value"
+msgstr "V odtieòoch ¹edej"
+
+#: src/main/print-escp2.c:829 src/main/print-escp2.c:830
+#, fuzzy
+msgid "Hextone Gray 2 Transition"
+msgstr "Jasná azúrová"
+
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:838
+#, fuzzy
+msgid "Hextone Gray 2 Density Scale"
+msgstr "V odtieòoch ¹edej"
+
+#: src/main/print-escp2.c:845
+#, fuzzy
+msgid "Hextone Gray 1 Value"
+msgstr "V odtieòoch ¹edej"
+
+#: src/main/print-escp2.c:846
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:853
+#, fuzzy
+msgid "Hextone Gray 1 Transition"
+msgstr "Jasná azúrová"
+
+#: src/main/print-escp2.c:854
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr "Jasná purpurová"
+
+#: src/main/print-escp2.c:861
+#, fuzzy
+msgid "Hextone Gray 1 Density Scale"
+msgstr "V odtieòoch ¹edej"
+
+#: src/main/print-escp2.c:862
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr "Jasná purpurová"
+
+#: src/main/print-escp2.c:893
 msgid "Drying Time Per Page"
 msgstr ""
 
-#: src/main/print-escp2.c:768
+#: src/main/print-escp2.c:894
 msgid "Set drying time per page"
 msgstr ""
 
-#: src/main/print-escp2.c:775
+#: src/main/print-escp2.c:901
 msgid "Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:776
+#: src/main/print-escp2.c:902
 msgid "Set drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:783
+#: src/main/print-escp2.c:909
 msgid "Minimum Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:784
+#: src/main/print-escp2.c:910
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:799
+#: src/main/print-escp2.c:925
+msgid "Quality Enhancement"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Enhance print quality by additional passes"
+msgstr ""
+
+#: src/main/print-escp2.c:933
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "Veµkos»"
 
-#: src/main/print-escp2.c:800
+#: src/main/print-escp2.c:934
 #, fuzzy
 msgid "Set printer paper thickness"
 msgstr "Nastavi» ¹tandardné"
 
-#: src/main/print-escp2.c:807
+#: src/main/print-escp2.c:941
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Hustota:"
 
-#: src/main/print-escp2.c:808
+#: src/main/print-escp2.c:942
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:815
+#: src/main/print-escp2.c:949
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:816
+#: src/main/print-escp2.c:950
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:823
+#: src/main/print-escp2.c:957
 #, fuzzy
 msgid "Print Method"
 msgstr "Model tlaèiarne:"
 
-#: src/main/print-escp2.c:824
+#: src/main/print-escp2.c:958
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:831
+#: src/main/print-escp2.c:965
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Obyèajný papier"
 
-#: src/main/print-escp2.c:832
+#: src/main/print-escp2.c:966
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:839
+#: src/main/print-escp2.c:973
 msgid "Feed Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:840
-#, c-format
+#: src/main/print-escp2.c:975
+#, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:1992
+#: src/main/print-escp2.c:2197
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Typ výstupu:"
 
-#: src/main/print-escp2.c:1994
+#: src/main/print-escp2.c:2199
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2208 src/cups/genppd.c:1484 src/cups/genppd.c:2059
+#: src/main/print-escp2.c:2413 src/cups/genppd.c:1517 src/cups/genppd.c:2093
 #, fuzzy
 msgid "Automatic"
 msgstr "Veµkos»"
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2415
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Jednosmerne"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2417
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Jednosmerne"
 
-#: src/main/print-escp2.c:2243
+#: src/main/print-escp2.c:2448
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2450
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2452
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2454
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2456
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2287
+#: src/main/print-escp2.c:2492
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:2858
+#: src/main/print-escp2.c:3100
 #, 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:4107 src/main/print-olympus.c:2472
+#: src/main/print-escp2.c:4355 src/main/print-olympus.c:2641
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1855,361 +2579,378 @@ msgid "test print"
 msgstr "Test tlaèe"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3205
-#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3217
-#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3233
-#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3255
-#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3276
-#: src/xml/xmli18n-tmp.h:3288 src/xml/xmli18n-tmp.h:3295
-#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3315
-#: src/xml/xmli18n-tmp.h:3327 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3368
-#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3380
-#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
-#: src/xml/xmli18n-tmp.h:3412 src/xml/xmli18n-tmp.h:3424
-#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3444
-#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3472
-#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3496
-#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3521
-#: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3544
-#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3556
-#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3581
-#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3598
-#: src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3754 src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:3809 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3863 src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:4058 src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:4163 src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:4227 src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:4335 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4467 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4594 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:4879 src/xml/xmli18n-tmp.h:4946
+#: src/xml/xmli18n-tmp.h:5000 src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:5243 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5365 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5512 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5667 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5784 src/xml/xmli18n-tmp.h:5805
+#: src/xml/xmli18n-tmp.h:5826
 msgid "Four Color Standard"
 msgstr "©tandardný ¹tvorfarebný"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3206
-#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3218
-#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3234
-#: src/xml/xmli18n-tmp.h:3244 src/xml/xmli18n-tmp.h:3251
-#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3268
-#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3289
-#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3306
-#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
-#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3354
-#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3377
-#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3389
-#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3413
-#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3435
-#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3455
-#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3485
-#: src/xml/xmli18n-tmp.h:3497 src/xml/xmli18n-tmp.h:3508
-#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3537
-#: src/xml/xmli18n-tmp.h:3545 src/xml/xmli18n-tmp.h:3549
-#: src/xml/xmli18n-tmp.h:3557 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3593
-#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3605
+#: src/xml/xmli18n-tmp.h:3759 src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3868 src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:4002 src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:4107 src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4472
+#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4817 src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5181 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5315 src/xml/xmli18n-tmp.h:5370
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5672
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5831
 msgid "Three Color Composite"
 msgstr "Kompozitný trojfarebný"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3241
-#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3265
-#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3286
-#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
-#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3351
-#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3374
-#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3398
-#: src/xml/xmli18n-tmp.h:3410 src/xml/xmli18n-tmp.h:3422
-#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3452
-#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3470
-#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3494
-#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3519
-#: src/xml/xmli18n-tmp.h:3534 src/xml/xmli18n-tmp.h:3542
-#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3741 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4086 src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4933
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5421
+#: src/xml/xmli18n-tmp.h:5499 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5723
 msgid "Six Color Photo"
 msgstr "Fotografický ¹es»farebný"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3242
-#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3266
-#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3287
-#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3326
-#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3352
-#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3375
-#: src/xml/xmli18n-tmp.h:3387 src/xml/xmli18n-tmp.h:3399
-#: src/xml/xmli18n-tmp.h:3411 src/xml/xmli18n-tmp.h:3423
-#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3453
-#: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3483
-#: src/xml/xmli18n-tmp.h:3495 src/xml/xmli18n-tmp.h:3506
-#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3535
-#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3566
-#: src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3748 src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:3989 src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:4094 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4267 src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4940
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5661
+#: src/xml/xmli18n-tmp.h:5730
 msgid "Five Color Photo Composite"
 msgstr "Kompozitný fotografický pä»farebný"
 
 #: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
-#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
-#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
-#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
-#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
-#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
-#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
-#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
-#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:849
-#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:963
-#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1077
-#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1170
-#: src/xml/xmli18n-tmp.h:1220 src/xml/xmli18n-tmp.h:1277
-#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1376
-#: src/xml/xmli18n-tmp.h:1439 src/xml/xmli18n-tmp.h:1502
-#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1619
-#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1739
-#: src/xml/xmli18n-tmp.h:1773
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1050
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1240
+#: src/xml/xmli18n-tmp.h:1335 src/xml/xmli18n-tmp.h:1449
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1580
+#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1862
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2200 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2297
 msgid "Plain Paper"
 msgstr "Obyèajný papier"
 
-#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
-#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
-#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
-#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
-#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
-#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
-#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
-#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
-#: src/xml/xmli18n-tmp.h:819 src/xml/xmli18n-tmp.h:858
-#: src/xml/xmli18n-tmp.h:915 src/xml/xmli18n-tmp.h:972
-#: src/xml/xmli18n-tmp.h:1029 src/xml/xmli18n-tmp.h:1086
-#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1176
-#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1286
-#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1385
-#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1508
-#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1628
-#: src/xml/xmli18n-tmp.h:1685 src/xml/xmli18n-tmp.h:1743
-#: src/xml/xmli18n-tmp.h:1779
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:101 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:365 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1160 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1740
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1871
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2136
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2267
+#: src/xml/xmli18n-tmp.h:2303
 msgid "Glossy Film"
 msgstr "Lesklý film"
 
-#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
-#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
-#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
-#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
-#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
-#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
-#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
-#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
-#: src/xml/xmli18n-tmp.h:821 src/xml/xmli18n-tmp.h:861
-#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:975
-#: src/xml/xmli18n-tmp.h:1032 src/xml/xmli18n-tmp.h:1089
-#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1178
-#: src/xml/xmli18n-tmp.h:1232 src/xml/xmli18n-tmp.h:1289
-#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1388
-#: src/xml/xmli18n-tmp.h:1451 src/xml/xmli18n-tmp.h:1511
-#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1631
-#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1745
-#: src/xml/xmli18n-tmp.h:1781
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:845 src/xml/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:965 src/xml/xmli18n-tmp.h:1022
+#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1359
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1550
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1745 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2305
 msgid "Transparencies"
 msgstr "Priesvitná fólia"
 
-#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
-#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
-#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
-#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
-#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
-#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
-#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
-#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
-#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:823
-#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:921
-#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:1035
-#: src/xml/xmli18n-tmp.h:1092 src/xml/xmli18n-tmp.h:1142
-#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1235
-#: src/xml/xmli18n-tmp.h:1292 src/xml/xmli18n-tmp.h:1344
-#: src/xml/xmli18n-tmp.h:1391 src/xml/xmli18n-tmp.h:1454
-#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1577
-#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1691
-#: src/xml/xmli18n-tmp.h:1747 src/xml/xmli18n-tmp.h:1783
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:55 src/xml/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:151 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1024
+#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2215
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2307
 msgid "Envelopes"
 msgstr "Obálky"
 
-#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
-#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
-#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
-#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
-#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
-#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
-#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
-#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
-#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:827
-#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:927
-#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:1041
-#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1146
-#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1241
-#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1348
-#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1460
-#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1583
-#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1697
-#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1787
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:1028
+#: src/xml/xmli18n-tmp.h:1085 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1275 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1556
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1665
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1834
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2076
+#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2311
 msgid "Matte Paper"
 msgstr "Matný papier"
 
-#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
-#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
-#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
-#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
-#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
-#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
-#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
-#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
-#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:831
-#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:933
-#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:1047
-#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1150
-#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1247
-#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1352
-#: src/xml/xmli18n-tmp.h:1403 src/xml/xmli18n-tmp.h:1466
-#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1589
-#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1703
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1791
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:167 src/xml/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:569
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1032
+#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1285 src/xml/xmli18n-tmp.h:1389
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1675
+#: src/xml/xmli18n-tmp.h:1770 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1889 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2012 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2227
+#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2315
 msgid "Inkjet Paper"
 msgstr "Papier pre atramentovú tlaèiareò"
 
-#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
-#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
-#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
-#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
-#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
-#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
-#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
-#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
-#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:833
-#: src/xml/xmli18n-tmp.h:879 src/xml/xmli18n-tmp.h:936
-#: src/xml/xmli18n-tmp.h:993 src/xml/xmli18n-tmp.h:1050
-#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1152
-#: src/xml/xmli18n-tmp.h:1190 src/xml/xmli18n-tmp.h:1250
-#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1354
-#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1469
-#: src/xml/xmli18n-tmp.h:1529 src/xml/xmli18n-tmp.h:1592
-#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1706
-#: src/xml/xmli18n-tmp.h:1757 src/xml/xmli18n-tmp.h:1793
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:425 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:512 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1034
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1499 src/xml/xmli18n-tmp.h:1562
+#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1775 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1955
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2088
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2317
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papier s fotografickou kvalitou"
 
-#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
-#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
-#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
-#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
-#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
-#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
-#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
-#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
-#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:835
-#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:939
-#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:1053
-#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1154
-#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1253
-#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1356
-#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1472
-#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1595
-#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1709
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1795
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1036
+#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1200
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1504 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1842
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2233
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2319
 msgid "Photo Paper"
 msgstr "Fotografický papier"
 
-#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
-#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
-#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
-#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
-#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
-#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
-#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
-#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
-#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:837
-#: src/xml/xmli18n-tmp.h:885 src/xml/xmli18n-tmp.h:942
-#: src/xml/xmli18n-tmp.h:999 src/xml/xmli18n-tmp.h:1056
-#: src/xml/xmli18n-tmp.h:1113 src/xml/xmli18n-tmp.h:1156
-#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1212
-#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1256
-#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1358
-#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1475
-#: src/xml/xmli18n-tmp.h:1535 src/xml/xmli18n-tmp.h:1598
-#: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1712
-#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1797
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:179 src/xml/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:518 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:869 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1038
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1407
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1566
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1622
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1844
+#: src/xml/xmli18n-tmp.h:1898 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2321
 msgid "Premium Glossy Photo Paper"
 msgstr "Lesklý foto papier Premium"
 
-#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
-#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
-#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
-#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
-#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
-#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
-#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
-#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
-#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:841
-#: src/xml/xmli18n-tmp.h:891 src/xml/xmli18n-tmp.h:948
-#: src/xml/xmli18n-tmp.h:1005 src/xml/xmli18n-tmp.h:1062
-#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1160
-#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1262
-#: src/xml/xmli18n-tmp.h:1319 src/xml/xmli18n-tmp.h:1362
-#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1481
-#: src/xml/xmli18n-tmp.h:1541 src/xml/xmli18n-tmp.h:1604
-#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1718
-#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1801
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1042
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1419
+#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1570
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2027 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2242
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2325
 msgid "Premium Luster Photo Paper"
 msgstr "Ligotavý foto papier Premium"
 
-#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
-#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
-#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
-#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
-#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
-#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
-#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
-#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
-#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:843
-#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:951
-#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1065
-#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1162
-#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1265
-#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1368
-#: src/xml/xmli18n-tmp.h:1427 src/xml/xmli18n-tmp.h:1490
-#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1607
-#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1727
-#: src/xml/xmli18n-tmp.h:1767 src/xml/xmli18n-tmp.h:1803
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:91 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:191 src/xml/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:439 src/xml/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:787 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1044
+#: src/xml/xmli18n-tmp.h:1125 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1315 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1854
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2327
 msgid "Photo Quality Glossy Paper"
 msgstr "Lesklý fotografický papier"
 
-#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
-#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
-#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
-#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
-#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
-#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
-#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
-#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:897
-#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:1011
-#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1125
-#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1206
-#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1325
-#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1430
-#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1553
-#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1667
-#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1805
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1130
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1320
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1616
+#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1856 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2329
 msgid "Ilford Heavy Paper"
 msgstr "Ilford »a¾ký papier"
 
-#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
-#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
-#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
-#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
-#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
-#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
-#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
-#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
-#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:847
-#: src/xml/xmli18n-tmp.h:903 src/xml/xmli18n-tmp.h:960
-#: src/xml/xmli18n-tmp.h:1017 src/xml/xmli18n-tmp.h:1074
-#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1168
-#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1214
-#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1274
-#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1374
-#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1499
-#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1616
-#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1736
-#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1809
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:129
+#: src/xml/xmli18n-tmp.h:203 src/xml/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:542 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1048
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1443
+#: src/xml/xmli18n-tmp.h:1539 src/xml/xmli18n-tmp.h:1578
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1720
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1985
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2333
 msgid "Other"
 msgstr "Iné"
 
@@ -2225,58 +2966,62 @@ msgstr "Manuálne s preru¹ením"
 msgid "Manual without Pause"
 msgstr "Manuálne bez preru¹enia"
 
-#: src/main/print-olympus.c:279
+#: src/main/print-olympus.c:281
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:280 src/cups/genppd.c:1685 src/cups/genppd.c:1713
-#: src/cups/genppd.c:1745 src/cups/genppd.c:1800 src/cups/genppd.c:1846
-#: src/cups/genppd.c:2147 src/cups/genppd.c:2160 src/cups/genppd.c:2183
-#: src/cups/genppd.c:2204 src/cups/genppd.c:2221
+#: src/main/print-olympus.c:282 src/cups/genppd.c:1718 src/cups/genppd.c:1746
+#: src/cups/genppd.c:1778 src/cups/genppd.c:1833 src/cups/genppd.c:1879
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2194 src/cups/genppd.c:2217
+#: src/cups/genppd.c:2238 src/cups/genppd.c:2255
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
-#: src/main/print-olympus.c:1132
+#: src/main/print-olympus.c:998 src/main/print-olympus.c:1061
+#: src/main/print-olympus.c:1165
 #, fuzzy
 msgid "Glossy"
 msgstr "Lesklý film"
 
-#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
-#: src/main/print-olympus.c:1133
+#: src/main/print-olympus.c:999 src/main/print-olympus.c:1062
+#: src/main/print-olympus.c:1166
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
+#: src/main/print-olympus.c:1063 src/main/print-olympus.c:1167
 #, fuzzy
 msgid "Matte"
 msgstr "Matný papier"
 
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
+#. TRANSLATORS: 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.
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1901
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1770
+#: src/main/print-olympus.c:1936
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-olympus.c:1778
+#: src/main/print-olympus.c:1944
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1952
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-olympus.c:1793
+#: src/main/print-olympus.c:1959
 #, fuzzy
 msgid "Black Balance"
 msgstr "Èiernobielo"
 
-#: src/main/print-olympus.c:1794
+#: src/main/print-olympus.c:1960
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
@@ -2309,7 +3054,7 @@ msgstr "Rýchloschnúce foto"
 msgid "Quick-dry Transparency"
 msgstr "Rýchloschnúce priesvit. fólie"
 
-#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3687
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:5925
 msgid "Manual"
 msgstr "Manuál"
 
@@ -2394,24 +3139,24 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:278 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3638
-#: src/xml/xmli18n-tmp.h:3647 src/xml/xmli18n-tmp.h:3656
-#: src/xml/xmli18n-tmp.h:3664
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5875
+#: src/xml/xmli18n-tmp.h:5884 src/xml/xmli18n-tmp.h:5893
+#: src/xml/xmli18n-tmp.h:5901
 msgid "Draft"
 msgstr ""
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:3633 src/xml/xmli18n-tmp.h:3641
-#: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3658
-#: src/xml/xmli18n-tmp.h:3666
+#: src/xml/xmli18n-tmp.h:5870 src/xml/xmli18n-tmp.h:5878
+#: src/xml/xmli18n-tmp.h:5886 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5903
 #, fuzzy
 msgid "High"
 msgstr "Vý¹ka:"
 
 #: src/main/print-pcl.c:282 src/main/print-pcl.c:283
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3634
-#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3650
-#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3667
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5896 src/xml/xmli18n-tmp.h:5904
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografia"
@@ -2447,15 +3192,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3671
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:5908
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3708
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:5946
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3823
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6061
 msgid "Custom"
 msgstr "Vlastný"
 
@@ -2463,35 +3208,44 @@ msgstr "Vlastný"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3629
-#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3654
+#: src/main/print-weave.c:1511
+msgid "Fatal error!"
+msgstr ""
+
+#: src/main/print-weave.c:1547
+msgid ""
+"Please report the above information to gimp-print-devel@lists.sourceforge.net"
+msgstr ""
+
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:5866
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5891
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3630
-#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3655
-#: src/xml/xmli18n-tmp.h:3663
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5900
 msgid "Economy"
 msgstr ""
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3635
-#: src/xml/xmli18n-tmp.h:3642 src/xml/xmli18n-tmp.h:3651
-#: src/xml/xmli18n-tmp.h:3660 src/xml/xmli18n-tmp.h:3668
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:5872
+#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3636
-#: src/xml/xmli18n-tmp.h:3643 src/xml/xmli18n-tmp.h:3652
-#: src/xml/xmli18n-tmp.h:3661 src/xml/xmli18n-tmp.h:3669
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:5873
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5889
+#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5906
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1326 src/cups/genppd.c:1989
-#: src/xml/xmli18n-tmp.h:3637 src/xml/xmli18n-tmp.h:3644
-#: src/xml/xmli18n-tmp.h:3653 src/xml/xmli18n-tmp.h:3662
-#: src/xml/xmli18n-tmp.h:3670
+#: src/main/generic-options.c:41 src/cups/genppd.c:1359 src/cups/genppd.c:2023
+#: src/xml/xmli18n-tmp.h:5874 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5899
+#: src/xml/xmli18n-tmp.h:5907
 msgid "Best"
 msgstr ""
 
@@ -3257,81 +4011,81 @@ msgstr ""
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:960
+#: src/cups/genppd.c:993
 msgid "English"
 msgstr "Slovak"
 
-#: src/cups/genppd.c:1159 src/cups/genppd.c:1175 src/cups/genppd.c:1934
-#: src/cups/genppd.c:1935
+#: src/cups/genppd.c:1192 src/cups/genppd.c:1208 src/cups/genppd.c:1968
+#: src/cups/genppd.c:1969
 #, fuzzy
 msgid "Media Size"
 msgstr "Veµkos» média:"
 
-#: src/cups/genppd.c:1248 src/cups/genppd.c:1970
+#: src/cups/genppd.c:1281 src/cups/genppd.c:2004
 #, fuzzy
 msgid "Color Model"
 msgstr "Farebne"
 
-#: src/cups/genppd.c:1275 src/cups/genppd.c:1972
+#: src/cups/genppd.c:1308 src/cups/genppd.c:2006
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "V odtieòoch ¹edej"
 
-#: src/cups/genppd.c:1285 src/cups/genppd.c:1976
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2010
 #, fuzzy
 msgid "RGB Color"
 msgstr "Farebne"
 
-#: src/cups/genppd.c:1292 src/cups/genppd.c:1977
+#: src/cups/genppd.c:1325 src/cups/genppd.c:2011
 msgid "CMY Color"
 msgstr "CMY farba"
 
-#: src/cups/genppd.c:1317 src/cups/genppd.c:1987
+#: src/cups/genppd.c:1350 src/cups/genppd.c:2021
 msgid "Color Precision"
 msgstr ""
 
-#: src/cups/genppd.c:1573 src/cups/genppd.c:2080
+#: src/cups/genppd.c:1606 src/cups/genppd.c:2114
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:1590 src/cups/genppd.c:2096
+#: src/cups/genppd.c:1623 src/cups/genppd.c:2130
 msgid "2-Sided Printing"
 msgstr ""
 
-#: src/cups/genppd.c:1615 src/cups/genppd.c:2113
+#: src/cups/genppd.c:1648 src/cups/genppd.c:2147
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1620 src/cups/genppd.c:2114
+#: src/cups/genppd.c:1653 src/cups/genppd.c:2148
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1621 src/cups/genppd.c:2115
+#: src/cups/genppd.c:1654 src/cups/genppd.c:2149
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1622 src/cups/genppd.c:2116
+#: src/cups/genppd.c:1655 src/cups/genppd.c:2150
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1716 src/cups/genppd.c:2162
+#: src/cups/genppd.c:1749 src/cups/genppd.c:2196
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1718 src/cups/genppd.c:2164
+#: src/cups/genppd.c:1751 src/cups/genppd.c:2198
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1757 src/cups/genppd.c:1820 src/cups/genppd.c:1864
-#: src/cups/genppd.c:2185 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+#: src/cups/genppd.c:1790 src/cups/genppd.c:1853 src/cups/genppd.c:1897
+#: src/cups/genppd.c:2219 src/cups/genppd.c:2249 src/cups/genppd.c:2266
 msgid "Value"
 msgstr ""
 
-#: src/cups/genppd.c:1762 src/cups/genppd.c:2189
+#: src/cups/genppd.c:1795 src/cups/genppd.c:2223
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/cups/genppd.c:1805 src/cups/genppd.c:2209
+#: src/cups/genppd.c:1838 src/cups/genppd.c:2243
 #, c-format
 msgid "%.1f mm"
 msgstr ""
@@ -3659,51 +4413,61 @@ 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:995 src/xml/xmli18n-tmp.h:383
-#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
-#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
-#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
-#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
-#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
-#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
-#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
-#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
-#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
-#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
-#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
-#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
-#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
-#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
-#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
-#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
-#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
-#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
-#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
-#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
-#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
-#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
-#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
-#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
-#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
-#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
-#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
-#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
-#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
-#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1503
-#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1509
-#: src/xml/xmli18n-tmp.h:1512 src/xml/xmli18n-tmp.h:1515
-#: src/xml/xmli18n-tmp.h:1518 src/xml/xmli18n-tmp.h:1521
-#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1527
-#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
-#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
-#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
-#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
-#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
-#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:2655
-#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2717
-#: src/xml/xmli18n-tmp.h:3045 src/xml/xmli18n-tmp.h:3252
-#: src/xml/xmli18n-tmp.h:3273 src/xml/xmli18n-tmp.h:3363
-#: src/xml/xmli18n-tmp.h:3531
+#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2001
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2010 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2025
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:4085 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4612 src/xml/xmli18n-tmp.h:5481
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotografický papier"
@@ -3715,131 +4479,303 @@ msgid "Unknown"
 msgstr ""
 
 #: src/escputil/escputil.c:1000 src/escputil/escputil.c:1289
-#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1921
-#: src/xml/xmli18n-tmp.h:1937 src/xml/xmli18n-tmp.h:2002
-#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2079
-#: src/xml/xmli18n-tmp.h:2105 src/xml/xmli18n-tmp.h:2119
-#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2173
-#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
-#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
-#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2293
-#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2346
-#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2418
-#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2445
-#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2469
-#: src/xml/xmli18n-tmp.h:2484 src/xml/xmli18n-tmp.h:2512
-#: src/xml/xmli18n-tmp.h:2525 src/xml/xmli18n-tmp.h:2564
-#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2626
-#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2746
-#: src/xml/xmli18n-tmp.h:2762 src/xml/xmli18n-tmp.h:2843
-#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2895
-#: src/xml/xmli18n-tmp.h:2912 src/xml/xmli18n-tmp.h:2946
-#: src/xml/xmli18n-tmp.h:3001 src/xml/xmli18n-tmp.h:3015
-#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3122
-#: src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2461 src/xml/xmli18n-tmp.h:2526
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2683 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2711 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3101 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3661
+#: src/xml/xmli18n-tmp.h:3678 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3750 src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:3782 src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:3932 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3964 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4388 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:4639 src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:4875 src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4936
+#: src/xml/xmli18n-tmp.h:4942 src/xml/xmli18n-tmp.h:4968
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5339 src/xml/xmli18n-tmp.h:5348
+#: src/xml/xmli18n-tmp.h:5355 src/xml/xmli18n-tmp.h:5361
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5417
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5430
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5477 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5502
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5536 src/xml/xmli18n-tmp.h:5544
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5557
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5657 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5719
+#: src/xml/xmli18n-tmp.h:5726 src/xml/xmli18n-tmp.h:5732
+#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5779
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Jasná azúrová"
 
 #: src/escputil/escputil.c:1001 src/escputil/escputil.c:1290
-#: src/xml/xmli18n-tmp.h:1906 src/xml/xmli18n-tmp.h:1922
-#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:2003
-#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2080
-#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2120
-#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2174
-#: src/xml/xmli18n-tmp.h:2188 src/xml/xmli18n-tmp.h:2201
-#: src/xml/xmli18n-tmp.h:2214 src/xml/xmli18n-tmp.h:2227
-#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2294
-#: src/xml/xmli18n-tmp.h:2309 src/xml/xmli18n-tmp.h:2347
-#: src/xml/xmli18n-tmp.h:2360 src/xml/xmli18n-tmp.h:2419
-#: src/xml/xmli18n-tmp.h:2432 src/xml/xmli18n-tmp.h:2446
-#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2470
-#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2513
-#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2565
-#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2627
-#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2748
-#: src/xml/xmli18n-tmp.h:2761 src/xml/xmli18n-tmp.h:2844
-#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2896
-#: src/xml/xmli18n-tmp.h:2913 src/xml/xmli18n-tmp.h:2947
-#: src/xml/xmli18n-tmp.h:3000 src/xml/xmli18n-tmp.h:3014
-#: src/xml/xmli18n-tmp.h:3028 src/xml/xmli18n-tmp.h:3123
-#: src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2446
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2527
+#: src/xml/xmli18n-tmp.h:2541 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2644
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2698
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2751
+#: src/xml/xmli18n-tmp.h:2803 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2956 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2994
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3381
+#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3662
+#: src/xml/xmli18n-tmp.h:3746 src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:3778 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3934 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3966 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:4265 src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:4390 src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:4428 src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4452
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4465
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4512 src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4586 src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:4641 src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4903
+#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4970
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:5044 src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5168
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5241 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5334
+#: src/xml/xmli18n-tmp.h:5341 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5363
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5419
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5471
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5504
+#: src/xml/xmli18n-tmp.h:5510 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5652
+#: src/xml/xmli18n-tmp.h:5659 src/xml/xmli18n-tmp.h:5665
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5721
+#: src/xml/xmli18n-tmp.h:5728 src/xml/xmli18n-tmp.h:5734
+#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5781
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Jasná purpurová"
 
-#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2433
-#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:3002
-#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3030
+#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3679 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4409 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:4566 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4605 src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4664 src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5376 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5450
+#: src/xml/xmli18n-tmp.h:5475 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5533 src/xml/xmli18n-tmp.h:5542
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5678 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5717
+#: src/xml/xmli18n-tmp.h:5747 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5777
 #, fuzzy
 msgid "Light Black"
 msgstr "Èierna"
 
-#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:384
-#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
-#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
-#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
-#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
-#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
-#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
-#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
-#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
-#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
-#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
-#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
-#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
-#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
-#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
-#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
-#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
-#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
-#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
-#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
-#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
-#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
-#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
-#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
-#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
-#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
-#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
-#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
-#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
-#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
-#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1504
-#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1510
-#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1516
-#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1522
-#: src/xml/xmli18n-tmp.h:1525 src/xml/xmli18n-tmp.h:1528
-#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1534
-#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1540
-#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1546
-#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1552
-#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1558
-#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:2654
-#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2716
-#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3264
-#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3371
-#: src/xml/xmli18n-tmp.h:3539
+#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:508 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:532 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:538 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:562 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:568 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
+#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
+#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
+#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
+#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
+#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
+#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
+#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
+#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
+#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
+#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
+#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2011 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2026
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2032
+#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2038
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:4044 src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:5530
 #, fuzzy
 msgid "Matte Black"
 msgstr "Matný papier"
 
-#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:2658
-#: src/xml/xmli18n-tmp.h:2702 src/xml/xmli18n-tmp.h:2720
-#: src/xml/xmli18n-tmp.h:3048
+#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3995 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4006 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4020 src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:4106 src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4148
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Lesklý film"
 
-#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:2760
-#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3013
-#: src/xml/xmli18n-tmp.h:3027
+#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3676
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4616 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5534 src/xml/xmli18n-tmp.h:5573
 #, fuzzy
 msgid "Light Light Black"
 msgstr "Èierna"
 
 #: src/escputil/escputil.c:1010 src/escputil/escputil.c:1029
-#: src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:4099 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4189
 #, fuzzy
 msgid "Orange"
 msgstr "Veµkos»"
@@ -4491,8233 +5427,8361 @@ msgstr "Tlaèím..."
 #: src/xml/xmli18n-tmp.h:68 src/xml/xmli18n-tmp.h:70 src/xml/xmli18n-tmp.h:72
 #: src/xml/xmli18n-tmp.h:74 src/xml/xmli18n-tmp.h:76 src/xml/xmli18n-tmp.h:78
 #: src/xml/xmli18n-tmp.h:80 src/xml/xmli18n-tmp.h:82 src/xml/xmli18n-tmp.h:84
-#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:92
-#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
-#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
-#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
-#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
-#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
-#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
-#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
-#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
-#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
-#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
-#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
-#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
-#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
-#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
-#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
-#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
-#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
-#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
-#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
-#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
-#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
-#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
-#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
-#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
-#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
-#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
-#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
-#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
-#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
-#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
-#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
-#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
-#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
-#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
-#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
-#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
-#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
-#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
-#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
-#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
-#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
-#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
-#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
-#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
-#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
-#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
-#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
-#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
-#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
-#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
-#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
-#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
-#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
-#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
-#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
-#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
-#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
-#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
-#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
-#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
-#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
-#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
-#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
-#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
-#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
-#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
-#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
-#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
-#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
-#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
-#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
-#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
-#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
-#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
-#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
-#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
-#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
-#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
-#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
-#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
-#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
-#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
-#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
-#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
-#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
-#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
-#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
-#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
-#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
-#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
-#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
-#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
-#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
-#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
-#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
-#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:92 src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:102 src/xml/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:106 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:114 src/xml/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:118 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:126 src/xml/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:130 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:136 src/xml/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:144 src/xml/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:168 src/xml/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:192 src/xml/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:216 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:232 src/xml/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:240 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:256 src/xml/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:264 src/xml/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:304 src/xml/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:312 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:320 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:328 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:336 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:344 src/xml/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:352 src/xml/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:384 src/xml/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:408 src/xml/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:412 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:432 src/xml/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:444 src/xml/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:448 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:468 src/xml/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:484 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:642 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:698 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:714 src/xml/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:722 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:738 src/xml/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:746 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:764 src/xml/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:780 src/xml/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:804 src/xml/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:814
 #: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:818
 #: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:822
 #: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:826
 #: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:830
-#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:834
-#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:838
-#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:842
-#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:846
-#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:850
-#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
-#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
-#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
-#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
-#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
-#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
-#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
-#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:898
-#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
-#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
-#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
-#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
-#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
-#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
-#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
-#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
-#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
-#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
-#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
-#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
-#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
-#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
-#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
-#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
-#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
-#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
-#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
-#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1018
-#: src/xml/xmli18n-tmp.h:1021 src/xml/xmli18n-tmp.h:1024
-#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1030
-#: src/xml/xmli18n-tmp.h:1033 src/xml/xmli18n-tmp.h:1036
-#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1042
-#: src/xml/xmli18n-tmp.h:1045 src/xml/xmli18n-tmp.h:1048
-#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1054
-#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1060
-#: src/xml/xmli18n-tmp.h:1063 src/xml/xmli18n-tmp.h:1066
-#: src/xml/xmli18n-tmp.h:1069 src/xml/xmli18n-tmp.h:1072
-#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1078
-#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1084
-#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1090
-#: src/xml/xmli18n-tmp.h:1093 src/xml/xmli18n-tmp.h:1096
-#: src/xml/xmli18n-tmp.h:1099 src/xml/xmli18n-tmp.h:1102
-#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1108
-#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1114
-#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1120
-#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1126
-#: src/xml/xmli18n-tmp.h:1129 src/xml/xmli18n-tmp.h:1132
-#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
-#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
-#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
-#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
-#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
-#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
-#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
-#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
-#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
-#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
-#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
-#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
-#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
-#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1189
-#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1193
-#: src/xml/xmli18n-tmp.h:1195 src/xml/xmli18n-tmp.h:1197
-#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1201
-#: src/xml/xmli18n-tmp.h:1203 src/xml/xmli18n-tmp.h:1205
-#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1209
-#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1221
-#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
-#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
-#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
-#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
-#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
-#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
-#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
-#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
-#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
-#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
-#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
-#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
-#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
-#: src/xml/xmli18n-tmp.h:1302 src/xml/xmli18n-tmp.h:1305
-#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1311
-#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1317
-#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1323
-#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1329
-#: src/xml/xmli18n-tmp.h:1332 src/xml/xmli18n-tmp.h:1335
-#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
-#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1343
-#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1347
-#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1351
-#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1355
-#: src/xml/xmli18n-tmp.h:1357 src/xml/xmli18n-tmp.h:1359
-#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1363
-#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1367
-#: src/xml/xmli18n-tmp.h:1369 src/xml/xmli18n-tmp.h:1371
-#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1375
-#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1566
-#: src/xml/xmli18n-tmp.h:1569 src/xml/xmli18n-tmp.h:1572
-#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1578
-#: src/xml/xmli18n-tmp.h:1581 src/xml/xmli18n-tmp.h:1584
-#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1590
-#: src/xml/xmli18n-tmp.h:1593 src/xml/xmli18n-tmp.h:1596
-#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1602
-#: src/xml/xmli18n-tmp.h:1605 src/xml/xmli18n-tmp.h:1608
-#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1614
-#: src/xml/xmli18n-tmp.h:1617 src/xml/xmli18n-tmp.h:1620
-#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1626
-#: src/xml/xmli18n-tmp.h:1629 src/xml/xmli18n-tmp.h:1632
-#: src/xml/xmli18n-tmp.h:1635 src/xml/xmli18n-tmp.h:1638
-#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1644
-#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
-#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
-#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
-#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
-#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
-#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
-#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
-#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
-#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
-#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
-#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
-#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
-#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
-#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
-#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:1778
-#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1782
-#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1786
-#: src/xml/xmli18n-tmp.h:1788 src/xml/xmli18n-tmp.h:1790
-#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1794
-#: src/xml/xmli18n-tmp.h:1796 src/xml/xmli18n-tmp.h:1798
-#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1802
-#: src/xml/xmli18n-tmp.h:1804 src/xml/xmli18n-tmp.h:1806
-#: src/xml/xmli18n-tmp.h:1808 src/xml/xmli18n-tmp.h:1810
-#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3204
-#: src/xml/xmli18n-tmp.h:3210 src/xml/xmli18n-tmp.h:3216
-#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3232
-#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3250
-#: src/xml/xmli18n-tmp.h:3294 src/xml/xmli18n-tmp.h:3302
-#: src/xml/xmli18n-tmp.h:3304 src/xml/xmli18n-tmp.h:3312
-#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3379
-#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
-#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3421
-#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3441
-#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3469
-#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3555
-#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3597
-#: src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:1017
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1025
+#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1035 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1047 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1056
+#: src/xml/xmli18n-tmp.h:1061 src/xml/xmli18n-tmp.h:1066
+#: src/xml/xmli18n-tmp.h:1071 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1086
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1096
+#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1116
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1126
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1136
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1161 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1181 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1206
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1216
+#: src/xml/xmli18n-tmp.h:1221 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1236
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1246
+#: src/xml/xmli18n-tmp.h:1251 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1261 src/xml/xmli18n-tmp.h:1266
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1281 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1291 src/xml/xmli18n-tmp.h:1296
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1311 src/xml/xmli18n-tmp.h:1316
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1326
+#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1336
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1378 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1414 src/xml/xmli18n-tmp.h:1420
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1432
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1450 src/xml/xmli18n-tmp.h:1455
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1465
+#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1480 src/xml/xmli18n-tmp.h:1485
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1540 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1551 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1583 src/xml/xmli18n-tmp.h:1585
+#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1603 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1607 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1646
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1666
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1676
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1716
+#: src/xml/xmli18n-tmp.h:1721 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1736
+#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1835
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1843
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1851
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:2049
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2057
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2065
+#: src/xml/xmli18n-tmp.h:2069 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2113
+#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2129
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2137
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2153
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2161
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2185
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2264
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2272
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2276
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2282 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2286 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2296
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2300
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2308
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2314 src/xml/xmli18n-tmp.h:2316
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2324
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:3787 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3895 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:4223 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5579
+#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5825
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Bright White Paper"
 msgstr "Matný papier"
 
-#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
-#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
-#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
-#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
-#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
-#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
-#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
-#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:817
-#: src/xml/xmli18n-tmp.h:855 src/xml/xmli18n-tmp.h:912
-#: src/xml/xmli18n-tmp.h:969 src/xml/xmli18n-tmp.h:1026
-#: src/xml/xmli18n-tmp.h:1083 src/xml/xmli18n-tmp.h:1136
-#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1226
-#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1338
-#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1445
-#: src/xml/xmli18n-tmp.h:1505 src/xml/xmli18n-tmp.h:1568
-#: src/xml/xmli18n-tmp.h:1625 src/xml/xmli18n-tmp.h:1682
-#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1777
-#: src/xml/xmli18n-tmp.h:3675
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:139 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:959 src/xml/xmli18n-tmp.h:1018
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1155
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1546
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1931
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:5912
 msgid "Postcard"
 msgstr "Pohµadnica"
 
-#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
-#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
-#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
-#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
-#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
-#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
-#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
-#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:825
-#: src/xml/xmli18n-tmp.h:867 src/xml/xmli18n-tmp.h:924
-#: src/xml/xmli18n-tmp.h:981 src/xml/xmli18n-tmp.h:1038
-#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1144
-#: src/xml/xmli18n-tmp.h:1182 src/xml/xmli18n-tmp.h:1238
-#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1346
-#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1457
-#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1580
-#: src/xml/xmli18n-tmp.h:1637 src/xml/xmli18n-tmp.h:1694
-#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1785
+#: src/xml/xmli18n-tmp.h:13 src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:155 src/xml/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:415 src/xml/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:851 src/xml/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1026
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1175
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1554
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1832
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2309
 msgid "Back Light Film"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
-#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
-#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
-#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
-#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
-#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
-#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
-#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:829
-#: src/xml/xmli18n-tmp.h:873 src/xml/xmli18n-tmp.h:930
-#: src/xml/xmli18n-tmp.h:987 src/xml/xmli18n-tmp.h:1044
-#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1148
-#: src/xml/xmli18n-tmp.h:1186 src/xml/xmli18n-tmp.h:1244
-#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1350
-#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1463
-#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1586
-#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1700
-#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1789
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:419 src/xml/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:857 src/xml/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1030
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1383
+#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1558
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2313
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Matný papier"
 
-#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
-#: src/xml/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:421
 #, fuzzy
 msgid "Premium Presentation Paper Matte"
 msgstr "Ligotavý foto papier Premium"
 
-#: src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:431
 #, fuzzy
-msgid "Premium Glossy Photo Paper 170 wt"
+msgid "Ultra Glossy Photo Paper"
+msgstr "Lesklý foto papier"
+
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1210
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1413
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1568
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1695
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1964
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2176 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2287 src/xml/xmli18n-tmp.h:2323
+#, fuzzy
+msgid "Premium Semigloss Photo Paper"
 msgstr "Lesklý foto papier Premium"
 
-#: src/xml/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:437
 #, fuzzy
-msgid "Premium Glossy Photo Paper 250 wt"
+msgid "Ultra Premium Photo Paper Luster"
 msgstr "Lesklý foto papier Premium"
 
-#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
-#: src/xml/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:37
+msgid "CD or DVD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:93 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1230
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1437
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2331
 #, fuzzy
-msgid "Ultra Glossy Photo Paper"
-msgstr "Lesklý foto papier"
+msgid "ColorLife Paper"
+msgstr "Obyèajný papier"
 
-#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
-#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
-#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
-#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
-#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
-#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
-#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
-#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:839
-#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:945
-#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1059
-#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1158
-#: src/xml/xmli18n-tmp.h:1196 src/xml/xmli18n-tmp.h:1259
-#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1360
-#: src/xml/xmli18n-tmp.h:1415 src/xml/xmli18n-tmp.h:1478
-#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1601
-#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1715
-#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1799
+#: src/xml/xmli18n-tmp.h:73
 #, fuzzy
-msgid "Premium Semigloss Photo Paper"
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Lesklý foto papier Premium"
+
+#: src/xml/xmli18n-tmp.h:75
+#, fuzzy
+msgid "Premium Glossy Photo Paper 250 wt"
 msgstr "Lesklý foto papier Premium"
 
-#: src/xml/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:81
 #, fuzzy
 msgid "Premium Semigloss Photo Paper 170 wt"
 msgstr "Lesklý foto papier Premium"
 
-#: src/xml/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:83
 #, fuzzy
 msgid "Premium Semigloss Photo Paper 250 wt"
 msgstr "Lesklý foto papier Premium"
 
-#: src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:87
 #, fuzzy
 msgid "Premium Luster Photo Paper 250 wt"
 msgstr "Ligotavý foto papier Premium"
 
-#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
-#: src/xml/xmli18n-tmp.h:334
-#, fuzzy
-msgid "Ultra Premium Photo Paper Luster"
-msgstr "Lesklý foto papier Premium"
-
-#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
-#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
-#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
-#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
-#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
-#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
-#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
-#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:845
-#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:957
-#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1071
-#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1166
-#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1271
-#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1372
-#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1496
-#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1613
-#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1733
-#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1807
-#, fuzzy
-msgid "ColorLife Paper"
-msgstr "Obyèajný papier"
-
-#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
-#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
-#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
-#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
-#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
-#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
-#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
-#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
-#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
-#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
-#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
-#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
-#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
-#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
-#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
-#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
-#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
-#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
-#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
-#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
-#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
-#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
-#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
-#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
-#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
-#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
-#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
-#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
-#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
-#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
-#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
-#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
-#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
-#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
-#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
-#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
-#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
-#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
-#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
-#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
-#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
-#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
-#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
-#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
-#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
-#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
-#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:851
-#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:857
-#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:863
-#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:869
-#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:875
-#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:881
-#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:887
-#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:893
-#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:899
-#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:905
-#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:911
-#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:917
-#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:923
-#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:929
-#: src/xml/xmli18n-tmp.h:932 src/xml/xmli18n-tmp.h:935
-#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:941
-#: src/xml/xmli18n-tmp.h:944 src/xml/xmli18n-tmp.h:947
-#: src/xml/xmli18n-tmp.h:950 src/xml/xmli18n-tmp.h:953
-#: src/xml/xmli18n-tmp.h:956 src/xml/xmli18n-tmp.h:959
-#: src/xml/xmli18n-tmp.h:962 src/xml/xmli18n-tmp.h:965
-#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:971
-#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:977
-#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:983
-#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:989
-#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:995
-#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1001
-#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1007
-#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1013
-#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1019
-#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1025
-#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1031
-#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1037
-#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1043
-#: src/xml/xmli18n-tmp.h:1046 src/xml/xmli18n-tmp.h:1049
-#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1055
-#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1061
-#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1067
-#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1073
-#: src/xml/xmli18n-tmp.h:1076 src/xml/xmli18n-tmp.h:1079
-#: src/xml/xmli18n-tmp.h:1082 src/xml/xmli18n-tmp.h:1085
-#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1091
-#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1097
-#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1103
-#: src/xml/xmli18n-tmp.h:1106 src/xml/xmli18n-tmp.h:1109
-#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1115
-#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1121
-#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1127
-#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1133
-#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1225
-#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1231
-#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1237
-#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1243
-#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1249
-#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1255
-#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1261
-#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1267
-#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1273
-#: src/xml/xmli18n-tmp.h:1276 src/xml/xmli18n-tmp.h:1279
-#: src/xml/xmli18n-tmp.h:1282 src/xml/xmli18n-tmp.h:1285
-#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1291
-#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1297
-#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1303
-#: src/xml/xmli18n-tmp.h:1306 src/xml/xmli18n-tmp.h:1309
-#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1315
-#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1321
-#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1327
-#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1333
-#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1567
-#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1573
-#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1579
-#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1585
-#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1591
-#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1597
-#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1603
-#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1609
-#: src/xml/xmli18n-tmp.h:1612 src/xml/xmli18n-tmp.h:1615
-#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1621
-#: src/xml/xmli18n-tmp.h:1624 src/xml/xmli18n-tmp.h:1627
-#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1633
-#: src/xml/xmli18n-tmp.h:1636 src/xml/xmli18n-tmp.h:1639
-#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1645
-#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1651
-#: src/xml/xmli18n-tmp.h:1654 src/xml/xmli18n-tmp.h:1657
-#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1663
-#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1669
-#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1675
-#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3223
-#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3231
-#: src/xml/xmli18n-tmp.h:3238 src/xml/xmli18n-tmp.h:3239
-#: src/xml/xmli18n-tmp.h:3300 src/xml/xmli18n-tmp.h:3301
-#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3311
-#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3396
-#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3408
-#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3420
-#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3432
-#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3440
-#: src/xml/xmli18n-tmp.h:3479 src/xml/xmli18n-tmp.h:3480
-#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3492
-#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3554
-#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:133 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:149 src/xml/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:173 src/xml/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:197 src/xml/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:205 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:221 src/xml/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:229 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:245 src/xml/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:253 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:261 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:269 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:277 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:285 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:293 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:301 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:309 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:317 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:325 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:333 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:341 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:349 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:357 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:619 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:643 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:667 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:691 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:707 src/xml/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:715 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:731 src/xml/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:739 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:755 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1062
+#: src/xml/xmli18n-tmp.h:1067 src/xml/xmli18n-tmp.h:1072
+#: src/xml/xmli18n-tmp.h:1077 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1092
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1102
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1112
+#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1122
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1132
+#: src/xml/xmli18n-tmp.h:1137 src/xml/xmli18n-tmp.h:1142
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1157 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1177 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1192
+#: src/xml/xmli18n-tmp.h:1197 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1212
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1222
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1242
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1252
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1272
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1287 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1297 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1327 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1385 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1445 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1461
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1516 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1647
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1657
+#: src/xml/xmli18n-tmp.h:1662 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1677
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1687
+#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1742 src/xml/xmli18n-tmp.h:1747
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1767
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1807
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2090 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2098 src/xml/xmli18n-tmp.h:2102
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2118
+#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2126
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2162 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2190
+#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:3884 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:4779 src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:4845 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4919
+#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4980
+#: src/xml/xmli18n-tmp.h:4986 src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5209 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5276
+#: src/xml/xmli18n-tmp.h:5277 src/xml/xmli18n-tmp.h:5283
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5607 src/xml/xmli18n-tmp.h:5633
+#: src/xml/xmli18n-tmp.h:5634 src/xml/xmli18n-tmp.h:5640
 msgid "Quadtone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
-#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
-#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
-#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
-#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:852
-#: src/xml/xmli18n-tmp.h:909 src/xml/xmli18n-tmp.h:966
-#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1080
-#: src/xml/xmli18n-tmp.h:1172 src/xml/xmli18n-tmp.h:1223
-#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1336
-#: src/xml/xmli18n-tmp.h:1379 src/xml/xmli18n-tmp.h:1442
-#: src/xml/xmli18n-tmp.h:1565 src/xml/xmli18n-tmp.h:1622
-#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1775
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:142 src/xml/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:150 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:174 src/xml/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:198 src/xml/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:214 src/xml/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:222 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:238 src/xml/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:246 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:262 src/xml/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:302 src/xml/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:310 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:318 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:326 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:334 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:342 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:350 src/xml/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:636 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:660 src/xml/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:708 src/xml/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:716 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:732 src/xml/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:756 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1103
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1123
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1158 src/xml/xmli18n-tmp.h:1163
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1183
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1193
+#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1213
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1223
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1238 src/xml/xmli18n-tmp.h:1243
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1253
+#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1283
+#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1313
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1333
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1362 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1374 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1462
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1472
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1487 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1502
+#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:1532
+#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1542
+#: src/xml/xmli18n-tmp.h:1633 src/xml/xmli18n-tmp.h:1638
+#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1648
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1658
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1713 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1728
+#: src/xml/xmli18n-tmp.h:1733 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1768
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2071
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2095
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2115 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2123 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2139 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2183
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2191
+#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2199
+msgid "MISQuadtone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1150 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2299
 msgid "Plain Paper Fast Load"
 msgstr "Obyèajný papier rýchle nasadenie"
 
-#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
-#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
-#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1364
-#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1484
-#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1970 src/xml/xmli18n-tmp.h:2030
+#: src/xml/xmli18n-tmp.h:2245
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Matný papier"
 
-#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
-#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
-#: src/xml/xmli18n-tmp.h:1202 src/xml/xmli18n-tmp.h:1366
-#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1487
-#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:881 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2248
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
-#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
-#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
-#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
-#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
-#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
-#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
-#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
-#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
-#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
-#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1377
-#: src/xml/xmli18n-tmp.h:1380 src/xml/xmli18n-tmp.h:1383
-#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1389
-#: src/xml/xmli18n-tmp.h:1392 src/xml/xmli18n-tmp.h:1395
-#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1401
-#: src/xml/xmli18n-tmp.h:1404 src/xml/xmli18n-tmp.h:1407
-#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1413
-#: src/xml/xmli18n-tmp.h:1416 src/xml/xmli18n-tmp.h:1419
-#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1425
-#: src/xml/xmli18n-tmp.h:1428 src/xml/xmli18n-tmp.h:1431
-#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1437
-#: src/xml/xmli18n-tmp.h:1440 src/xml/xmli18n-tmp.h:1443
-#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1449
-#: src/xml/xmli18n-tmp.h:1452 src/xml/xmli18n-tmp.h:1455
-#: src/xml/xmli18n-tmp.h:1458 src/xml/xmli18n-tmp.h:1461
-#: src/xml/xmli18n-tmp.h:1464 src/xml/xmli18n-tmp.h:1467
-#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1473
-#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1479
-#: src/xml/xmli18n-tmp.h:1482 src/xml/xmli18n-tmp.h:1485
-#: src/xml/xmli18n-tmp.h:1488 src/xml/xmli18n-tmp.h:1491
-#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1497
-#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1677
-#: src/xml/xmli18n-tmp.h:1680 src/xml/xmli18n-tmp.h:1683
-#: src/xml/xmli18n-tmp.h:1686 src/xml/xmli18n-tmp.h:1689
-#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1695
-#: src/xml/xmli18n-tmp.h:1698 src/xml/xmli18n-tmp.h:1701
-#: src/xml/xmli18n-tmp.h:1704 src/xml/xmli18n-tmp.h:1707
-#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1713
-#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1719
-#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1725
-#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1731
-#: src/xml/xmli18n-tmp.h:1734 src/xml/xmli18n-tmp.h:1737
-#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3503
-#: src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:1863
+#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1881
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1893
+#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1905
+#: src/xml/xmli18n-tmp.h:1908 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1923
+#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:1950 src/xml/xmli18n-tmp.h:1953
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1968 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1983
+#: src/xml/xmli18n-tmp.h:1986 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2204 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2255
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5645
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
-#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
-#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
-#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
-#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
-#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
-#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
-#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
-#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
-#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
-#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1378
-#: src/xml/xmli18n-tmp.h:1381 src/xml/xmli18n-tmp.h:1384
-#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1390
-#: src/xml/xmli18n-tmp.h:1393 src/xml/xmli18n-tmp.h:1396
-#: src/xml/xmli18n-tmp.h:1399 src/xml/xmli18n-tmp.h:1402
-#: src/xml/xmli18n-tmp.h:1405 src/xml/xmli18n-tmp.h:1408
-#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1414
-#: src/xml/xmli18n-tmp.h:1417 src/xml/xmli18n-tmp.h:1420
-#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1426
-#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1432
-#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1438
-#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1444
-#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1450
-#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1456
-#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1462
-#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1468
-#: src/xml/xmli18n-tmp.h:1471 src/xml/xmli18n-tmp.h:1474
-#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1480
-#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1486
-#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1492
-#: src/xml/xmli18n-tmp.h:1495 src/xml/xmli18n-tmp.h:1498
-#: src/xml/xmli18n-tmp.h:1501 src/xml/xmli18n-tmp.h:1678
-#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1684
-#: src/xml/xmli18n-tmp.h:1687 src/xml/xmli18n-tmp.h:1690
-#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1696
-#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1702
-#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1708
-#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1714
-#: src/xml/xmli18n-tmp.h:1717 src/xml/xmli18n-tmp.h:1720
-#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1726
-#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1732
-#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1738
-#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3517
-#: src/xml/xmli18n-tmp.h:3577
+#: src/xml/xmli18n-tmp.h:835 src/xml/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:841 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1879 src/xml/xmli18n-tmp.h:1882
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1894
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1909 src/xml/xmli18n-tmp.h:1912
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1924
+#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1954
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1969 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1984
+#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2208
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2229 src/xml/xmli18n-tmp.h:2232
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2238
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2244
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2253 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2259 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5714
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1826
-#: src/xml/xmli18n-tmp.h:1839 src/xml/xmli18n-tmp.h:1852
-#: src/xml/xmli18n-tmp.h:1907 src/xml/xmli18n-tmp.h:1923
-#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1952
-#: src/xml/xmli18n-tmp.h:1965 src/xml/xmli18n-tmp.h:2054
-#: src/xml/xmli18n-tmp.h:2081 src/xml/xmli18n-tmp.h:2146
-#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
-#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
-#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2348
-#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2407
-#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2899
-#: src/xml/xmli18n-tmp.h:2916 src/xml/xmli18n-tmp.h:3142
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1139
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1154 src/xml/xmli18n-tmp.h:1159
+#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1179
+#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1199
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1214 src/xml/xmli18n-tmp.h:1219
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1229
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1244 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1259
+#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1274 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1289
+#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1309
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1329
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1423
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1429
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1447
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1634
+#: src/xml/xmli18n-tmp.h:1639 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1664
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1764
+#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1784
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1799 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1819
+msgid "MIS Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1463 src/xml/xmli18n-tmp.h:1468
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1478
+#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1508
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1533 src/xml/xmli18n-tmp.h:1538
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4858 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:5289
+msgid "Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2489 src/xml/xmli18n-tmp.h:2578
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2713 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2752
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2885 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:3051 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3665
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1828
-#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1853
-#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1879
-#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
-#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1940
-#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1966
-#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2055
-#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2133
-#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2175
-#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
-#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
-#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2336
-#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
-#: src/xml/xmli18n-tmp.h:2408 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2699
+#: src/xml/xmli18n-tmp.h:2714 src/xml/xmli18n-tmp.h:2727
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2886
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:3052
 msgid "180 DPI Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1830
-#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1854
-#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1880
-#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
-#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1941
-#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1967
-#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
-#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2134
-#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2176
-#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
-#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
-#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2337
-#: src/xml/xmli18n-tmp.h:2350 src/xml/xmli18n-tmp.h:2363
-#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
-#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2434
-#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2459
-#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2529
-#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2601
-#: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2703
-#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2735
-#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2768
-#: src/xml/xmli18n-tmp.h:2872 src/xml/xmli18n-tmp.h:2884
-#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2917
-#: src/xml/xmli18n-tmp.h:2961 src/xml/xmli18n-tmp.h:3007
-#: src/xml/xmli18n-tmp.h:3021 src/xml/xmli18n-tmp.h:3035
-#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3126
-#: src/xml/xmli18n-tmp.h:3143
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2404
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2658
+#: src/xml/xmli18n-tmp.h:2672 src/xml/xmli18n-tmp.h:2700
+#: src/xml/xmli18n-tmp.h:2715 src/xml/xmli18n-tmp.h:2728
+#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2754
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2919 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3053
+#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3125
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3292
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3530
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3649
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3684
 #, fuzzy
 msgid "360 x 180 DPI Draft"
 msgstr "150x150 DPI"
 
-#: src/xml/xmli18n-tmp.h:1818 src/xml/xmli18n-tmp.h:1831
-#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1855
-#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1881
-#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
-#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1942
-#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1968
-#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2135
-#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2392 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2418 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2479 src/xml/xmli18n-tmp.h:2492
+#: src/xml/xmli18n-tmp.h:2581 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2862 src/xml/xmli18n-tmp.h:2934
 #, fuzzy
 msgid "360 DPI High Quality"
 msgstr "1440 x 360 DPI Vysoká kvalita"
 
-#: src/xml/xmli18n-tmp.h:1819 src/xml/xmli18n-tmp.h:1832
-#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1856
-#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1882
-#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
-#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1943
-#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1969
-#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1992
-#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2020
-#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
-#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
-#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2096
-#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2123
-#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2149
-#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2177
-#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2205
-#: src/xml/xmli18n-tmp.h:2218 src/xml/xmli18n-tmp.h:2231
-#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2254
-#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
-#: src/xml/xmli18n-tmp.h:2297 src/xml/xmli18n-tmp.h:2312
-#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2339
-#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
-#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2385
-#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2411
-#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2435
-#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2460
-#: src/xml/xmli18n-tmp.h:2473 src/xml/xmli18n-tmp.h:2488
-#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2516
-#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2541
-#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2591
-#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
-#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2645
-#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2675
-#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2704
-#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2736
-#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2769
-#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2808
-#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2833
-#: src/xml/xmli18n-tmp.h:2847 src/xml/xmli18n-tmp.h:2861
-#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2885
-#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2918
-#: src/xml/xmli18n-tmp.h:2935 src/xml/xmli18n-tmp.h:2950
-#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2987
-#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3022
-#: src/xml/xmli18n-tmp.h:3036 src/xml/xmli18n-tmp.h:3050
-#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3081
-#: src/xml/xmli18n-tmp.h:3098 src/xml/xmli18n-tmp.h:3113
-#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2369 src/xml/xmli18n-tmp.h:2380
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2406
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2493
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2544
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
+#: src/xml/xmli18n-tmp.h:2582 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2729
+#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2806
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2836
+#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
+#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3012
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3040
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3184 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3424 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3485 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3573
+#: src/xml/xmli18n-tmp.h:3587 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3650 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3685
 #, fuzzy
 msgid "360 DPI"
 msgstr "600 DPI"
 
-#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1833
-#: src/xml/xmli18n-tmp.h:1846 src/xml/xmli18n-tmp.h:1857
-#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1883
-#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1912
-#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1944
-#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1970
-#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1993
-#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2021
-#: src/xml/xmli18n-tmp.h:2033 src/xml/xmli18n-tmp.h:2045
-#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
-#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2097
-#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2124
-#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2150
-#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2178
-#: src/xml/xmli18n-tmp.h:2193 src/xml/xmli18n-tmp.h:2206
-#: src/xml/xmli18n-tmp.h:2219 src/xml/xmli18n-tmp.h:2232
-#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2255
-#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
-#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2313
-#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2340
-#: src/xml/xmli18n-tmp.h:2352 src/xml/xmli18n-tmp.h:2365
-#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2386
-#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2412
-#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2436
-#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2461
-#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2489
-#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2517
-#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2542
-#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2567
-#: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2592
-#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2616
-#: src/xml/xmli18n-tmp.h:2631 src/xml/xmli18n-tmp.h:2646
-#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2676
-#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2705
-#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2737
-#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2770
-#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2809
-#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2834
-#: src/xml/xmli18n-tmp.h:2848 src/xml/xmli18n-tmp.h:2862
-#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2886
-#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2919
-#: src/xml/xmli18n-tmp.h:2936 src/xml/xmli18n-tmp.h:2951
-#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2988
-#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3023
-#: src/xml/xmli18n-tmp.h:3037 src/xml/xmli18n-tmp.h:3051
-#: src/xml/xmli18n-tmp.h:3066 src/xml/xmli18n-tmp.h:3083
-#: src/xml/xmli18n-tmp.h:3099 src/xml/xmli18n-tmp.h:3114
-#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:2344 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2452 src/xml/xmli18n-tmp.h:2468
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2494
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2557 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:2594
+#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2648
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2674
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2807
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2837
+#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
+#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3013
+#: src/xml/xmli18n-tmp.h:3026 src/xml/xmli18n-tmp.h:3041
+#: src/xml/xmli18n-tmp.h:3055 src/xml/xmli18n-tmp.h:3066
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3140
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3170
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3229
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3333
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3358
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3385
+#: src/xml/xmli18n-tmp.h:3397 src/xml/xmli18n-tmp.h:3409
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3442
+#: src/xml/xmli18n-tmp.h:3459 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3574
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3637
+#: src/xml/xmli18n-tmp.h:3651 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3686
 #, fuzzy
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1834
-#: src/xml/xmli18n-tmp.h:1847 src/xml/xmli18n-tmp.h:1858
-#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1884
-#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1913
-#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1945
-#: src/xml/xmli18n-tmp.h:1958 src/xml/xmli18n-tmp.h:1971
-#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:1994
-#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2022
-#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2046
-#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2071
-#: src/xml/xmli18n-tmp.h:2086 src/xml/xmli18n-tmp.h:2098
-#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2125
-#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2151
-#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2179
-#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2207
-#: src/xml/xmli18n-tmp.h:2220 src/xml/xmli18n-tmp.h:2233
-#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2256
-#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
-#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2314
-#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2341
-#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
-#: src/xml/xmli18n-tmp.h:2376 src/xml/xmli18n-tmp.h:2387
-#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2413
-#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2437
-#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2462
-#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2490
-#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2518
-#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2543
-#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
-#: src/xml/xmli18n-tmp.h:2580 src/xml/xmli18n-tmp.h:2593
-#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2617
-#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
-#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2677
-#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2706
-#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2738
-#: src/xml/xmli18n-tmp.h:2753 src/xml/xmli18n-tmp.h:2771
-#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2810
-#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2835
-#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
-#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2887
-#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2921
-#: src/xml/xmli18n-tmp.h:2937 src/xml/xmli18n-tmp.h:2952
-#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2990
-#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3024
-#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3052
-#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3085
-#: src/xml/xmli18n-tmp.h:3100 src/xml/xmli18n-tmp.h:3115
-#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:2345 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2469
+#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2546
+#: src/xml/xmli18n-tmp.h:2558 src/xml/xmli18n-tmp.h:2570
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2595
+#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2622
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2675
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2731
+#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2808
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2838
+#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2890
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2922 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3014
+#: src/xml/xmli18n-tmp.h:3027 src/xml/xmli18n-tmp.h:3042
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3067
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3186 src/xml/xmli18n-tmp.h:3201
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3334
+#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3359
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3444
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3475
+#: src/xml/xmli18n-tmp.h:3489 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3533 src/xml/xmli18n-tmp.h:3547
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3652 src/xml/xmli18n-tmp.h:3669
+#: src/xml/xmli18n-tmp.h:3687
 #, fuzzy
 msgid "720 DPI"
 msgstr "1200 DPI"
 
-#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
-#: src/xml/xmli18n-tmp.h:1978 src/xml/xmli18n-tmp.h:2004
-#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2030
-#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2067
-#: src/xml/xmli18n-tmp.h:2094 src/xml/xmli18n-tmp.h:2107
-#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2161
-#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2252
-#: src/xml/xmli18n-tmp.h:2280 src/xml/xmli18n-tmp.h:2295
-#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2323
-#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
-#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2486
-#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2552
-#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2613
-#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
-#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2686
-#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2806
-#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2831
-#: src/xml/xmli18n-tmp.h:2845 src/xml/xmli18n-tmp.h:2859
-#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2948
-#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3080
-#: src/xml/xmli18n-tmp.h:3097 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2554
+#: src/xml/xmli18n-tmp.h:2566 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2804 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2834 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3076
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3382
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3586 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3634
 #, fuzzy
 msgid "360 x 120 DPI Economy"
 msgstr "600x600 DPI monochromaticky"
 
-#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1842
-#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2005
-#: src/xml/xmli18n-tmp.h:2019 src/xml/xmli18n-tmp.h:2031
-#: src/xml/xmli18n-tmp.h:2043 src/xml/xmli18n-tmp.h:2068
-#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
-#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2162
-#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2253
-#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2296
-#: src/xml/xmli18n-tmp.h:2311 src/xml/xmli18n-tmp.h:2324
-#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2384
-#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2487
-#: src/xml/xmli18n-tmp.h:2500 src/xml/xmli18n-tmp.h:2553
-#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2614
-#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2644
-#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2687
-#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2807
-#: src/xml/xmli18n-tmp.h:2820 src/xml/xmli18n-tmp.h:2832
-#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
-#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2949
-#: src/xml/xmli18n-tmp.h:3112
+#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2555
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2632
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3077
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3211
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3383
+#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3635
 #, fuzzy
 msgid "360 x 240 DPI Draft"
 msgstr "600x600 DPI"
 
-#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1872
-#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1898
-#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1930
-#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1959
-#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:1995
-#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2023
-#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2047
-#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2087
-#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2112
-#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2139
-#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2166
-#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2328
-#: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2388
-#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2557
-#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2922
-#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2991
-#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3086
+#: src/xml/xmli18n-tmp.h:2383 src/xml/xmli18n-tmp.h:2396
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2422
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2470 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2507 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2704 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:3057 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3118 src/xml/xmli18n-tmp.h:3445
+#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3514
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3609
 #, fuzzy
 msgid "720 DPI High Quality"
 msgstr "1200 DPI Vysoká kvalita"
 
-#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1873
-#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1899
-#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1931
-#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1984
-#: src/xml/xmli18n-tmp.h:1996 src/xml/xmli18n-tmp.h:2010
-#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2036
-#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2061
-#: src/xml/xmli18n-tmp.h:2073 src/xml/xmli18n-tmp.h:2088
-#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2127
-#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2153
-#: src/xml/xmli18n-tmp.h:2167 src/xml/xmli18n-tmp.h:2181
-#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2208
-#: src/xml/xmli18n-tmp.h:2221 src/xml/xmli18n-tmp.h:2234
-#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2257
-#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2285
-#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2315
-#: src/xml/xmli18n-tmp.h:2329 src/xml/xmli18n-tmp.h:2354
-#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2389
-#: src/xml/xmli18n-tmp.h:2399 src/xml/xmli18n-tmp.h:2425
-#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2451
-#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
-#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2504
-#: src/xml/xmli18n-tmp.h:2519 src/xml/xmli18n-tmp.h:2534
-#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2558
-#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2605
-#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2633
-#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2663
-#: src/xml/xmli18n-tmp.h:2678 src/xml/xmli18n-tmp.h:2691
-#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2725
-#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2754
-#: src/xml/xmli18n-tmp.h:2772 src/xml/xmli18n-tmp.h:2787
-#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2811
-#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2836
-#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
-#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2888
-#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2923
-#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2953
-#: src/xml/xmli18n-tmp.h:2968 src/xml/xmli18n-tmp.h:2978
-#: src/xml/xmli18n-tmp.h:2992 src/xml/xmli18n-tmp.h:3011
-#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3039
-#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
-#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3101
-#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3130
-#: src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:2384 src/xml/xmli18n-tmp.h:2397
+#: src/xml/xmli18n-tmp.h:2410 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2548 src/xml/xmli18n-tmp.h:2560
+#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2691 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2794 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2839
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2923 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3105
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3129
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3231 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3311
+#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3335
+#: src/xml/xmli18n-tmp.h:3348 src/xml/xmli18n-tmp.h:3360
+#: src/xml/xmli18n-tmp.h:3372 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3427 src/xml/xmli18n-tmp.h:3446
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3576 src/xml/xmli18n-tmp.h:3593
+#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3688
 #, fuzzy
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1874
-#: src/xml/xmli18n-tmp.h:1887 src/xml/xmli18n-tmp.h:1900
-#: src/xml/xmli18n-tmp.h:1916 src/xml/xmli18n-tmp.h:1932
-#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1985
-#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2011
-#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2037
-#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2062
-#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2089
-#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2128
-#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2154
-#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2182
-#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2258
-#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
-#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2316
-#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2390
-#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2559
-#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2634
-#: src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2385 src/xml/xmli18n-tmp.h:2398
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2535
+#: src/xml/xmli18n-tmp.h:2549 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2782
+#: src/xml/xmli18n-tmp.h:2795 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3388
 #, fuzzy
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
 
-#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1960
-#: src/xml/xmli18n-tmp.h:2100 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2902
 #, fuzzy
 msgid "720 DPI Highest Quality"
 msgstr "1200 DPI Najvy¹¹ia kvalita"
 
-#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2259
-#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
-#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2317
-#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2477
-#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2505
-#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2606
-#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2635
-#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2740
-#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2866
-#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2796 src/xml/xmli18n-tmp.h:2811
+#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3216 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3412
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2260
-#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
-#: src/xml/xmli18n-tmp.h:2303 src/xml/xmli18n-tmp.h:2318
-#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2771 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2812
+#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:3160 src/xml/xmli18n-tmp.h:3390
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
 
-#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2439
-#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2493
-#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2546
-#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2582
-#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2620
-#: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2664
-#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
-#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2726
-#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2755
-#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2789
-#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2812
-#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2878
-#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
-#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2939
-#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2969
-#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2994
-#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
-#: src/xml/xmli18n-tmp.h:3088 src/xml/xmli18n-tmp.h:3102
-#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3131
-#: src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2963
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3070
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3106
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3297 src/xml/xmli18n-tmp.h:3313
+#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
+#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3401
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3492
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3577 src/xml/xmli18n-tmp.h:3594
+#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3671 src/xml/xmli18n-tmp.h:3689
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2426
-#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2452
-#: src/xml/xmli18n-tmp.h:2464 src/xml/xmli18n-tmp.h:2479
-#: src/xml/xmli18n-tmp.h:2494 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2547
-#: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2583
-#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2621
-#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2665
-#: src/xml/xmli18n-tmp.h:2680 src/xml/xmli18n-tmp.h:2694
-#: src/xml/xmli18n-tmp.h:2709 src/xml/xmli18n-tmp.h:2727
-#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2756
-#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2790
-#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2813
-#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2837
-#: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2879
-#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
-#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2940
-#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2970
-#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2995
-#: src/xml/xmli18n-tmp.h:3012 src/xml/xmli18n-tmp.h:3026
-#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3055
-#: src/xml/xmli18n-tmp.h:3072 src/xml/xmli18n-tmp.h:3089
-#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3118
-#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3071
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3107
+#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3251
+#: src/xml/xmli18n-tmp.h:3266 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3298 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3324 src/xml/xmli18n-tmp.h:3337
+#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3374 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3463
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3535 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3563 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3612
+#: src/xml/xmli18n-tmp.h:3626 src/xml/xmli18n-tmp.h:3641
+#: src/xml/xmli18n-tmp.h:3655 src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:3690
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:4374
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "®ltá"
 
-#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2584
-#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2711
-#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2743
-#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2776
-#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2908
-#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2972
-#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3057
-#: src/xml/xmli18n-tmp.h:3074 src/xml/xmli18n-tmp.h:3091
-#: src/xml/xmli18n-tmp.h:3105 src/xml/xmli18n-tmp.h:3134
-#: src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3108
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3267
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3495
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3614
+#: src/xml/xmli18n-tmp.h:3628 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3692
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2666 src/xml/xmli18n-tmp.h:2681
-#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2728
-#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2775
-#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2814
-#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2838
-#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2926
-#: src/xml/xmli18n-tmp.h:2941 src/xml/xmli18n-tmp.h:2971
-#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
-#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
-#: src/xml/xmli18n-tmp.h:3090 src/xml/xmli18n-tmp.h:3104
-#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3133
-#: src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3190 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3234 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3325 src/xml/xmli18n-tmp.h:3338
+#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3362
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3505
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3613
+#: src/xml/xmli18n-tmp.h:3627 src/xml/xmli18n-tmp.h:3642
+#: src/xml/xmli18n-tmp.h:3656 src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:3691
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2712
-#: src/xml/xmli18n-tmp.h:2730 src/xml/xmli18n-tmp.h:2759
-#: src/xml/xmli18n-tmp.h:2777 src/xml/xmli18n-tmp.h:2909
-#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2973
-#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3058
-#: src/xml/xmli18n-tmp.h:3075 src/xml/xmli18n-tmp.h:3092
-#: src/xml/xmli18n-tmp.h:3106 src/xml/xmli18n-tmp.h:3135
-#: src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3301 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3496
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3615
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2798 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3502
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2965
-#: src/xml/xmli18n-tmp.h:2989 src/xml/xmli18n-tmp.h:3067
-#: src/xml/xmli18n-tmp.h:3084
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:3607
 #, fuzzy
 msgid "720 x 360 DPI Enhanced"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:3479
 #, fuzzy
 msgid "Black 1"
 msgstr "Èierna"
 
-#: src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3480
 #, fuzzy
 msgid "Black 2"
 msgstr "Èierna"
 
-#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3065
-#: src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3605
 #, fuzzy
 msgid "360 DPI Enhanced"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3516
 #, fuzzy
 msgid "1440 x 720 DPI High Quality"
 msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
 
-#: src/xml/xmli18n-tmp.h:3153
-msgid "Lower Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3677
+#, fuzzy
+msgid "Vivid Light Magenta"
+msgstr "Jasná purpurová"
 
-#: src/xml/xmli18n-tmp.h:3154
-msgid "Upper Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3682
+#, fuzzy
+msgid "Vivid Magenta"
+msgstr "Purpurová"
+
+#: src/xml/xmli18n-tmp.h:3694
+#, fuzzy
+msgid "Main Tray"
+msgstr "Zásobník"
+
+#: src/xml/xmli18n-tmp.h:3695
+#, fuzzy
+msgid "Photo Tray"
+msgstr "Fotografia"
 
-#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3160
-#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3176
-#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3186
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3725 src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:3732
 #, fuzzy
 msgid "Print to CD"
 msgstr "Tlaèi» do súboru?"
 
-#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3181
-#: src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:3730
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Zásobník"
 
-#: src/xml/xmli18n-tmp.h:3157 src/xml/xmli18n-tmp.h:3182
-#: src/xml/xmli18n-tmp.h:3185
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:3731
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3159 src/xml/xmli18n-tmp.h:3164
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3705
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manuál"
 
-#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3709
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3710
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3171
-#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3180
-#: src/xml/xmli18n-tmp.h:3193
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3716 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3739
 msgid "Roll Feed"
 msgstr "Kotúèový podávaè"
 
-#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3714 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3723
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Manuál"
 
-#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3715 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3724
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Manuál"
 
-#: src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3733
 #, fuzzy
 msgid "Photo Board"
 msgstr "Fotografický papier"
 
-#: src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3734
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3735
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3190
+#: src/xml/xmli18n-tmp.h:3736
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Automatický výber"
 
-#: src/xml/xmli18n-tmp.h:3191
+#: src/xml/xmli18n-tmp.h:3737
 msgid "Manual Selection"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3199 src/xml/xmli18n-tmp.h:3207
-#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3219
-#: src/xml/xmli18n-tmp.h:3227 src/xml/xmli18n-tmp.h:3235
-#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3257
-#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3278
-#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3297
-#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3317
-#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3342
-#: src/xml/xmli18n-tmp.h:3356 src/xml/xmli18n-tmp.h:3382
-#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
-#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3426
-#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3446
-#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3474
-#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3498
-#: src/xml/xmli18n-tmp.h:3510 src/xml/xmli18n-tmp.h:3524
-#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3558
-#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:3584
-#: src/xml/xmli18n-tmp.h:3594 src/xml/xmli18n-tmp.h:3600
-#: src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3763 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3872 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:4067 src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4172 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4236 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:4754 src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5102 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5679 src/xml/xmli18n-tmp.h:5748
+#: src/xml/xmli18n-tmp.h:5793 src/xml/xmli18n-tmp.h:5814
+#: src/xml/xmli18n-tmp.h:5835
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3208
-#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3220
-#: src/xml/xmli18n-tmp.h:3228 src/xml/xmli18n-tmp.h:3236
-#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3259
-#: src/xml/xmli18n-tmp.h:3270 src/xml/xmli18n-tmp.h:3280
-#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3298
-#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3318
-#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3344
-#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3383
-#: src/xml/xmli18n-tmp.h:3391 src/xml/xmli18n-tmp.h:3403
-#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3427
-#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3447
-#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3475
-#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3499
-#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3526
-#: src/xml/xmli18n-tmp.h:3551 src/xml/xmli18n-tmp.h:3559
-#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3586
-#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3601
-#: src/xml/xmli18n-tmp.h:3607
+#: src/xml/xmli18n-tmp.h:3765 src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4484 src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:4756 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5321
+#: src/xml/xmli18n-tmp.h:5382 src/xml/xmli18n-tmp.h:5451
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5795 src/xml/xmli18n-tmp.h:5816
+#: src/xml/xmli18n-tmp.h:5837
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Kompozitný trojfarebný"
 
-#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
-#: src/xml/xmli18n-tmp.h:3215 src/xml/xmli18n-tmp.h:3221
-#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3237
-#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3271
-#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3299
-#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3319
-#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3345
-#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3384
-#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
-#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3428
-#: src/xml/xmli18n-tmp.h:3438 src/xml/xmli18n-tmp.h:3448
-#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3463
-#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3476
-#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3500
-#: src/xml/xmli18n-tmp.h:3513 src/xml/xmli18n-tmp.h:3527
-#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3560
-#: src/xml/xmli18n-tmp.h:3573 src/xml/xmli18n-tmp.h:3587
-#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3602
-#: src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:3824 src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5325
+#: src/xml/xmli18n-tmp.h:5386 src/xml/xmli18n-tmp.h:5455
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5757
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5841
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "©tandardný ¹tvorfarebný"
 
-#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3248
-#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
-#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3360
-#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
-#: src/xml/xmli18n-tmp.h:3417 src/xml/xmli18n-tmp.h:3429
-#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3459
-#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3501 src/xml/xmli18n-tmp.h:3514
-#: src/xml/xmli18n-tmp.h:3528 src/xml/xmli18n-tmp.h:3574
-#: src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4424 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:5066 src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:5196 src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5391
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5762
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3249
-#: src/xml/xmli18n-tmp.h:3272 src/xml/xmli18n-tmp.h:3293
-#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3333
-#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3361
-#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
-#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3430
-#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3460
-#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3478
-#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3502
-#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3529
-#: src/xml/xmli18n-tmp.h:3575 src/xml/xmli18n-tmp.h:3589
+#: src/xml/xmli18n-tmp.h:3780 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:4078 src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:4430 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4972
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5150 src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5336
+#: src/xml/xmli18n-tmp.h:5397 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5768
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3919 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:4781 src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:4795 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4921
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:4996
+#: src/xml/xmli18n-tmp.h:5023 src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:5226 src/xml/xmli18n-tmp.h:5279
+#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5603 src/xml/xmli18n-tmp.h:5609
+#: src/xml/xmli18n-tmp.h:5636 src/xml/xmli18n-tmp.h:5642
+#, fuzzy
+msgid "Gray 3"
+msgstr "Zásobník 3"
+
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4782 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4796 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4916 src/xml/xmli18n-tmp.h:4922
+#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4983
+#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5286 src/xml/xmli18n-tmp.h:5294
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5643
+#, fuzzy
+msgid "Gray 2"
+msgstr "Zásobník 2"
+
+#: src/xml/xmli18n-tmp.h:3855 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:4856 src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:4931 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4998
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:5214 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5611
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5644
+#, fuzzy
+msgid "Gray 1"
+msgstr "Zásobník 1"
+
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4985 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5606 src/xml/xmli18n-tmp.h:5639
+msgid "MIS Quadtone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4114
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Roz¹írený sedemfarebný"
 
-#: src/xml/xmli18n-tmp.h:3260 src/xml/xmli18n-tmp.h:3281
+#: src/xml/xmli18n-tmp.h:4016 src/xml/xmli18n-tmp.h:4121
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Kompozitný trojfarebný"
 
-#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3282
+#: src/xml/xmli18n-tmp.h:4021 src/xml/xmli18n-tmp.h:4126
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "©tandardný ¹tvorfarebný"
 
-#: src/xml/xmli18n-tmp.h:3262 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4132
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Kompozitný roz¹írený ¹es»farebný"
 
-#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:4035 src/xml/xmli18n-tmp.h:4140
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Roz¹írený sedemfarebný"
 
-#: src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:4141
+#, fuzzy
+msgid "MatteBlack"
+msgstr "Matný papier"
+
+#: src/xml/xmli18n-tmp.h:4224
 #, fuzzy
 msgid "Default Black"
 msgstr "Nastavi» ¹tandardné"
 
-#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
-#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3365
-#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3504
-#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3533
-#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3564
-#: src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4446 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4573 src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:5344
+#: src/xml/xmli18n-tmp.h:5413 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5715
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:4315
 msgid "Six Color Enhanced Composite"
 msgstr "Kompozitný roz¹írený ¹es»farebný"
 
-#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3348
-#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3516
-#: src/xml/xmli18n-tmp.h:3530 src/xml/xmli18n-tmp.h:3576
-#: src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:4368 src/xml/xmli18n-tmp.h:4437
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:5404
+#: src/xml/xmli18n-tmp.h:5473 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5775
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3355
-#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3523
-#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5745
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "V odtieòoch ¹edej"
 
-#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3357
-#: src/xml/xmli18n-tmp.h:3511 src/xml/xmli18n-tmp.h:3525
-#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:4412 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5448
+#: src/xml/xmli18n-tmp.h:5681 src/xml/xmli18n-tmp.h:5750
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "©tandardný ¹tvorfarebný"
 
-#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3372
-#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3540
+#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5531
 #, fuzzy
 msgid "Eight Color Photo"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3378
-#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:4652 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5570
 #, fuzzy
 msgid "Eight Color Raw"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/xml/xmli18n-tmp.h:3462 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:5288
+msgid "MIS Six Tone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:4994
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5291
+#, fuzzy
+msgid "Gray 5"
+msgstr "Zásobník 1"
+
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:4928 src/xml/xmli18n-tmp.h:4995
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5292
+#, fuzzy
+msgid "Gray 4"
+msgstr "Zásobník 4"
+
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5145
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3615
-#: src/xml/xmli18n-tmp.h:3621
+#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5852
+#: src/xml/xmli18n-tmp.h:5858
 #, fuzzy
 msgid "Interleave"
 msgstr "Názov tlaèiarne:"
 
-#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3616
-#: src/xml/xmli18n-tmp.h:3622
+#: src/xml/xmli18n-tmp.h:5848 src/xml/xmli18n-tmp.h:5853
+#: src/xml/xmli18n-tmp.h:5859
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3612 src/xml/xmli18n-tmp.h:3617
-#: src/xml/xmli18n-tmp.h:3623
+#: src/xml/xmli18n-tmp.h:5849 src/xml/xmli18n-tmp.h:5854
+#: src/xml/xmli18n-tmp.h:5860
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3613 src/xml/xmli18n-tmp.h:3618
-#: src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5855
+#: src/xml/xmli18n-tmp.h:5861
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:5862
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Názov tlaèiarne:"
 
-#: src/xml/xmli18n-tmp.h:3626
+#: src/xml/xmli18n-tmp.h:5863
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Jas:"
 
-#: src/xml/xmli18n-tmp.h:3628
+#: src/xml/xmli18n-tmp.h:5865
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:5909
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:5910
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:3674
+#: src/xml/xmli18n-tmp.h:5911
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:3679
+#: src/xml/xmli18n-tmp.h:5916
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:3680
+#: src/xml/xmli18n-tmp.h:5917
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:5918
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:3682
+#: src/xml/xmli18n-tmp.h:5919
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 Foto papier"
 
-#: src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:5920
+#, fuzzy
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr "Epson 4x6 Foto papier"
+
+#: src/xml/xmli18n-tmp.h:5921
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:3684
+#: src/xml/xmli18n-tmp.h:5922
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:3685
+#: src/xml/xmli18n-tmp.h:5923
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:3686
+#: src/xml/xmli18n-tmp.h:5924
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:3688
+#: src/xml/xmli18n-tmp.h:5926
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:3689
+#: src/xml/xmli18n-tmp.h:5927
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/xml/xmli18n-tmp.h:3690
+#: src/xml/xmli18n-tmp.h:5928
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3691
+#: src/xml/xmli18n-tmp.h:5929
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:3692
+#: src/xml/xmli18n-tmp.h:5930
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:3693
+#: src/xml/xmli18n-tmp.h:5931
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:3694
+#: src/xml/xmli18n-tmp.h:5932
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:3695
+#: src/xml/xmli18n-tmp.h:5933
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:3696
+#: src/xml/xmli18n-tmp.h:5934
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:3697
+#: src/xml/xmli18n-tmp.h:5935
 #, fuzzy
 msgid "22x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:3698
+#: src/xml/xmli18n-tmp.h:5936
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:3699
+#: src/xml/xmli18n-tmp.h:5937
 msgid "Super A1 24x36"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3700
+#: src/xml/xmli18n-tmp.h:5938
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:5939
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:3702
+#: src/xml/xmli18n-tmp.h:5940
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:3703
+#: src/xml/xmli18n-tmp.h:5941
 #, fuzzy
 msgid "Super A0"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:5942
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:3705
+#: src/xml/xmli18n-tmp.h:5943
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:3706
+#: src/xml/xmli18n-tmp.h:5944
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:3707
+#: src/xml/xmli18n-tmp.h:5945
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:3709
+#: src/xml/xmli18n-tmp.h:5947
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:3710
+#: src/xml/xmli18n-tmp.h:5948
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:5949
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:5950
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:3713
+#: src/xml/xmli18n-tmp.h:5951
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:3714
+#: src/xml/xmli18n-tmp.h:5952
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:3715
+#: src/xml/xmli18n-tmp.h:5953
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:3716
+#: src/xml/xmli18n-tmp.h:5954
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:5955
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:5956
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:5957
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:5958
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:5959
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:3722
+#: src/xml/xmli18n-tmp.h:5960
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:3723
+#: src/xml/xmli18n-tmp.h:5961
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:3724
+#: src/xml/xmli18n-tmp.h:5962
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:3725
+#: src/xml/xmli18n-tmp.h:5963
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:3726
+#: src/xml/xmli18n-tmp.h:5964
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:5965
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:5966
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:5967
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:3730
+#: src/xml/xmli18n-tmp.h:5968
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:3731
+#: src/xml/xmli18n-tmp.h:5969
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:3732
+#: src/xml/xmli18n-tmp.h:5970
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:3733
+#: src/xml/xmli18n-tmp.h:5971
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:3734
+#: src/xml/xmli18n-tmp.h:5972
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:3735
+#: src/xml/xmli18n-tmp.h:5973
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:3736
+#: src/xml/xmli18n-tmp.h:5974
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:3737
+#: src/xml/xmli18n-tmp.h:5975
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5976
 #, fuzzy
 msgid "Super B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3739
+#: src/xml/xmli18n-tmp.h:5977
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:5978
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:3741
+#: src/xml/xmli18n-tmp.h:5979
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:5980
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:3743
+#: src/xml/xmli18n-tmp.h:5981
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:5982
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:5983
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:3746
+#: src/xml/xmli18n-tmp.h:5984
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:3747
+#: src/xml/xmli18n-tmp.h:5985
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:3748
+#: src/xml/xmli18n-tmp.h:5986
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:5987
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:3750
+#: src/xml/xmli18n-tmp.h:5988
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:3751
+#: src/xml/xmli18n-tmp.h:5989
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:5990
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:5991
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:3754
+#: src/xml/xmli18n-tmp.h:5992
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:3755
+#: src/xml/xmli18n-tmp.h:5993
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:3756
+#: src/xml/xmli18n-tmp.h:5994
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:5995
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:3758
+#: src/xml/xmli18n-tmp.h:5996
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:3759
+#: src/xml/xmli18n-tmp.h:5997
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:5998
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:3761
+#: src/xml/xmli18n-tmp.h:5999
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:6000
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:3763
+#: src/xml/xmli18n-tmp.h:6001
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:6002
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:3765
+#: src/xml/xmli18n-tmp.h:6003
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:3766
+#: src/xml/xmli18n-tmp.h:6004
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:6005
 #, fuzzy
 msgid "DL landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:3768
+#: src/xml/xmli18n-tmp.h:6006
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:3769
+#: src/xml/xmli18n-tmp.h:6007
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:3770
+#: src/xml/xmli18n-tmp.h:6008
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:6009
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:3772
+#: src/xml/xmli18n-tmp.h:6010
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:6011
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:3774
+#: src/xml/xmli18n-tmp.h:6012
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:3775
+#: src/xml/xmli18n-tmp.h:6013
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:6014
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:6015
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Na ¹írku"
 
-#: src/xml/xmli18n-tmp.h:3778
+#: src/xml/xmli18n-tmp.h:6016
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:3779
+#: src/xml/xmli18n-tmp.h:6017
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3780
+#: src/xml/xmli18n-tmp.h:6018
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:6019
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3782
+#: src/xml/xmli18n-tmp.h:6020
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:6021
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3784
+#: src/xml/xmli18n-tmp.h:6022
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:6023
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:6024
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:3787
+#: src/xml/xmli18n-tmp.h:6025
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:6026
 msgid "American foolscap"
 msgstr "Americké rozmery"
 
-#: src/xml/xmli18n-tmp.h:3789
+#: src/xml/xmli18n-tmp.h:6027
 msgid "European foolscap"
 msgstr "Európske rozmery"
 
-#: src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:6028
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:6029
 msgid "Large Crown Quarto"
 msgstr "Large Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:3792
+#: src/xml/xmli18n-tmp.h:6030
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:6031
 msgid "Royal Quarto"
 msgstr "Royal Quarto"
 
-#: src/xml/xmli18n-tmp.h:3794
+#: src/xml/xmli18n-tmp.h:6032
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:3795
+#: src/xml/xmli18n-tmp.h:6033
 msgid "Large Crown Octavo"
 msgstr "Large Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:6034
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:6035
 msgid "Royal Octavo"
 msgstr "Royal Octavo"
 
-#: src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:6036
 msgid "Small paperback"
 msgstr "Small paperback"
 
-#: src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:6037
 msgid "Penguin small paperback"
 msgstr "Penguin small paperback"
 
-#: src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:6038
 msgid "Penguin large paperback"
 msgstr "Penguin large paperback"
 
-#: src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:6039
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3802
+#: src/xml/xmli18n-tmp.h:6040
 msgid "Hagaki Card"
 msgstr "Hagaki karta"
 
-#: src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:6041
 msgid "Oufuku Card"
 msgstr "Oufuku karta"
 
-#: src/xml/xmli18n-tmp.h:3804
+#: src/xml/xmli18n-tmp.h:6042
 msgid "Japanese long envelope #3"
 msgstr "Japonská dlhá obálka #3"
 
-#: src/xml/xmli18n-tmp.h:3805
+#: src/xml/xmli18n-tmp.h:6043
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japonská dlhá obálka #3"
 
-#: src/xml/xmli18n-tmp.h:3806
+#: src/xml/xmli18n-tmp.h:6044
 msgid "Japanese long envelope #4"
 msgstr "Japonská dlhá obálka #4"
 
-#: src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:6045
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japonská dlhá obálka #4"
 
-#: src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:6046
 msgid "Japanese Kaku envelope #4"
 msgstr "Japonská Kaku obálka #4"
 
-#: src/xml/xmli18n-tmp.h:3809
+#: src/xml/xmli18n-tmp.h:6047
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japonská Kaku obálka #4"
 
-#: src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:6048
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:6049
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:6050
 msgid "A2 Invitation"
 msgstr "A2 pozvánka"
 
-#: src/xml/xmli18n-tmp.h:3813
+#: src/xml/xmli18n-tmp.h:6051
 #, fuzzy
 msgid "Monarch Envelope"
 msgstr "Obálka"
 
-#: src/xml/xmli18n-tmp.h:3814
+#: src/xml/xmli18n-tmp.h:6052
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Obálka"
 
-#: src/xml/xmli18n-tmp.h:3815
+#: src/xml/xmli18n-tmp.h:6053
 msgid "4x5 3/8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3816
+#: src/xml/xmli18n-tmp.h:6054
 #, fuzzy
 msgid "4x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:6055
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3818
+#: src/xml/xmli18n-tmp.h:6056
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3819
+#: src/xml/xmli18n-tmp.h:6057
 #, fuzzy
 msgid "Wide Postcard"
 msgstr "Pohµadnica"
 
-#: src/xml/xmli18n-tmp.h:3820
+#: src/xml/xmli18n-tmp.h:6058
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:6059
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:6060
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3824
+#: src/xml/xmli18n-tmp.h:6062
 msgid "89 mm Roll Paper"
 msgstr "89 mm rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:6063
 msgid "4 Inch Roll Paper"
 msgstr "4 palcová rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:3826
+#: src/xml/xmli18n-tmp.h:6064
 msgid "5 Inch Roll Paper"
 msgstr "5 palcová rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:3827
+#: src/xml/xmli18n-tmp.h:6065
 msgid "210 mm Roll Paper"
 msgstr "210 mm rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:6066
 msgid "13 Inch Roll Paper"
 msgstr "13 palcová rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:3829
+#: src/xml/xmli18n-tmp.h:6067
 #, fuzzy
 msgid "17 Inch Roll Paper"
 msgstr "13 palcová rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:6068
 msgid "22 Inch Roll Paper"
 msgstr "22 palcová rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:3831
+#: src/xml/xmli18n-tmp.h:6069
 msgid "24 Inch Roll Paper"
 msgstr "24 palcová rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:6070
 msgid "36 Inch Roll Paper"
 msgstr "36 palcová rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:6071
 msgid "44 Inch Roll Paper"
 msgstr "44 palcová rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:3834
+#: src/xml/xmli18n-tmp.h:6072
 #, fuzzy
 msgid "60 Inch Roll Paper"
 msgstr "36 palcová rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:6073
 #, fuzzy
 msgid "64 Inch Roll Paper"
 msgstr "4 palcová rolka papiera"
 
-#: src/xml/xmli18n-tmp.h:3836
+#: src/xml/xmli18n-tmp.h:6074
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3837
+#: src/xml/xmli18n-tmp.h:6075
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:6076
 msgid "Canon BJ-30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:6077
 msgid "Canon BJC-50"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:6078
 msgid "Canon BJC-55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:6079
 msgid "Canon BJC-80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:6080
 msgid "Canon BJC-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:6081
 msgid "Canon BJC-210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3844
+#: src/xml/xmli18n-tmp.h:6082
 msgid "Canon BJC-240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:6083
 msgid "Canon BJC-250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3846
+#: src/xml/xmli18n-tmp.h:6084
 msgid "Canon BJC-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3847
+#: src/xml/xmli18n-tmp.h:6085
 msgid "Canon BJC-2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3848
+#: src/xml/xmli18n-tmp.h:6086
 msgid "Canon BJC-2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:6087
 msgid "Canon BJC-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3850
+#: src/xml/xmli18n-tmp.h:6088
 msgid "Canon BJC-2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:6089
 msgid "Canon BJC-3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:6090
 msgid "Canon BJC-4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3853
+#: src/xml/xmli18n-tmp.h:6091
 msgid "Canon BJC-4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3854
+#: src/xml/xmli18n-tmp.h:6092
 msgid "Canon BJC-4400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3855
+#: src/xml/xmli18n-tmp.h:6093
 msgid "Canon BJC-5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3856
+#: src/xml/xmli18n-tmp.h:6094
 msgid "Canon BJC-5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3857
+#: src/xml/xmli18n-tmp.h:6095
 msgid "Canon BJC-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3858
+#: src/xml/xmli18n-tmp.h:6096
 msgid "Canon BJC-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:6097
 msgid "Canon BJC-6200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:6098
 msgid "Canon BJC-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:6099
 msgid "Canon BJC-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:6100
 msgid "Canon BJC-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3863
+#: src/xml/xmli18n-tmp.h:6101
 msgid "Canon BJC-8200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:6102
 msgid "Canon BJC-8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:6103
 msgid "Canon S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:6104
 msgid "Canon S200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3867
+#: src/xml/xmli18n-tmp.h:6105
 msgid "Canon S300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3868
+#: src/xml/xmli18n-tmp.h:6106
 msgid "Canon S400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3869
+#: src/xml/xmli18n-tmp.h:6107
 msgid "Canon S450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3870
+#: src/xml/xmli18n-tmp.h:6108
 msgid "Canon S500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:6109
 msgid "Canon S600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3872
+#: src/xml/xmli18n-tmp.h:6110
 msgid "Canon S630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3873
+#: src/xml/xmli18n-tmp.h:6111
 msgid "Canon S800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3874
+#: src/xml/xmli18n-tmp.h:6112
 msgid "Canon S4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:6113
 msgid "Canon PIXMA iP2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:6114
 msgid "Canon PIXMA iP3000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3877
+#: src/xml/xmli18n-tmp.h:6115
 msgid "Canon PIXMA iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3878
+#: src/xml/xmli18n-tmp.h:6116
 msgid "Canon PIXMA iP4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:6117
 msgid "Canon PIXMA iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3880
+#: src/xml/xmli18n-tmp.h:6118
 msgid "Canon PIXMA iP4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3881
+#: src/xml/xmli18n-tmp.h:6119
 msgid "Canon PIXMA iP4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:6120
 msgid "Canon PIXMA iP4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:6121
 msgid "Canon PIXMA iP4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3884
+#: src/xml/xmli18n-tmp.h:6122
 msgid "Canon PIXMA iP5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3885
+#: src/xml/xmli18n-tmp.h:6123
 msgid "Canon PIXMA iP5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3886
+#: src/xml/xmli18n-tmp.h:6124
 msgid "Canon PIXMA iP5300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3887
+#: src/xml/xmli18n-tmp.h:6125
 msgid "Canon PIXMA iP6000D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3888
+#: src/xml/xmli18n-tmp.h:6126
 msgid "Canon PIXMA iP6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:6127
 msgid "Canon PIXMA iP8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:6128
+msgid "Canon PIXMA iX4000"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:6129
 msgid "Canon PIXMA iX5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:6130
 msgid "Canon PIXMA Pro9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:6131
 msgid "Canon PIXMA MP150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:6132
 msgid "Canon PIXMA MP160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:6133
 msgid "Canon PIXMA MP170"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3895
+#: src/xml/xmli18n-tmp.h:6134
 msgid "Canon PIXMA MP180"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:6135
 msgid "Canon PIXMA MP220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3897
+#: src/xml/xmli18n-tmp.h:6136
 msgid "Canon PIXMA MP500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:6137
 msgid "Canon PIXMA MP520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:6138
 msgid "Canon PIXMA MP610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3900
+#: src/xml/xmli18n-tmp.h:6139
 msgid "Canon PIXMA MP700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:6140
 msgid "Canon PIXMA MP710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3902
+#: src/xml/xmli18n-tmp.h:6141
 msgid "Canon PIXMA MP730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3903
+#: src/xml/xmli18n-tmp.h:6142
 msgid "Canon PIXMA MP740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:6143
 msgid "Canon PIXMA MP750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:6144
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:6145
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:6146
 msgid "Canon PIXMA MP780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:6147
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:6148
 msgid "Canon PIXMA MP830"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3910
+#: src/xml/xmli18n-tmp.h:6149
 msgid "Canon PIXUS iP3100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:6150
 msgid "Canon PIXUS iP4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3912
+#: src/xml/xmli18n-tmp.h:6151
 msgid "Canon i80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3913
+#: src/xml/xmli18n-tmp.h:6152
 msgid "Canon i560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3914
+#: src/xml/xmli18n-tmp.h:6153
 msgid "Canon i850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:6154
 msgid "Canon i860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3916
+#: src/xml/xmli18n-tmp.h:6155
 msgid "Canon i865"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:6156
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:6157
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3919
+#: src/xml/xmli18n-tmp.h:6158
 #, fuzzy
 msgid "Epson B-300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3920
+#: src/xml/xmli18n-tmp.h:6159
 #, fuzzy
 msgid "Epson B-308"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3921
+#: src/xml/xmli18n-tmp.h:6160
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3922
+#: src/xml/xmli18n-tmp.h:6161
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3923
+#: src/xml/xmli18n-tmp.h:6162
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:3924
+#: src/xml/xmli18n-tmp.h:6163
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:6164
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:6165
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:6166
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:6167
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:6168
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:6169
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:6170
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3932
+#: src/xml/xmli18n-tmp.h:6171
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:6172
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3934
+#: src/xml/xmli18n-tmp.h:6173
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3935
+#: src/xml/xmli18n-tmp.h:6174
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:6175
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3937
+#: src/xml/xmli18n-tmp.h:6176
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:6177
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3939
+#: src/xml/xmli18n-tmp.h:6178
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:6179
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:6180
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3942
+#: src/xml/xmli18n-tmp.h:6181
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3943
+#: src/xml/xmli18n-tmp.h:6182
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:6183
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:6184
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3946
+#: src/xml/xmli18n-tmp.h:6185
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3947
+#: src/xml/xmli18n-tmp.h:6186
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3948
+#: src/xml/xmli18n-tmp.h:6187
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3949
+#: src/xml/xmli18n-tmp.h:6188
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:6189
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3951
+#: src/xml/xmli18n-tmp.h:6190
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:6191
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3953
+#: src/xml/xmli18n-tmp.h:6192
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:6193
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:6194
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3956
+#: src/xml/xmli18n-tmp.h:6195
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3957
+#: src/xml/xmli18n-tmp.h:6196
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3958
+#: src/xml/xmli18n-tmp.h:6197
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3959
+#: src/xml/xmli18n-tmp.h:6198
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3960
+#: src/xml/xmli18n-tmp.h:6199
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:6200
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:6201
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:6202
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3964
+#: src/xml/xmli18n-tmp.h:6203
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:6204
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3966
+#: src/xml/xmli18n-tmp.h:6205
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3967
+#: src/xml/xmli18n-tmp.h:6206
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:6207
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:6208
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3970
+#: src/xml/xmli18n-tmp.h:6209
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:6210
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:3972
+#: src/xml/xmli18n-tmp.h:6211
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:6212
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:6213
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:3975
+#: src/xml/xmli18n-tmp.h:6214
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:6215
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:6216
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:6217
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:3979
+#: src/xml/xmli18n-tmp.h:6218
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:6219
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:3981
+#: src/xml/xmli18n-tmp.h:6220
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:3982
+#: src/xml/xmli18n-tmp.h:6221
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:3983
+#: src/xml/xmli18n-tmp.h:6222
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:3984
+#: src/xml/xmli18n-tmp.h:6223
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:6224
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:6225
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:3987
+#: src/xml/xmli18n-tmp.h:6226
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:6227
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:3989
+#: src/xml/xmli18n-tmp.h:6228
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "Stylus Color 83"
 
-#: src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:6229
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:6230
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:3992
+#: src/xml/xmli18n-tmp.h:6231
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:3993
+#: src/xml/xmli18n-tmp.h:6232
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:6233
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:3995
+#: src/xml/xmli18n-tmp.h:6234
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:6235
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:6236
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:3998
+#: src/xml/xmli18n-tmp.h:6237
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:3999
+#: src/xml/xmli18n-tmp.h:6238
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:6239
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Stylus C40ux"
 
-#: src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:6240
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Stylus C40sx"
 
-#: src/xml/xmli18n-tmp.h:4002
+#: src/xml/xmli18n-tmp.h:6241
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:6242
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:6243
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4005
+#: src/xml/xmli18n-tmp.h:6244
 #, fuzzy
-msgid "Epson Stylus Offixe TX300F"
+msgid "Epson Stylus Office TX300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4006
+#: src/xml/xmli18n-tmp.h:6245
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:6246
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:4008
+#: src/xml/xmli18n-tmp.h:6247
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4009
+#: src/xml/xmli18n-tmp.h:6248
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:6249
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:6250
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:6251
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4013
+#: src/xml/xmli18n-tmp.h:6252
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4014
+#: src/xml/xmli18n-tmp.h:6253
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:6254
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:4016
+#: src/xml/xmli18n-tmp.h:6255
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:6256
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:6257
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4019
+#: src/xml/xmli18n-tmp.h:6258
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4020
+#: src/xml/xmli18n-tmp.h:6259
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4021
+#: src/xml/xmli18n-tmp.h:6260
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:4022
+#: src/xml/xmli18n-tmp.h:6261
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:4023
+#: src/xml/xmli18n-tmp.h:6262
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:4024
+#: src/xml/xmli18n-tmp.h:6263
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:6264
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:6265
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4027
+#: src/xml/xmli18n-tmp.h:6266
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:6267
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:6268
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:6269
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:4031
+#: src/xml/xmli18n-tmp.h:6270
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:6271
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4033
+#: src/xml/xmli18n-tmp.h:6272
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4034
+#: src/xml/xmli18n-tmp.h:6273
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4035
+#: src/xml/xmli18n-tmp.h:6274
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:6275
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4037
+#: src/xml/xmli18n-tmp.h:6276
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:4038
+#: src/xml/xmli18n-tmp.h:6277
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4039
+#: src/xml/xmli18n-tmp.h:6278
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:6279
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4041
+#: src/xml/xmli18n-tmp.h:6280
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:6281
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:6282
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4044
+#: src/xml/xmli18n-tmp.h:6283
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:6284
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:6285
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:6286
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:6287
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4049
+#: src/xml/xmli18n-tmp.h:6288
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:6289
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4051
+#: src/xml/xmli18n-tmp.h:6290
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:6291
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4053
+#: src/xml/xmli18n-tmp.h:6292
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4054
+#: src/xml/xmli18n-tmp.h:6293
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:6294
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4056
+#: src/xml/xmli18n-tmp.h:6295
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:6296
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4058
+#: src/xml/xmli18n-tmp.h:6297
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4059
+#: src/xml/xmli18n-tmp.h:6298
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:6299
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:6300
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4062
+#: src/xml/xmli18n-tmp.h:6301
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:6302
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4064
+#: src/xml/xmli18n-tmp.h:6303
+#, fuzzy
+msgid "Epson Stylus Photo R2880"
+msgstr "Stylus Photo 1280"
+
+#: src/xml/xmli18n-tmp.h:6304
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4065
+#: src/xml/xmli18n-tmp.h:6305
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:6306
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4067
+#: src/xml/xmli18n-tmp.h:6307
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:6308
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4069
+#: src/xml/xmli18n-tmp.h:6309
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:6310
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:6311
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4072
+#: src/xml/xmli18n-tmp.h:6312
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:6313
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4074
+#: src/xml/xmli18n-tmp.h:6314
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4075
+#: src/xml/xmli18n-tmp.h:6315
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4076
+#: src/xml/xmli18n-tmp.h:6316
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:6317
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4078
+#: src/xml/xmli18n-tmp.h:6318
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:6319
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:6320
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:6321
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4082
+#: src/xml/xmli18n-tmp.h:6322
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:6323
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4084
+#: src/xml/xmli18n-tmp.h:6324
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4085
+#: src/xml/xmli18n-tmp.h:6325
 #, fuzzy
-msgid "Epson Stylus Photo TX800W"
+msgid "Epson Stylus Photo TX800FW"
 msgstr "Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4086
+#: src/xml/xmli18n-tmp.h:6326
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:4087
+#: src/xml/xmli18n-tmp.h:6327
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:4088
+#: src/xml/xmli18n-tmp.h:6328
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4089
+#: src/xml/xmli18n-tmp.h:6329
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:6330
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4091
+#: src/xml/xmli18n-tmp.h:6331
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:6332
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4093
+#: src/xml/xmli18n-tmp.h:6333
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4094
+#: src/xml/xmli18n-tmp.h:6334
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:6335
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:6336
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4097
+#: src/xml/xmli18n-tmp.h:6337
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:6338
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4099
+#: src/xml/xmli18n-tmp.h:6339
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:6340
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:6341
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:6342
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:6343
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:6344
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:6345
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:6346
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:6347
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:6348
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:6349
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4110
+#: src/xml/xmli18n-tmp.h:6350
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:6351
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:6352
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4113
+#: src/xml/xmli18n-tmp.h:6353
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:6354
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:6355
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4116
+#: src/xml/xmli18n-tmp.h:6356
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:6357
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4118
+#: src/xml/xmli18n-tmp.h:6358
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4119
+#: src/xml/xmli18n-tmp.h:6359
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:6360
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4121
+#: src/xml/xmli18n-tmp.h:6361
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:6362
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:6363
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4124
+#: src/xml/xmli18n-tmp.h:6364
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:6365
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4126
+#: src/xml/xmli18n-tmp.h:6366
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4127
+#: src/xml/xmli18n-tmp.h:6367
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4128
+#: src/xml/xmli18n-tmp.h:6368
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4129
+#: src/xml/xmli18n-tmp.h:6369
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:6370
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:6371
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:6372
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:6373
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:6374
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:6375
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:6376
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:6377
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:6378
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:6379
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:6380
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:6381
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:6382
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:6383
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4144
+#: src/xml/xmli18n-tmp.h:6384
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:6385
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:6386
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:6387
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:6388
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Stylus C20ux"
 
-#: src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:6389
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:6390
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:6391
+#, fuzzy
+msgid "Epson Stylus DX4000"
+msgstr "Stylus C20sx"
+
+#: src/xml/xmli18n-tmp.h:6392
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:6393
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:6394
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4154
+#: src/xml/xmli18n-tmp.h:6395
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:6396
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:6397
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:6398
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:6399
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:6400
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:6401
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:6402
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:6403
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:6404
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:6405
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:6406
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:6407
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:6408
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:6409
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:6410
 #, fuzzy
-msgid "Epson Stylus PX700FW"
+msgid "Epson Stylus PX700W"
 msgstr "Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:6411
 #, fuzzy
 msgid "Epson Stylus PX800FW"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:6412
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4172
+#: src/xml/xmli18n-tmp.h:6413
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:6414
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4174
+#: src/xml/xmli18n-tmp.h:6415
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:6416
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:6417
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4177
+#: src/xml/xmli18n-tmp.h:6418
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4178
+#: src/xml/xmli18n-tmp.h:6419
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4179
+#: src/xml/xmli18n-tmp.h:6420
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4180
+#: src/xml/xmli18n-tmp.h:6421
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4181
+#: src/xml/xmli18n-tmp.h:6422
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:6423
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:6424
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:6425
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:6426
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:6427
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4187
+#: src/xml/xmli18n-tmp.h:6428
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4188
+#: src/xml/xmli18n-tmp.h:6429
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Stylus C20sx"
 
-#: src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:6430
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:6431
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:6432
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4192
+#: src/xml/xmli18n-tmp.h:6433
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:6434
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:6435
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:6436
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4196
+#: src/xml/xmli18n-tmp.h:6437
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:6438
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:6439
 msgid "Epson PictureMate 215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4199
+#: src/xml/xmli18n-tmp.h:6440
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:6441
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:6442
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:6443
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4204
+#: src/xml/xmli18n-tmp.h:6445
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:6446
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:6447
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4207
+#: src/xml/xmli18n-tmp.h:6448
 msgid "Epson WorkForce 30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:6449
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:6450
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:6451
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:6452
 msgid "Epson CL 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4212
+#: src/xml/xmli18n-tmp.h:6453
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:6454
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:6455
 msgid "Epson E 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4215
+#: src/xml/xmli18n-tmp.h:6456
 msgid "Epson E 150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4216
+#: src/xml/xmli18n-tmp.h:6457
 msgid "Epson E 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:6458
 msgid "Epson E 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:6459
 msgid "Epson E 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4219
+#: src/xml/xmli18n-tmp.h:6460
 msgid "Epson E 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:6461
 msgid "Epson E 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:6462
 msgid "Epson E 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:6463
 msgid "Epson EM 900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:6464
 msgid "Epson EM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4224
+#: src/xml/xmli18n-tmp.h:6465
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:6466
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:6467
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:6468
 msgid "Epson MC 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4228
+#: src/xml/xmli18n-tmp.h:6469
 msgid "Epson MC 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4229
+#: src/xml/xmli18n-tmp.h:6470
 msgid "Epson MC 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:6471
 msgid "Epson MC 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:6472
 msgid "Epson MC 10000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:6473
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:6474
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:6475
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:6476
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:6477
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:6478
 msgid "Epson MJ 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4238
+#: src/xml/xmli18n-tmp.h:6479
 msgid "Epson MJ 5100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:6480
 msgid "Epson MJ 6000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:6481
 msgid "Epson MJ 8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:6482
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4242
+#: src/xml/xmli18n-tmp.h:6483
 msgid "Epson PM 700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4243
+#: src/xml/xmli18n-tmp.h:6484
 msgid "Epson PM 730C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:6485
 msgid "Epson PM 740C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:6486
 msgid "Epson PM 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4246
+#: src/xml/xmli18n-tmp.h:6487
 msgid "Epson PM 760C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:6488
 msgid "Epson PM 770C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Epson PM 780C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:6490
 msgid "Epson PM 790PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Epson PM 800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4251
+#: src/xml/xmli18n-tmp.h:6492
 msgid "Epson PM 850PT"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Epson PM 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4253
+#: src/xml/xmli18n-tmp.h:6494
 msgid "Epson PM 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4254
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Epson PM 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:6496
 msgid "Epson PM 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:6497
 msgid "Epson PM 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:6498
 msgid "Epson PM 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:6499
 msgid "Epson PM 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4259
+#: src/xml/xmli18n-tmp.h:6500
 msgid "Epson PM 2000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4260
+#: src/xml/xmli18n-tmp.h:6501
 msgid "Epson PM 2200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:6502
 msgid "Epson PM 3000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4262
+#: src/xml/xmli18n-tmp.h:6503
 msgid "Epson PM 3300C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4263
+#: src/xml/xmli18n-tmp.h:6504
 msgid "Epson PM 3500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4264
+#: src/xml/xmli18n-tmp.h:6505
 msgid "Epson PM 3700C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4265
+#: src/xml/xmli18n-tmp.h:6506
 msgid "Epson PM 4000PX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:6507
 msgid "Epson PM 5000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:6508
 msgid "Epson PM 7000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:6509
 msgid "Epson PM 9000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:6510
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:6511
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:6512
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:6513
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:6514
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4274
+#: src/xml/xmli18n-tmp.h:6515
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4275
+#: src/xml/xmli18n-tmp.h:6516
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4276
+#: src/xml/xmli18n-tmp.h:6517
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:6518
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:6519
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:6520
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:6521
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:6522
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:6523
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:6524
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:6525
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4285
+#: src/xml/xmli18n-tmp.h:6526
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4286
+#: src/xml/xmli18n-tmp.h:6527
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:6528
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:6529
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:6530
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:6531
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:6532
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4292
+#: src/xml/xmli18n-tmp.h:6533
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:6534
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:6535
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4295
+#: src/xml/xmli18n-tmp.h:6536
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4296
+#: src/xml/xmli18n-tmp.h:6537
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4297
+#: src/xml/xmli18n-tmp.h:6538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:6539
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4299
+#: src/xml/xmli18n-tmp.h:6540
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:6541
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:6542
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:6543
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:6544
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4305
+#: src/xml/xmli18n-tmp.h:6546
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:6547
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4307
+#: src/xml/xmli18n-tmp.h:6548
+#, fuzzy
+msgid "Epson PX G5600"
+msgstr "Stylus C60"
+
+#: src/xml/xmli18n-tmp.h:6549
 msgid "Epson PX 7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4308
+#: src/xml/xmli18n-tmp.h:6550
 msgid "Epson PX 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4309
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4310
+#: src/xml/xmli18n-tmp.h:6552
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:6553
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:6554
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4313
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:6556
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4315
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:6559
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:6560
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:6561
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:6562
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:6563
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:6564
 msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:6565
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4324
+#: src/xml/xmli18n-tmp.h:6566
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:6567
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4326
+#: src/xml/xmli18n-tmp.h:6568
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4327
+#: src/xml/xmli18n-tmp.h:6569
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:6570
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:6571
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Brother HL-1430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:6576
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Brother HL-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4337
+#: src/xml/xmli18n-tmp.h:6579
 msgid "Brother HL-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:6580
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:6581
 msgid "Brother HL-1670N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:6582
 msgid "Brother HL-1850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:6583
 msgid "Brother HL-1870N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:6584
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:6585
 msgid "Brother HL-2460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:6586
 msgid "Brother HL-2460N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:6587
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4346
+#: src/xml/xmli18n-tmp.h:6588
 msgid "Brother HL-5030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:6589
 msgid "Brother HL-5040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:6590
 msgid "Brother HL-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:6591
 msgid "Brother HL-5070N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4350
+#: src/xml/xmli18n-tmp.h:6592
 msgid "Brother HL-5140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4351
+#: src/xml/xmli18n-tmp.h:6593
 msgid "Brother HL-5150D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:6594
 msgid "Brother HL-5170DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:6595
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4354
+#: src/xml/xmli18n-tmp.h:6596
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:6597
 msgid "Brother HL-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:6598
 msgid "Brother HL-7050N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4357
+#: src/xml/xmli18n-tmp.h:6599
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4358
+#: src/xml/xmli18n-tmp.h:6600
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:6601
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:6602
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:6603
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:6604
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:6605
 msgid "Canon GP 335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:6606
 msgid "Canon LBP-4sx"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:6607
 msgid "Canon LBP-430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:6608
 msgid "Canon LBP-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:6609
 msgid "Canon LBP-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:6610
 msgid "Canon LBP-1760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:6611
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:6612
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:6613
 msgid "DEC 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:6614
 msgid "DEC LN17"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4373
+#: src/xml/xmli18n-tmp.h:6615
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4374
+#: src/xml/xmli18n-tmp.h:6616
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:6617
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4376
+#: src/xml/xmli18n-tmp.h:6618
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:6619
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:6620
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:6621
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:6622
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:6623
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:6624
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:6625
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4384
+#: src/xml/xmli18n-tmp.h:6626
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4385
+#: src/xml/xmli18n-tmp.h:6627
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4386
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4387
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:6630
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4389
+#: src/xml/xmli18n-tmp.h:6631
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4392
+#: src/xml/xmli18n-tmp.h:6634
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:6635
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:6636
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:6637
 msgid "Epson EPL-N2050PS+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4397
+#: src/xml/xmli18n-tmp.h:6639
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:6640
 #, fuzzy
 msgid "Epson EPL-N2500PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4400
+#: src/xml/xmli18n-tmp.h:6642
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:6643
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4403
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:6646
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:6647
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/xml/xmli18n-tmp.h:4406
+#: src/xml/xmli18n-tmp.h:6648
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/xml/xmli18n-tmp.h:4407
+#: src/xml/xmli18n-tmp.h:6649
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/xml/xmli18n-tmp.h:4408
+#: src/xml/xmli18n-tmp.h:6650
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:6651
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:6652
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:6653
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:6654
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:6656
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:6657
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4416
+#: src/xml/xmli18n-tmp.h:6658
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:6659
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:6660
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:6661
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4420
-msgid "Gestetner 3532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4421
-msgid "Gestetner 4235g"
+#: src/xml/xmli18n-tmp.h:6662
+msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:6663
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4423
-msgid "Gestetner 4532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4424
-msgid "Gestetner 4245g"
+#: src/xml/xmli18n-tmp.h:6664
+msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:6665
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:6666
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:6668
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:6669
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:6670
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4431
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:6672
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:6673
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:6674
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:6675
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4436
+#: src/xml/xmli18n-tmp.h:6676
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4437
-msgid "Gestetner DSm635"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4438
-msgid "Gestetner DSm635G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4439
-msgid "Gestetner DSm645"
+#: src/xml/xmli18n-tmp.h:6677
+msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4440
-msgid "Gestetner DS645G"
+#: src/xml/xmli18n-tmp.h:6678
+msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:6679
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:6680
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4443
+#: src/xml/xmli18n-tmp.h:6681
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:6682
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:6683
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4446
-msgid "Gestetner DSm735"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4447
-msgid "Gestetner DSm735G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4448
-msgid "Gestetner DSm745"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4449
-msgid "Gestetner DSm745G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4450
-msgid "Gestetner MP1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4451
-msgid "Gestetner DSm7110"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4452
-msgid "Gestetner MP1350"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4453
-msgid "Gestetner DSm7135"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4454
-msgid "Gestetner MP1600"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4455
-msgid "Gestetner DSm716"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4456
-msgid "Gestetner MP2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4457
-msgid "Gestetner DSm721d"
+#: src/xml/xmli18n-tmp.h:6684
+msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4458
-msgid "Gestetner MP2500"
+#: src/xml/xmli18n-tmp.h:6685
+msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4459
-msgid "Gestetner DSm625"
+#: src/xml/xmli18n-tmp.h:6686
+msgid "Gestetner MP1100/DSm7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4460
-msgid "Gestetner MP3500"
+#: src/xml/xmli18n-tmp.h:6687
+msgid "Gestetner MP1350/DSm7135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4461
-msgid "Gestetner DSm735e"
+#: src/xml/xmli18n-tmp.h:6688
+msgid "Gestetner MP1600/DSm716"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4462
-msgid "Gestetner MP4500"
+#: src/xml/xmli18n-tmp.h:6689
+msgid "Gestetner MP2000/DSm721d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4463
-msgid "Gestetner DSm745e"
+#: src/xml/xmli18n-tmp.h:6690
+msgid "Gestetner MP2500/DSm625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4464
-msgid "Gestetner MP5500"
+#: src/xml/xmli18n-tmp.h:6691
+msgid "Gestetner MP3500/DSm735e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4465
-msgid "Gestetner DSm755"
+#: src/xml/xmli18n-tmp.h:6692
+msgid "Gestetner MP4500/DSm745e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4466
-msgid "Gestetner MP6500"
+#: src/xml/xmli18n-tmp.h:6693
+msgid "Gestetner MP5500/DSm755"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4467
-msgid "Gestetner DSm765"
+#: src/xml/xmli18n-tmp.h:6694
+msgid "Gestetner MP6500/DSm765"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4468
-msgid "Gestetner MP7500"
+#: src/xml/xmli18n-tmp.h:6695
+msgid "Gestetner MP7500/DSm775"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4469
-msgid "Gestetner DSm775"
+#: src/xml/xmli18n-tmp.h:6696
+msgid "Gestetner MP9000/DSm790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4470
-msgid "Gestetner MP9000"
+#: src/xml/xmli18n-tmp.h:6697
+msgid "Gestetner MP 161/DSm416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4471
-msgid "Gestetner DSm790"
+#: src/xml/xmli18n-tmp.h:6698
+msgid "Gestetner MP 2510/DSm725e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4472
-msgid "Gestetner MP 161"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4473
-msgid "Gestetner DSm416"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4474
-msgid "Gestetner MP 2510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4475
-msgid "Gestetner DSm725e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:6699
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:6700
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4478
-msgid "Gestetner MP 3010"
+#: src/xml/xmli18n-tmp.h:6701
+msgid "Gestetner MP 3010/DSm730e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4479
-msgid "Gestetner DSm730e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4480
+#: src/xml/xmli18n-tmp.h:6702
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:6703
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:6704
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:6705
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:6706
 msgid "Gestetner MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:6707
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:6708
 msgid "HP Business Inkjet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:6709
 msgid "HP Business Inkjet 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:6710
 msgid "HP Business Inkjet 2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4489
+#: src/xml/xmli18n-tmp.h:6711
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:6712
 msgid "HP Business Inkjet 2280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:6713
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4492
+#: src/xml/xmli18n-tmp.h:6714
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:6715
 msgid "HP Color LaserJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:6716
 msgid "HP Color LaserJet 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4495
+#: src/xml/xmli18n-tmp.h:6717
 msgid "HP Color LaserJet 4550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4496
+#: src/xml/xmli18n-tmp.h:6718
 msgid "HP Color LaserJet 4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4497
+#: src/xml/xmli18n-tmp.h:6719
 msgid "HP Color LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:6720
 msgid "HP Color LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:6721
 msgid "HP Color LaserJet 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:6722
 msgid "HP Color LaserJet 8550GN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:6723
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:6724
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:6725
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:6726
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:6727
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4506
+#: src/xml/xmli18n-tmp.h:6728
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:6729
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4508
+#: src/xml/xmli18n-tmp.h:6730
 msgid "HP DesignJet 750C Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4509
+#: src/xml/xmli18n-tmp.h:6731
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4510
+#: src/xml/xmli18n-tmp.h:6732
 msgid "HP DesignJet 2500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:6733
 msgid "HP DesignJet 3500CP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:6734
 msgid "HP DesignJet ColorPro CAD"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:6735
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:6736
 msgid "HP DeskJet 420C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:6737
 msgid "HP DeskJet 450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:6738
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:6739
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4518
+#: src/xml/xmli18n-tmp.h:6740
 msgid "HP DeskJet 505J Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:6741
 msgid "HP DeskJet 510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:6742
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:6743
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:6744
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4523
+#: src/xml/xmli18n-tmp.h:6745
 msgid "HP DeskJet 5550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:6746
 msgid "HP DeskJet 5551"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:6747
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:6748
 msgid "HP DeskJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:6749
 msgid "HP DeskJet 600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4528
+#: src/xml/xmli18n-tmp.h:6750
 msgid "HP DeskJet 610C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4529
+#: src/xml/xmli18n-tmp.h:6751
 msgid "HP DeskJet 610CL"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4530
+#: src/xml/xmli18n-tmp.h:6752
 msgid "HP DeskJet 6122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:6753
 msgid "HP DeskJet 6127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4532
+#: src/xml/xmli18n-tmp.h:6754
 msgid "HP DeskJet 612C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:6755
 msgid "HP DeskJet 640C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:6756
 msgid "HP DeskJet 648C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:6757
 msgid "HP DeskJet 660C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:6758
 msgid "HP DeskJet 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:6759
 msgid "HP DeskJet 670TV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:6760
 msgid "HP DeskJet 672C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4539
+#: src/xml/xmli18n-tmp.h:6761
 msgid "HP DeskJet 680C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4540
+#: src/xml/xmli18n-tmp.h:6762
 msgid "HP DeskJet 682C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4541
+#: src/xml/xmli18n-tmp.h:6763
 msgid "HP DeskJet 690C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4542
+#: src/xml/xmli18n-tmp.h:6764
 msgid "HP DeskJet 692C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4543
+#: src/xml/xmli18n-tmp.h:6765
 msgid "HP DeskJet 693C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:6766
 msgid "HP DeskJet 694C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:6767
 msgid "HP DeskJet 695C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4546
+#: src/xml/xmli18n-tmp.h:6768
 msgid "HP DeskJet 697C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:6769
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:6770
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:6771
 msgid "HP DeskJet 815C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:6772
 msgid "HP DeskJet 816C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:6773
 msgid "HP DeskJet 825C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4552
+#: src/xml/xmli18n-tmp.h:6774
 msgid "HP DeskJet 830C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:6775
 msgid "HP DeskJet 832C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:6776
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:6777
 msgid "HP DeskJet 841C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:6778
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:6779
 msgid "HP DeskJet 843C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:6780
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:6781
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:6782
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:6783
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:6784
 msgid "HP DeskJet 880C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:6785
 msgid "HP DeskJet 882C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:6786
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:6787
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:6788
 msgid "HP DeskJet 916C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4567
+#: src/xml/xmli18n-tmp.h:6789
 msgid "HP DeskJet 920C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4568
+#: src/xml/xmli18n-tmp.h:6790
 msgid "HP DeskJet 9300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:6791
 msgid "HP DeskJet 930C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4570
+#: src/xml/xmli18n-tmp.h:6792
 msgid "HP DeskJet 932C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4571
+#: src/xml/xmli18n-tmp.h:6793
 msgid "HP DeskJet 933C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:6794
 msgid "HP DeskJet 934C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:6795
 msgid "HP DeskJet 935C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:6796
 msgid "HP DeskJet 940C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:6797
 msgid "HP DeskJet 948C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:6798
 msgid "HP DeskJet 950C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:6799
 msgid "HP DeskJet 952C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:6800
 msgid "HP DeskJet 955C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:6801
 msgid "HP DeskJet 957C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:6802
 msgid "HP DeskJet 959C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:6803
 msgid "HP DeskJet 960C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4582
+#: src/xml/xmli18n-tmp.h:6804
 msgid "HP DeskJet 970C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4583
+#: src/xml/xmli18n-tmp.h:6805
 msgid "HP DeskJet 975C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4584
+#: src/xml/xmli18n-tmp.h:6806
 msgid "HP DeskJet 980C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4585
+#: src/xml/xmli18n-tmp.h:6807
 msgid "HP DeskJet 990C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:6808
 msgid "HP DeskJet 995C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:6809
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:6810
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:6811
 msgid "HP DeskJet 1125C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:6812
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:6813
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:6814
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4593
+#: src/xml/xmli18n-tmp.h:6815
 msgid "HP DeskJet 1600CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4594
+#: src/xml/xmli18n-tmp.h:6816
 msgid "HP DeskJet 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:6817
 msgid "HP DeskJet 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:6818
 msgid "HP DeskJet 2500CM"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4597
+#: src/xml/xmli18n-tmp.h:6819
 msgid "HP DeskJet 340C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:6820
 msgid "HP DeskJet 3810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:6821
 msgid "HP DeskJet 3816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:6822
 msgid "HP DeskJet 3820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:6823
 msgid "HP DeskJet 3822"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4602
+#: src/xml/xmli18n-tmp.h:6824
 msgid "HP LaserJet 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:6825
 msgid "HP LaserJet 2D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:6826
 msgid "HP LaserJet 2P Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:6827
 msgid "HP LaserJet 2P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:6828
 msgid "HP LaserJet 3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4607
+#: src/xml/xmli18n-tmp.h:6829
 msgid "HP LaserJet 3D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:6830
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4609
+#: src/xml/xmli18n-tmp.h:6831
 msgid "HP LaserJet 3P w/PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4610
+#: src/xml/xmli18n-tmp.h:6832
 msgid "HP LaserJet 4 Plus"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:6833
 msgid "HP LaserJet 4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:6834
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4613
+#: src/xml/xmli18n-tmp.h:6835
 msgid "HP LaserJet 4M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:6836
 msgid "HP LaserJet 4ML"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:6837
 msgid "HP LaserJet 4P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:6838
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:6839
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:6840
 msgid "HP LaserJet 5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:6841
 msgid "HP LaserJet 5L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:6842
 msgid "HP LaserJet 5M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:6843
 msgid "HP LaserJet 5MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:6844
 msgid "HP LaserJet 5P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:6845
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4624
+#: src/xml/xmli18n-tmp.h:6846
 msgid "HP LaserJet 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4625
+#: src/xml/xmli18n-tmp.h:6847
 msgid "HP LaserJet 6L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:6848
 msgid "HP LaserJet 6MP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4627
+#: src/xml/xmli18n-tmp.h:6849
 msgid "HP LaserJet 6P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4628
+#: src/xml/xmli18n-tmp.h:6850
 msgid "HP LaserJet 1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:6851
 msgid "HP LaserJet 1012"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:6852
 msgid "HP LaserJet 1015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:6853
 msgid "HP LaserJet 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:6854
 msgid "HP LaserJet 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:6855
 msgid "HP LaserJet 1100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:6856
 msgid "HP LaserJet 1150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:6857
 msgid "HP LaserJet 1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4636
+#: src/xml/xmli18n-tmp.h:6858
 msgid "HP LaserJet 1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4637
+#: src/xml/xmli18n-tmp.h:6859
 msgid "HP LaserJet 1220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4638
+#: src/xml/xmli18n-tmp.h:6860
 msgid "HP LaserJet 1300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:6861
 msgid "HP LaserJet 1320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4640
+#: src/xml/xmli18n-tmp.h:6862
 msgid "HP LaserJet 2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:6863
 msgid "HP LaserJet 2100M"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:6864
 msgid "HP LaserJet 2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:6865
 msgid "HP LaserJet 2300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4644
+#: src/xml/xmli18n-tmp.h:6866
 msgid "HP LaserJet 2410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:6867
 msgid "HP LaserJet 2420"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:6868
 msgid "HP LaserJet 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4647
+#: src/xml/xmli18n-tmp.h:6869
 msgid "HP LaserJet 3015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4648
+#: src/xml/xmli18n-tmp.h:6870
 msgid "HP LaserJet 3020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:6871
 msgid "HP LaserJet 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4650
+#: src/xml/xmli18n-tmp.h:6872
 msgid "HP LaserJet 3050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:6873
 msgid "HP LaserJet 3052"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:6874
 msgid "HP LaserJet 3055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:6875
 msgid "HP LaserJet 3200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:6876
 msgid "HP LaserJet 3200m"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:6877
 msgid "HP LaserJet 3200se"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:6878
 msgid "HP LaserJet 3300 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:6879
 msgid "HP LaserJet 3310 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:6880
 msgid "HP LaserJet 3320 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:6881
 msgid "HP LaserJet 3320N MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4660
+#: src/xml/xmli18n-tmp.h:6882
 msgid "HP LaserJet 3330 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:6883
 msgid "HP LaserJet 3380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:6884
 msgid "HP LaserJet 3390"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4663
+#: src/xml/xmli18n-tmp.h:6885
 msgid "HP LaserJet 3392"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:6886
 msgid "HP LaserJet 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:6887
 msgid "HP LaserJet 4050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:6888
 msgid "HP LaserJet 4100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4667
+#: src/xml/xmli18n-tmp.h:6889
 msgid "HP LaserJet 4200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:6890
 msgid "HP LaserJet 4240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:6891
 msgid "HP LaserJet 4250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:6892
 msgid "HP LaserJet 4300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4671
+#: src/xml/xmli18n-tmp.h:6893
 msgid "HP LaserJet 4345 mfp"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:6894
 msgid "HP LaserJet 4350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:6895
 msgid "HP LaserJet 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:6896
 msgid "HP LaserJet 5100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:6897
 msgid "HP LaserJet 5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:6898
 msgid "HP LaserJet 5200L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:6899
 msgid "HP LaserJet 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:6900
 msgid "HP LaserJet 8100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:6901
 msgid "HP LaserJet 8150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4680
+#: src/xml/xmli18n-tmp.h:6902
 msgid "HP LaserJet 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:6903
 msgid "HP LaserJet 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4682
+#: src/xml/xmli18n-tmp.h:6904
 msgid "HP LaserJet 9040 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4683
+#: src/xml/xmli18n-tmp.h:6905
 msgid "HP LaserJet 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4684
+#: src/xml/xmli18n-tmp.h:6906
 msgid "HP LaserJet 9050 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:6907
 msgid "HP LaserJet M3027 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:6908
 msgid "HP LaserJet M3035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:6909
 msgid "HP LaserJet M4345 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:6910
 msgid "HP LaserJet M5025 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:6911
 msgid "HP LaserJet M5035 MFP"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:6912
 msgid "HP LaserJet P2010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:6913
 msgid "HP LaserJet P2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:6914
 msgid "HP LaserJet P3004"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:6915
 msgid "HP LaserJet P3005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:6916
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4695
+#: src/xml/xmli18n-tmp.h:6917
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:6918
 msgid "HP OfficeJet 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:6919
 msgid "HP OfficeJet 330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:6920
 msgid "HP OfficeJet 350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:6921
 msgid "HP OfficeJet 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4700
+#: src/xml/xmli18n-tmp.h:6922
 msgid "HP OfficeJet 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:6923
 msgid "HP OfficeJet 570"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:6924
 msgid "HP OfficeJet 580"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4703
+#: src/xml/xmli18n-tmp.h:6925
 msgid "HP OfficeJet 590"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:6926
 msgid "HP OfficeJet 600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:6927
 msgid "HP OfficeJet 610"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4706
+#: src/xml/xmli18n-tmp.h:6928
 msgid "HP OfficeJet 625"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4707
+#: src/xml/xmli18n-tmp.h:6929
 msgid "HP OfficeJet 630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:6930
 msgid "HP OfficeJet 635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:6931
 msgid "HP OfficeJet 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4710
+#: src/xml/xmli18n-tmp.h:6932
 msgid "HP OfficeJet 710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:6933
 msgid "HP OfficeJet 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:6934
 msgid "HP OfficeJet 725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:6935
 msgid "HP OfficeJet 5105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:6936
 msgid "HP OfficeJet 5110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:6937
 msgid "HP OfficeJet 5110xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:6938
 msgid "HP OfficeJet 6105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:6939
 msgid "HP OfficeJet 6110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4718
+#: src/xml/xmli18n-tmp.h:6940
 msgid "HP OfficeJet 7110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:6941
 msgid "HP OfficeJet 7130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:6942
 msgid "HP OfficeJet 7140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4721
+#: src/xml/xmli18n-tmp.h:6943
 msgid "HP OfficeJet D125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:6944
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:6945
 msgid "HP OfficeJet D145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:6946
 msgid "HP OfficeJet D155"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4725
+#: src/xml/xmli18n-tmp.h:6947
 msgid "HP OfficeJet G55"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:6948
 msgid "HP OfficeJet G85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:6949
 msgid "HP OfficeJet G95"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4728
+#: src/xml/xmli18n-tmp.h:6950
 msgid "HP OfficeJet K60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4729
+#: src/xml/xmli18n-tmp.h:6951
 msgid "HP OfficeJet K60xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:6952
 msgid "HP OfficeJet K80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:6953
 msgid "HP OfficeJet K80xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4732
+#: src/xml/xmli18n-tmp.h:6954
 msgid "HP OfficeJet LX"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:6955
 msgid "HP OfficeJet Pro 1150C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:6956
 msgid "HP OfficeJet Pro 1170C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:6957
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:6958
 msgid "HP OfficeJet R40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:6959
 msgid "HP OfficeJet R45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:6960
 msgid "HP OfficeJet R60"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4739
+#: src/xml/xmli18n-tmp.h:6961
 msgid "HP OfficeJet R65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4740
+#: src/xml/xmli18n-tmp.h:6962
 msgid "HP OfficeJet R80"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4741
+#: src/xml/xmli18n-tmp.h:6963
 msgid "HP OfficeJet T45"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4742
+#: src/xml/xmli18n-tmp.h:6964
 msgid "HP OfficeJet T65"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:6965
 msgid "HP OfficeJet V40"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:6966
 msgid "HP OfficeJet V40xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4745
+#: src/xml/xmli18n-tmp.h:6967
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:6968
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:6969
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:6970
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4749
+#: src/xml/xmli18n-tmp.h:6971
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:6972
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:6973
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4752
+#: src/xml/xmli18n-tmp.h:6974
 msgid "HP PSC 2110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:6975
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:6976
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4755
+#: src/xml/xmli18n-tmp.h:6977
 msgid "HP PhotoSmart 7150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:6978
 msgid "HP PhotoSmart 7345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:6979
 msgid "HP PhotoSmart 7350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:6980
 msgid "HP PhotoSmart 7550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4759
+#: src/xml/xmli18n-tmp.h:6981
 msgid "HP PhotoSmart P100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4760
+#: src/xml/xmli18n-tmp.h:6982
 msgid "HP PhotoSmart P130"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:6983
 msgid "HP PhotoSmart P230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4762
+#: src/xml/xmli18n-tmp.h:6984
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:6985
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:6986
 msgid "HP PhotoSmart P1115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4765
+#: src/xml/xmli18n-tmp.h:6987
 msgid "HP PhotoSmart P1215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:6988
 msgid "HP PhotoSmart P1218"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:6989
 msgid "HP PhotoSmart P1315"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "Názov tlaèiarne:"
 
-#: src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:6991
 msgid "IBM 4019"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:6992
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:6993
 msgid "IBM 4312"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4772
+#: src/xml/xmli18n-tmp.h:6994
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:6995
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4774
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4775
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4776
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:6999
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:7000
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:7002
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:7003
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:7004
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:7005
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:7006
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:7007
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:7008
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:7009
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:7010
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:7011
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4790
+#: src/xml/xmli18n-tmp.h:7012
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:7013
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:7014
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:7015
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4794
+#: src/xml/xmli18n-tmp.h:7016
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:7017
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:7018
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4797
+#: src/xml/xmli18n-tmp.h:7019
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:7020
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:7021
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:7022
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:7023
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:7025
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:7026
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:7027
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:7028
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4807
+#: src/xml/xmli18n-tmp.h:7029
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4808
+#: src/xml/xmli18n-tmp.h:7030
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:7031
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:7032
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:7034
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:7035
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:7037
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:7039
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:7040
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4819
+#: src/xml/xmli18n-tmp.h:7041
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:7042
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:7043
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:7044
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:7045
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:7046
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:7047
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:7048
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:7049
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:7050
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:7051
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4830
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:7057
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4837
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4840
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4842
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4852
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4853
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4854
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4855
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4866
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4867
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4873
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4874
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4883
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4886
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4888
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4890
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4894
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4896
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4903
-msgid "Lanier MP 2500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4904
-msgid "Lanier LD125"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4905
-msgid "Lanier MP 1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4906
-msgid "Lanier LD1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4907
-msgid "Lanier MP 1350"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4908
-msgid "Lanier LD1135"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4909
-msgid "Lanier MP 1600"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4910
-msgid "Lanier LD316"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4911
-msgid "Lanier MP 161"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4912
-msgid "Lanier LD016"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4913
-msgid "Lanier MP 2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4914
-msgid "Lanier LD320d"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4915
-msgid "Lanier MP 2510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4916
-msgid "Lanier LD325"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4917
-msgid "Lanier MP 2550B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4918
-msgid "Lanier LD425B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4919
-msgid "Lanier MP 2550"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4920
-msgid "Lanier LD425"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4921
-msgid "Lanier MP 3010"
+#: src/xml/xmli18n-tmp.h:7125
+msgid "Lanier MP2500/LD125"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4922
-msgid "Lanier LD330"
+#: src/xml/xmli18n-tmp.h:7126
+msgid "Lanier MP 1100/LD1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4923
-msgid "Lanier MP 3350B"
+#: src/xml/xmli18n-tmp.h:7127
+msgid "Lanier MP 1350/LD1135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4924
-msgid "Lanier LD433B"
+#: src/xml/xmli18n-tmp.h:7128
+msgid "Lanier MP 1600/LD316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4925
-msgid "Lanier MP 3350"
+#: src/xml/xmli18n-tmp.h:7129
+msgid "Lanier MP 161/LD016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4926
-msgid "Lanier LD433"
+#: src/xml/xmli18n-tmp.h:7130
+msgid "Lanier MP 2000/LD320d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4927
-msgid "Lanier MP 3500"
+#: src/xml/xmli18n-tmp.h:7131
+msgid "Lanier MP 2510/LD325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4928
-msgid "Lanier LD335"
+#: src/xml/xmli18n-tmp.h:7132
+msgid "Lanier MP 2550B/LD425B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4929
-msgid "Lanier MP 4000B"
+#: src/xml/xmli18n-tmp.h:7133
+msgid "Lanier MP 2550/LD425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4930
-msgid "Lanier LD040B"
+#: src/xml/xmli18n-tmp.h:7134
+msgid "Lanier MP 3010/LD330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4931
-msgid "Lanier MP 4000"
+#: src/xml/xmli18n-tmp.h:7135
+msgid "Lanier MP 3350B/LD433B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4932
-msgid "Lanier LD040"
+#: src/xml/xmli18n-tmp.h:7136
+msgid "Lanier MP 3350/LD433"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4933
-msgid "Lanier MP 4500"
+#: src/xml/xmli18n-tmp.h:7137
+msgid "Lanier MP 3500/LD335"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4934
-msgid "Lanier LD345"
+#: src/xml/xmli18n-tmp.h:7138
+msgid "Lanier MP 4000B/LD040B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4935
-msgid "Lanier MP 5000B"
+#: src/xml/xmli18n-tmp.h:7139
+msgid "Lanier MP 4000/LD040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4936
-msgid "Lanier LD050B"
+#: src/xml/xmli18n-tmp.h:7140
+msgid "Lanier MP 4500/LD345"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4937
-msgid "Lanier MP 5000"
+#: src/xml/xmli18n-tmp.h:7141
+msgid "Lanier MP 5000B/LD050B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4938
-msgid "Lanier LD050"
+#: src/xml/xmli18n-tmp.h:7142
+msgid "Lanier MP 5000/LD050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4939
-msgid "Lanier MP 5500"
+#: src/xml/xmli18n-tmp.h:7143
+msgid "Lanier MP 5500/LD255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4940
-msgid "Lanier LD255"
+#: src/xml/xmli18n-tmp.h:7144
+msgid "Lanier MP 6500/LD265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4941
-msgid "Lanier MP 6500"
+#: src/xml/xmli18n-tmp.h:7145
+msgid "Lanier MP 7500/LD275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4942
-msgid "Lanier LD265"
+#: src/xml/xmli18n-tmp.h:7146
+msgid "Lanier MP 9000/LD190"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4943
-msgid "Lanier MP 7500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4944
-msgid "Lanier LD275"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4945
-msgid "Lanier MP 9000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4946
-msgid "Lanier LD190"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:7148
 msgid "Lexmark Optra E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4950
+#: src/xml/xmli18n-tmp.h:7150
 msgid "Lexmark Optra E220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:7151
 msgid "Lexmark Optra E321"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4952
+#: src/xml/xmli18n-tmp.h:7152
 msgid "Lexmark Optra E323"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4953
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:7155
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4960
+#: src/xml/xmli18n-tmp.h:7160
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:7161
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:7162
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4963
+#: src/xml/xmli18n-tmp.h:7163
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:7164
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:7165
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4966
-msgid "NRG 10515"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4967
-msgid "NRG 10518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4968
-msgid "NRG 10512"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4969
-msgid "NRG 2205"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4970
-msgid "NRG 2238"
+#: src/xml/xmli18n-tmp.h:7166
+msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4971
-msgid "NRG 2212"
+#: src/xml/xmli18n-tmp.h:7167
+msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4972
-msgid "NRG 2705"
+#: src/xml/xmli18n-tmp.h:7168
+msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4973
-msgid "NRG 2738"
+#: src/xml/xmli18n-tmp.h:7169
+msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4974
-msgid "NRG 2712"
+#: src/xml/xmli18n-tmp.h:7170
+msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4975
-msgid "NRG 3205"
+#: src/xml/xmli18n-tmp.h:7171
+msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4976
-msgid "NRG 3238"
+#: src/xml/xmli18n-tmp.h:7172
+msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4977
-msgid "NRG 3212"
+#: src/xml/xmli18n-tmp.h:7173
+msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4978
-msgid "NRG 3525"
+#: src/xml/xmli18n-tmp.h:7174
+msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4979
-msgid "NRG 3508"
+#: src/xml/xmli18n-tmp.h:7175
+msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4980
-msgid "NRG 3502"
+#: src/xml/xmli18n-tmp.h:7176
+msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4981
-msgid "NRG 3545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4982
-msgid "NRG 3518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4983
-msgid "NRG 3532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4984
-msgid "NRG 4525"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4985
-msgid "NRG 4508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4986
-msgid "NRG 4502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4987
-msgid "NRG 4545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4988
-msgid "NRG 4518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4989
-msgid "NRG 4532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4990
-msgid "NRG 6002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4991
-msgid "NRG 6005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4992
-msgid "NRG 6008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4993
-msgid "NRG 7502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4994
-msgid "NRG 7505"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4995
-msgid "NRG 7508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4996
-msgid "NRG 9005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4997
-msgid "NRG 9008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4998
-msgid "NRG 9002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:7177
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:7178
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5001
+#: src/xml/xmli18n-tmp.h:7179
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:7180
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:7181
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:7182
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:7183
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5006
+#: src/xml/xmli18n-tmp.h:7184
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:7185
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:7186
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5009
+#: src/xml/xmli18n-tmp.h:7187
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:7188
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:7189
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:7190
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:7191
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:7192
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5015
+#: src/xml/xmli18n-tmp.h:7193
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5016
+#: src/xml/xmli18n-tmp.h:7194
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5017
+#: src/xml/xmli18n-tmp.h:7195
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:7196
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:7197
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:7198
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:7199
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:7200
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:7201
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:7202
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5025
+#: src/xml/xmli18n-tmp.h:7203
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:7204
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:7205
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5028
+#: src/xml/xmli18n-tmp.h:7206
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:7207
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:7208
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:7209
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:7210
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5033
+#: src/xml/xmli18n-tmp.h:7211
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:7212
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:7213
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:7214
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:7215
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:7216
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:7217
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5040
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5051
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5053
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:7234
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:7235
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5060
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5062
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5063
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:7242
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:7243
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:7244
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:7245
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:7246
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:7247
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:7248
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:7249
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5072
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5074
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5075
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5076
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:7255
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:7258
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5081
+#: src/xml/xmli18n-tmp.h:7259
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:7263
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5086
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5088
+#: src/xml/xmli18n-tmp.h:7266
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:7267
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5090
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5091
+#: src/xml/xmli18n-tmp.h:7269
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:7270
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5093
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5099
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5103
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5104
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:7284
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5107
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5108
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5110
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5118
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5120
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5126
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5127
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5131
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5133
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5134
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5138
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5146
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5147
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5150
-msgid "Savin 2535"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5151
-msgid "Savin 2235"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5152
-msgid "Savin 2545"
+#: src/xml/xmli18n-tmp.h:7328
+msgid "Savin 2535/2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5153
-msgid "Savin 2245"
+#: src/xml/xmli18n-tmp.h:7329
+msgid "Savin 2545/2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5154
+#: src/xml/xmli18n-tmp.h:7330
 msgid "Savin 2560"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5155
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5158
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5160
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5163
-msgid "Savin 4035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5164
-msgid "Savin 4135g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5165
-msgid "Savin 4035e"
+#: src/xml/xmli18n-tmp.h:7339
+msgid "Savin 4035/4135g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5166
-msgid "Savin 4135eG"
+#: src/xml/xmli18n-tmp.h:7340
+msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5167
-msgid "Savin 4045"
+#: src/xml/xmli18n-tmp.h:7341
+msgid "Savin 4045/4145g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5168
-msgid "Savin 4145g"
+#: src/xml/xmli18n-tmp.h:7342
+msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5169
-msgid "Savin 4045e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5170
-msgid "Savin 4145eG"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5171
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:7344
 msgid "Savin 4060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5173
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5174
+#: src/xml/xmli18n-tmp.h:7346
 msgid "Savin 4090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:7348
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5177
+#: src/xml/xmli18n-tmp.h:7349
 msgid "Savin 8020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:7353
 msgid "Savin 8030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5183
-msgid "Savin 8035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5184
-msgid "Savin 8035g"
+#: src/xml/xmli18n-tmp.h:7355
+msgid "Savin 8035/8035g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5186
-msgid "Savin 8045"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5187
-msgid "Savin 8045g"
+#: src/xml/xmli18n-tmp.h:7357
+msgid "Savin 8045/8045g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5190
+#: src/xml/xmli18n-tmp.h:7360
 msgid "Savin 8065"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5192
+#: src/xml/xmli18n-tmp.h:7362
 msgid "Savin 8090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5194
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:7370
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5201
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:7373
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:7374
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5205
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5206
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:7379
 msgid "Sony IJP-V100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5211
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "Nastavi» tlaèiareò"
 
-#: src/xml/xmli18n-tmp.h:5212
+#: src/xml/xmli18n-tmp.h:7382
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5213
+#: src/xml/xmli18n-tmp.h:7383
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5216
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5221
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5224
+#: src/xml/xmli18n-tmp.h:7394
 msgid "Lexmark X73"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5225
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5227
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Olympus P-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5230
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Olympus P-11"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Olympus P-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Olympus P-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Olympus P-300E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:7404
 msgid "Olympus P-300U"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Olympus P-330E"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5236
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Olympus P-330NE"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Olympus P-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Olympus P-440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:7409
 msgid "Olympus P-S100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:7410
 msgid "Canon CP-10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Canon CP-100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Canon CP-200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Canon CP-220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5244
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Canon CP-300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Canon CP-330"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Canon SELPHY-CP-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5247
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Canon SELPHY-CP-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Canon SELPHY-CP-510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5249
+#: src/xml/xmli18n-tmp.h:7419
+msgid "Canon SELPHY-CP-520"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Canon SELPHY-CP-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Canon SELPHY-CP-710"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:7422
 msgid "Canon SELPHY-CP-720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5252
+#: src/xml/xmli18n-tmp.h:7423
 msgid "Canon SELPHY-CP-730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:7424
 msgid "Canon SELPHY-CP-740"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:7425
 msgid "Canon SELPHY-CP-750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Canon SELPHY ES1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Canon SELPHY ES2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:7428
 msgid "Canon SELPHY ES20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5258
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5259
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:7432
 msgid "Sony UP-DR100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Sony UP-DR150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:7434
 msgid "Fujifilm Printpix-CX-400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Fujifilm Printpix-CX-550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:7436
 msgid "Fujifilm FinePix-NX-500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:7438
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5268
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Dai Nippon Printing DS40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Dai Nippon Printing DS80"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5269
+#: src/xml/xmli18n-tmp.h:7442
 msgid "RAW DATA 8 bit"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Epson Stylus Offixe TX300F"
+#~ msgstr "Stylus C20sx"
+
 #~ msgid "ISOLatin1"
 #~ msgstr "ISOLatin1"
 
diff --git a/po/sv.gmo b/po/sv.gmo
index 1643e3f..b617806 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index 4a06e33..2acfa0f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gutenprint 5.0.0\n"
 "Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-21 22:25-0500\n"
+"POT-Creation-Date: 2009-07-26 19:14-0400\n"
 "PO-Revision-Date: 2006-05-23 23:04+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -20,7 +20,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2109 src/main/print-pcl.c:1779
+#: src/main/print-escp2.c:2314 src/main/print-pcl.c:1779
 msgid "Default"
 msgstr "Standard"
 
@@ -94,15 +94,15 @@ msgstr "Densitet"
 
 #: src/main/dither-main.c:91 src/main/print-canon.c:300
 #: src/main/print-canon.c:308 src/main/print-canon.c:316
-#: src/main/print-canon.c:324 src/main/print-escp2.c:439
-#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
-#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-canon.c:324 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: 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-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:1769
-#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
-#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1935
+#: src/main/print-olympus.c:1943 src/main/print-olympus.c:1951
+#: src/main/print-olympus.c:1959 src/main/print-pcl.c:1324
 #: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
 #: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
@@ -164,7 +164,7 @@ msgid "Dither algorithm"
 msgstr "Färgutjämningsalgoritm"
 
 #: src/main/print-canon.c:199 src/main/print-escp2.c:165
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1866
 #: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "Pappersstorlek"
@@ -181,8 +181,8 @@ msgstr "Pappersstorlek"
 #: src/main/print-escp2.c:254 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:1704 src/main/print-olympus.c:1710
-#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-olympus.c:1866 src/main/print-olympus.c:1872
+#: src/main/print-olympus.c:1878 src/main/print-olympus.c:1884
 #: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
 #: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
 #: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
@@ -191,31 +191,31 @@ msgid "Basic Printer Setup"
 msgstr "Grundläggande skrivarinställningar"
 
 #: src/main/print-canon.c:200 src/main/print-escp2.c:166
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1867
 #: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr "Storlek på pappret som du vill skriva ut till"
 
 #: src/main/print-canon.c:205 src/main/print-escp2.c:171
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1259 src/cups/genppd.c:1339 src/cups/genppd.c:2001
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1872
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1372 src/cups/genppd.c:2035
 msgid "Media Type"
 msgstr "Mediatyp"
 
 #: src/main/print-canon.c:206 src/main/print-escp2.c:172
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1873
 #: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Typ av media (vanligt papper, fotopapper, etc.)"
 
 #: src/main/print-canon.c:211 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
-#: src/main/print-pcl.c:1265 src/cups/genppd.c:1368 src/cups/genppd.c:2020
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1878
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1401 src/cups/genppd.c:2054
 msgid "Media Source"
 msgstr "Mediakälla"
 
 #: src/main/print-canon.c:212 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1879
 #: src/main/print-pcl.c:1266
 #, fuzzy
 msgid "Source (input slot) of the media"
@@ -253,8 +253,8 @@ msgstr ""
 #: src/main/print-canon.c:235 src/main/print-canon.c:241
 #: src/main/print-canon.c:253 src/main/print-escp2.c:207
 #: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1906
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr "Avancerad skrivarkonfiguration"
@@ -269,25 +269,25 @@ msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:247 src/main/print-escp2.c:219
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
-#: src/main/print-pcl.c:1277 src/cups/genppd.c:1446 src/cups/genppd.c:2056
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1884
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1479 src/cups/genppd.c:2090
 msgid "Resolution"
 msgstr "Upplösning"
 
 #: src/main/print-canon.c:248 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1723
+#: src/main/print-olympus.c:1885
 msgid "Resolution and quality of the print"
 msgstr "Upplösning och kvalitet på utskriften"
 
 #: src/main/print-canon.c:253 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Bläcktyp"
 
 #: src/main/print-canon.c:254 src/main/print-escp2.c:231
 #: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
+#: src/main/print-olympus.c:1891 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Typ av bläck i skrivaren"
@@ -305,32 +305,33 @@ msgstr "Bläckkanaler"
 #: 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-escp2.c:320 src/main/print-escp2.c:767
-#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
-#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
-#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
-#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:893 src/main/print-escp2.c:901
+#: src/main/print-escp2.c:909 src/main/print-escp2.c:925
+#: src/main/print-escp2.c:933 src/main/print-escp2.c:941
+#: src/main/print-escp2.c:949 src/main/print-escp2.c:957
+#: src/main/print-escp2.c:965 src/main/print-escp2.c:973
 #: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr "Avancerad skrivarfunktionalitet"
 
-#: src/main/print-canon.c:265 src/main/print-escp2.c:326
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-canon.c:265 src/main/print-escp2.c:332
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1912
 #: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Utskriftsläge"
 
 #: src/main/print-canon.c:265 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:326
-#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-color.c:208 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1912 src/main/print-pcl.c:1295
 #: src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr "Kärnparameter"
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:327
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-canon.c:266 src/main/print-escp2.c:333
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1913
 #: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
@@ -358,56 +359,56 @@ msgstr "Utskriftskvalitet"
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:300 src/main/print-escp2.c:439
+#: src/main/print-canon.c:300 src/main/print-escp2.c:445
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Intensitet:"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:301 src/main/print-escp2.c:446
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-canon.c:308 src/main/print-escp2.c:447
+#: src/main/print-canon.c:308 src/main/print-escp2.c:453
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:309 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Justera magentabalansen på utskriften"
 
-#: src/main/print-canon.c:316 src/main/print-escp2.c:455
+#: src/main/print-canon.c:316 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Intensitet:"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:317 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Justera gulbalansen på utskriften"
 
-#: src/main/print-canon.c:324 src/main/print-escp2.c:463
+#: src/main/print-canon.c:324 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 #, fuzzy
 msgid "Black Density"
 msgstr "Intensitet:"
 
-#: src/main/print-canon.c:325 src/main/print-escp2.c:464
+#: src/main/print-canon.c:325 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Justera cyanbalansen på utskriften"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:333
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:541 src/main/print-escp2.c:542
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 #, fuzzy
@@ -415,29 +416,36 @@ msgid "Light Cyan Transition"
 msgstr "Ljus cyan"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:340
-#: src/main/print-canon.c:348 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
-#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
-#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
-#: src/main/print-pcl.c:1364
+#: src/main/print-canon.c:348 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:541
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:557
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:573
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:589
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:605
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:621
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:637
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:653
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:669
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:685
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:701
+#: src/main/print-escp2.c:709 src/main/print-escp2.c:717
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:733
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:749
+#: src/main/print-escp2.c:757 src/main/print-escp2.c:765
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:781
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:797
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:813
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:829
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:845
+#: src/main/print-escp2.c:853 src/main/print-escp2.c:861
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr "Avancerad bläckjustering"
 
 #: src/main/print-canon.c:340 src/main/print-canon.c:341
-#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
+#: src/main/print-escp2.c:573 src/main/print-escp2.c:574
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 #, fuzzy
@@ -449,14 +457,14 @@ msgstr "Ljus magenta"
 msgid "Light Yellow Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-canon.c:368 src/main/print-escp2.c:2283
-#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3609
-#: src/xml/xmli18n-tmp.h:3614 src/xml/xmli18n-tmp.h:3620
-#: src/xml/xmli18n-tmp.h:3627
+#: src/main/print-canon.c:368 src/main/print-escp2.c:2488
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5851 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5864
 msgid "Off"
 msgstr "Av"
 
-#: src/main/print-canon.c:369 src/main/print-escp2.c:2285
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2490
 #: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr "LÃ¥ng kant (Standard)"
@@ -465,66 +473,67 @@ msgstr "LÃ¥ng kant (Standard)"
 msgid "Short Edge (Flip)"
 msgstr "Kort kant (Vänd)"
 
-#: src/main/print-canon.c:646 src/main/print-escp2.c:2005
-#: src/xml/xmli18n-tmp.h:3676
+#: src/main/print-canon.c:646 src/main/print-escp2.c:2210
+#: src/xml/xmli18n-tmp.h:5913
 msgid "CD - 5 inch"
 msgstr "CD - 5 tum"
 
-#: src/main/print-canon.c:648 src/main/print-escp2.c:2007
-#: src/xml/xmli18n-tmp.h:3677
+#: src/main/print-canon.c:648 src/main/print-escp2.c:2212
+#: src/xml/xmli18n-tmp.h:5914
 msgid "CD - 3 inch"
 msgstr "CD - 3 tum"
 
-#: src/main/print-canon.c:650 src/main/print-escp2.c:2009
-#: src/xml/xmli18n-tmp.h:3678
+#: src/main/print-canon.c:650 src/main/print-escp2.c:2214
+#: src/xml/xmli18n-tmp.h:5915
 #, fuzzy
 msgid "CD - Custom"
 msgstr "Anpassat"
 
-#: src/main/print-canon.c:673 src/main/print-escp2.c:2034
-#: src/cups/genppd.c:1323 src/cups/genppd.c:1572 src/cups/genppd.c:1988
-#: src/cups/genppd.c:2079
+#: src/main/print-canon.c:673 src/main/print-escp2.c:2239
+#: src/cups/genppd.c:1356 src/cups/genppd.c:1605 src/cups/genppd.c:2022
+#: src/cups/genppd.c:2113
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-canon.c:675 src/main/print-escp2.c:2036
+#: src/main/print-canon.c:675 src/main/print-escp2.c:2241
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Skriv ut till fil?"
 
-#: src/main/print-canon.c:790 src/main/print-escp2.c:2447
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-canon.c:790 src/main/print-escp2.c:2652
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2167
 #: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
 #: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "Färg"
 
-#: src/main/print-canon.c:792 src/main/print-escp2.c:2449
+#: src/main/print-canon.c:792 src/main/print-escp2.c:2654
 #: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
 #: src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "Svart och vitt"
 
-#: src/main/print-canon.c:831 src/main/print-escp2.c:2089
+#: src/main/print-canon.c:831 src/main/print-escp2.c:2294
 #: src/main/print-pcl.c:1797 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Utdatatyp:"
 
-#: src/main/print-canon.c:833 src/main/print-escp2.c:2131
-#: src/main/print-escp2.c:2229 src/main/print-escp2.c:2241
+#: src/main/print-canon.c:833 src/main/print-escp2.c:2336
+#: src/main/print-escp2.c:2434 src/main/print-escp2.c:2446
 #: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
 #: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
-#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1215
-#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1219
-#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
-#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3170
-#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3177
-#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3461
-#: src/xml/xmli18n-tmp.h:3464 src/xml/xmli18n-tmp.h:3632
-#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3648
-#: src/xml/xmli18n-tmp.h:3657 src/xml/xmli18n-tmp.h:3665
+#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1627 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3713 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3722 src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5902
 msgid "Standard"
 msgstr "Standard"
 
@@ -562,7 +571,7 @@ msgid "Pre-Dithered"
 msgstr "Skriv ut"
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1268 src/cups/genppd.c:1971
+#: src/cups/genppd.c:1301 src/cups/genppd.c:2005
 msgid "Grayscale"
 msgstr "Gråtoner"
 
@@ -578,11 +587,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1299 src/cups/genppd.c:1978
+#: src/main/print-color.c:129 src/cups/genppd.c:1332 src/cups/genppd.c:2012
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1306 src/cups/genppd.c:1979
+#: src/main/print-color.c:131 src/cups/genppd.c:1339 src/cups/genppd.c:2013
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -646,7 +655,7 @@ msgid "Output image type"
 msgstr "Utdatatyp:"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338
 msgid "Raw Channels"
 msgstr "RÃ¥kanaler"
 
@@ -713,56 +722,208 @@ msgstr ""
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
 #: src/escputil/escputil.c:997 src/escputil/escputil.c:1017
-#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:1812
-#: src/xml/xmli18n-tmp.h:1823 src/xml/xmli18n-tmp.h:1836
-#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1863
-#: src/xml/xmli18n-tmp.h:1876 src/xml/xmli18n-tmp.h:1889
-#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1918
-#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1949
-#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1975
-#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:1999
-#: src/xml/xmli18n-tmp.h:2013 src/xml/xmli18n-tmp.h:2027
-#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2051
-#: src/xml/xmli18n-tmp.h:2064 src/xml/xmli18n-tmp.h:2076
-#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2102
-#: src/xml/xmli18n-tmp.h:2116 src/xml/xmli18n-tmp.h:2130
-#: src/xml/xmli18n-tmp.h:2143 src/xml/xmli18n-tmp.h:2156
-#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2184
-#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2210
-#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2236
-#: src/xml/xmli18n-tmp.h:2249 src/xml/xmli18n-tmp.h:2262
-#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2290
-#: src/xml/xmli18n-tmp.h:2305 src/xml/xmli18n-tmp.h:2320
-#: src/xml/xmli18n-tmp.h:2332 src/xml/xmli18n-tmp.h:2343
-#: src/xml/xmli18n-tmp.h:2356 src/xml/xmli18n-tmp.h:2369
-#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2392
-#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2415
-#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2442
-#: src/xml/xmli18n-tmp.h:2454 src/xml/xmli18n-tmp.h:2466
-#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2496
-#: src/xml/xmli18n-tmp.h:2509 src/xml/xmli18n-tmp.h:2522
-#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
-#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2574
-#: src/xml/xmli18n-tmp.h:2586 src/xml/xmli18n-tmp.h:2598
-#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2623
-#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2653
-#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2683
-#: src/xml/xmli18n-tmp.h:2697 src/xml/xmli18n-tmp.h:2715
-#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2745
-#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
-#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2803
-#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2828
-#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2854
-#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2881
-#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2915
-#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2943
-#: src/xml/xmli18n-tmp.h:2959 src/xml/xmli18n-tmp.h:2976
-#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:3004
-#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3032
-#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3062
-#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3093
-#: src/xml/xmli18n-tmp.h:3107 src/xml/xmli18n-tmp.h:3125
-#: src/xml/xmli18n-tmp.h:3141
+#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2387
+#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2413
+#: src/xml/xmli18n-tmp.h:2426 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2499
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2551
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2575
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2708
+#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2786
+#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2814
+#: src/xml/xmli18n-tmp.h:2829 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2893
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2966
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3005 src/xml/xmli18n-tmp.h:3020
+#: src/xml/xmli18n-tmp.h:3033 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3061 src/xml/xmli18n-tmp.h:3073
+#: src/xml/xmli18n-tmp.h:3085 src/xml/xmli18n-tmp.h:3098
+#: src/xml/xmli18n-tmp.h:3110 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3377
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3616
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3648
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3766 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3775 src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:3794 src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:3805 src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3869 src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:3880 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3902 src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:3913 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:3948 src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:3970 src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:3983 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4023 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4064 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4075 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4088 src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:4103 src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:4118 src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:4143 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:4203 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4275 src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4309 src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4356 src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4421
+#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4449
+#: src/xml/xmli18n-tmp.h:4456 src/xml/xmli18n-tmp.h:4462
+#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4485 src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:4551 src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:4694 src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4717 src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:4818 src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:4829 src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4885 src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4935
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:5041 src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:5052 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:5121 src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5165
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5182 src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:5193 src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:5271 src/xml/xmli18n-tmp.h:5299
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5327 src/xml/xmli18n-tmp.h:5331
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5347
+#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5367 src/xml/xmli18n-tmp.h:5371
+#: src/xml/xmli18n-tmp.h:5383 src/xml/xmli18n-tmp.h:5388
+#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5440
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5461 src/xml/xmli18n-tmp.h:5468
+#: src/xml/xmli18n-tmp.h:5476 src/xml/xmli18n-tmp.h:5486
+#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5514
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5525
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5543
+#: src/xml/xmli18n-tmp.h:5550 src/xml/xmli18n-tmp.h:5556
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5574 src/xml/xmli18n-tmp.h:5582
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5592
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5625
+#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5649
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5662
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5690
+#: src/xml/xmli18n-tmp.h:5694 src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5731
+#: src/xml/xmli18n-tmp.h:5738 src/xml/xmli18n-tmp.h:5742
+#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5759
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5770
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5807
+#: src/xml/xmli18n-tmp.h:5811 src/xml/xmli18n-tmp.h:5817
+#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5828
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5843
 msgid "Cyan"
 msgstr "Cyan"
 
@@ -772,56 +933,208 @@ msgstr "Justera cyangamma"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
 #: src/escputil/escputil.c:998 src/escputil/escputil.c:1018
-#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:1813
-#: src/xml/xmli18n-tmp.h:1824 src/xml/xmli18n-tmp.h:1837
-#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1864
-#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1890
-#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1919
-#: src/xml/xmli18n-tmp.h:1935 src/xml/xmli18n-tmp.h:1950
-#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1976
-#: src/xml/xmli18n-tmp.h:1988 src/xml/xmli18n-tmp.h:2000
-#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2028
-#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2052
-#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2077
-#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2103
-#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2131
-#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2157
-#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2185
-#: src/xml/xmli18n-tmp.h:2198 src/xml/xmli18n-tmp.h:2211
-#: src/xml/xmli18n-tmp.h:2224 src/xml/xmli18n-tmp.h:2237
-#: src/xml/xmli18n-tmp.h:2250 src/xml/xmli18n-tmp.h:2263
-#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2291
-#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2321
-#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2344
-#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2370
-#: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2393
-#: src/xml/xmli18n-tmp.h:2405 src/xml/xmli18n-tmp.h:2416
-#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2443
-#: src/xml/xmli18n-tmp.h:2455 src/xml/xmli18n-tmp.h:2467
-#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2497
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2523
-#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2575
-#: src/xml/xmli18n-tmp.h:2587 src/xml/xmli18n-tmp.h:2599
-#: src/xml/xmli18n-tmp.h:2611 src/xml/xmli18n-tmp.h:2624
-#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
-#: src/xml/xmli18n-tmp.h:2670 src/xml/xmli18n-tmp.h:2684
-#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2714
-#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2747
-#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2780
-#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
-#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2829
-#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2855
-#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2882
-#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2914
-#: src/xml/xmli18n-tmp.h:2931 src/xml/xmli18n-tmp.h:2944
-#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2975
-#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:3005
-#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3033
-#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3060
-#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3094
-#: src/xml/xmli18n-tmp.h:3108 src/xml/xmli18n-tmp.h:3124
-#: src/xml/xmli18n-tmp.h:3140
+#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2361
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2388
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2414
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2459 src/xml/xmli18n-tmp.h:2474
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2512 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2552
+#: src/xml/xmli18n-tmp.h:2564 src/xml/xmli18n-tmp.h:2576
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2787
+#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2815
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2868
+#: src/xml/xmli18n-tmp.h:2881 src/xml/xmli18n-tmp.h:2894
+#: src/xml/xmli18n-tmp.h:2905 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:2967
+#: src/xml/xmli18n-tmp.h:2979 src/xml/xmli18n-tmp.h:2991
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3062 src/xml/xmli18n-tmp.h:3074
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3099
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3135 src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:3163 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3353
+#: src/xml/xmli18n-tmp.h:3365 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
+#: src/xml/xmli18n-tmp.h:3420 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3542 src/xml/xmli18n-tmp.h:3556
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3600 src/xml/xmli18n-tmp.h:3617
+#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3647
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3751 src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:3784 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3795 src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:3806 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3837 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3903 src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3939 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3960 src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:3972 src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:3984 src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:3999 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:4039 src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:4104 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:4170 src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4194 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:4230 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:4276 src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4311 src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4338 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:4401 src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:4427 src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:4442 src/xml/xmli18n-tmp.h:4451
+#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4464
+#: src/xml/xmli18n-tmp.h:4470 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4486 src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:4511 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:4809 src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4909 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:5007 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5018 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5111 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5123 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5148 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:5240 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5250 src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:5261 src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5301
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5313
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5349
+#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5401
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5441
+#: src/xml/xmli18n-tmp.h:5453 src/xml/xmli18n-tmp.h:5458
+#: src/xml/xmli18n-tmp.h:5463 src/xml/xmli18n-tmp.h:5470
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5496 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5527
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5552 src/xml/xmli18n-tmp.h:5558
+#: src/xml/xmli18n-tmp.h:5564 src/xml/xmli18n-tmp.h:5568
+#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5593
+#: src/xml/xmli18n-tmp.h:5598 src/xml/xmli18n-tmp.h:5616
+#: src/xml/xmli18n-tmp.h:5620 src/xml/xmli18n-tmp.h:5626
+#: src/xml/xmli18n-tmp.h:5631 src/xml/xmli18n-tmp.h:5651
+#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
+#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5674
+#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5720
+#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5733
+#: src/xml/xmli18n-tmp.h:5739 src/xml/xmli18n-tmp.h:5743
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5818
+#: src/xml/xmli18n-tmp.h:5823 src/xml/xmli18n-tmp.h:5829
+#: src/xml/xmli18n-tmp.h:5833 src/xml/xmli18n-tmp.h:5839
+#: src/xml/xmli18n-tmp.h:5844
 msgid "Magenta"
 msgstr "Magenta"
 
@@ -831,56 +1144,208 @@ msgstr "Justera magentagamma"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
 #: src/escputil/escputil.c:999 src/escputil/escputil.c:1019
-#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:1814
-#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
-#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1865
-#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1891
-#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1920
-#: src/xml/xmli18n-tmp.h:1936 src/xml/xmli18n-tmp.h:1951
-#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1977
-#: src/xml/xmli18n-tmp.h:1989 src/xml/xmli18n-tmp.h:2001
-#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2029
-#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2053
-#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2078
-#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2104
-#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
-#: src/xml/xmli18n-tmp.h:2145 src/xml/xmli18n-tmp.h:2158
-#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2186
-#: src/xml/xmli18n-tmp.h:2199 src/xml/xmli18n-tmp.h:2212
-#: src/xml/xmli18n-tmp.h:2225 src/xml/xmli18n-tmp.h:2238
-#: src/xml/xmli18n-tmp.h:2251 src/xml/xmli18n-tmp.h:2264
-#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2292
-#: src/xml/xmli18n-tmp.h:2307 src/xml/xmli18n-tmp.h:2322
-#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
-#: src/xml/xmli18n-tmp.h:2358 src/xml/xmli18n-tmp.h:2371
-#: src/xml/xmli18n-tmp.h:2382 src/xml/xmli18n-tmp.h:2394
-#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2417
-#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2444
-#: src/xml/xmli18n-tmp.h:2456 src/xml/xmli18n-tmp.h:2468
-#: src/xml/xmli18n-tmp.h:2483 src/xml/xmli18n-tmp.h:2498
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2524
-#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2551
-#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2576
-#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
-#: src/xml/xmli18n-tmp.h:2612 src/xml/xmli18n-tmp.h:2625
-#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2651
-#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2685
-#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2713
-#: src/xml/xmli18n-tmp.h:2734 src/xml/xmli18n-tmp.h:2749
-#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2779
-#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2805
-#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2830
-#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2856
-#: src/xml/xmli18n-tmp.h:2871 src/xml/xmli18n-tmp.h:2883
-#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2910
-#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2945
-#: src/xml/xmli18n-tmp.h:2960 src/xml/xmli18n-tmp.h:2974
-#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3006
-#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3034
-#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3061
-#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3095
-#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3120
-#: src/xml/xmli18n-tmp.h:3136
+#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2389
+#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2444
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2475
+#: src/xml/xmli18n-tmp.h:2488 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2513 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2565 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2602
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2762
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2788
+#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2816
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2846
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2906 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3022
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3048
+#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3075
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3124
+#: src/xml/xmli18n-tmp.h:3136 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3175
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3315 src/xml/xmli18n-tmp.h:3329
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3433
+#: src/xml/xmli18n-tmp.h:3455 src/xml/xmli18n-tmp.h:3468
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3497
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3601 src/xml/xmli18n-tmp.h:3618
+#: src/xml/xmli18n-tmp.h:3632 src/xml/xmli18n-tmp.h:3643
+#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3747 src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3834 src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:3844 src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:3867 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:3900 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3910 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3935 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:3967 src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:3979 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4005 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4062 src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4110 src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:4124 src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4167 src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:4272 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:4321 src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:4334 src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4367 src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4471
+#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4505 src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4549 src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:4562 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4580 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4602 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:4678 src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:4691 src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4770 src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4893 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4904 src/xml/xmli18n-tmp.h:4911
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:4971 src/xml/xmli18n-tmp.h:4978
+#: src/xml/xmli18n-tmp.h:5004 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5050 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5071 src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:5097 src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:5142 src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:5169 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5184
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5257 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5318
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5358
+#: src/xml/xmli18n-tmp.h:5364 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5385
+#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5438
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5454
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5465
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5511
+#: src/xml/xmli18n-tmp.h:5516 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5547 src/xml/xmli18n-tmp.h:5554
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5584 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5617 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5632
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5687
+#: src/xml/xmli18n-tmp.h:5692 src/xml/xmli18n-tmp.h:5698
+#: src/xml/xmli18n-tmp.h:5705 src/xml/xmli18n-tmp.h:5713
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5729
+#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
+#: src/xml/xmli18n-tmp.h:5744 src/xml/xmli18n-tmp.h:5756
+#: src/xml/xmli18n-tmp.h:5761 src/xml/xmli18n-tmp.h:5767
+#: src/xml/xmli18n-tmp.h:5774 src/xml/xmli18n-tmp.h:5782
+#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5792
+#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5803
+#: src/xml/xmli18n-tmp.h:5809 src/xml/xmli18n-tmp.h:5813
+#: src/xml/xmli18n-tmp.h:5819 src/xml/xmli18n-tmp.h:5824
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5845
 msgid "Yellow"
 msgstr "Gul"
 
@@ -890,9 +1355,17 @@ msgstr "Justera gulgamma"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
 #: src/escputil/escputil.c:1006 src/escputil/escputil.c:1025
-#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2700
-#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2795
-#: src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:4041 src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:4056 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4091 src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:4155 src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5155
 msgid "Red"
 msgstr "Röd"
 
@@ -910,8 +1383,13 @@ msgstr "Justera gröngamma"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
 #: src/escputil/escputil.c:1007 src/escputil/escputil.c:1026
-#: src/xml/xmli18n-tmp.h:2657 src/xml/xmli18n-tmp.h:2701
-#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4051 src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:4084 src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:5156
 msgid "Blue"
 msgstr "Blå"
 
@@ -922,53 +1400,183 @@ msgstr "Justera blågamma"
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
 #: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1016 src/escputil/escputil.c:1285
-#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
-#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
-#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1875
-#: src/xml/xmli18n-tmp.h:1888 src/xml/xmli18n-tmp.h:1901
-#: src/xml/xmli18n-tmp.h:1917 src/xml/xmli18n-tmp.h:1933
-#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1961
-#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1986
-#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2012
-#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2038
-#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2063
-#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2090
-#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2115
-#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2142
-#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2169
-#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
-#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
-#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2248
-#: src/xml/xmli18n-tmp.h:2261 src/xml/xmli18n-tmp.h:2274
-#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2304
-#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2331
-#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
-#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
-#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2403
-#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2420
-#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2441
-#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2465
-#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2495
-#: src/xml/xmli18n-tmp.h:2508 src/xml/xmli18n-tmp.h:2521
-#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
-#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2573
-#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2597
-#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2622
-#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2672
-#: src/xml/xmli18n-tmp.h:2682 src/xml/xmli18n-tmp.h:2731
-#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2764
-#: src/xml/xmli18n-tmp.h:2781 src/xml/xmli18n-tmp.h:2794
-#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2815
-#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2839
-#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2868
-#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2894
-#: src/xml/xmli18n-tmp.h:2911 src/xml/xmli18n-tmp.h:2929
-#: src/xml/xmli18n-tmp.h:2942 src/xml/xmli18n-tmp.h:2977
-#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:3003
-#: src/xml/xmli18n-tmp.h:3017 src/xml/xmli18n-tmp.h:3031
-#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3079
-#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3110
-#: src/xml/xmli18n-tmp.h:3121 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2372
+#: src/xml/xmli18n-tmp.h:2386 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2457
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2510
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2536
+#: src/xml/xmli18n-tmp.h:2550 src/xml/xmli18n-tmp.h:2562
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2599 src/xml/xmli18n-tmp.h:2614
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2639
+#: src/xml/xmli18n-tmp.h:2653 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2965
+#: src/xml/xmli18n-tmp.h:2977 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3019
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3060 src/xml/xmli18n-tmp.h:3072
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3133 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3196
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3526
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3680 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3755 src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:3804 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3819 src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:3831 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3846 src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3873 src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:3924 src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:3943 src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:4022 src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4059 src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:4142 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4164 src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:4179 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:4255 src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4289 src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:4308 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4413 src/xml/xmli18n-tmp.h:4420
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4455
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4507 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:4565 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:4604 src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:4702 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:4733 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:4786 src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4920 src/xml/xmli18n-tmp.h:4926
+#: src/xml/xmli18n-tmp.h:4934 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:4973 src/xml/xmli18n-tmp.h:4981
+#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:4993
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:5047 src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5151
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5186
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5223 src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5270
+#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5284
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5320
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5337
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5375
+#: src/xml/xmli18n-tmp.h:5378 src/xml/xmli18n-tmp.h:5380
+#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5435
+#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5447
+#: src/xml/xmli18n-tmp.h:5449 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5474
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5492
+#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5571
+#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5590
+#: src/xml/xmli18n-tmp.h:5596 src/xml/xmli18n-tmp.h:5602
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5614
+#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5629
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5655
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5680 src/xml/xmli18n-tmp.h:5682
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5700
+#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5716
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5749
+#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5769 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5794
+#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5806
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5836
+#: src/xml/xmli18n-tmp.h:5842
 msgid "Black"
 msgstr "Svart"
 
@@ -976,7 +1584,7 @@ msgstr "Svart"
 msgid "Adjust the black gamma"
 msgstr "Justera svartgamma"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1769
+#: src/main/print-color.c:322 src/main/print-olympus.c:1935
 msgid "Cyan Balance"
 msgstr "Cyanbalans"
 
@@ -989,7 +1597,7 @@ msgstr "Gråbalans"
 msgid "Adjust the cyan gray balance"
 msgstr "Justera cyan-gråbalansen"
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1777
+#: src/main/print-color.c:330 src/main/print-olympus.c:1943
 msgid "Magenta Balance"
 msgstr "Magentabalans"
 
@@ -997,7 +1605,7 @@ msgstr "Magentabalans"
 msgid "Adjust the magenta gray balance"
 msgstr "Justera magenta-gråbalansen"
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1785
+#: src/main/print-color.c:338 src/main/print-olympus.c:1951
 msgid "Yellow Balance"
 msgstr "Gulbalans"
 
@@ -1025,11 +1633,11 @@ msgstr "Bläckgräns"
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
-#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
-#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
-#: src/main/print-escp2.c:759
+#: src/main/print-escp2.c:344 src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356 src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368 src/main/print-escp2.c:374
+#: src/main/print-escp2.c:869 src/main/print-escp2.c:877
+#: src/main/print-escp2.c:885
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Utdatatyp:"
@@ -1038,27 +1646,27 @@ msgstr "Utdatatyp:"
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:743
+#: src/main/print-color.c:365 src/main/print-escp2.c:869
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:744
+#: src/main/print-color.c:366 src/main/print-escp2.c:870
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:751
+#: src/main/print-color.c:373 src/main/print-escp2.c:877
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:752
+#: src/main/print-color.c:374 src/main/print-escp2.c:878
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:759
+#: src/main/print-color.c:381 src/main/print-escp2.c:885
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:760
+#: src/main/print-color.c:382 src/main/print-escp2.c:886
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -1315,11 +1923,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1906
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1907
 msgid "Print without borders"
 msgstr ""
 
@@ -1332,7 +1940,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:266 src/main/print-escp2.c:267
-#: src/cups/genppd.c:1567 src/cups/genppd.c:2078
+#: src/cups/genppd.c:1600 src/cups/genppd.c:2112
 #, fuzzy
 msgid "Output Order"
 msgstr "Utdatatyp:"
@@ -1375,370 +1983,487 @@ msgid "Has multiple choices of ink cartridges"
 msgstr ""
 
 #: src/main/print-escp2.c:320 src/main/print-escp2.c:321
+#, fuzzy
+msgid "Raw Channel Names"
+msgstr "Kanalnamn"
+
+#: src/main/print-escp2.c:326 src/main/print-escp2.c:327
 msgid "Channel Names"
 msgstr "Kanalnamn"
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:339
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:344
 msgid "Cyan Map"
 msgstr "Cyankarta"
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:345
 msgid "Adjust the cyan map"
 msgstr "Justera cyankartan"
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350
 msgid "Magenta Map"
 msgstr "Magentakarta"
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:351
 msgid "Adjust the magenta map"
 msgstr "Justera magentakartan"
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356
 msgid "Yellow Map"
 msgstr "Gulkarta"
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:357
 msgid "Adjust the yellow map"
 msgstr "Justera gulkartan"
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362
 msgid "Blue Map"
 msgstr "Blåkarta"
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:363
 msgid "Adjust the blue map"
 msgstr "Justera blåkartan"
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368
 #, fuzzy
 msgid "Orange Map"
 msgstr "Cyankarta"
 
-#: src/main/print-escp2.c:363
+#: src/main/print-escp2.c:369
 #, fuzzy
 msgid "Adjust the orange map"
 msgstr "Justera rödkartan"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:374
 msgid "Red Map"
 msgstr "Rödkarta"
 
-#: src/main/print-escp2.c:369
+#: src/main/print-escp2.c:375
 msgid "Adjust the red map"
 msgstr "Justera rödkartan"
 
-#: src/main/print-escp2.c:471
+#: src/main/print-escp2.c:477
 #, fuzzy
 msgid "Red Density"
 msgstr "Intensitet:"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:478
 #, fuzzy
 msgid "Adjust the red density"
 msgstr "Justera gulbalansen på utskriften"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:485
 #, fuzzy
 msgid "Blue Density"
 msgstr "Intensitet:"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:486
 #, fuzzy
 msgid "Adjust the blue density"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:493
 #, fuzzy
 msgid "Orange Density"
 msgstr "Intensitet:"
 
-#: src/main/print-escp2.c:488
+#: src/main/print-escp2.c:494
 #, fuzzy
 msgid "Adjust the orange density"
 msgstr "Justera gulbalansen på utskriften"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:501
 msgid "Gloss Level"
 msgstr "Glansnivå"
 
-#: src/main/print-escp2.c:496
+#: src/main/print-escp2.c:502
 msgid "Adjust the gloss level"
 msgstr "Justera glansnivån"
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:509
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:504
+#: src/main/print-escp2.c:510
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:517
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:512
+#: src/main/print-escp2.c:518
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:525
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:520
+#: src/main/print-escp2.c:526
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:534
 #, fuzzy
 msgid "Light Cyan Value"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:550
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "Intensitet:"
 
-#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
+#: src/main/print-escp2.c:557 src/main/print-escp2.c:558
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "Ljus magenta"
 
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:566
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "Magenta"
 
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:582
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "Mörk gul"
 
-#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
+#: src/main/print-escp2.c:589 src/main/print-escp2.c:590
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:598
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "Intensitet:"
 
-#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
+#: src/main/print-escp2.c:605 src/main/print-escp2.c:606
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:630
 #, fuzzy
 msgid "Gray Value"
 msgstr "Gråtoner"
 
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
-#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:614
+#: src/main/print-escp2.c:637 src/main/print-escp2.c:638
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
+#: src/main/print-escp2.c:621 src/main/print-escp2.c:622
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:646
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "Gråtoner"
 
-#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
+#: src/main/print-escp2.c:653 src/main/print-escp2.c:654
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:726
 #, fuzzy
 msgid "Light Gray Value"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
-#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:662
+#: src/main/print-escp2.c:733 src/main/print-escp2.c:734
 #, fuzzy
 msgid "Light Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
-#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
+#: src/main/print-escp2.c:669 src/main/print-escp2.c:670
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:742
 #, fuzzy
 msgid "Light Gray Density Scale"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:678
 #, fuzzy
 msgid "Dark Gray Value"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
+#: src/main/print-escp2.c:685 src/main/print-escp2.c:686
 #, fuzzy
 msgid "Dark Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:694
 #, fuzzy
 msgid "Dark Gray Density Scale"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:701
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "Gråtoner"
 
-#: src/main/print-escp2.c:696
+#: src/main/print-escp2.c:702
 #, fuzzy
 msgid "Medium Gray Value"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:709
 #, fuzzy
 msgid "Mid Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:704
+#: src/main/print-escp2.c:710
 #, fuzzy
 msgid "Medium Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:717
 #, fuzzy
 msgid "Mid Gray Density Scale"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:712
+#: src/main/print-escp2.c:718
 #, fuzzy
 msgid "Medium Gray Density Scale"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:767
+#: src/main/print-escp2.c:749
+#, fuzzy
+msgid "Hextone Gray 5 Value"
+msgstr "Gråtoner"
+
+#: src/main/print-escp2.c:750
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:757
+#, fuzzy
+msgid "Hextone Gray 5 Transition"
+msgstr "Ljus cyan"
+
+#: src/main/print-escp2.c:758
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr "Ljus cyan"
+
+#: src/main/print-escp2.c:765
+#, fuzzy
+msgid "Hextone Gray 5 Density Scale"
+msgstr "Gråtoner"
+
+#: src/main/print-escp2.c:766
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr "Ljus cyan"
+
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:774
+#, fuzzy
+msgid "Hextone Gray 4 Value"
+msgstr "Gråtoner"
+
+#: src/main/print-escp2.c:781 src/main/print-escp2.c:782
+#, fuzzy
+msgid "Hextone Gray 4 Transition"
+msgstr "Ljus cyan"
+
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:790
+#, fuzzy
+msgid "Hextone Gray 4 Density Scale"
+msgstr "Gråtoner"
+
+#: src/main/print-escp2.c:797 src/main/print-escp2.c:798
+#, fuzzy
+msgid "Hextone Gray 3 Value"
+msgstr "Gråtoner"
+
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:806
+#, fuzzy
+msgid "Hextone Gray 3 Transition"
+msgstr "Ljus cyan"
+
+#: src/main/print-escp2.c:813 src/main/print-escp2.c:814
+#, fuzzy
+msgid "Hextone Gray 3 Density Scale"
+msgstr "Gråtoner"
+
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:822
+#, fuzzy
+msgid "Hextone Gray 2 Value"
+msgstr "Gråtoner"
+
+#: src/main/print-escp2.c:829 src/main/print-escp2.c:830
+#, fuzzy
+msgid "Hextone Gray 2 Transition"
+msgstr "Ljus cyan"
+
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:838
+#, fuzzy
+msgid "Hextone Gray 2 Density Scale"
+msgstr "Gråtoner"
+
+#: src/main/print-escp2.c:845
+#, fuzzy
+msgid "Hextone Gray 1 Value"
+msgstr "Gråtoner"
+
+#: src/main/print-escp2.c:846
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:853
+#, fuzzy
+msgid "Hextone Gray 1 Transition"
+msgstr "Ljus cyan"
+
+#: src/main/print-escp2.c:854
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr "Ljus magenta"
+
+#: src/main/print-escp2.c:861
+#, fuzzy
+msgid "Hextone Gray 1 Density Scale"
+msgstr "Gråtoner"
+
+#: src/main/print-escp2.c:862
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr "Magenta"
+
+#: src/main/print-escp2.c:893
 msgid "Drying Time Per Page"
 msgstr ""
 
-#: src/main/print-escp2.c:768
+#: src/main/print-escp2.c:894
 msgid "Set drying time per page"
 msgstr ""
 
-#: src/main/print-escp2.c:775
+#: src/main/print-escp2.c:901
 msgid "Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:776
+#: src/main/print-escp2.c:902
 msgid "Set drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:783
+#: src/main/print-escp2.c:909
 msgid "Minimum Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:784
+#: src/main/print-escp2.c:910
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:799
+#: src/main/print-escp2.c:925
+#, fuzzy
+msgid "Quality Enhancement"
+msgstr "Lägg till glansförbättring"
+
+#: src/main/print-escp2.c:926
+msgid "Enhance print quality by additional passes"
+msgstr ""
+
+#: src/main/print-escp2.c:933
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "Pappersstorlek"
 
-#: src/main/print-escp2.c:800
+#: src/main/print-escp2.c:934
 #, fuzzy
 msgid "Set printer paper thickness"
 msgstr "Ställ in standardvärden"
 
-#: src/main/print-escp2.c:807
+#: src/main/print-escp2.c:941
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "Intensitet:"
 
-#: src/main/print-escp2.c:808
+#: src/main/print-escp2.c:942
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:815
+#: src/main/print-escp2.c:949
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:816
+#: src/main/print-escp2.c:950
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:823
+#: src/main/print-escp2.c:957
 #, fuzzy
 msgid "Print Method"
 msgstr "Utskriftsläge"
 
-#: src/main/print-escp2.c:824
+#: src/main/print-escp2.c:958
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:831
+#: src/main/print-escp2.c:965
 #, fuzzy
 msgid "Platen Gap"
 msgstr "Vanligt papper"
 
-#: src/main/print-escp2.c:832
+#: src/main/print-escp2.c:966
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:839
+#: src/main/print-escp2.c:973
 #, fuzzy
 msgid "Feed Adjustment"
 msgstr "Finjustering"
 
-#: src/main/print-escp2.c:840
-#, c-format
+#: src/main/print-escp2.c:975
+#, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:1992
+#: src/main/print-escp2.c:2197
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Utdatatyp:"
 
-#: src/main/print-escp2.c:1994
+#: src/main/print-escp2.c:2199
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2208 src/cups/genppd.c:1484 src/cups/genppd.c:2059
+#: src/main/print-escp2.c:2413 src/cups/genppd.c:1517 src/cups/genppd.c:2093
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2415
 msgid "Bidirectional"
 msgstr "Dubbelriktad"
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2417
 msgid "Unidirectional"
 msgstr "Enkelriktad"
 
-#: src/main/print-escp2.c:2243
+#: src/main/print-escp2.c:2448
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2450
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2452
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2454
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2456
 msgid "Nearest Neighbor Avoidance"
 msgstr "Undvik närmaste granne"
 
-#: src/main/print-escp2.c:2287
+#: src/main/print-escp2.c:2492
 #, fuzzy
 msgid "Short Edge(Flip)"
 msgstr "Kort kant (Vänd)"
 
-#: src/main/print-escp2.c:2858
+#: src/main/print-escp2.c:3100
 #, 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:4107 src/main/print-olympus.c:2472
+#: src/main/print-escp2.c:4355 src/main/print-olympus.c:2641
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr "Utskriftsflaggor inte validerade; kan inte skriva ut.\n"
@@ -1793,364 +2518,381 @@ msgstr "testutskrift"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3205
-#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3217
-#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3233
-#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3255
-#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3276
-#: src/xml/xmli18n-tmp.h:3288 src/xml/xmli18n-tmp.h:3295
-#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3315
-#: src/xml/xmli18n-tmp.h:3327 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3368
-#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3380
-#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
-#: src/xml/xmli18n-tmp.h:3412 src/xml/xmli18n-tmp.h:3424
-#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3444
-#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3472
-#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3496
-#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3521
-#: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3544
-#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3556
-#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3581
-#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3598
-#: src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3754 src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:3809 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3863 src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:4058 src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:4163 src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:4227 src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:4335 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4467 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4594 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:4879 src/xml/xmli18n-tmp.h:4946
+#: src/xml/xmli18n-tmp.h:5000 src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:5243 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5365 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5512 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5667 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5784 src/xml/xmli18n-tmp.h:5805
+#: src/xml/xmli18n-tmp.h:5826
 msgid "Four Color Standard"
 msgstr "Fyrfärgs standard"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3206
-#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3218
-#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3234
-#: src/xml/xmli18n-tmp.h:3244 src/xml/xmli18n-tmp.h:3251
-#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3268
-#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3289
-#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3306
-#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
-#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3354
-#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3377
-#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3389
-#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3413
-#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3435
-#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3455
-#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3485
-#: src/xml/xmli18n-tmp.h:3497 src/xml/xmli18n-tmp.h:3508
-#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3537
-#: src/xml/xmli18n-tmp.h:3545 src/xml/xmli18n-tmp.h:3549
-#: src/xml/xmli18n-tmp.h:3557 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3593
-#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3605
+#: src/xml/xmli18n-tmp.h:3759 src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3868 src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:4002 src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:4107 src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4472
+#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4817 src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5181 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5315 src/xml/xmli18n-tmp.h:5370
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5672
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5831
 msgid "Three Color Composite"
 msgstr "Trefärgers sammansatt"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3241
-#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3265
-#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3286
-#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
-#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3351
-#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3374
-#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3398
-#: src/xml/xmli18n-tmp.h:3410 src/xml/xmli18n-tmp.h:3422
-#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3452
-#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3470
-#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3494
-#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3519
-#: src/xml/xmli18n-tmp.h:3534 src/xml/xmli18n-tmp.h:3542
-#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3741 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4086 src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4933
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5421
+#: src/xml/xmli18n-tmp.h:5499 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5723
 msgid "Six Color Photo"
 msgstr "Sexfärgs foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3242
-#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3266
-#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3287
-#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3326
-#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3352
-#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3375
-#: src/xml/xmli18n-tmp.h:3387 src/xml/xmli18n-tmp.h:3399
-#: src/xml/xmli18n-tmp.h:3411 src/xml/xmli18n-tmp.h:3423
-#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3453
-#: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3483
-#: src/xml/xmli18n-tmp.h:3495 src/xml/xmli18n-tmp.h:3506
-#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3535
-#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3566
-#: src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3748 src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:3989 src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:4094 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4267 src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4940
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5661
+#: src/xml/xmli18n-tmp.h:5730
 msgid "Five Color Photo Composite"
 msgstr "Femfärgsfoto sammansatt"
 
 #: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
-#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
-#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
-#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
-#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
-#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
-#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
-#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
-#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:849
-#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:963
-#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1077
-#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1170
-#: src/xml/xmli18n-tmp.h:1220 src/xml/xmli18n-tmp.h:1277
-#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1376
-#: src/xml/xmli18n-tmp.h:1439 src/xml/xmli18n-tmp.h:1502
-#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1619
-#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1739
-#: src/xml/xmli18n-tmp.h:1773
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1050
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1240
+#: src/xml/xmli18n-tmp.h:1335 src/xml/xmli18n-tmp.h:1449
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1580
+#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1862
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2200 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2297
 msgid "Plain Paper"
 msgstr "Vanligt papper"
 
-#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
-#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
-#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
-#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
-#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
-#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
-#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
-#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
-#: src/xml/xmli18n-tmp.h:819 src/xml/xmli18n-tmp.h:858
-#: src/xml/xmli18n-tmp.h:915 src/xml/xmli18n-tmp.h:972
-#: src/xml/xmli18n-tmp.h:1029 src/xml/xmli18n-tmp.h:1086
-#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1176
-#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1286
-#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1385
-#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1508
-#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1628
-#: src/xml/xmli18n-tmp.h:1685 src/xml/xmli18n-tmp.h:1743
-#: src/xml/xmli18n-tmp.h:1779
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:101 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:365 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1160 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1740
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1871
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2136
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2267
+#: src/xml/xmli18n-tmp.h:2303
 msgid "Glossy Film"
 msgstr "Glansig film"
 
-#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
-#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
-#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
-#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
-#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
-#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
-#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
-#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
-#: src/xml/xmli18n-tmp.h:821 src/xml/xmli18n-tmp.h:861
-#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:975
-#: src/xml/xmli18n-tmp.h:1032 src/xml/xmli18n-tmp.h:1089
-#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1178
-#: src/xml/xmli18n-tmp.h:1232 src/xml/xmli18n-tmp.h:1289
-#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1388
-#: src/xml/xmli18n-tmp.h:1451 src/xml/xmli18n-tmp.h:1511
-#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1631
-#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1745
-#: src/xml/xmli18n-tmp.h:1781
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:845 src/xml/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:965 src/xml/xmli18n-tmp.h:1022
+#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1359
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1550
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1745 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2305
 msgid "Transparencies"
 msgstr "Genomskinligheter"
 
-#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
-#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
-#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
-#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
-#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
-#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
-#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
-#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
-#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:823
-#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:921
-#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:1035
-#: src/xml/xmli18n-tmp.h:1092 src/xml/xmli18n-tmp.h:1142
-#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1235
-#: src/xml/xmli18n-tmp.h:1292 src/xml/xmli18n-tmp.h:1344
-#: src/xml/xmli18n-tmp.h:1391 src/xml/xmli18n-tmp.h:1454
-#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1577
-#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1691
-#: src/xml/xmli18n-tmp.h:1747 src/xml/xmli18n-tmp.h:1783
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:55 src/xml/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:151 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1024
+#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2215
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2307
 msgid "Envelopes"
 msgstr "Kuvert"
 
-#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
-#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
-#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
-#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
-#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
-#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
-#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
-#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
-#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:827
-#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:927
-#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:1041
-#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1146
-#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1241
-#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1348
-#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1460
-#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1583
-#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1697
-#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1787
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:1028
+#: src/xml/xmli18n-tmp.h:1085 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1275 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1556
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1665
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1834
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2076
+#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2311
 msgid "Matte Paper"
 msgstr "Matte-papper"
 
-#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
-#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
-#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
-#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
-#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
-#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
-#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
-#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
-#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:831
-#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:933
-#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:1047
-#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1150
-#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1247
-#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1352
-#: src/xml/xmli18n-tmp.h:1403 src/xml/xmli18n-tmp.h:1466
-#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1589
-#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1703
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1791
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:167 src/xml/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:569
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1032
+#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1285 src/xml/xmli18n-tmp.h:1389
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1675
+#: src/xml/xmli18n-tmp.h:1770 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1889 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2012 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2227
+#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2315
 msgid "Inkjet Paper"
 msgstr "Bläckstrålepapper"
 
-#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
-#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
-#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
-#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
-#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
-#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
-#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
-#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
-#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:833
-#: src/xml/xmli18n-tmp.h:879 src/xml/xmli18n-tmp.h:936
-#: src/xml/xmli18n-tmp.h:993 src/xml/xmli18n-tmp.h:1050
-#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1152
-#: src/xml/xmli18n-tmp.h:1190 src/xml/xmli18n-tmp.h:1250
-#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1354
-#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1469
-#: src/xml/xmli18n-tmp.h:1529 src/xml/xmli18n-tmp.h:1592
-#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1706
-#: src/xml/xmli18n-tmp.h:1757 src/xml/xmli18n-tmp.h:1793
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:425 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:512 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1034
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1499 src/xml/xmli18n-tmp.h:1562
+#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1775 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1955
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2088
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2317
 msgid "Photo Quality Inkjet Paper"
 msgstr "Bläckstrålepapper med fotokvalitet"
 
-#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
-#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
-#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
-#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
-#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
-#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
-#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
-#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
-#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:835
-#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:939
-#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:1053
-#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1154
-#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1253
-#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1356
-#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1472
-#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1595
-#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1709
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1795
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1036
+#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1200
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1504 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1842
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2233
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2319
 msgid "Photo Paper"
 msgstr "Fotopapper"
 
-#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
-#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
-#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
-#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
-#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
-#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
-#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
-#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
-#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:837
-#: src/xml/xmli18n-tmp.h:885 src/xml/xmli18n-tmp.h:942
-#: src/xml/xmli18n-tmp.h:999 src/xml/xmli18n-tmp.h:1056
-#: src/xml/xmli18n-tmp.h:1113 src/xml/xmli18n-tmp.h:1156
-#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1212
-#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1256
-#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1358
-#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1475
-#: src/xml/xmli18n-tmp.h:1535 src/xml/xmli18n-tmp.h:1598
-#: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1712
-#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1797
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:179 src/xml/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:518 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:869 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1038
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1407
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1566
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1622
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1844
+#: src/xml/xmli18n-tmp.h:1898 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2321
 msgid "Premium Glossy Photo Paper"
 msgstr "Premiumglansigt fotopapper"
 
-#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
-#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
-#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
-#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
-#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
-#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
-#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
-#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
-#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:841
-#: src/xml/xmli18n-tmp.h:891 src/xml/xmli18n-tmp.h:948
-#: src/xml/xmli18n-tmp.h:1005 src/xml/xmli18n-tmp.h:1062
-#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1160
-#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1262
-#: src/xml/xmli18n-tmp.h:1319 src/xml/xmli18n-tmp.h:1362
-#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1481
-#: src/xml/xmli18n-tmp.h:1541 src/xml/xmli18n-tmp.h:1604
-#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1718
-#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1801
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1042
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1419
+#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1570
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2027 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2242
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2325
 msgid "Premium Luster Photo Paper"
 msgstr "Fotopapper med premiumlyster"
 
-#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
-#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
-#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
-#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
-#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
-#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
-#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
-#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
-#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:843
-#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:951
-#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1065
-#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1162
-#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1265
-#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1368
-#: src/xml/xmli18n-tmp.h:1427 src/xml/xmli18n-tmp.h:1490
-#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1607
-#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1727
-#: src/xml/xmli18n-tmp.h:1767 src/xml/xmli18n-tmp.h:1803
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:91 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:191 src/xml/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:439 src/xml/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:787 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1044
+#: src/xml/xmli18n-tmp.h:1125 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1315 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1854
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2327
 msgid "Photo Quality Glossy Paper"
 msgstr "Glansigt papper med fotokvalitet"
 
-#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
-#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
-#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
-#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
-#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
-#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
-#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
-#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:897
-#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:1011
-#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1125
-#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1206
-#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1325
-#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1430
-#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1553
-#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1667
-#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1805
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1130
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1320
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1616
+#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1856 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2329
 msgid "Ilford Heavy Paper"
 msgstr "Tungt Ilford-papper"
 
-#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
-#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
-#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
-#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
-#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
-#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
-#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
-#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
-#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:847
-#: src/xml/xmli18n-tmp.h:903 src/xml/xmli18n-tmp.h:960
-#: src/xml/xmli18n-tmp.h:1017 src/xml/xmli18n-tmp.h:1074
-#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1168
-#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1214
-#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1274
-#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1374
-#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1499
-#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1616
-#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1736
-#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1809
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:129
+#: src/xml/xmli18n-tmp.h:203 src/xml/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:542 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1048
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1443
+#: src/xml/xmli18n-tmp.h:1539 src/xml/xmli18n-tmp.h:1578
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1720
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1985
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2333
 msgid "Other"
 msgstr "Annat"
 
@@ -2166,52 +2908,56 @@ msgstr "Manuell med paus"
 msgid "Manual without Pause"
 msgstr "Manuell utan paus"
 
-#: src/main/print-olympus.c:279
+#: src/main/print-olympus.c:281
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:280 src/cups/genppd.c:1685 src/cups/genppd.c:1713
-#: src/cups/genppd.c:1745 src/cups/genppd.c:1800 src/cups/genppd.c:1846
-#: src/cups/genppd.c:2147 src/cups/genppd.c:2160 src/cups/genppd.c:2183
-#: src/cups/genppd.c:2204 src/cups/genppd.c:2221
+#: src/main/print-olympus.c:282 src/cups/genppd.c:1718 src/cups/genppd.c:1746
+#: src/cups/genppd.c:1778 src/cups/genppd.c:1833 src/cups/genppd.c:1879
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2194 src/cups/genppd.c:2217
+#: src/cups/genppd.c:2238 src/cups/genppd.c:2255
 msgid "None"
 msgstr "Inget"
 
-#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
-#: src/main/print-olympus.c:1132
+#: src/main/print-olympus.c:998 src/main/print-olympus.c:1061
+#: src/main/print-olympus.c:1165
 msgid "Glossy"
 msgstr "Glansig"
 
-#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
-#: src/main/print-olympus.c:1133
+#: src/main/print-olympus.c:999 src/main/print-olympus.c:1062
+#: src/main/print-olympus.c:1166
 msgid "Texture"
 msgstr "Textur"
 
-#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
+#: src/main/print-olympus.c:1063 src/main/print-olympus.c:1167
 msgid "Matte"
 msgstr "Matt"
 
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
+#. TRANSLATORS: 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.
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1901
 msgid "Laminate Pattern"
 msgstr "Laminatmönster"
 
-#: src/main/print-olympus.c:1770
+#: src/main/print-olympus.c:1936
 msgid "Adjust the cyan balance"
 msgstr "Justera cyanbalansen"
 
-#: src/main/print-olympus.c:1778
+#: src/main/print-olympus.c:1944
 msgid "Adjust the magenta balance"
 msgstr "Justera magentabalansen"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1952
 msgid "Adjust the yellow balance"
 msgstr "Justera gulbalansen"
 
-#: src/main/print-olympus.c:1793
+#: src/main/print-olympus.c:1959
 msgid "Black Balance"
 msgstr "Svartbalans"
 
-#: src/main/print-olympus.c:1794
+#: src/main/print-olympus.c:1960
 msgid "Adjust the black balance"
 msgstr "Justera svartbalansen"
 
@@ -2243,7 +2989,7 @@ msgstr "Snabbtorkande foto"
 msgid "Quick-dry Transparency"
 msgstr "Snabbtorkande genomskinligt"
 
-#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3687
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:5925
 msgid "Manual"
 msgstr "Manuell"
 
@@ -2328,23 +3074,23 @@ msgid "2400x600 DPI"
 msgstr "2400×600 DPI"
 
 #: src/main/print-pcl.c:278 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3638
-#: src/xml/xmli18n-tmp.h:3647 src/xml/xmli18n-tmp.h:3656
-#: src/xml/xmli18n-tmp.h:3664
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5875
+#: src/xml/xmli18n-tmp.h:5884 src/xml/xmli18n-tmp.h:5893
+#: src/xml/xmli18n-tmp.h:5901
 msgid "Draft"
 msgstr "Utdrag"
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:3633 src/xml/xmli18n-tmp.h:3641
-#: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3658
-#: src/xml/xmli18n-tmp.h:3666
+#: src/xml/xmli18n-tmp.h:5870 src/xml/xmli18n-tmp.h:5878
+#: src/xml/xmli18n-tmp.h:5886 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5903
 msgid "High"
 msgstr "Hög"
 
 #: src/main/print-pcl.c:282 src/main/print-pcl.c:283
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3634
-#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3650
-#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3667
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5896 src/xml/xmli18n-tmp.h:5904
 msgid "Photo"
 msgstr "Foto"
 
@@ -2377,15 +3123,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3671
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:5908
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3708
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:5946
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3823
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6061
 msgid "Custom"
 msgstr "Anpassat"
 
@@ -2393,36 +3139,46 @@ msgstr "Anpassat"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3629
-#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3654
+#: src/main/print-weave.c:1511
+#, fuzzy
+msgid "Fatal error!"
+msgstr "Fel: Ödesdigert fel\n"
+
+#: src/main/print-weave.c:1547
+msgid ""
+"Please report the above information to gimp-print-devel@lists.sourceforge.net"
+msgstr ""
+
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:5866
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5891
 msgid "Fast Economy"
 msgstr "Snabb ekonomi"
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3630
-#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3655
-#: src/xml/xmli18n-tmp.h:3663
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5900
 msgid "Economy"
 msgstr "Ekonomi"
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3635
-#: src/xml/xmli18n-tmp.h:3642 src/xml/xmli18n-tmp.h:3651
-#: src/xml/xmli18n-tmp.h:3660 src/xml/xmli18n-tmp.h:3668
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:5872
+#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3636
-#: src/xml/xmli18n-tmp.h:3643 src/xml/xmli18n-tmp.h:3652
-#: src/xml/xmli18n-tmp.h:3661 src/xml/xmli18n-tmp.h:3669
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:5873
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5889
+#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5906
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Sexfärgs foto"
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1326 src/cups/genppd.c:1989
-#: src/xml/xmli18n-tmp.h:3637 src/xml/xmli18n-tmp.h:3644
-#: src/xml/xmli18n-tmp.h:3653 src/xml/xmli18n-tmp.h:3662
-#: src/xml/xmli18n-tmp.h:3670
+#: src/main/generic-options.c:41 src/cups/genppd.c:1359 src/cups/genppd.c:2023
+#: src/xml/xmli18n-tmp.h:5874 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5899
+#: src/xml/xmli18n-tmp.h:5907
 msgid "Best"
 msgstr "Bästa"
 
@@ -3148,85 +3904,85 @@ msgstr "Extra 5"
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:960
+#: src/cups/genppd.c:993
 msgid "English"
 msgstr "Swedish"
 
-#: src/cups/genppd.c:1159 src/cups/genppd.c:1175 src/cups/genppd.c:1934
-#: src/cups/genppd.c:1935
+#: src/cups/genppd.c:1192 src/cups/genppd.c:1208 src/cups/genppd.c:1968
+#: src/cups/genppd.c:1969
 #, fuzzy
 msgid "Media Size"
 msgstr "Mediastorlek:"
 
-#: src/cups/genppd.c:1248 src/cups/genppd.c:1970
+#: src/cups/genppd.c:1281 src/cups/genppd.c:2004
 #, fuzzy
 msgid "Color Model"
 msgstr "Jobbläge"
 
-#: src/cups/genppd.c:1275 src/cups/genppd.c:1972
+#: src/cups/genppd.c:1308 src/cups/genppd.c:2006
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "Gråtoner"
 
-#: src/cups/genppd.c:1285 src/cups/genppd.c:1976
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2010
 #, fuzzy
 msgid "RGB Color"
 msgstr "Färg"
 
-#: src/cups/genppd.c:1292 src/cups/genppd.c:1977
+#: src/cups/genppd.c:1325 src/cups/genppd.c:2011
 msgid "CMY Color"
 msgstr "CMY-färg"
 
-#: src/cups/genppd.c:1317 src/cups/genppd.c:1987
+#: src/cups/genppd.c:1350 src/cups/genppd.c:2021
 #, fuzzy
 msgid "Color Precision"
 msgstr "Färgjustering"
 
-#: src/cups/genppd.c:1573 src/cups/genppd.c:2080
+#: src/cups/genppd.c:1606 src/cups/genppd.c:2114
 #, fuzzy
 msgid "Reverse"
 msgstr "Bästa"
 
-#: src/cups/genppd.c:1590 src/cups/genppd.c:2096
+#: src/cups/genppd.c:1623 src/cups/genppd.c:2130
 #, fuzzy
 msgid "2-Sided Printing"
 msgstr "Dubbelsidad utskrift"
 
-#: src/cups/genppd.c:1615 src/cups/genppd.c:2113
+#: src/cups/genppd.c:1648 src/cups/genppd.c:2147
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1620 src/cups/genppd.c:2114
+#: src/cups/genppd.c:1653 src/cups/genppd.c:2148
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1621 src/cups/genppd.c:2115
+#: src/cups/genppd.c:1654 src/cups/genppd.c:2149
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1622 src/cups/genppd.c:2116
+#: src/cups/genppd.c:1655 src/cups/genppd.c:2150
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1716 src/cups/genppd.c:2162
+#: src/cups/genppd.c:1749 src/cups/genppd.c:2196
 msgid "No"
 msgstr "Nej"
 
-#: src/cups/genppd.c:1718 src/cups/genppd.c:2164
+#: src/cups/genppd.c:1751 src/cups/genppd.c:2198
 msgid "Yes"
 msgstr "Ja"
 
-#: src/cups/genppd.c:1757 src/cups/genppd.c:1820 src/cups/genppd.c:1864
-#: src/cups/genppd.c:2185 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+#: src/cups/genppd.c:1790 src/cups/genppd.c:1853 src/cups/genppd.c:1897
+#: src/cups/genppd.c:2219 src/cups/genppd.c:2249 src/cups/genppd.c:2266
 #, fuzzy
 msgid "Value"
 msgstr "Blå"
 
-#: src/cups/genppd.c:1762 src/cups/genppd.c:2189
+#: src/cups/genppd.c:1795 src/cups/genppd.c:2223
 msgid "Fine Adjustment"
 msgstr "Finjustering"
 
-#: src/cups/genppd.c:1805 src/cups/genppd.c:2209
+#: src/cups/genppd.c:1838 src/cups/genppd.c:2243
 #, c-format
 msgid "%.1f mm"
 msgstr ""
@@ -3568,51 +4324,61 @@ msgstr ""
 "Kan inte detektera skrivartyp.\n"
 "Använd flaggan -m för att ange din skrivarmodell.\n"
 
-#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:383
-#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
-#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
-#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
-#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
-#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
-#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
-#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
-#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
-#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
-#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
-#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
-#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
-#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
-#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
-#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
-#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
-#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
-#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
-#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
-#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
-#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
-#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
-#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
-#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
-#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
-#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
-#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
-#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
-#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
-#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1503
-#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1509
-#: src/xml/xmli18n-tmp.h:1512 src/xml/xmli18n-tmp.h:1515
-#: src/xml/xmli18n-tmp.h:1518 src/xml/xmli18n-tmp.h:1521
-#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1527
-#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
-#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
-#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
-#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
-#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
-#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:2655
-#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2717
-#: src/xml/xmli18n-tmp.h:3045 src/xml/xmli18n-tmp.h:3252
-#: src/xml/xmli18n-tmp.h:3273 src/xml/xmli18n-tmp.h:3363
-#: src/xml/xmli18n-tmp.h:3531
+#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2001
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2010 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2025
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:4085 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4612 src/xml/xmli18n-tmp.h:5481
 msgid "Photo Black"
 msgstr "Fotosvart"
 
@@ -3623,125 +4389,297 @@ msgid "Unknown"
 msgstr "Okänt"
 
 #: src/escputil/escputil.c:1000 src/escputil/escputil.c:1289
-#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1921
-#: src/xml/xmli18n-tmp.h:1937 src/xml/xmli18n-tmp.h:2002
-#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2079
-#: src/xml/xmli18n-tmp.h:2105 src/xml/xmli18n-tmp.h:2119
-#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2173
-#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
-#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
-#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2293
-#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2346
-#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2418
-#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2445
-#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2469
-#: src/xml/xmli18n-tmp.h:2484 src/xml/xmli18n-tmp.h:2512
-#: src/xml/xmli18n-tmp.h:2525 src/xml/xmli18n-tmp.h:2564
-#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2626
-#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2746
-#: src/xml/xmli18n-tmp.h:2762 src/xml/xmli18n-tmp.h:2843
-#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2895
-#: src/xml/xmli18n-tmp.h:2912 src/xml/xmli18n-tmp.h:2946
-#: src/xml/xmli18n-tmp.h:3001 src/xml/xmli18n-tmp.h:3015
-#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3122
-#: src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2461 src/xml/xmli18n-tmp.h:2526
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2683 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2711 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3101 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3661
+#: src/xml/xmli18n-tmp.h:3678 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3750 src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:3782 src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:3932 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3964 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4388 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:4639 src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:4875 src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4936
+#: src/xml/xmli18n-tmp.h:4942 src/xml/xmli18n-tmp.h:4968
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5339 src/xml/xmli18n-tmp.h:5348
+#: src/xml/xmli18n-tmp.h:5355 src/xml/xmli18n-tmp.h:5361
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5417
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5430
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5477 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5502
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5536 src/xml/xmli18n-tmp.h:5544
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5557
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5657 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5719
+#: src/xml/xmli18n-tmp.h:5726 src/xml/xmli18n-tmp.h:5732
+#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5779
 msgid "Light Cyan"
 msgstr "Ljus cyan"
 
 #: src/escputil/escputil.c:1001 src/escputil/escputil.c:1290
-#: src/xml/xmli18n-tmp.h:1906 src/xml/xmli18n-tmp.h:1922
-#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:2003
-#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2080
-#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2120
-#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2174
-#: src/xml/xmli18n-tmp.h:2188 src/xml/xmli18n-tmp.h:2201
-#: src/xml/xmli18n-tmp.h:2214 src/xml/xmli18n-tmp.h:2227
-#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2294
-#: src/xml/xmli18n-tmp.h:2309 src/xml/xmli18n-tmp.h:2347
-#: src/xml/xmli18n-tmp.h:2360 src/xml/xmli18n-tmp.h:2419
-#: src/xml/xmli18n-tmp.h:2432 src/xml/xmli18n-tmp.h:2446
-#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2470
-#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2513
-#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2565
-#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2627
-#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2748
-#: src/xml/xmli18n-tmp.h:2761 src/xml/xmli18n-tmp.h:2844
-#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2896
-#: src/xml/xmli18n-tmp.h:2913 src/xml/xmli18n-tmp.h:2947
-#: src/xml/xmli18n-tmp.h:3000 src/xml/xmli18n-tmp.h:3014
-#: src/xml/xmli18n-tmp.h:3028 src/xml/xmli18n-tmp.h:3123
-#: src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2446
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2527
+#: src/xml/xmli18n-tmp.h:2541 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2644
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2698
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2751
+#: src/xml/xmli18n-tmp.h:2803 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2956 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2994
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3381
+#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3662
+#: src/xml/xmli18n-tmp.h:3746 src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:3778 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3934 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3966 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:4265 src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:4390 src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:4428 src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4452
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4465
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4512 src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4586 src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:4641 src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4903
+#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4970
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:5044 src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5168
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5241 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5334
+#: src/xml/xmli18n-tmp.h:5341 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5363
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5419
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5471
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5504
+#: src/xml/xmli18n-tmp.h:5510 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5652
+#: src/xml/xmli18n-tmp.h:5659 src/xml/xmli18n-tmp.h:5665
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5721
+#: src/xml/xmli18n-tmp.h:5728 src/xml/xmli18n-tmp.h:5734
+#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5781
 msgid "Light Magenta"
 msgstr "Ljus magenta"
 
-#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2433
-#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:3002
-#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3030
+#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3679 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4409 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:4566 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4605 src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4664 src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5376 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5450
+#: src/xml/xmli18n-tmp.h:5475 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5533 src/xml/xmli18n-tmp.h:5542
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5678 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5717
+#: src/xml/xmli18n-tmp.h:5747 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5777
 msgid "Light Black"
 msgstr "Ljus svart"
 
-#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:384
-#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
-#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
-#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
-#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
-#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
-#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
-#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
-#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
-#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
-#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
-#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
-#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
-#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
-#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
-#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
-#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
-#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
-#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
-#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
-#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
-#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
-#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
-#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
-#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
-#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
-#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
-#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
-#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
-#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
-#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1504
-#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1510
-#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1516
-#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1522
-#: src/xml/xmli18n-tmp.h:1525 src/xml/xmli18n-tmp.h:1528
-#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1534
-#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1540
-#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1546
-#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1552
-#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1558
-#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:2654
-#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2716
-#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3264
-#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3371
-#: src/xml/xmli18n-tmp.h:3539
+#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:508 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:532 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:538 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:562 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:568 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
+#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
+#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
+#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
+#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
+#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
+#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
+#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
+#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
+#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
+#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
+#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2011 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2026
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2032
+#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2038
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:4044 src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:5530
 msgid "Matte Black"
 msgstr "Matt svart"
 
-#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:2658
-#: src/xml/xmli18n-tmp.h:2702 src/xml/xmli18n-tmp.h:2720
-#: src/xml/xmli18n-tmp.h:3048
+#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3995 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4006 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4020 src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:4106 src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Gloss Optimizer"
 msgstr "Glansoptimerare"
 
-#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:2760
-#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3013
-#: src/xml/xmli18n-tmp.h:3027
+#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3676
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4616 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5534 src/xml/xmli18n-tmp.h:5573
 msgid "Light Light Black"
 msgstr "Ljus-ljus svart"
 
 #: src/escputil/escputil.c:1010 src/escputil/escputil.c:1029
-#: src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:4099 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4189
 #, fuzzy
 msgid "Orange"
 msgstr "Sida"
@@ -4393,8303 +5331,8477 @@ msgstr "Skriver ut..."
 #: src/xml/xmli18n-tmp.h:68 src/xml/xmli18n-tmp.h:70 src/xml/xmli18n-tmp.h:72
 #: src/xml/xmli18n-tmp.h:74 src/xml/xmli18n-tmp.h:76 src/xml/xmli18n-tmp.h:78
 #: src/xml/xmli18n-tmp.h:80 src/xml/xmli18n-tmp.h:82 src/xml/xmli18n-tmp.h:84
-#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:92
-#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
-#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
-#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
-#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
-#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
-#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
-#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
-#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
-#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
-#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
-#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
-#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
-#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
-#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
-#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
-#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
-#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
-#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
-#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
-#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
-#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
-#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
-#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
-#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
-#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
-#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
-#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
-#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
-#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
-#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
-#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
-#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
-#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
-#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
-#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
-#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
-#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
-#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
-#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
-#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
-#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
-#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
-#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
-#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
-#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
-#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
-#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
-#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
-#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
-#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
-#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
-#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
-#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
-#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
-#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
-#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
-#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
-#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
-#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
-#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
-#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
-#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
-#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
-#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
-#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
-#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
-#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
-#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
-#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
-#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
-#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
-#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
-#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
-#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
-#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
-#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
-#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
-#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
-#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
-#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
-#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
-#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
-#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
-#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
-#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
-#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
-#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
-#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
-#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
-#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
-#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
-#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
-#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
-#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
-#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
-#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:92 src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:102 src/xml/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:106 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:114 src/xml/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:118 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:126 src/xml/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:130 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:136 src/xml/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:144 src/xml/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:168 src/xml/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:192 src/xml/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:216 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:232 src/xml/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:240 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:256 src/xml/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:264 src/xml/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:304 src/xml/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:312 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:320 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:328 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:336 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:344 src/xml/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:352 src/xml/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:384 src/xml/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:408 src/xml/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:412 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:432 src/xml/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:444 src/xml/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:448 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:468 src/xml/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:484 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:642 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:698 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:714 src/xml/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:722 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:738 src/xml/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:746 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:764 src/xml/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:780 src/xml/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:804 src/xml/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:814
 #: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:818
 #: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:822
 #: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:826
 #: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:830
-#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:834
-#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:838
-#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:842
-#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:846
-#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:850
-#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
-#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
-#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
-#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
-#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
-#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
-#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
-#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:898
-#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
-#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
-#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
-#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
-#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
-#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
-#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
-#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
-#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
-#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
-#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
-#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
-#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
-#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
-#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
-#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
-#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
-#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
-#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
-#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1018
-#: src/xml/xmli18n-tmp.h:1021 src/xml/xmli18n-tmp.h:1024
-#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1030
-#: src/xml/xmli18n-tmp.h:1033 src/xml/xmli18n-tmp.h:1036
-#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1042
-#: src/xml/xmli18n-tmp.h:1045 src/xml/xmli18n-tmp.h:1048
-#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1054
-#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1060
-#: src/xml/xmli18n-tmp.h:1063 src/xml/xmli18n-tmp.h:1066
-#: src/xml/xmli18n-tmp.h:1069 src/xml/xmli18n-tmp.h:1072
-#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1078
-#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1084
-#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1090
-#: src/xml/xmli18n-tmp.h:1093 src/xml/xmli18n-tmp.h:1096
-#: src/xml/xmli18n-tmp.h:1099 src/xml/xmli18n-tmp.h:1102
-#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1108
-#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1114
-#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1120
-#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1126
-#: src/xml/xmli18n-tmp.h:1129 src/xml/xmli18n-tmp.h:1132
-#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
-#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
-#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
-#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
-#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
-#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
-#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
-#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
-#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
-#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
-#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
-#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
-#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
-#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1189
-#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1193
-#: src/xml/xmli18n-tmp.h:1195 src/xml/xmli18n-tmp.h:1197
-#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1201
-#: src/xml/xmli18n-tmp.h:1203 src/xml/xmli18n-tmp.h:1205
-#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1209
-#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1221
-#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
-#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
-#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
-#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
-#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
-#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
-#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
-#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
-#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
-#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
-#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
-#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
-#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
-#: src/xml/xmli18n-tmp.h:1302 src/xml/xmli18n-tmp.h:1305
-#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1311
-#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1317
-#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1323
-#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1329
-#: src/xml/xmli18n-tmp.h:1332 src/xml/xmli18n-tmp.h:1335
-#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
-#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1343
-#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1347
-#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1351
-#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1355
-#: src/xml/xmli18n-tmp.h:1357 src/xml/xmli18n-tmp.h:1359
-#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1363
-#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1367
-#: src/xml/xmli18n-tmp.h:1369 src/xml/xmli18n-tmp.h:1371
-#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1375
-#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1566
-#: src/xml/xmli18n-tmp.h:1569 src/xml/xmli18n-tmp.h:1572
-#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1578
-#: src/xml/xmli18n-tmp.h:1581 src/xml/xmli18n-tmp.h:1584
-#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1590
-#: src/xml/xmli18n-tmp.h:1593 src/xml/xmli18n-tmp.h:1596
-#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1602
-#: src/xml/xmli18n-tmp.h:1605 src/xml/xmli18n-tmp.h:1608
-#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1614
-#: src/xml/xmli18n-tmp.h:1617 src/xml/xmli18n-tmp.h:1620
-#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1626
-#: src/xml/xmli18n-tmp.h:1629 src/xml/xmli18n-tmp.h:1632
-#: src/xml/xmli18n-tmp.h:1635 src/xml/xmli18n-tmp.h:1638
-#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1644
-#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
-#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
-#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
-#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
-#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
-#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
-#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
-#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
-#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
-#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
-#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
-#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
-#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
-#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
-#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:1778
-#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1782
-#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1786
-#: src/xml/xmli18n-tmp.h:1788 src/xml/xmli18n-tmp.h:1790
-#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1794
-#: src/xml/xmli18n-tmp.h:1796 src/xml/xmli18n-tmp.h:1798
-#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1802
-#: src/xml/xmli18n-tmp.h:1804 src/xml/xmli18n-tmp.h:1806
-#: src/xml/xmli18n-tmp.h:1808 src/xml/xmli18n-tmp.h:1810
-#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3204
-#: src/xml/xmli18n-tmp.h:3210 src/xml/xmli18n-tmp.h:3216
-#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3232
-#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3250
-#: src/xml/xmli18n-tmp.h:3294 src/xml/xmli18n-tmp.h:3302
-#: src/xml/xmli18n-tmp.h:3304 src/xml/xmli18n-tmp.h:3312
-#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3379
-#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
-#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3421
-#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3441
-#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3469
-#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3555
-#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3597
-#: src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:1017
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1025
+#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1035 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1047 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1056
+#: src/xml/xmli18n-tmp.h:1061 src/xml/xmli18n-tmp.h:1066
+#: src/xml/xmli18n-tmp.h:1071 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1086
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1096
+#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1116
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1126
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1136
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1161 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1181 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1206
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1216
+#: src/xml/xmli18n-tmp.h:1221 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1236
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1246
+#: src/xml/xmli18n-tmp.h:1251 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1261 src/xml/xmli18n-tmp.h:1266
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1281 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1291 src/xml/xmli18n-tmp.h:1296
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1311 src/xml/xmli18n-tmp.h:1316
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1326
+#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1336
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1378 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1414 src/xml/xmli18n-tmp.h:1420
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1432
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1450 src/xml/xmli18n-tmp.h:1455
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1465
+#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1480 src/xml/xmli18n-tmp.h:1485
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1540 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1551 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1583 src/xml/xmli18n-tmp.h:1585
+#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1603 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1607 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1646
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1666
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1676
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1716
+#: src/xml/xmli18n-tmp.h:1721 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1736
+#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1835
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1843
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1851
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:2049
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2057
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2065
+#: src/xml/xmli18n-tmp.h:2069 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2113
+#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2129
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2137
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2153
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2161
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2185
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2264
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2272
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2276
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2282 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2286 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2296
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2300
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2308
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2314 src/xml/xmli18n-tmp.h:2316
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2324
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:3787 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3895 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:4223 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5579
+#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5825
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Bright White Paper"
 msgstr "Matte-papper"
 
-#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
-#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
-#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
-#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
-#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
-#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
-#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
-#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:817
-#: src/xml/xmli18n-tmp.h:855 src/xml/xmli18n-tmp.h:912
-#: src/xml/xmli18n-tmp.h:969 src/xml/xmli18n-tmp.h:1026
-#: src/xml/xmli18n-tmp.h:1083 src/xml/xmli18n-tmp.h:1136
-#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1226
-#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1338
-#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1445
-#: src/xml/xmli18n-tmp.h:1505 src/xml/xmli18n-tmp.h:1568
-#: src/xml/xmli18n-tmp.h:1625 src/xml/xmli18n-tmp.h:1682
-#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1777
-#: src/xml/xmli18n-tmp.h:3675
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:139 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:959 src/xml/xmli18n-tmp.h:1018
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1155
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1546
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1931
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:5912
 msgid "Postcard"
 msgstr "Vykort"
 
-#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
-#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
-#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
-#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
-#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
-#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
-#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
-#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:825
-#: src/xml/xmli18n-tmp.h:867 src/xml/xmli18n-tmp.h:924
-#: src/xml/xmli18n-tmp.h:981 src/xml/xmli18n-tmp.h:1038
-#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1144
-#: src/xml/xmli18n-tmp.h:1182 src/xml/xmli18n-tmp.h:1238
-#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1346
-#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1457
-#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1580
-#: src/xml/xmli18n-tmp.h:1637 src/xml/xmli18n-tmp.h:1694
-#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1785
+#: src/xml/xmli18n-tmp.h:13 src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:155 src/xml/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:415 src/xml/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:851 src/xml/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1026
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1175
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1554
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1832
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2309
 msgid "Back Light Film"
 msgstr "Bakljusfilm"
 
-#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
-#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
-#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
-#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
-#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
-#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
-#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
-#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:829
-#: src/xml/xmli18n-tmp.h:873 src/xml/xmli18n-tmp.h:930
-#: src/xml/xmli18n-tmp.h:987 src/xml/xmli18n-tmp.h:1044
-#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1148
-#: src/xml/xmli18n-tmp.h:1186 src/xml/xmli18n-tmp.h:1244
-#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1350
-#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1463
-#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1586
-#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1700
-#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1789
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:419 src/xml/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:857 src/xml/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1030
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1383
+#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1558
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2313
 msgid "Matte Paper Heavyweight"
 msgstr "Matt tungt papper"
 
-#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
-#: src/xml/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:421
 #, fuzzy
 msgid "Premium Presentation Paper Matte"
 msgstr "Fotopapper med premiumlyster"
 
-#: src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:431
 #, fuzzy
-msgid "Premium Glossy Photo Paper 170 wt"
-msgstr "Premiumglansigt fotopapper"
+msgid "Ultra Glossy Photo Paper"
+msgstr "Glansigt fotopapper"
 
-#: src/xml/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1210
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1413
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1568
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1695
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1964
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2176 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2287 src/xml/xmli18n-tmp.h:2323
+msgid "Premium Semigloss Photo Paper"
+msgstr "Premium halvglansigt fotopapper"
+
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:437
 #, fuzzy
-msgid "Premium Glossy Photo Paper 250 wt"
+msgid "Ultra Premium Photo Paper Luster"
 msgstr "Premiumglansigt fotopapper"
 
-#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
-#: src/xml/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:37
+msgid "CD or DVD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:93 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1230
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1437
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2331
+msgid "ColorLife Paper"
+msgstr "ColorLife-papper"
+
+#: src/xml/xmli18n-tmp.h:73
 #, fuzzy
-msgid "Ultra Glossy Photo Paper"
-msgstr "Glansigt fotopapper"
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "Premiumglansigt fotopapper"
 
-#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
-#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
-#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
-#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
-#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
-#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
-#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
-#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:839
-#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:945
-#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1059
-#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1158
-#: src/xml/xmli18n-tmp.h:1196 src/xml/xmli18n-tmp.h:1259
-#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1360
-#: src/xml/xmli18n-tmp.h:1415 src/xml/xmli18n-tmp.h:1478
-#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1601
-#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1715
-#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1799
-msgid "Premium Semigloss Photo Paper"
-msgstr "Premium halvglansigt fotopapper"
+#: src/xml/xmli18n-tmp.h:75
+#, fuzzy
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "Premiumglansigt fotopapper"
 
-#: src/xml/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:81
 #, fuzzy
 msgid "Premium Semigloss Photo Paper 170 wt"
 msgstr "Premium halvglansigt fotopapper"
 
-#: src/xml/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:83
 #, fuzzy
 msgid "Premium Semigloss Photo Paper 250 wt"
 msgstr "Premium halvglansigt fotopapper"
 
-#: src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:87
 #, fuzzy
 msgid "Premium Luster Photo Paper 250 wt"
 msgstr "Fotopapper med premiumlyster"
 
-#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
-#: src/xml/xmli18n-tmp.h:334
-#, fuzzy
-msgid "Ultra Premium Photo Paper Luster"
-msgstr "Premiumglansigt fotopapper"
-
-#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
-#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
-#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
-#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
-#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
-#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
-#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
-#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:845
-#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:957
-#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1071
-#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1166
-#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1271
-#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1372
-#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1496
-#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1613
-#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1733
-#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1807
-msgid "ColorLife Paper"
-msgstr "ColorLife-papper"
-
-#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
-#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
-#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
-#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
-#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
-#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
-#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
-#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
-#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
-#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
-#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
-#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
-#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
-#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
-#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
-#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
-#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
-#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
-#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
-#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
-#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
-#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
-#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
-#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
-#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
-#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
-#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
-#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
-#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
-#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
-#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
-#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
-#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
-#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
-#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
-#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
-#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
-#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
-#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
-#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
-#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
-#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
-#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
-#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
-#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
-#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
-#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:851
-#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:857
-#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:863
-#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:869
-#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:875
-#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:881
-#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:887
-#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:893
-#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:899
-#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:905
-#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:911
-#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:917
-#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:923
-#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:929
-#: src/xml/xmli18n-tmp.h:932 src/xml/xmli18n-tmp.h:935
-#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:941
-#: src/xml/xmli18n-tmp.h:944 src/xml/xmli18n-tmp.h:947
-#: src/xml/xmli18n-tmp.h:950 src/xml/xmli18n-tmp.h:953
-#: src/xml/xmli18n-tmp.h:956 src/xml/xmli18n-tmp.h:959
-#: src/xml/xmli18n-tmp.h:962 src/xml/xmli18n-tmp.h:965
-#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:971
-#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:977
-#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:983
-#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:989
-#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:995
-#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1001
-#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1007
-#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1013
-#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1019
-#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1025
-#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1031
-#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1037
-#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1043
-#: src/xml/xmli18n-tmp.h:1046 src/xml/xmli18n-tmp.h:1049
-#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1055
-#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1061
-#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1067
-#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1073
-#: src/xml/xmli18n-tmp.h:1076 src/xml/xmli18n-tmp.h:1079
-#: src/xml/xmli18n-tmp.h:1082 src/xml/xmli18n-tmp.h:1085
-#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1091
-#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1097
-#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1103
-#: src/xml/xmli18n-tmp.h:1106 src/xml/xmli18n-tmp.h:1109
-#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1115
-#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1121
-#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1127
-#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1133
-#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1225
-#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1231
-#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1237
-#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1243
-#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1249
-#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1255
-#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1261
-#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1267
-#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1273
-#: src/xml/xmli18n-tmp.h:1276 src/xml/xmli18n-tmp.h:1279
-#: src/xml/xmli18n-tmp.h:1282 src/xml/xmli18n-tmp.h:1285
-#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1291
-#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1297
-#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1303
-#: src/xml/xmli18n-tmp.h:1306 src/xml/xmli18n-tmp.h:1309
-#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1315
-#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1321
-#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1327
-#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1333
-#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1567
-#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1573
-#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1579
-#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1585
-#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1591
-#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1597
-#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1603
-#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1609
-#: src/xml/xmli18n-tmp.h:1612 src/xml/xmli18n-tmp.h:1615
-#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1621
-#: src/xml/xmli18n-tmp.h:1624 src/xml/xmli18n-tmp.h:1627
-#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1633
-#: src/xml/xmli18n-tmp.h:1636 src/xml/xmli18n-tmp.h:1639
-#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1645
-#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1651
-#: src/xml/xmli18n-tmp.h:1654 src/xml/xmli18n-tmp.h:1657
-#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1663
-#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1669
-#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1675
-#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3223
-#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3231
-#: src/xml/xmli18n-tmp.h:3238 src/xml/xmli18n-tmp.h:3239
-#: src/xml/xmli18n-tmp.h:3300 src/xml/xmli18n-tmp.h:3301
-#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3311
-#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3396
-#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3408
-#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3420
-#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3432
-#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3440
-#: src/xml/xmli18n-tmp.h:3479 src/xml/xmli18n-tmp.h:3480
-#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3492
-#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3554
-#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:133 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:149 src/xml/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:173 src/xml/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:197 src/xml/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:205 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:221 src/xml/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:229 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:245 src/xml/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:253 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:261 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:269 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:277 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:285 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:293 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:301 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:309 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:317 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:325 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:333 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:341 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:349 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:357 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:619 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:643 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:667 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:691 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:707 src/xml/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:715 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:731 src/xml/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:739 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:755 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1062
+#: src/xml/xmli18n-tmp.h:1067 src/xml/xmli18n-tmp.h:1072
+#: src/xml/xmli18n-tmp.h:1077 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1092
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1102
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1112
+#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1122
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1132
+#: src/xml/xmli18n-tmp.h:1137 src/xml/xmli18n-tmp.h:1142
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1157 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1177 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1192
+#: src/xml/xmli18n-tmp.h:1197 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1212
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1222
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1242
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1252
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1272
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1287 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1297 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1327 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1385 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1445 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1461
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1516 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1647
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1657
+#: src/xml/xmli18n-tmp.h:1662 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1677
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1687
+#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1742 src/xml/xmli18n-tmp.h:1747
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1767
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1807
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2090 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2098 src/xml/xmli18n-tmp.h:2102
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2118
+#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2126
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2162 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2190
+#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:3884 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:4779 src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:4845 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4919
+#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4980
+#: src/xml/xmli18n-tmp.h:4986 src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5209 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5276
+#: src/xml/xmli18n-tmp.h:5277 src/xml/xmli18n-tmp.h:5283
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5607 src/xml/xmli18n-tmp.h:5633
+#: src/xml/xmli18n-tmp.h:5634 src/xml/xmli18n-tmp.h:5640
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
-#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
-#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
-#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
-#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:852
-#: src/xml/xmli18n-tmp.h:909 src/xml/xmli18n-tmp.h:966
-#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1080
-#: src/xml/xmli18n-tmp.h:1172 src/xml/xmli18n-tmp.h:1223
-#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1336
-#: src/xml/xmli18n-tmp.h:1379 src/xml/xmli18n-tmp.h:1442
-#: src/xml/xmli18n-tmp.h:1565 src/xml/xmli18n-tmp.h:1622
-#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1775
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:142 src/xml/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:150 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:174 src/xml/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:198 src/xml/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:214 src/xml/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:222 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:238 src/xml/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:246 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:262 src/xml/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:302 src/xml/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:310 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:318 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:326 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:334 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:342 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:350 src/xml/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:636 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:660 src/xml/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:708 src/xml/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:716 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:732 src/xml/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:756 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1103
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1123
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1158 src/xml/xmli18n-tmp.h:1163
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1183
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1193
+#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1213
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1223
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1238 src/xml/xmli18n-tmp.h:1243
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1253
+#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1283
+#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1313
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1333
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1362 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1374 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1462
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1472
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1487 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1502
+#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:1532
+#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1542
+#: src/xml/xmli18n-tmp.h:1633 src/xml/xmli18n-tmp.h:1638
+#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1648
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1658
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1713 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1728
+#: src/xml/xmli18n-tmp.h:1733 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1768
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2071
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2095
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2115 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2123 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2139 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2183
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2191
+#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2199
+#, fuzzy
+msgid "MISQuadtone"
+msgstr "Quadtone"
+
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1150 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2299
 msgid "Plain Paper Fast Load"
 msgstr "Snabbladdning av vanligt papper"
 
-#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
-#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
-#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1364
-#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1484
-#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1970 src/xml/xmli18n-tmp.h:2030
+#: src/xml/xmli18n-tmp.h:2245
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Matte-papper"
 
-#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
-#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
-#: src/xml/xmli18n-tmp.h:1202 src/xml/xmli18n-tmp.h:1366
-#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1487
-#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:881 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2248
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
-#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
-#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
-#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
-#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
-#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
-#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
-#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
-#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
-#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
-#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1377
-#: src/xml/xmli18n-tmp.h:1380 src/xml/xmli18n-tmp.h:1383
-#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1389
-#: src/xml/xmli18n-tmp.h:1392 src/xml/xmli18n-tmp.h:1395
-#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1401
-#: src/xml/xmli18n-tmp.h:1404 src/xml/xmli18n-tmp.h:1407
-#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1413
-#: src/xml/xmli18n-tmp.h:1416 src/xml/xmli18n-tmp.h:1419
-#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1425
-#: src/xml/xmli18n-tmp.h:1428 src/xml/xmli18n-tmp.h:1431
-#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1437
-#: src/xml/xmli18n-tmp.h:1440 src/xml/xmli18n-tmp.h:1443
-#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1449
-#: src/xml/xmli18n-tmp.h:1452 src/xml/xmli18n-tmp.h:1455
-#: src/xml/xmli18n-tmp.h:1458 src/xml/xmli18n-tmp.h:1461
-#: src/xml/xmli18n-tmp.h:1464 src/xml/xmli18n-tmp.h:1467
-#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1473
-#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1479
-#: src/xml/xmli18n-tmp.h:1482 src/xml/xmli18n-tmp.h:1485
-#: src/xml/xmli18n-tmp.h:1488 src/xml/xmli18n-tmp.h:1491
-#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1497
-#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1677
-#: src/xml/xmli18n-tmp.h:1680 src/xml/xmli18n-tmp.h:1683
-#: src/xml/xmli18n-tmp.h:1686 src/xml/xmli18n-tmp.h:1689
-#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1695
-#: src/xml/xmli18n-tmp.h:1698 src/xml/xmli18n-tmp.h:1701
-#: src/xml/xmli18n-tmp.h:1704 src/xml/xmli18n-tmp.h:1707
-#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1713
-#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1719
-#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1725
-#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1731
-#: src/xml/xmli18n-tmp.h:1734 src/xml/xmli18n-tmp.h:1737
-#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3503
-#: src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:1863
+#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1881
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1893
+#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1905
+#: src/xml/xmli18n-tmp.h:1908 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1923
+#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:1950 src/xml/xmli18n-tmp.h:1953
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1968 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1983
+#: src/xml/xmli18n-tmp.h:1986 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2204 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2255
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5645
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Sexfärgs foto"
 
-#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
-#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
-#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
-#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
-#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
-#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
-#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
-#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
-#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
-#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
-#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1378
-#: src/xml/xmli18n-tmp.h:1381 src/xml/xmli18n-tmp.h:1384
-#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1390
-#: src/xml/xmli18n-tmp.h:1393 src/xml/xmli18n-tmp.h:1396
-#: src/xml/xmli18n-tmp.h:1399 src/xml/xmli18n-tmp.h:1402
-#: src/xml/xmli18n-tmp.h:1405 src/xml/xmli18n-tmp.h:1408
-#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1414
-#: src/xml/xmli18n-tmp.h:1417 src/xml/xmli18n-tmp.h:1420
-#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1426
-#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1432
-#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1438
-#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1444
-#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1450
-#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1456
-#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1462
-#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1468
-#: src/xml/xmli18n-tmp.h:1471 src/xml/xmli18n-tmp.h:1474
-#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1480
-#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1486
-#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1492
-#: src/xml/xmli18n-tmp.h:1495 src/xml/xmli18n-tmp.h:1498
-#: src/xml/xmli18n-tmp.h:1501 src/xml/xmli18n-tmp.h:1678
-#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1684
-#: src/xml/xmli18n-tmp.h:1687 src/xml/xmli18n-tmp.h:1690
-#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1696
-#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1702
-#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1708
-#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1714
-#: src/xml/xmli18n-tmp.h:1717 src/xml/xmli18n-tmp.h:1720
-#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1726
-#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1732
-#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1738
-#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3517
-#: src/xml/xmli18n-tmp.h:3577
+#: src/xml/xmli18n-tmp.h:835 src/xml/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:841 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1879 src/xml/xmli18n-tmp.h:1882
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1894
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1909 src/xml/xmli18n-tmp.h:1912
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1924
+#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1954
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1969 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1984
+#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2208
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2229 src/xml/xmli18n-tmp.h:2232
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2238
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2244
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2253 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2259 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5714
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1826
-#: src/xml/xmli18n-tmp.h:1839 src/xml/xmli18n-tmp.h:1852
-#: src/xml/xmli18n-tmp.h:1907 src/xml/xmli18n-tmp.h:1923
-#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1952
-#: src/xml/xmli18n-tmp.h:1965 src/xml/xmli18n-tmp.h:2054
-#: src/xml/xmli18n-tmp.h:2081 src/xml/xmli18n-tmp.h:2146
-#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
-#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
-#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2348
-#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2407
-#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2899
-#: src/xml/xmli18n-tmp.h:2916 src/xml/xmli18n-tmp.h:3142
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1139
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1154 src/xml/xmli18n-tmp.h:1159
+#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1179
+#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1199
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1214 src/xml/xmli18n-tmp.h:1219
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1229
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1244 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1259
+#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1274 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1289
+#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1309
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1329
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1423
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1429
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1447
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1634
+#: src/xml/xmli18n-tmp.h:1639 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1664
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1764
+#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1784
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1799 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1819
+msgid "MIS Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1463 src/xml/xmli18n-tmp.h:1468
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1478
+#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1508
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1533 src/xml/xmli18n-tmp.h:1538
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4858 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:5289
+msgid "Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2489 src/xml/xmli18n-tmp.h:2578
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2713 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2752
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2885 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:3051 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3665
 msgid "360 x 90 DPI Fast Economy"
 msgstr "360 × 90 DPI snabb ekonomi"
 
-#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1828
-#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1853
-#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1879
-#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
-#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1940
-#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1966
-#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2055
-#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2133
-#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2175
-#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
-#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
-#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2336
-#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
-#: src/xml/xmli18n-tmp.h:2408 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2699
+#: src/xml/xmli18n-tmp.h:2714 src/xml/xmli18n-tmp.h:2727
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2886
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:3052
 msgid "180 DPI Economy"
 msgstr "180 DPI ekonomi"
 
-#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1830
-#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1854
-#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1880
-#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
-#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1941
-#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1967
-#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
-#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2134
-#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2176
-#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
-#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
-#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2337
-#: src/xml/xmli18n-tmp.h:2350 src/xml/xmli18n-tmp.h:2363
-#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
-#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2434
-#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2459
-#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2529
-#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2601
-#: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2703
-#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2735
-#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2768
-#: src/xml/xmli18n-tmp.h:2872 src/xml/xmli18n-tmp.h:2884
-#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2917
-#: src/xml/xmli18n-tmp.h:2961 src/xml/xmli18n-tmp.h:3007
-#: src/xml/xmli18n-tmp.h:3021 src/xml/xmli18n-tmp.h:3035
-#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3126
-#: src/xml/xmli18n-tmp.h:3143
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2404
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2658
+#: src/xml/xmli18n-tmp.h:2672 src/xml/xmli18n-tmp.h:2700
+#: src/xml/xmli18n-tmp.h:2715 src/xml/xmli18n-tmp.h:2728
+#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2754
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2919 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3053
+#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3125
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3292
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3530
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3649
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3684
 msgid "360 x 180 DPI Draft"
 msgstr "360 × 180 DPI utdrag"
 
-#: src/xml/xmli18n-tmp.h:1818 src/xml/xmli18n-tmp.h:1831
-#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1855
-#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1881
-#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
-#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1942
-#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1968
-#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2135
-#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2392 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2418 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2479 src/xml/xmli18n-tmp.h:2492
+#: src/xml/xmli18n-tmp.h:2581 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2862 src/xml/xmli18n-tmp.h:2934
 msgid "360 DPI High Quality"
 msgstr "360 DPI hög kvalitet"
 
-#: src/xml/xmli18n-tmp.h:1819 src/xml/xmli18n-tmp.h:1832
-#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1856
-#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1882
-#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
-#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1943
-#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1969
-#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1992
-#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2020
-#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
-#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
-#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2096
-#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2123
-#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2149
-#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2177
-#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2205
-#: src/xml/xmli18n-tmp.h:2218 src/xml/xmli18n-tmp.h:2231
-#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2254
-#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
-#: src/xml/xmli18n-tmp.h:2297 src/xml/xmli18n-tmp.h:2312
-#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2339
-#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
-#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2385
-#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2411
-#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2435
-#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2460
-#: src/xml/xmli18n-tmp.h:2473 src/xml/xmli18n-tmp.h:2488
-#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2516
-#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2541
-#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2591
-#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
-#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2645
-#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2675
-#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2704
-#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2736
-#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2769
-#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2808
-#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2833
-#: src/xml/xmli18n-tmp.h:2847 src/xml/xmli18n-tmp.h:2861
-#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2885
-#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2918
-#: src/xml/xmli18n-tmp.h:2935 src/xml/xmli18n-tmp.h:2950
-#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2987
-#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3022
-#: src/xml/xmli18n-tmp.h:3036 src/xml/xmli18n-tmp.h:3050
-#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3081
-#: src/xml/xmli18n-tmp.h:3098 src/xml/xmli18n-tmp.h:3113
-#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2369 src/xml/xmli18n-tmp.h:2380
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2406
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2493
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2544
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
+#: src/xml/xmli18n-tmp.h:2582 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2729
+#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2806
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2836
+#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
+#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3012
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3040
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3184 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3424 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3485 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3573
+#: src/xml/xmli18n-tmp.h:3587 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3650 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3685
 msgid "360 DPI"
 msgstr "360 DPI"
 
-#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1833
-#: src/xml/xmli18n-tmp.h:1846 src/xml/xmli18n-tmp.h:1857
-#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1883
-#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1912
-#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1944
-#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1970
-#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1993
-#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2021
-#: src/xml/xmli18n-tmp.h:2033 src/xml/xmli18n-tmp.h:2045
-#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
-#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2097
-#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2124
-#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2150
-#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2178
-#: src/xml/xmli18n-tmp.h:2193 src/xml/xmli18n-tmp.h:2206
-#: src/xml/xmli18n-tmp.h:2219 src/xml/xmli18n-tmp.h:2232
-#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2255
-#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
-#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2313
-#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2340
-#: src/xml/xmli18n-tmp.h:2352 src/xml/xmli18n-tmp.h:2365
-#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2386
-#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2412
-#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2436
-#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2461
-#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2489
-#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2517
-#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2542
-#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2567
-#: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2592
-#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2616
-#: src/xml/xmli18n-tmp.h:2631 src/xml/xmli18n-tmp.h:2646
-#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2676
-#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2705
-#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2737
-#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2770
-#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2809
-#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2834
-#: src/xml/xmli18n-tmp.h:2848 src/xml/xmli18n-tmp.h:2862
-#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2886
-#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2919
-#: src/xml/xmli18n-tmp.h:2936 src/xml/xmli18n-tmp.h:2951
-#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2988
-#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3023
-#: src/xml/xmli18n-tmp.h:3037 src/xml/xmli18n-tmp.h:3051
-#: src/xml/xmli18n-tmp.h:3066 src/xml/xmli18n-tmp.h:3083
-#: src/xml/xmli18n-tmp.h:3099 src/xml/xmli18n-tmp.h:3114
-#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:2344 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2452 src/xml/xmli18n-tmp.h:2468
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2494
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2557 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:2594
+#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2648
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2674
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2807
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2837
+#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
+#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3013
+#: src/xml/xmli18n-tmp.h:3026 src/xml/xmli18n-tmp.h:3041
+#: src/xml/xmli18n-tmp.h:3055 src/xml/xmli18n-tmp.h:3066
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3140
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3170
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3229
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3333
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3358
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3385
+#: src/xml/xmli18n-tmp.h:3397 src/xml/xmli18n-tmp.h:3409
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3442
+#: src/xml/xmli18n-tmp.h:3459 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3574
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3637
+#: src/xml/xmli18n-tmp.h:3651 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3686
 msgid "720 x 360 DPI"
 msgstr "720 × 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1834
-#: src/xml/xmli18n-tmp.h:1847 src/xml/xmli18n-tmp.h:1858
-#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1884
-#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1913
-#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1945
-#: src/xml/xmli18n-tmp.h:1958 src/xml/xmli18n-tmp.h:1971
-#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:1994
-#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2022
-#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2046
-#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2071
-#: src/xml/xmli18n-tmp.h:2086 src/xml/xmli18n-tmp.h:2098
-#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2125
-#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2151
-#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2179
-#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2207
-#: src/xml/xmli18n-tmp.h:2220 src/xml/xmli18n-tmp.h:2233
-#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2256
-#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
-#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2314
-#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2341
-#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
-#: src/xml/xmli18n-tmp.h:2376 src/xml/xmli18n-tmp.h:2387
-#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2413
-#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2437
-#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2462
-#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2490
-#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2518
-#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2543
-#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
-#: src/xml/xmli18n-tmp.h:2580 src/xml/xmli18n-tmp.h:2593
-#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2617
-#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
-#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2677
-#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2706
-#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2738
-#: src/xml/xmli18n-tmp.h:2753 src/xml/xmli18n-tmp.h:2771
-#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2810
-#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2835
-#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
-#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2887
-#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2921
-#: src/xml/xmli18n-tmp.h:2937 src/xml/xmli18n-tmp.h:2952
-#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2990
-#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3024
-#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3052
-#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3085
-#: src/xml/xmli18n-tmp.h:3100 src/xml/xmli18n-tmp.h:3115
-#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:2345 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2469
+#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2546
+#: src/xml/xmli18n-tmp.h:2558 src/xml/xmli18n-tmp.h:2570
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2595
+#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2622
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2675
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2731
+#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2808
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2838
+#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2890
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2922 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3014
+#: src/xml/xmli18n-tmp.h:3027 src/xml/xmli18n-tmp.h:3042
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3067
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3186 src/xml/xmli18n-tmp.h:3201
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3334
+#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3359
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3444
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3475
+#: src/xml/xmli18n-tmp.h:3489 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3533 src/xml/xmli18n-tmp.h:3547
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3652 src/xml/xmli18n-tmp.h:3669
+#: src/xml/xmli18n-tmp.h:3687
 msgid "720 DPI"
 msgstr "720 DPI"
 
-#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
-#: src/xml/xmli18n-tmp.h:1978 src/xml/xmli18n-tmp.h:2004
-#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2030
-#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2067
-#: src/xml/xmli18n-tmp.h:2094 src/xml/xmli18n-tmp.h:2107
-#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2161
-#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2252
-#: src/xml/xmli18n-tmp.h:2280 src/xml/xmli18n-tmp.h:2295
-#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2323
-#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
-#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2486
-#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2552
-#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2613
-#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
-#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2686
-#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2806
-#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2831
-#: src/xml/xmli18n-tmp.h:2845 src/xml/xmli18n-tmp.h:2859
-#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2948
-#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3080
-#: src/xml/xmli18n-tmp.h:3097 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2554
+#: src/xml/xmli18n-tmp.h:2566 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2804 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2834 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3076
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3382
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3586 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3634
 msgid "360 x 120 DPI Economy"
 msgstr "360 × 120 DPI ekonomi"
 
-#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1842
-#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2005
-#: src/xml/xmli18n-tmp.h:2019 src/xml/xmli18n-tmp.h:2031
-#: src/xml/xmli18n-tmp.h:2043 src/xml/xmli18n-tmp.h:2068
-#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
-#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2162
-#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2253
-#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2296
-#: src/xml/xmli18n-tmp.h:2311 src/xml/xmli18n-tmp.h:2324
-#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2384
-#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2487
-#: src/xml/xmli18n-tmp.h:2500 src/xml/xmli18n-tmp.h:2553
-#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2614
-#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2644
-#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2687
-#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2807
-#: src/xml/xmli18n-tmp.h:2820 src/xml/xmli18n-tmp.h:2832
-#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
-#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2949
-#: src/xml/xmli18n-tmp.h:3112
+#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2555
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2632
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3077
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3211
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3383
+#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3635
 msgid "360 x 240 DPI Draft"
 msgstr "360 × 240 DPI utdrag"
 
-#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1872
-#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1898
-#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1930
-#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1959
-#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:1995
-#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2023
-#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2047
-#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2087
-#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2112
-#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2139
-#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2166
-#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2328
-#: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2388
-#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2557
-#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2922
-#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2991
-#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3086
+#: src/xml/xmli18n-tmp.h:2383 src/xml/xmli18n-tmp.h:2396
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2422
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2470 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2507 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2704 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:3057 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3118 src/xml/xmli18n-tmp.h:3445
+#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3514
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3609
 msgid "720 DPI High Quality"
 msgstr "720 DPI hög kvalitet"
 
-#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1873
-#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1899
-#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1931
-#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1984
-#: src/xml/xmli18n-tmp.h:1996 src/xml/xmli18n-tmp.h:2010
-#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2036
-#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2061
-#: src/xml/xmli18n-tmp.h:2073 src/xml/xmli18n-tmp.h:2088
-#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2127
-#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2153
-#: src/xml/xmli18n-tmp.h:2167 src/xml/xmli18n-tmp.h:2181
-#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2208
-#: src/xml/xmli18n-tmp.h:2221 src/xml/xmli18n-tmp.h:2234
-#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2257
-#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2285
-#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2315
-#: src/xml/xmli18n-tmp.h:2329 src/xml/xmli18n-tmp.h:2354
-#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2389
-#: src/xml/xmli18n-tmp.h:2399 src/xml/xmli18n-tmp.h:2425
-#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2451
-#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
-#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2504
-#: src/xml/xmli18n-tmp.h:2519 src/xml/xmli18n-tmp.h:2534
-#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2558
-#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2605
-#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2633
-#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2663
-#: src/xml/xmli18n-tmp.h:2678 src/xml/xmli18n-tmp.h:2691
-#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2725
-#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2754
-#: src/xml/xmli18n-tmp.h:2772 src/xml/xmli18n-tmp.h:2787
-#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2811
-#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2836
-#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
-#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2888
-#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2923
-#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2953
-#: src/xml/xmli18n-tmp.h:2968 src/xml/xmli18n-tmp.h:2978
-#: src/xml/xmli18n-tmp.h:2992 src/xml/xmli18n-tmp.h:3011
-#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3039
-#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
-#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3101
-#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3130
-#: src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:2384 src/xml/xmli18n-tmp.h:2397
+#: src/xml/xmli18n-tmp.h:2410 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2548 src/xml/xmli18n-tmp.h:2560
+#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2691 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2794 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2839
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2923 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3105
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3129
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3231 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3311
+#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3335
+#: src/xml/xmli18n-tmp.h:3348 src/xml/xmli18n-tmp.h:3360
+#: src/xml/xmli18n-tmp.h:3372 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3427 src/xml/xmli18n-tmp.h:3446
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3576 src/xml/xmli18n-tmp.h:3593
+#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3688
 msgid "1440 x 720 DPI"
 msgstr "1440 × 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1874
-#: src/xml/xmli18n-tmp.h:1887 src/xml/xmli18n-tmp.h:1900
-#: src/xml/xmli18n-tmp.h:1916 src/xml/xmli18n-tmp.h:1932
-#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1985
-#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2011
-#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2037
-#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2062
-#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2089
-#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2128
-#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2154
-#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2182
-#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2258
-#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
-#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2316
-#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2390
-#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2559
-#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2634
-#: src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2385 src/xml/xmli18n-tmp.h:2398
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2535
+#: src/xml/xmli18n-tmp.h:2549 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2782
+#: src/xml/xmli18n-tmp.h:2795 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3388
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 × 720 DPI högsta kvalitet"
 
-#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1960
-#: src/xml/xmli18n-tmp.h:2100 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2902
 msgid "720 DPI Highest Quality"
 msgstr "720 DPI högsta kvalitet"
 
-#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2259
-#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
-#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2317
-#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2477
-#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2505
-#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2606
-#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2635
-#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2740
-#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2866
-#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2796 src/xml/xmli18n-tmp.h:2811
+#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3216 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3412
 msgid "2880 x 720 DPI"
 msgstr "2880 × 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2260
-#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
-#: src/xml/xmli18n-tmp.h:2303 src/xml/xmli18n-tmp.h:2318
-#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2771 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2812
+#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:3160 src/xml/xmli18n-tmp.h:3390
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 × 720 DPI högsta kvalitet"
 
-#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2439
-#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2493
-#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2546
-#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2582
-#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2620
-#: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2664
-#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
-#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2726
-#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2755
-#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2789
-#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2812
-#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2878
-#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
-#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2939
-#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2969
-#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2994
-#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
-#: src/xml/xmli18n-tmp.h:3088 src/xml/xmli18n-tmp.h:3102
-#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3131
-#: src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2963
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3070
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3106
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3297 src/xml/xmli18n-tmp.h:3313
+#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
+#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3401
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3492
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3577 src/xml/xmli18n-tmp.h:3594
+#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3671 src/xml/xmli18n-tmp.h:3689
 msgid "1440 x 1440 DPI"
 msgstr "1440 × 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2426
-#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2452
-#: src/xml/xmli18n-tmp.h:2464 src/xml/xmli18n-tmp.h:2479
-#: src/xml/xmli18n-tmp.h:2494 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2547
-#: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2583
-#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2621
-#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2665
-#: src/xml/xmli18n-tmp.h:2680 src/xml/xmli18n-tmp.h:2694
-#: src/xml/xmli18n-tmp.h:2709 src/xml/xmli18n-tmp.h:2727
-#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2756
-#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2790
-#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2813
-#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2837
-#: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2879
-#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
-#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2940
-#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2970
-#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2995
-#: src/xml/xmli18n-tmp.h:3012 src/xml/xmli18n-tmp.h:3026
-#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3055
-#: src/xml/xmli18n-tmp.h:3072 src/xml/xmli18n-tmp.h:3089
-#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3118
-#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3071
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3107
+#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3251
+#: src/xml/xmli18n-tmp.h:3266 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3298 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3324 src/xml/xmli18n-tmp.h:3337
+#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3374 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3463
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3535 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3563 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3612
+#: src/xml/xmli18n-tmp.h:3626 src/xml/xmli18n-tmp.h:3641
+#: src/xml/xmli18n-tmp.h:3655 src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:3690
 msgid "2880 x 1440 DPI"
 msgstr "2880 × 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:4374
 msgid "Dark Yellow"
 msgstr "Mörk gul"
 
-#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2584
-#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2711
-#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2743
-#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2776
-#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2908
-#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2972
-#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3057
-#: src/xml/xmli18n-tmp.h:3074 src/xml/xmli18n-tmp.h:3091
-#: src/xml/xmli18n-tmp.h:3105 src/xml/xmli18n-tmp.h:3134
-#: src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3108
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3267
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3495
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3614
+#: src/xml/xmli18n-tmp.h:3628 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3692
 msgid "2880 x 2880 DPI"
 msgstr "2880 × 2880 DPI"
 
-#: src/xml/xmli18n-tmp.h:2666 src/xml/xmli18n-tmp.h:2681
-#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2728
-#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2775
-#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2814
-#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2838
-#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2926
-#: src/xml/xmli18n-tmp.h:2941 src/xml/xmli18n-tmp.h:2971
-#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
-#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
-#: src/xml/xmli18n-tmp.h:3090 src/xml/xmli18n-tmp.h:3104
-#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3133
-#: src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3190 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3234 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3325 src/xml/xmli18n-tmp.h:3338
+#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3362
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3505
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3613
+#: src/xml/xmli18n-tmp.h:3627 src/xml/xmli18n-tmp.h:3642
+#: src/xml/xmli18n-tmp.h:3656 src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:3691
 msgid "5760 x 1440 DPI"
 msgstr "5760 × 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2712
-#: src/xml/xmli18n-tmp.h:2730 src/xml/xmli18n-tmp.h:2759
-#: src/xml/xmli18n-tmp.h:2777 src/xml/xmli18n-tmp.h:2909
-#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2973
-#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3058
-#: src/xml/xmli18n-tmp.h:3075 src/xml/xmli18n-tmp.h:3092
-#: src/xml/xmli18n-tmp.h:3106 src/xml/xmli18n-tmp.h:3135
-#: src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3301 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3496
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3615
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
 msgid "5760 x 2880 DPI"
 msgstr "5760 × 2880 DPI"
 
-#: src/xml/xmli18n-tmp.h:2798 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3502
 msgid "1440 x 720 DPI Transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2965
-#: src/xml/xmli18n-tmp.h:2989 src/xml/xmli18n-tmp.h:3067
-#: src/xml/xmli18n-tmp.h:3084
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:3607
 #, fuzzy
 msgid "720 x 360 DPI Enhanced"
 msgstr "720 × 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:3479
 #, fuzzy
 msgid "Black 1"
 msgstr "Svart"
 
-#: src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3480
 #, fuzzy
 msgid "Black 2"
 msgstr "Svart"
 
-#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3065
-#: src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3605
 #, fuzzy
 msgid "360 DPI Enhanced"
 msgstr "720 × 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3516
 #, fuzzy
 msgid "1440 x 720 DPI High Quality"
 msgstr "1440 × 720 DPI högsta kvalitet"
 
-#: src/xml/xmli18n-tmp.h:3153
-msgid "Lower Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3677
+#, fuzzy
+msgid "Vivid Light Magenta"
+msgstr "Ljus magenta"
 
-#: src/xml/xmli18n-tmp.h:3154
-msgid "Upper Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3682
+#, fuzzy
+msgid "Vivid Magenta"
+msgstr "Magenta"
+
+#: src/xml/xmli18n-tmp.h:3694
+#, fuzzy
+msgid "Main Tray"
+msgstr "Fack"
 
-#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3160
-#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3176
-#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3186
+#: src/xml/xmli18n-tmp.h:3695
+#, fuzzy
+msgid "Photo Tray"
+msgstr "Fotografi"
+
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3725 src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:3732
 msgid "Print to CD"
 msgstr "Skriv ut till cd"
 
-#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3181
-#: src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:3730
 #, fuzzy
 msgid "Rear Tray"
 msgstr "Fack"
 
-#: src/xml/xmli18n-tmp.h:3157 src/xml/xmli18n-tmp.h:3182
-#: src/xml/xmli18n-tmp.h:3185
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:3731
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3159 src/xml/xmli18n-tmp.h:3164
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3705
 msgid "Manual Feed"
 msgstr "Manuell matning"
 
-#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3709
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3710
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3171
-#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3180
-#: src/xml/xmli18n-tmp.h:3193
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3716 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3739
 msgid "Roll Feed"
 msgstr "Rullmatning"
 
-#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3714 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3723
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "Manuell matning"
 
-#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3715 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3724
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "Manuell matning"
 
-#: src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3733
 #, fuzzy
 msgid "Photo Board"
 msgstr "Fotosvart"
 
-#: src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3734
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3735
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3190
+#: src/xml/xmli18n-tmp.h:3736
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Välj automatiskt"
 
-#: src/xml/xmli18n-tmp.h:3191
+#: src/xml/xmli18n-tmp.h:3737
 msgid "Manual Selection"
 msgstr ""
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:3199 src/xml/xmli18n-tmp.h:3207
-#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3219
-#: src/xml/xmli18n-tmp.h:3227 src/xml/xmli18n-tmp.h:3235
-#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3257
-#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3278
-#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3297
-#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3317
-#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3342
-#: src/xml/xmli18n-tmp.h:3356 src/xml/xmli18n-tmp.h:3382
-#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
-#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3426
-#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3446
-#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3474
-#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3498
-#: src/xml/xmli18n-tmp.h:3510 src/xml/xmli18n-tmp.h:3524
-#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3558
-#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:3584
-#: src/xml/xmli18n-tmp.h:3594 src/xml/xmli18n-tmp.h:3600
-#: src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3763 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3872 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:4067 src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4172 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4236 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:4754 src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5102 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5679 src/xml/xmli18n-tmp.h:5748
+#: src/xml/xmli18n-tmp.h:5793 src/xml/xmli18n-tmp.h:5814
+#: src/xml/xmli18n-tmp.h:5835
 msgid "One Color Raw"
 msgstr "Enfärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3208
-#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3220
-#: src/xml/xmli18n-tmp.h:3228 src/xml/xmli18n-tmp.h:3236
-#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3259
-#: src/xml/xmli18n-tmp.h:3270 src/xml/xmli18n-tmp.h:3280
-#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3298
-#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3318
-#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3344
-#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3383
-#: src/xml/xmli18n-tmp.h:3391 src/xml/xmli18n-tmp.h:3403
-#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3427
-#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3447
-#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3475
-#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3499
-#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3526
-#: src/xml/xmli18n-tmp.h:3551 src/xml/xmli18n-tmp.h:3559
-#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3586
-#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3601
-#: src/xml/xmli18n-tmp.h:3607
+#: src/xml/xmli18n-tmp.h:3765 src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4484 src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:4756 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5321
+#: src/xml/xmli18n-tmp.h:5382 src/xml/xmli18n-tmp.h:5451
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5795 src/xml/xmli18n-tmp.h:5816
+#: src/xml/xmli18n-tmp.h:5837
 msgid "Three Color Raw"
 msgstr "Trefärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
-#: src/xml/xmli18n-tmp.h:3215 src/xml/xmli18n-tmp.h:3221
-#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3237
-#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3271
-#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3299
-#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3319
-#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3345
-#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3384
-#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
-#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3428
-#: src/xml/xmli18n-tmp.h:3438 src/xml/xmli18n-tmp.h:3448
-#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3463
-#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3476
-#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3500
-#: src/xml/xmli18n-tmp.h:3513 src/xml/xmli18n-tmp.h:3527
-#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3560
-#: src/xml/xmli18n-tmp.h:3573 src/xml/xmli18n-tmp.h:3587
-#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3602
-#: src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:3824 src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5325
+#: src/xml/xmli18n-tmp.h:5386 src/xml/xmli18n-tmp.h:5455
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5757
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5841
 msgid "Four Color Raw"
 msgstr "Fyrfärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3248
-#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
-#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3360
-#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
-#: src/xml/xmli18n-tmp.h:3417 src/xml/xmli18n-tmp.h:3429
-#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3459
-#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3501 src/xml/xmli18n-tmp.h:3514
-#: src/xml/xmli18n-tmp.h:3528 src/xml/xmli18n-tmp.h:3574
-#: src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4424 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:5066 src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:5196 src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5391
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5762
 msgid "Five Color Raw"
 msgstr "Femfärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3249
-#: src/xml/xmli18n-tmp.h:3272 src/xml/xmli18n-tmp.h:3293
-#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3333
-#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3361
-#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
-#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3430
-#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3460
-#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3478
-#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3502
-#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3529
-#: src/xml/xmli18n-tmp.h:3575 src/xml/xmli18n-tmp.h:3589
+#: src/xml/xmli18n-tmp.h:3780 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:4078 src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:4430 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4972
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5150 src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5336
+#: src/xml/xmli18n-tmp.h:5397 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5768
 msgid "Six Color Raw"
 msgstr "Sexfärgers rå"
 
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3919 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:4781 src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:4795 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4921
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:4996
+#: src/xml/xmli18n-tmp.h:5023 src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:5226 src/xml/xmli18n-tmp.h:5279
+#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5603 src/xml/xmli18n-tmp.h:5609
+#: src/xml/xmli18n-tmp.h:5636 src/xml/xmli18n-tmp.h:5642
+#, fuzzy
+msgid "Gray 3"
+msgstr "Fack 3"
+
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4782 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4796 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4916 src/xml/xmli18n-tmp.h:4922
+#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4983
+#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5286 src/xml/xmli18n-tmp.h:5294
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5643
+#, fuzzy
+msgid "Gray 2"
+msgstr "Fack 2"
+
+#: src/xml/xmli18n-tmp.h:3855 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:4856 src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:4931 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4998
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:5214 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5611
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5644
+#, fuzzy
+msgid "Gray 1"
+msgstr "Fack 1"
+
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4985 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5606 src/xml/xmli18n-tmp.h:5639
+#, fuzzy
+msgid "MIS Quadtone"
+msgstr "Quadtone"
+
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4114
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Enfärgers rå förbättrad glansig"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:3260 src/xml/xmli18n-tmp.h:3281
+#: src/xml/xmli18n-tmp.h:4016 src/xml/xmli18n-tmp.h:4121
 msgid "Three Color Raw Gloss"
 msgstr "Trefärgers rå glansig"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3282
+#: src/xml/xmli18n-tmp.h:4021 src/xml/xmli18n-tmp.h:4126
 msgid "Four Color Raw Gloss"
 msgstr "Fyrfärgers rå glansig"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:3262 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4132
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Sexfärgers förbättrad glansig rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:4035 src/xml/xmli18n-tmp.h:4140
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sjufärgers förbättrad glansig rå"
 
-#: src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:4141
+#, fuzzy
+msgid "MatteBlack"
+msgstr "Matt svart"
+
+#: src/xml/xmli18n-tmp.h:4224
 #, fuzzy
 msgid "Default Black"
 msgstr "Standard"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
-#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3365
-#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3504
-#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3533
-#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3564
-#: src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4446 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4573 src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:5344
+#: src/xml/xmli18n-tmp.h:5413 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Seven Color Photo"
 msgstr "Sjufärgs foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:4315
 msgid "Six Color Enhanced Composite"
 msgstr "Sexfärgs förbättrad sammansatt"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3348
-#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3516
-#: src/xml/xmli18n-tmp.h:3530 src/xml/xmli18n-tmp.h:3576
-#: src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:4368 src/xml/xmli18n-tmp.h:4437
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:5404
+#: src/xml/xmli18n-tmp.h:5473 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5775
 msgid "Seven Color Raw"
 msgstr "Sjufärgers rå"
 
-#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3355
-#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3523
-#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5745
 msgid "Two Level Grayscale"
 msgstr "Tvånivås gråton"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3357
-#: src/xml/xmli18n-tmp.h:3511 src/xml/xmli18n-tmp.h:3525
-#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:4412 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5448
+#: src/xml/xmli18n-tmp.h:5681 src/xml/xmli18n-tmp.h:5750
 msgid "Two Color Raw"
 msgstr "Tvåfärgers rå"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3372
-#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3540
+#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5531
 msgid "Eight Color Photo"
 msgstr "Åttafärgers foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3378
-#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:4652 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5570
 msgid "Eight Color Raw"
 msgstr "Åttafärgers rå"
 
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:5288
+msgid "MIS Six Tone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:4994
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5291
+#, fuzzy
+msgid "Gray 5"
+msgstr "Fack 1"
+
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:4928 src/xml/xmli18n-tmp.h:4995
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5292
+#, fuzzy
+msgid "Gray 4"
+msgstr "Fack 4"
+
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/xml/xmli18n-tmp.h:3462 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5145
 #, fuzzy
 msgid "Four Color Photo"
 msgstr "Sexfärgs foto"
 
-#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3615
-#: src/xml/xmli18n-tmp.h:3621
+#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5852
+#: src/xml/xmli18n-tmp.h:5858
 #, fuzzy
 msgid "Interleave"
 msgstr "Skrivarnamn:"
 
-#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3616
-#: src/xml/xmli18n-tmp.h:3622
+#: src/xml/xmli18n-tmp.h:5848 src/xml/xmli18n-tmp.h:5853
+#: src/xml/xmli18n-tmp.h:5859
 msgid "Full Overlap"
 msgstr "Full överlappning"
 
-#: src/xml/xmli18n-tmp.h:3612 src/xml/xmli18n-tmp.h:3617
-#: src/xml/xmli18n-tmp.h:3623
+#: src/xml/xmli18n-tmp.h:5849 src/xml/xmli18n-tmp.h:5854
+#: src/xml/xmli18n-tmp.h:5860
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3613 src/xml/xmli18n-tmp.h:3618
-#: src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5855
+#: src/xml/xmli18n-tmp.h:5861
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:5862
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Skrivarnamn:"
 
-#: src/xml/xmli18n-tmp.h:3626
+#: src/xml/xmli18n-tmp.h:5863
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Ljusstyrka:"
 
-#: src/xml/xmli18n-tmp.h:3628
+#: src/xml/xmli18n-tmp.h:5865
 msgid "On"
 msgstr "PÃ¥"
 
-#: src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:5909
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:5910
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:3674
+#: src/xml/xmli18n-tmp.h:5911
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:3679
+#: src/xml/xmli18n-tmp.h:5916
 msgid "3x5"
 msgstr "3×5"
 
-#: src/xml/xmli18n-tmp.h:3680
+#: src/xml/xmli18n-tmp.h:5917
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:5918
 msgid "4x6"
 msgstr "4×6"
 
-#: src/xml/xmli18n-tmp.h:3682
+#: src/xml/xmli18n-tmp.h:5919
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4×6 fotopapper"
 
-#: src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:5920
+#, fuzzy
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr "Epson 4×6 fotopapper"
+
+#: src/xml/xmli18n-tmp.h:5921
 msgid "5x7"
 msgstr "5×7"
 
-#: src/xml/xmli18n-tmp.h:3684
+#: src/xml/xmli18n-tmp.h:5922
 msgid "5x8"
 msgstr "5×8"
 
-#: src/xml/xmli18n-tmp.h:3685
+#: src/xml/xmli18n-tmp.h:5923
 msgid "6x8"
 msgstr "6×8"
 
-#: src/xml/xmli18n-tmp.h:3686
+#: src/xml/xmli18n-tmp.h:5924
 msgid "8x10"
 msgstr "8×10"
 
-#: src/xml/xmli18n-tmp.h:3688
+#: src/xml/xmli18n-tmp.h:5926
 msgid "12x18"
 msgstr "12×18"
 
-#: src/xml/xmli18n-tmp.h:3689
+#: src/xml/xmli18n-tmp.h:5927
 msgid "Super B 13x19"
 msgstr "Super B 13×19"
 
-#: src/xml/xmli18n-tmp.h:3690
+#: src/xml/xmli18n-tmp.h:5928
 msgid "Engineering C 17x22"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3691
+#: src/xml/xmli18n-tmp.h:5929
 msgid "8x12"
 msgstr "8×12"
 
-#: src/xml/xmli18n-tmp.h:3692
+#: src/xml/xmli18n-tmp.h:5930
 msgid "11x14"
 msgstr "11×14"
 
-#: src/xml/xmli18n-tmp.h:3693
+#: src/xml/xmli18n-tmp.h:5931
 msgid "16x20"
 msgstr "16×20"
 
-#: src/xml/xmli18n-tmp.h:3694
+#: src/xml/xmli18n-tmp.h:5932
 msgid "16x24"
 msgstr "16×24"
 
-#: src/xml/xmli18n-tmp.h:3695
+#: src/xml/xmli18n-tmp.h:5933
 msgid "20x24"
 msgstr "20×24"
 
-#: src/xml/xmli18n-tmp.h:3696
+#: src/xml/xmli18n-tmp.h:5934
 msgid "20x30"
 msgstr "20×30"
 
-#: src/xml/xmli18n-tmp.h:3697
+#: src/xml/xmli18n-tmp.h:5935
 msgid "22x30"
 msgstr "22×30"
 
-#: src/xml/xmli18n-tmp.h:3698
+#: src/xml/xmli18n-tmp.h:5936
 msgid "24x30"
 msgstr "24×30"
 
-#: src/xml/xmli18n-tmp.h:3699
+#: src/xml/xmli18n-tmp.h:5937
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/xml/xmli18n-tmp.h:3700
+#: src/xml/xmli18n-tmp.h:5938
 msgid "30x40"
 msgstr "30×40"
 
-#: src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:5939
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:3702
+#: src/xml/xmli18n-tmp.h:5940
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:3703
+#: src/xml/xmli18n-tmp.h:5941
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:5942
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:3705
+#: src/xml/xmli18n-tmp.h:5943
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:3706
+#: src/xml/xmli18n-tmp.h:5944
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:3707
+#: src/xml/xmli18n-tmp.h:5945
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:3709
+#: src/xml/xmli18n-tmp.h:5947
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:3710
+#: src/xml/xmli18n-tmp.h:5948
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:5949
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:5950
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:3713
+#: src/xml/xmli18n-tmp.h:5951
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:3714
+#: src/xml/xmli18n-tmp.h:5952
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:3715
+#: src/xml/xmli18n-tmp.h:5953
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:3716
+#: src/xml/xmli18n-tmp.h:5954
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:5955
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:5956
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:5957
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:5958
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:5959
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:3722
+#: src/xml/xmli18n-tmp.h:5960
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:3723
+#: src/xml/xmli18n-tmp.h:5961
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:3724
+#: src/xml/xmli18n-tmp.h:5962
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:3725
+#: src/xml/xmli18n-tmp.h:5963
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:3726
+#: src/xml/xmli18n-tmp.h:5964
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:5965
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:5966
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:5967
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:3730
+#: src/xml/xmli18n-tmp.h:5968
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:3731
+#: src/xml/xmli18n-tmp.h:5969
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:3732
+#: src/xml/xmli18n-tmp.h:5970
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:3733
+#: src/xml/xmli18n-tmp.h:5971
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:3734
+#: src/xml/xmli18n-tmp.h:5972
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:3735
+#: src/xml/xmli18n-tmp.h:5973
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:3736
+#: src/xml/xmli18n-tmp.h:5974
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:3737
+#: src/xml/xmli18n-tmp.h:5975
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5976
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3739
+#: src/xml/xmli18n-tmp.h:5977
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:5978
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:3741
+#: src/xml/xmli18n-tmp.h:5979
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:5980
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:3743
+#: src/xml/xmli18n-tmp.h:5981
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:5982
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:5983
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:3746
+#: src/xml/xmli18n-tmp.h:5984
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:3747
+#: src/xml/xmli18n-tmp.h:5985
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:3748
+#: src/xml/xmli18n-tmp.h:5986
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:5987
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:3750
+#: src/xml/xmli18n-tmp.h:5988
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:3751
+#: src/xml/xmli18n-tmp.h:5989
 #, fuzzy
 msgid "C0 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:5990
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:5991
 #, fuzzy
 msgid "C1 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:3754
+#: src/xml/xmli18n-tmp.h:5992
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:3755
+#: src/xml/xmli18n-tmp.h:5993
 #, fuzzy
 msgid "C2 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:3756
+#: src/xml/xmli18n-tmp.h:5994
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:5995
 #, fuzzy
 msgid "C3 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:3758
+#: src/xml/xmli18n-tmp.h:5996
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:3759
+#: src/xml/xmli18n-tmp.h:5997
 #, fuzzy
 msgid "C4 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:5998
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:3761
+#: src/xml/xmli18n-tmp.h:5999
 #, fuzzy
 msgid "C5 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:6000
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:3763
+#: src/xml/xmli18n-tmp.h:6001
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:6002
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:3765
+#: src/xml/xmli18n-tmp.h:6003
 #, fuzzy
 msgid "C6 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:3766
+#: src/xml/xmli18n-tmp.h:6004
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:6005
 #, fuzzy
 msgid "DL landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:3768
+#: src/xml/xmli18n-tmp.h:6006
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:3769
+#: src/xml/xmli18n-tmp.h:6007
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:3770
+#: src/xml/xmli18n-tmp.h:6008
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:6009
 #, fuzzy
 msgid "C7 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:3772
+#: src/xml/xmli18n-tmp.h:6010
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:6011
 #, fuzzy
 msgid "C8 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:3774
+#: src/xml/xmli18n-tmp.h:6012
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:3775
+#: src/xml/xmli18n-tmp.h:6013
 #, fuzzy
 msgid "C9 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:6014
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:6015
 #, fuzzy
 msgid "C10 landscape"
 msgstr "Liggande"
 
-#: src/xml/xmli18n-tmp.h:3778
+#: src/xml/xmli18n-tmp.h:6016
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:3779
+#: src/xml/xmli18n-tmp.h:6017
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3780
+#: src/xml/xmli18n-tmp.h:6018
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:6019
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3782
+#: src/xml/xmli18n-tmp.h:6020
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:6021
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3784
+#: src/xml/xmli18n-tmp.h:6022
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:6023
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:6024
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:3787
+#: src/xml/xmli18n-tmp.h:6025
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:6026
 msgid "American foolscap"
 msgstr "Amerikansk folio"
 
-#: src/xml/xmli18n-tmp.h:3789
+#: src/xml/xmli18n-tmp.h:6027
 msgid "European foolscap"
 msgstr "Europeisk folio"
 
-#: src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:6028
 msgid "Crown Quarto"
 msgstr "Crown Quarto"
 
-#: src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:6029
 msgid "Large Crown Quarto"
 msgstr "Large crown quarto"
 
 # får plats
-#: src/xml/xmli18n-tmp.h:3792
+#: src/xml/xmli18n-tmp.h:6030
 msgid "Demy Quarto"
 msgstr "Demy quarto"
 
-#: src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:6031
 msgid "Royal Quarto"
 msgstr "Royal quarto"
 
-#: src/xml/xmli18n-tmp.h:3794
+#: src/xml/xmli18n-tmp.h:6032
 msgid "Crown Octavo"
 msgstr "Crown octavo"
 
-#: src/xml/xmli18n-tmp.h:3795
+#: src/xml/xmli18n-tmp.h:6033
 msgid "Large Crown Octavo"
 msgstr "Large crown octavo"
 
-#: src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:6034
 msgid "Demy Octavo"
 msgstr "Demy octavo"
 
-#: src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:6035
 msgid "Royal Octavo"
 msgstr "Royal octavo"
 
-#: src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:6036
 msgid "Small paperback"
 msgstr "Liten pocket"
 
-#: src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:6037
 msgid "Penguin small paperback"
 msgstr "Liten pingvinpocket"
 
-#: src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:6038
 msgid "Penguin large paperback"
 msgstr "Stor pingvinpocket"
 
-#: src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:6039
 msgid "10cm x 15cm"
 msgstr "10cm x 15cm"
 
-#: src/xml/xmli18n-tmp.h:3802
+#: src/xml/xmli18n-tmp.h:6040
 msgid "Hagaki Card"
 msgstr "Hagaki-kort"
 
-#: src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:6041
 msgid "Oufuku Card"
 msgstr "Oufuku-kort"
 
-#: src/xml/xmli18n-tmp.h:3804
+#: src/xml/xmli18n-tmp.h:6042
 msgid "Japanese long envelope #3"
 msgstr "Japanskt långt kuvert 3"
 
-#: src/xml/xmli18n-tmp.h:3805
+#: src/xml/xmli18n-tmp.h:6043
 #, fuzzy
 msgid "Japanese long envelope #3 landscape"
 msgstr "Japanskt långt kuvert 3"
 
-#: src/xml/xmli18n-tmp.h:3806
+#: src/xml/xmli18n-tmp.h:6044
 msgid "Japanese long envelope #4"
 msgstr "Japanskt långt kuvert 4"
 
-#: src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:6045
 #, fuzzy
 msgid "Japanese long envelope #4 landscape"
 msgstr "Japanskt långt kuvert 4"
 
-#: src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:6046
 msgid "Japanese Kaku envelope #4"
 msgstr "Japanskt Kaku-kuvert 4"
 
-#: src/xml/xmli18n-tmp.h:3809
+#: src/xml/xmli18n-tmp.h:6047
 #, fuzzy
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr "Japanskt Kaku-kuvert 4"
 
-#: src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:6048
 msgid "Commercial 10"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:6049
 #, fuzzy
 msgid "Commercial 10 landscape"
 msgstr "Commercial 10"
 
-#: src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:6050
 msgid "A2 Invitation"
 msgstr "A2-inbjudan"
 
-#: src/xml/xmli18n-tmp.h:3813
+#: src/xml/xmli18n-tmp.h:6051
 msgid "Monarch Envelope"
 msgstr "Monarkkuvert"
 
-#: src/xml/xmli18n-tmp.h:3814
+#: src/xml/xmli18n-tmp.h:6052
 #, fuzzy
 msgid "Monarch Envelope landscape"
 msgstr "Monarkkuvert"
 
-#: src/xml/xmli18n-tmp.h:3815
+#: src/xml/xmli18n-tmp.h:6053
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/xml/xmli18n-tmp.h:3816
+#: src/xml/xmli18n-tmp.h:6054
 msgid "4x7"
 msgstr "4x7"
 
-#: src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:6055
 msgid "CP_L"
 msgstr "CP_L"
 
-#: src/xml/xmli18n-tmp.h:3818
+#: src/xml/xmli18n-tmp.h:6056
 msgid "Card"
 msgstr "Kort"
 
-#: src/xml/xmli18n-tmp.h:3819
+#: src/xml/xmli18n-tmp.h:6057
 msgid "Wide Postcard"
 msgstr "Brett vykort"
 
-#: src/xml/xmli18n-tmp.h:3820
+#: src/xml/xmli18n-tmp.h:6058
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:6059
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:6060
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3824
+#: src/xml/xmli18n-tmp.h:6062
 msgid "89 mm Roll Paper"
 msgstr "89 mm rullpapper"
 
-#: src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:6063
 msgid "4 Inch Roll Paper"
 msgstr "4 tum rullpapper"
 
-#: src/xml/xmli18n-tmp.h:3826
+#: src/xml/xmli18n-tmp.h:6064
 msgid "5 Inch Roll Paper"
 msgstr "5 tum rullpapper"
 
-#: src/xml/xmli18n-tmp.h:3827
+#: src/xml/xmli18n-tmp.h:6065
 msgid "210 mm Roll Paper"
 msgstr "210 mm rullpapper"
 
-#: src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:6066
 msgid "13 Inch Roll Paper"
 msgstr "13 tum rullpapper"
 
-#: src/xml/xmli18n-tmp.h:3829
+#: src/xml/xmli18n-tmp.h:6067
 #, fuzzy
 msgid "17 Inch Roll Paper"
 msgstr "13 tum rullpapper"
 
-#: src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:6068
 msgid "22 Inch Roll Paper"
 msgstr "22 tum rullpapper"
 
-#: src/xml/xmli18n-tmp.h:3831
+#: src/xml/xmli18n-tmp.h:6069
 msgid "24 Inch Roll Paper"
 msgstr "24 tum rullpapper"
 
-#: src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:6070
 msgid "36 Inch Roll Paper"
 msgstr "36 tum rullpapper"
 
-#: src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:6071
 msgid "44 Inch Roll Paper"
 msgstr "44 tum rullpapper"
 
-#: src/xml/xmli18n-tmp.h:3834
+#: src/xml/xmli18n-tmp.h:6072
 #, fuzzy
 msgid "60 Inch Roll Paper"
 msgstr "36 tum rullpapper"
 
-#: src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:6073
 #, fuzzy
 msgid "64 Inch Roll Paper"
 msgstr "4 tum rullpapper"
 
-#: src/xml/xmli18n-tmp.h:3836
+#: src/xml/xmli18n-tmp.h:6074
 msgid "PostScript Level 1"
 msgstr "PostScript nivå 1"
 
-#: src/xml/xmli18n-tmp.h:3837
+#: src/xml/xmli18n-tmp.h:6075
 msgid "PostScript Level 2"
 msgstr "PostScript nivå 2"
 
-#: src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:6076
 msgid "Canon BJ-30"
 msgstr "Canon BJ-30"
 
-#: src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:6077
 msgid "Canon BJC-50"
 msgstr "Canon BJC-50"
 
-#: src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:6078
 msgid "Canon BJC-55"
 msgstr "Canon BJC-55"
 
-#: src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:6079
 msgid "Canon BJC-80"
 msgstr "Canon BJC-80"
 
-#: src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:6080
 msgid "Canon BJC-85"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:6081
 msgid "Canon BJC-210"
 msgstr "Canon BJC-210"
 
-#: src/xml/xmli18n-tmp.h:3844
+#: src/xml/xmli18n-tmp.h:6082
 msgid "Canon BJC-240"
 msgstr "Canon BJC-240"
 
-#: src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:6083
 msgid "Canon BJC-250"
 msgstr "Canon BJC-250"
 
-#: src/xml/xmli18n-tmp.h:3846
+#: src/xml/xmli18n-tmp.h:6084
 msgid "Canon BJC-1000"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:3847
+#: src/xml/xmli18n-tmp.h:6085
 msgid "Canon BJC-2000"
 msgstr "Canon BJC-2000"
 
-#: src/xml/xmli18n-tmp.h:3848
+#: src/xml/xmli18n-tmp.h:6086
 msgid "Canon BJC-2010"
 msgstr "Canon BJC-2010"
 
-#: src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:6087
 msgid "Canon BJC-2100"
 msgstr "Canon BJC-2100"
 
-#: src/xml/xmli18n-tmp.h:3850
+#: src/xml/xmli18n-tmp.h:6088
 msgid "Canon BJC-2110"
 msgstr "Canon BJC-2110"
 
-#: src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:6089
 msgid "Canon BJC-3000"
 msgstr "Canon BJC-3000"
 
-#: src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:6090
 msgid "Canon BJC-4000"
 msgstr "Canon BJC-4000"
 
-#: src/xml/xmli18n-tmp.h:3853
+#: src/xml/xmli18n-tmp.h:6091
 msgid "Canon BJC-4300"
 msgstr "Canon BJC-4300"
 
-#: src/xml/xmli18n-tmp.h:3854
+#: src/xml/xmli18n-tmp.h:6092
 msgid "Canon BJC-4400"
 msgstr "Canon BJC-4400"
 
-#: src/xml/xmli18n-tmp.h:3855
+#: src/xml/xmli18n-tmp.h:6093
 #, fuzzy
 msgid "Canon BJC-5100"
 msgstr "Canon BJC-1000"
 
-#: src/xml/xmli18n-tmp.h:3856
+#: src/xml/xmli18n-tmp.h:6094
 #, fuzzy
 msgid "Canon BJC-5500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:3857
+#: src/xml/xmli18n-tmp.h:6095
 msgid "Canon BJC-6000"
 msgstr "Canon BJC-6000"
 
-#: src/xml/xmli18n-tmp.h:3858
+#: src/xml/xmli18n-tmp.h:6096
 msgid "Canon BJC-6100"
 msgstr "Canon BJC-6100"
 
-#: src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:6097
 msgid "Canon BJC-6200"
 msgstr "Canon BJC-6200"
 
-#: src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:6098
 msgid "Canon BJC-6500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:6099
 msgid "Canon BJC-7000"
 msgstr "Canon BJC-7000"
 
-#: src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:6100
 msgid "Canon BJC-7100"
 msgstr "Canon BJC-7100"
 
-#: src/xml/xmli18n-tmp.h:3863
+#: src/xml/xmli18n-tmp.h:6101
 msgid "Canon BJC-8200"
 msgstr "Canon BJC-8200"
 
-#: src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:6102
 #, fuzzy
 msgid "Canon BJC-8500"
 msgstr "Canon BJC-6500"
 
-#: src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:6103
 msgid "Canon S100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:6104
 msgid "Canon S200"
 msgstr "Canon S200"
 
-#: src/xml/xmli18n-tmp.h:3867
+#: src/xml/xmli18n-tmp.h:6105
 msgid "Canon S300"
 msgstr "Canon S300"
 
-#: src/xml/xmli18n-tmp.h:3868
+#: src/xml/xmli18n-tmp.h:6106
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:3869
+#: src/xml/xmli18n-tmp.h:6107
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:3870
+#: src/xml/xmli18n-tmp.h:6108
 msgid "Canon S500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:6109
 msgid "Canon S600"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:3872
+#: src/xml/xmli18n-tmp.h:6110
 msgid "Canon S630"
 msgstr "Canon S630"
 
-#: src/xml/xmli18n-tmp.h:3873
+#: src/xml/xmli18n-tmp.h:6111
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:3874
+#: src/xml/xmli18n-tmp.h:6112
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:6113
 #, fuzzy
 msgid "Canon PIXMA iP2000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:6114
 #, fuzzy
 msgid "Canon PIXMA iP3000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3877
+#: src/xml/xmli18n-tmp.h:6115
 #, fuzzy
 msgid "Canon PIXMA iP3100"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3878
+#: src/xml/xmli18n-tmp.h:6116
 #, fuzzy
 msgid "Canon PIXMA iP4000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:6117
 #, fuzzy
 msgid "Canon PIXMA iP4100"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3880
+#: src/xml/xmli18n-tmp.h:6118
 #, fuzzy
 msgid "Canon PIXMA iP4200"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3881
+#: src/xml/xmli18n-tmp.h:6119
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:6120
 #, fuzzy
 msgid "Canon PIXMA iP4500"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:6121
 #, fuzzy
 msgid "Canon PIXMA iP4600"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3884
+#: src/xml/xmli18n-tmp.h:6122
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3885
+#: src/xml/xmli18n-tmp.h:6123
 #, fuzzy
 msgid "Canon PIXMA iP5200"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3886
+#: src/xml/xmli18n-tmp.h:6124
 #, fuzzy
 msgid "Canon PIXMA iP5300"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3887
+#: src/xml/xmli18n-tmp.h:6125
 #, fuzzy
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3888
+#: src/xml/xmli18n-tmp.h:6126
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:6127
 #, fuzzy
 msgid "Canon PIXMA iP8500"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:6128
+#, fuzzy
+msgid "Canon PIXMA iX4000"
+msgstr "Canon iP4000"
+
+#: src/xml/xmli18n-tmp.h:6129
 #, fuzzy
 msgid "Canon PIXMA iX5000"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:6130
 #, fuzzy
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:6131
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:6132
 #, fuzzy
 msgid "Canon PIXMA MP160"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:6133
 #, fuzzy
 msgid "Canon PIXMA MP170"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:3895
+#: src/xml/xmli18n-tmp.h:6134
 #, fuzzy
 msgid "Canon PIXMA MP180"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:6135
 #, fuzzy
 msgid "Canon PIXMA MP220"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:3897
+#: src/xml/xmli18n-tmp.h:6136
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Canon S500"
 
-#: src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:6137
 #, fuzzy
 msgid "Canon PIXMA MP520"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:6138
 #, fuzzy
 msgid "Canon PIXMA MP610"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:3900
+#: src/xml/xmli18n-tmp.h:6139
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:6140
 #, fuzzy
 msgid "Canon PIXMA MP710"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:3902
+#: src/xml/xmli18n-tmp.h:6141
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:3903
+#: src/xml/xmli18n-tmp.h:6142
 #, fuzzy
 msgid "Canon PIXMA MP740"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:6143
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:6144
 #, fuzzy
 msgid "Canon PIXMA MP760"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:6145
 #, fuzzy
 msgid "Canon PIXMA MP770"
 msgstr "Epson PM 770C"
 
-#: src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:6146
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:6147
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:6148
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:3910
+#: src/xml/xmli18n-tmp.h:6149
 #, fuzzy
 msgid "Canon PIXUS iP3100"
 msgstr "Canon S100"
 
-#: src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:6150
 #, fuzzy
 msgid "Canon PIXUS iP4100"
 msgstr "Canon iP4000"
 
-#: src/xml/xmli18n-tmp.h:3912
+#: src/xml/xmli18n-tmp.h:6151
 #, fuzzy
 msgid "Canon i80"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:3913
+#: src/xml/xmli18n-tmp.h:6152
 #, fuzzy
 msgid "Canon i560"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:3914
+#: src/xml/xmli18n-tmp.h:6153
 #, fuzzy
 msgid "Canon i850"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:6154
 #, fuzzy
 msgid "Canon i860"
 msgstr "Canon S600"
 
-#: src/xml/xmli18n-tmp.h:3916
+#: src/xml/xmli18n-tmp.h:6155
 #, fuzzy
 msgid "Canon i865"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:6156
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:6157
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3919
+#: src/xml/xmli18n-tmp.h:6158
 #, fuzzy
 msgid "Epson B-300"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:3920
+#: src/xml/xmli18n-tmp.h:6159
 #, fuzzy
 msgid "Epson B-308"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:3921
+#: src/xml/xmli18n-tmp.h:6160
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:3922
+#: src/xml/xmli18n-tmp.h:6161
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:3923
+#: src/xml/xmli18n-tmp.h:6162
 msgid "Epson Stylus C20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:3924
+#: src/xml/xmli18n-tmp.h:6163
 msgid "Epson Stylus C20SX"
 msgstr "Epson Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:6164
 msgid "Epson Stylus C20UX"
 msgstr "Epson Stylus C20UX"
 
-#: src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:6165
 msgid "Epson Stylus C40"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:6166
 msgid "Epson Stylus C40SX"
 msgstr "Epson Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:6167
 msgid "Epson Stylus C40UX"
 msgstr "Epson Stylus C40UX"
 
-#: src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:6168
 msgid "Epson Stylus C41"
 msgstr "Epson Stylus C41"
 
-#: src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:6169
 msgid "Epson Stylus C41SX"
 msgstr "Epson Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:6170
 msgid "Epson Stylus C41UX"
 msgstr "Epson Stylus C41UX"
 
-#: src/xml/xmli18n-tmp.h:3932
+#: src/xml/xmli18n-tmp.h:6171
 msgid "Epson Stylus C42"
 msgstr "Epson Stylus C42"
 
-#: src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:6172
 msgid "Epson Stylus C42SX"
 msgstr "Epson Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:3934
+#: src/xml/xmli18n-tmp.h:6173
 msgid "Epson Stylus C42UX"
 msgstr "Epson Stylus C42UX"
 
-#: src/xml/xmli18n-tmp.h:3935
+#: src/xml/xmli18n-tmp.h:6174
 msgid "Epson Stylus C43"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:6175
 msgid "Epson Stylus C43SX"
 msgstr "Epson Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:3937
+#: src/xml/xmli18n-tmp.h:6176
 msgid "Epson Stylus C43UX"
 msgstr "Epson Stylus C43UX"
 
-#: src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:6177
 msgid "Epson Stylus C44"
 msgstr "Epson Stylus C44"
 
-#: src/xml/xmli18n-tmp.h:3939
+#: src/xml/xmli18n-tmp.h:6178
 msgid "Epson Stylus C44SX"
 msgstr "Epson Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:6179
 msgid "Epson Stylus C44UX"
 msgstr "Epson Stylus C44UX"
 
-#: src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:6180
 msgid "Epson Stylus C45"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:3942
+#: src/xml/xmli18n-tmp.h:6181
 msgid "Epson Stylus C46"
 msgstr "Epson Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:3943
+#: src/xml/xmli18n-tmp.h:6182
 msgid "Epson Stylus C48"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:6183
 msgid "Epson Stylus C50"
 msgstr "Epson Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:6184
 msgid "Epson Stylus C60"
 msgstr "Epson Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3946
+#: src/xml/xmli18n-tmp.h:6185
 msgid "Epson Stylus C61"
 msgstr "Epson Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:3947
+#: src/xml/xmli18n-tmp.h:6186
 msgid "Epson Stylus C62"
 msgstr "Epson Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:3948
+#: src/xml/xmli18n-tmp.h:6187
 msgid "Epson Stylus C63"
 msgstr "Epson Stylus C63"
 
-#: src/xml/xmli18n-tmp.h:3949
+#: src/xml/xmli18n-tmp.h:6188
 msgid "Epson Stylus C64"
 msgstr "Epson Stylus C64"
 
-#: src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:6189
 msgid "Epson Stylus C65"
 msgstr "Epson Stylus C65"
 
-#: src/xml/xmli18n-tmp.h:3951
+#: src/xml/xmli18n-tmp.h:6190
 msgid "Epson Stylus C66"
 msgstr "Epson Stylus C66"
 
-#: src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:6191
 msgid "Epson Stylus C68"
 msgstr "Epson Stylus C68"
 
-#: src/xml/xmli18n-tmp.h:3953
+#: src/xml/xmli18n-tmp.h:6192
 msgid "Epson Stylus C70"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:6193
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "Epson Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:6194
 msgid "Epson Stylus C80"
 msgstr "Epson Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3956
+#: src/xml/xmli18n-tmp.h:6195
 msgid "Epson Stylus C82"
 msgstr "Epson Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:3957
+#: src/xml/xmli18n-tmp.h:6196
 msgid "Epson Stylus C83"
 msgstr "Epson Stylus C83"
 
-#: src/xml/xmli18n-tmp.h:3958
+#: src/xml/xmli18n-tmp.h:6197
 msgid "Epson Stylus C84"
 msgstr "Epson Stylus C84"
 
-#: src/xml/xmli18n-tmp.h:3959
+#: src/xml/xmli18n-tmp.h:6198
 msgid "Epson Stylus C85"
 msgstr "Epson Stylus C85"
 
-#: src/xml/xmli18n-tmp.h:3960
+#: src/xml/xmli18n-tmp.h:6199
 msgid "Epson Stylus C86"
 msgstr "Epson Stylus C86"
 
-#: src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:6200
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "Epson Stylus C48"
 
-#: src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:6201
 msgid "Epson Stylus C88"
 msgstr "Epson Stylus C88"
 
-#: src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:6202
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:3964
+#: src/xml/xmli18n-tmp.h:6203
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:6204
 msgid "Epson Stylus Color"
 msgstr "Epson Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3966
+#: src/xml/xmli18n-tmp.h:6205
 msgid "Epson Stylus Color I"
 msgstr "Epson Stylus Color I"
 
-#: src/xml/xmli18n-tmp.h:3967
+#: src/xml/xmli18n-tmp.h:6206
 msgid "Epson Stylus Color II"
 msgstr "Epson Stylus Color II"
 
-#: src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:6207
 msgid "Epson Stylus Color IIs"
 msgstr "Epson Stylus Color IIs"
 
-#: src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:6208
 msgid "Epson Stylus Color PRO"
 msgstr "Epson Stylus Color PRO"
 
-#: src/xml/xmli18n-tmp.h:3970
+#: src/xml/xmli18n-tmp.h:6209
 msgid "Epson Stylus Pro XL"
 msgstr "Epson Stylus Pro XL"
 
-#: src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:6210
 msgid "Epson Stylus Color 400"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:3972
+#: src/xml/xmli18n-tmp.h:6211
 msgid "Epson Stylus Color 440"
 msgstr "Epson Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:6212
 msgid "Epson Stylus Color 460"
 msgstr "Epson Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:6213
 msgid "Epson Stylus Color 480"
 msgstr "Epson Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:3975
+#: src/xml/xmli18n-tmp.h:6214
 msgid "Epson Stylus Color 500"
 msgstr "Epson Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:6215
 msgid "Epson Stylus Color 580"
 msgstr "Epson Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:6216
 msgid "Epson Stylus Color 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:6217
 msgid "Epson Stylus Color 640"
 msgstr "Epson Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:3979
+#: src/xml/xmli18n-tmp.h:6218
 msgid "Epson Stylus Color 660"
 msgstr "Epson Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:6219
 msgid "Epson Stylus Color 670"
 msgstr "Epson Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:3981
+#: src/xml/xmli18n-tmp.h:6220
 msgid "Epson Stylus Color 680"
 msgstr "Epson Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:3982
+#: src/xml/xmli18n-tmp.h:6221
 msgid "Epson Stylus Color 740"
 msgstr "Epson Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:3983
+#: src/xml/xmli18n-tmp.h:6222
 msgid "Epson Stylus Color 760"
 msgstr "Epson Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:3984
+#: src/xml/xmli18n-tmp.h:6223
 msgid "Epson Stylus Color 777"
 msgstr "Epson Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:6224
 msgid "Epson Stylus Color 800"
 msgstr "Epson Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:6225
 msgid "Epson Stylus Color 850"
 msgstr "Epson Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:3987
+#: src/xml/xmli18n-tmp.h:6226
 msgid "Epson Stylus Color 860"
 msgstr "Epson Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:6227
 msgid "Epson Stylus Color 880"
 msgstr "Epson Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:3989
+#: src/xml/xmli18n-tmp.h:6228
 msgid "Epson Stylus Color 8 3"
 msgstr "Epson Stylus Color 8 3"
 
-#: src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:6229
 msgid "Epson Stylus Color 900"
 msgstr "Epson Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:6230
 msgid "Epson Stylus Color 980"
 msgstr "Epson Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:3992
+#: src/xml/xmli18n-tmp.h:6231
 msgid "Epson Stylus Color 1160"
 msgstr "Epson Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:3993
+#: src/xml/xmli18n-tmp.h:6232
 msgid "Epson Stylus Color 1500"
 msgstr "Epson Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:6233
 msgid "Epson Stylus Color 1520"
 msgstr "Epson Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:3995
+#: src/xml/xmli18n-tmp.h:6234
 msgid "Epson Stylus Color 3000"
 msgstr "Epson Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:6235
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:6236
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:3998
+#: src/xml/xmli18n-tmp.h:6237
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:3999
+#: src/xml/xmli18n-tmp.h:6238
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:6239
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "Epson Stylus C43"
 
-#: src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:6240
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "Epson Stylus C40"
 
-#: src/xml/xmli18n-tmp.h:4002
+#: src/xml/xmli18n-tmp.h:6241
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:6242
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:6243
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4005
+#: src/xml/xmli18n-tmp.h:6244
 #, fuzzy
-msgid "Epson Stylus Offixe TX300F"
+msgid "Epson Stylus Office TX300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4006
+#: src/xml/xmli18n-tmp.h:6245
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:6246
 msgid "Epson Stylus Photo"
 msgstr "Epson Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:4008
+#: src/xml/xmli18n-tmp.h:6247
 msgid "Epson Stylus Photo 700"
 msgstr "Epson Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4009
+#: src/xml/xmli18n-tmp.h:6248
 msgid "Epson Stylus Photo EX"
 msgstr "Epson Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:6249
 msgid "Epson Stylus Photo EX3"
 msgstr "Epson Stylus Photo EX3"
 
-#: src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:6250
 msgid "Epson Stylus Photo 720"
 msgstr "Epson Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:6251
 msgid "Epson Stylus Photo 750"
 msgstr "Epson Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4013
+#: src/xml/xmli18n-tmp.h:6252
 msgid "Epson Stylus Photo 780"
 msgstr "Epson Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4014
+#: src/xml/xmli18n-tmp.h:6253
 msgid "Epson Stylus Photo 785"
 msgstr "Epson Stylus Photo 785"
 
-#: src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:6254
 msgid "Epson Stylus Photo 790"
 msgstr "Epson Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:4016
+#: src/xml/xmli18n-tmp.h:6255
 msgid "Epson Stylus Photo 810"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:6256
 msgid "Epson Stylus Photo 820"
 msgstr "Epson Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:6257
 msgid "Epson Stylus Photo 825"
 msgstr "Epson Stylus Photo 825"
 
-#: src/xml/xmli18n-tmp.h:4019
+#: src/xml/xmli18n-tmp.h:6258
 msgid "Epson Stylus Photo 830"
 msgstr "Epson Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:4020
+#: src/xml/xmli18n-tmp.h:6259
 msgid "Epson Stylus Photo 830U"
 msgstr "Epson Stylus Photo 830U"
 
-#: src/xml/xmli18n-tmp.h:4021
+#: src/xml/xmli18n-tmp.h:6260
 msgid "Epson Stylus Photo 870"
 msgstr "Epson Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:4022
+#: src/xml/xmli18n-tmp.h:6261
 msgid "Epson Stylus Photo 875"
 msgstr "Epson Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:4023
+#: src/xml/xmli18n-tmp.h:6262
 msgid "Epson Stylus Photo 890"
 msgstr "Epson Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:4024
+#: src/xml/xmli18n-tmp.h:6263
 msgid "Epson Stylus Photo 895"
 msgstr "Epson Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:6264
 msgid "Epson Stylus Photo 900"
 msgstr "Epson Stylus Photo 900"
 
-#: src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:6265
 msgid "Epson Stylus Photo 915"
 msgstr "Epson Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:4027
+#: src/xml/xmli18n-tmp.h:6266
 msgid "Epson Stylus Photo 925"
 msgstr "Epson Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:6267
 msgid "Epson Stylus Photo 935"
 msgstr "Epson Stylus Photo 935"
 
-#: src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:6268
 msgid "Epson Stylus Photo 950"
 msgstr "Epson Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:6269
 msgid "Epson Stylus Photo 960"
 msgstr "Epson Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:4031
+#: src/xml/xmli18n-tmp.h:6270
 msgid "Epson Stylus Photo 1200"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:6271
 msgid "Epson Stylus Photo 1270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4033
+#: src/xml/xmli18n-tmp.h:6272
 msgid "Epson Stylus Photo 1280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4034
+#: src/xml/xmli18n-tmp.h:6273
 msgid "Epson Stylus Photo 1290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4035
+#: src/xml/xmli18n-tmp.h:6274
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "Epson Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:6275
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "Epson Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4037
+#: src/xml/xmli18n-tmp.h:6276
 msgid "Epson Stylus Photo 2000P"
 msgstr "Epson Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:4038
+#: src/xml/xmli18n-tmp.h:6277
 msgid "Epson Stylus Photo 2100"
 msgstr "Epson Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:4039
+#: src/xml/xmli18n-tmp.h:6278
 msgid "Epson Stylus Photo 2200"
 msgstr "Epson Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:6279
 msgid "Epson Stylus Photo R200"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:4041
+#: src/xml/xmli18n-tmp.h:6280
 msgid "Epson Stylus Photo R210"
 msgstr "Epson Stylus Photo R210"
 
-#: src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:6281
 msgid "Epson Stylus Photo R220"
 msgstr "Epson Stylus Photo R220"
 
-#: src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:6282
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:4044
+#: src/xml/xmli18n-tmp.h:6283
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:6284
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:6285
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "Epson Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:6286
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:6287
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "Epson Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4049
+#: src/xml/xmli18n-tmp.h:6288
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "Epson Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:6289
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4051
+#: src/xml/xmli18n-tmp.h:6290
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "Epson Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:6291
 msgid "Epson Stylus Photo R300"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:4053
+#: src/xml/xmli18n-tmp.h:6292
 msgid "Epson Stylus Photo R310"
 msgstr "Epson Stylus Photo R310"
 
-#: src/xml/xmli18n-tmp.h:4054
+#: src/xml/xmli18n-tmp.h:6293
 msgid "Epson Stylus Photo R320"
 msgstr "Epson Stylus Photo R320"
 
-#: src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:6294
 msgid "Epson Stylus Photo R340"
 msgstr "Epson Stylus Photo R340"
 
-#: src/xml/xmli18n-tmp.h:4056
+#: src/xml/xmli18n-tmp.h:6295
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:6296
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:4058
+#: src/xml/xmli18n-tmp.h:6297
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:4059
+#: src/xml/xmli18n-tmp.h:6298
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "Epson Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:6299
 msgid "Epson Stylus Photo R800"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:6300
 msgid "Epson Stylus Photo R1800"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:4062
+#: src/xml/xmli18n-tmp.h:6301
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "Epson Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:6302
 msgid "Epson Stylus Photo R2400"
 msgstr "Epson Stylus Photo R2400"
 
-#: src/xml/xmli18n-tmp.h:4064
+#: src/xml/xmli18n-tmp.h:6303
+#, fuzzy
+msgid "Epson Stylus Photo R2880"
+msgstr "Epson Stylus Photo 1280"
+
+#: src/xml/xmli18n-tmp.h:6304
 msgid "Epson Stylus Photo RX400"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:4065
+#: src/xml/xmli18n-tmp.h:6305
 msgid "Epson Stylus Photo RX420"
 msgstr "Epson Stylus Photo RX420"
 
-#: src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:6306
 msgid "Epson Stylus Photo RX425"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4067
+#: src/xml/xmli18n-tmp.h:6307
 msgid "Epson Stylus Photo RX430"
 msgstr "Epson Stylus Photo RX430"
 
-#: src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:6308
 msgid "Epson Stylus Photo RX500"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4069
+#: src/xml/xmli18n-tmp.h:6309
 msgid "Epson Stylus Photo RX510"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:6310
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:6311
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4072
+#: src/xml/xmli18n-tmp.h:6312
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:6313
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4074
+#: src/xml/xmli18n-tmp.h:6314
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4075
+#: src/xml/xmli18n-tmp.h:6315
 msgid "Epson Stylus Photo RX600"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:4076
+#: src/xml/xmli18n-tmp.h:6316
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "Epson Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:6317
 msgid "Epson Stylus Photo RX620"
 msgstr "Epson Stylus Photo RX620"
 
-#: src/xml/xmli18n-tmp.h:4078
+#: src/xml/xmli18n-tmp.h:6318
 msgid "Epson Stylus Photo RX630"
 msgstr "Epson Stylus Photo RX630"
 
-#: src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:6319
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "Epson Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:6320
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "Epson Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:6321
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "Epson Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4082
+#: src/xml/xmli18n-tmp.h:6322
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "Epson Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:6323
 msgid "Epson Stylus Photo RX700"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:4084
+#: src/xml/xmli18n-tmp.h:6324
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "Epson Stylus Photo RX700"
 
-#: src/xml/xmli18n-tmp.h:4085
+#: src/xml/xmli18n-tmp.h:6325
 #, fuzzy
-msgid "Epson Stylus Photo TX800W"
+msgid "Epson Stylus Photo TX800FW"
 msgstr "Epson Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:4086
+#: src/xml/xmli18n-tmp.h:6326
 msgid "Epson Stylus Pro 5000"
 msgstr "Epson Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:4087
+#: src/xml/xmli18n-tmp.h:6327
 msgid "Epson Stylus Pro 5500"
 msgstr "Epson Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:4088
+#: src/xml/xmli18n-tmp.h:6328
 msgid "Epson Stylus Pro 7000"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4089
+#: src/xml/xmli18n-tmp.h:6329
 msgid "Epson Stylus Pro 7500"
 msgstr "Epson Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:6330
 msgid "Epson Stylus Pro 7600"
 msgstr "Epson Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:4091
+#: src/xml/xmli18n-tmp.h:6331
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:6332
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "Epson Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4093
+#: src/xml/xmli18n-tmp.h:6333
 msgid "Epson Stylus Pro 9000"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4094
+#: src/xml/xmli18n-tmp.h:6334
 msgid "Epson Stylus Pro 9500"
 msgstr "Epson Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:6335
 msgid "Epson Stylus Pro 9600"
 msgstr "Epson Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:6336
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4097
+#: src/xml/xmli18n-tmp.h:6337
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "Epson Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:6338
 msgid "Epson Stylus Pro 10000"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4099
+#: src/xml/xmli18n-tmp.h:6339
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "Epson Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:6340
 msgid "Epson Stylus Scan 2000"
 msgstr "Epson Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:6341
 msgid "Epson Stylus Scan 2500"
 msgstr "Epson Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:6342
 msgid "Epson Stylus CX1500"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:6343
 msgid "Epson Stylus CX3100"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:6344
 msgid "Epson Stylus CX3200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:6345
 msgid "Epson Stylus CX3500"
 msgstr "Epson Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:6346
 msgid "Epson Stylus CX3600"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:6347
 msgid "Epson Stylus CX3650"
 msgstr "Epson Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:6348
 msgid "Epson Stylus CX3700"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:6349
 msgid "Epson Stylus CX3800"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:4110
+#: src/xml/xmli18n-tmp.h:6350
 msgid "Epson Stylus CX3805"
 msgstr "Epson Stylus CX3805"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:6351
 msgid "Epson Stylus CX3810"
 msgstr "Epson Stylus CX3810"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:6352
 msgid "Epson Stylus CX4100"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4113
+#: src/xml/xmli18n-tmp.h:6353
 msgid "Epson Stylus CX4200"
 msgstr "Epson Stylus CX4200"
 
-#: src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:6354
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:6355
 msgid "Epson Stylus CX4500"
 msgstr "Epson Stylus CX4500"
 
-#: src/xml/xmli18n-tmp.h:4116
+#: src/xml/xmli18n-tmp.h:6356
 msgid "Epson Stylus CX4600"
 msgstr "Epson Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:6357
 msgid "Epson Stylus CX4700"
 msgstr "Epson Stylus CX4700"
 
-#: src/xml/xmli18n-tmp.h:4118
+#: src/xml/xmli18n-tmp.h:6358
 msgid "Epson Stylus CX4800"
 msgstr "Epson Stylus CX4800"
 
-#: src/xml/xmli18n-tmp.h:4119
+#: src/xml/xmli18n-tmp.h:6359
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:6360
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4121
+#: src/xml/xmli18n-tmp.h:6361
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:6362
 msgid "Epson Stylus CX5100"
 msgstr "Epson Stylus CX5100"
 
-#: src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:6363
 msgid "Epson Stylus CX5200"
 msgstr "Epson Stylus CX5200"
 
-#: src/xml/xmli18n-tmp.h:4124
+#: src/xml/xmli18n-tmp.h:6364
 msgid "Epson Stylus CX5300"
 msgstr "Epson Stylus CX5300"
 
-#: src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:6365
 msgid "Epson Stylus CX5400"
 msgstr "Epson Stylus CX5400"
 
-#: src/xml/xmli18n-tmp.h:4126
+#: src/xml/xmli18n-tmp.h:6366
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4127
+#: src/xml/xmli18n-tmp.h:6367
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4128
+#: src/xml/xmli18n-tmp.h:6368
 msgid "Epson Stylus CX5700"
 msgstr "Epson Stylus CX5700"
 
-#: src/xml/xmli18n-tmp.h:4129
+#: src/xml/xmli18n-tmp.h:6369
 msgid "Epson Stylus CX5800"
 msgstr "Epson Stylus CX5800"
 
-#: src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:6370
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "Epson Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:6371
 msgid "Epson Stylus CX6300"
 msgstr "Epson Stylus CX6300"
 
-#: src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:6372
 msgid "Epson Stylus CX6400"
 msgstr "Epson Stylus CX6400"
 
-#: src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:6373
 msgid "Epson Stylus CX6500"
 msgstr "Epson Stylus CX6500"
 
-#: src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:6374
 msgid "Epson Stylus CX6600"
 msgstr "Epson Stylus CX6600"
 
-#: src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:6375
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:6376
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:6377
 msgid "Epson Stylus CX7700"
 msgstr "Epson Stylus CX7700"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:6378
 msgid "Epson Stylus CX7800"
 msgstr "Epson Stylus CX7800"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:6379
 msgid "Epson Stylus CX8300"
 msgstr "Epson Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:6380
 msgid "Epson Stylus CX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:6381
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:6382
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:6383
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4144
+#: src/xml/xmli18n-tmp.h:6384
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "Epson Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:6385
 msgid "Epson Stylus D68"
 msgstr "Epson Stylus D68"
 
-#: src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:6386
 msgid "Epson Stylus D88"
 msgstr "Epson Stylus D88"
 
-#: src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:6387
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:6388
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:6389
 msgid "Epson Stylus DX3800"
 msgstr "Epson Stylus DX3800"
 
-#: src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:6390
 msgid "Epson Stylus DX3850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:6391
+#, fuzzy
+msgid "Epson Stylus DX4000"
+msgstr "Epson Stylus DX4200"
+
+#: src/xml/xmli18n-tmp.h:6392
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:6393
 msgid "Epson Stylus DX4200"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:6394
 msgid "Epson Stylus DX4250"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:4154
+#: src/xml/xmli18n-tmp.h:6395
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:6396
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:6397
 msgid "Epson Stylus DX4800"
 msgstr "Epson Stylus DX4800"
 
-#: src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:6398
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:6399
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:6400
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:6401
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "Epson Stylus DX4250"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:6402
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "Epson Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:6403
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "Epson Stylus DX3850"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:6404
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:6405
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:6406
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:6407
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:6408
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "Epson Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:6409
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:6410
 #, fuzzy
-msgid "Epson Stylus PX700FW"
+msgid "Epson Stylus PX700W"
 msgstr "Epson Stylus CX3700"
 
-#: src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:6411
 #, fuzzy
 msgid "Epson Stylus PX800FW"
 msgstr "Epson Stylus CX3800"
 
-#: src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:6412
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:4172
+#: src/xml/xmli18n-tmp.h:6413
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:6414
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4174
+#: src/xml/xmli18n-tmp.h:6415
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:6416
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:6417
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4177
+#: src/xml/xmli18n-tmp.h:6418
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "Epson Stylus DX4200"
 
-#: src/xml/xmli18n-tmp.h:4178
+#: src/xml/xmli18n-tmp.h:6419
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "Epson Stylus C20"
 
-#: src/xml/xmli18n-tmp.h:4179
+#: src/xml/xmli18n-tmp.h:6420
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4180
+#: src/xml/xmli18n-tmp.h:6421
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4181
+#: src/xml/xmli18n-tmp.h:6422
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:6423
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:6424
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:6425
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:6426
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:6427
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "Epson Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4187
+#: src/xml/xmli18n-tmp.h:6428
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "Epson Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4188
+#: src/xml/xmli18n-tmp.h:6429
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "Epson Stylus CX4100"
 
-#: src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:6430
 msgid "Epson PictureMate"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:6431
 #, fuzzy
 msgid "Epson PictureMate Dash"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:6432
 msgid "Epson PictureMate Deluxe"
 msgstr "Epson PictureMate Deluxe"
 
-#: src/xml/xmli18n-tmp.h:4192
+#: src/xml/xmli18n-tmp.h:6433
 #, fuzzy
 msgid "Epson PictureMate Flash"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:6434
 #, fuzzy
 msgid "Epson PictureMate Pal"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:6435
 #, fuzzy
 msgid "Epson PictureMate Snap"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:6436
 #, fuzzy
 msgid "Epson PictureMate 100"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4196
+#: src/xml/xmli18n-tmp.h:6437
 #, fuzzy
 msgid "Epson PictureMate 200"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:6438
 #, fuzzy
 msgid "Epson PictureMate 210"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:6439
 #, fuzzy
 msgid "Epson PictureMate 215"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4199
+#: src/xml/xmli18n-tmp.h:6440
 #, fuzzy
 msgid "Epson PictureMate 240"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:6441
 #, fuzzy
 msgid "Epson PictureMate 250"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:6442
 #, fuzzy
 msgid "Epson PictureMate 260"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:6443
 #, fuzzy
 msgid "Epson PictureMate 270"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:6444
 #, fuzzy
 msgid "Epson PictureMate 280"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4204
+#: src/xml/xmli18n-tmp.h:6445
 #, fuzzy
 msgid "Epson PictureMate 290"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:6446
 #, fuzzy
 msgid "Epson PictureMate 500"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:6447
 #, fuzzy
 msgid "Epson PictureMate 2005"
 msgstr "Epson PictureMate"
 
-#: src/xml/xmli18n-tmp.h:4207
+#: src/xml/xmli18n-tmp.h:6448
 #, fuzzy
 msgid "Epson WorkForce 30"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:6449
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "Epson Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:6450
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:6451
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "Epson Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:6452
 msgid "Epson CL 700"
 msgstr "Epson CL 700"
 
-#: src/xml/xmli18n-tmp.h:4212
+#: src/xml/xmli18n-tmp.h:6453
 msgid "Epson CL 750"
 msgstr "Epson CL 750"
 
-#: src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:6454
 msgid "Epson CL 760"
 msgstr "Epson CL 760"
 
-#: src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:6455
 msgid "Epson E 100"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4215
+#: src/xml/xmli18n-tmp.h:6456
 msgid "Epson E 150"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:4216
+#: src/xml/xmli18n-tmp.h:6457
 msgid "Epson E 200"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:6458
 #, fuzzy
 msgid "Epson E 300"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:6459
 #, fuzzy
 msgid "Epson E 500"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4219
+#: src/xml/xmli18n-tmp.h:6460
 #, fuzzy
 msgid "Epson E 520"
 msgstr "Epson E 150"
 
-#: src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:6461
 #, fuzzy
 msgid "Epson E 700"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:6462
 #, fuzzy
 msgid "Epson E 720"
 msgstr "Epson E 200"
 
-#: src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:6463
 msgid "Epson EM 900C"
 msgstr "Epson EM 900C"
 
-#: src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:6464
 msgid "Epson EM 930C"
 msgstr "Epson EM 930C"
 
-#: src/xml/xmli18n-tmp.h:4224
+#: src/xml/xmli18n-tmp.h:6465
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:6466
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:6467
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:6468
 msgid "Epson MC 2000"
 msgstr "Epson MC 2000"
 
-#: src/xml/xmli18n-tmp.h:4228
+#: src/xml/xmli18n-tmp.h:6469
 msgid "Epson MC 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4229
+#: src/xml/xmli18n-tmp.h:6470
 msgid "Epson MC 7000"
 msgstr "Epson MC 7000"
 
-#: src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:6471
 msgid "Epson MC 9000"
 msgstr "Epson MC 9000"
 
-#: src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:6472
 msgid "Epson MC 10000"
 msgstr "Epson MC 10000"
 
-#: src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:6473
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:6474
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:6475
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:6476
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:6477
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Epson E 100"
 
-#: src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:6478
 msgid "Epson MJ 930C"
 msgstr "Epson MJ 930C"
 
-#: src/xml/xmli18n-tmp.h:4238
+#: src/xml/xmli18n-tmp.h:6479
 msgid "Epson MJ 5100C"
 msgstr "Epson MJ 5100C"
 
-#: src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:6480
 msgid "Epson MJ 6000C"
 msgstr "Epson MJ 6000C"
 
-#: src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:6481
 msgid "Epson MJ 8000C"
 msgstr "Epson MJ 8000C"
 
-#: src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:6482
 #, fuzzy
 msgid "Epson PM 670C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:4242
+#: src/xml/xmli18n-tmp.h:6483
 msgid "Epson PM 700C"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:4243
+#: src/xml/xmli18n-tmp.h:6484
 msgid "Epson PM 730C"
 msgstr "Epson PM 730C"
 
-#: src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:6485
 msgid "Epson PM 740C"
 msgstr "Epson PM 740C"
 
-#: src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:6486
 msgid "Epson PM 750C"
 msgstr "Epson PM 750C"
 
-#: src/xml/xmli18n-tmp.h:4246
+#: src/xml/xmli18n-tmp.h:6487
 msgid "Epson PM 760C"
 msgstr "Epson PM 760C"
 
-#: src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:6488
 msgid "Epson PM 770C"
 msgstr "Epson PM 770C"
 
-#: src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:6489
 msgid "Epson PM 780C"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:6490
 msgid "Epson PM 790PT"
 msgstr "Epson PM 790PT"
 
-#: src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:6491
 msgid "Epson PM 800C"
 msgstr "Epson PM 800C"
 
-#: src/xml/xmli18n-tmp.h:4251
+#: src/xml/xmli18n-tmp.h:6492
 msgid "Epson PM 850PT"
 msgstr "Epson PM 850PT"
 
-#: src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:6493
 msgid "Epson PM 870C"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:4253
+#: src/xml/xmli18n-tmp.h:6494
 msgid "Epson PM 880C"
 msgstr "Epson PM 880C"
 
-#: src/xml/xmli18n-tmp.h:4254
+#: src/xml/xmli18n-tmp.h:6495
 msgid "Epson PM 930C"
 msgstr "Epson PM 930C"
 
-#: src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:6496
 msgid "Epson PM 940C"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:6497
 msgid "Epson PM 950C"
 msgstr "Epson PM 950C"
 
-#: src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:6498
 msgid "Epson PM 970C"
 msgstr "Epson PM 970C"
 
-#: src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:6499
 msgid "Epson PM 980C"
 msgstr "Epson PM 980C"
 
-#: src/xml/xmli18n-tmp.h:4259
+#: src/xml/xmli18n-tmp.h:6500
 msgid "Epson PM 2000C"
 msgstr "Epson PM 2000C"
 
-#: src/xml/xmli18n-tmp.h:4260
+#: src/xml/xmli18n-tmp.h:6501
 msgid "Epson PM 2200C"
 msgstr "Epson PM 2200C"
 
-#: src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:6502
 msgid "Epson PM 3000C"
 msgstr "Epson PM 3000C"
 
-#: src/xml/xmli18n-tmp.h:4262
+#: src/xml/xmli18n-tmp.h:6503
 msgid "Epson PM 3300C"
 msgstr "Epson PM 3300C"
 
-#: src/xml/xmli18n-tmp.h:4263
+#: src/xml/xmli18n-tmp.h:6504
 msgid "Epson PM 3500C"
 msgstr "Epson PM 3500C"
 
-#: src/xml/xmli18n-tmp.h:4264
+#: src/xml/xmli18n-tmp.h:6505
 msgid "Epson PM 3700C"
 msgstr "Epson PM 3700C"
 
-#: src/xml/xmli18n-tmp.h:4265
+#: src/xml/xmli18n-tmp.h:6506
 msgid "Epson PM 4000PX"
 msgstr "Epson PM 4000PX"
 
-#: src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:6507
 msgid "Epson PM 5000C"
 msgstr "Epson PM 5000C"
 
-#: src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:6508
 msgid "Epson PM 7000C"
 msgstr "Epson PM 7000C"
 
-#: src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:6509
 msgid "Epson PM 9000C"
 msgstr "Epson PM 9000C"
 
-#: src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:6510
 msgid "Epson PM 10000"
 msgstr "Epson PM 10000"
 
-#: src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:6511
 msgid "Epson PM A650"
 msgstr "Epson PM A650"
 
-#: src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:6512
 msgid "Epson PM A750"
 msgstr "Epson PM A750"
 
-#: src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:6513
 #, fuzzy
 msgid "Epson PM A820"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:6514
 msgid "Epson PM A890"
 msgstr "Epson PM A890"
 
-#: src/xml/xmli18n-tmp.h:4274
+#: src/xml/xmli18n-tmp.h:6515
 msgid "Epson PM A900"
 msgstr "Epson PM A900"
 
-#: src/xml/xmli18n-tmp.h:4275
+#: src/xml/xmli18n-tmp.h:6516
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "Epson PM 940C"
 
-#: src/xml/xmli18n-tmp.h:4276
+#: src/xml/xmli18n-tmp.h:6517
 msgid "Epson PM A950"
 msgstr "Epson PM A950"
 
-#: src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:6518
 msgid "Epson PM D600"
 msgstr "Epson PM D600"
 
-#: src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:6519
 msgid "Epson PM D750"
 msgstr "Epson PM D750"
 
-#: src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:6520
 msgid "Epson PM D770"
 msgstr "Epson PM D770"
 
-#: src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:6521
 msgid "Epson PM D800"
 msgstr "Epson PM D800"
 
-#: src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:6522
 #, fuzzy
 msgid "Epson PM D870"
 msgstr "Epson PM 870C"
 
-#: src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:6523
 msgid "Epson PM D1000"
 msgstr "Epson PM D1000"
 
-#: src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:6524
 msgid "Epson PM G700"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:6525
 msgid "Epson PM G720"
 msgstr "Epson PM G720"
 
-#: src/xml/xmli18n-tmp.h:4285
+#: src/xml/xmli18n-tmp.h:6526
 msgid "Epson PM G730"
 msgstr "Epson PM G730"
 
-#: src/xml/xmli18n-tmp.h:4286
+#: src/xml/xmli18n-tmp.h:6527
 msgid "Epson PM G800"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:6528
 msgid "Epson PM G820"
 msgstr "Epson PM G820"
 
-#: src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:6529
 #, fuzzy
 msgid "Epson PM G850"
 msgstr "Epson PM G800"
 
-#: src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:6530
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "Epson PM 700C"
 
-#: src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:6531
 #, fuzzy
 msgid "Epson PM G4500"
 msgstr "Epson PM G700"
 
-#: src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:6532
 msgid "Epson PX A650"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4292
+#: src/xml/xmli18n-tmp.h:6533
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:6534
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:6535
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4295
+#: src/xml/xmli18n-tmp.h:6536
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:4296
+#: src/xml/xmli18n-tmp.h:6537
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4297
+#: src/xml/xmli18n-tmp.h:6538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "Epson PX A650"
 
-#: src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:6539
 msgid "Epson PX G900"
 msgstr "Epson PX G900"
 
-#: src/xml/xmli18n-tmp.h:4299
+#: src/xml/xmli18n-tmp.h:6540
 msgid "Epson PX G920"
 msgstr "Epson PX G920"
 
-#: src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:6541
 msgid "Epson PX G5000"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:6542
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "Epson PX G5000"
 
-#: src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:6543
 msgid "Epson PX V500"
 msgstr "Epson PX V500"
 
-#: src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:6544
 msgid "Epson PX V600"
 msgstr "Epson PX V600"
 
-#: src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Epson PX V630"
 msgstr "Epson PX V630"
 
-#: src/xml/xmli18n-tmp.h:4305
+#: src/xml/xmli18n-tmp.h:6546
 #, fuzzy
 msgid "Epson PX V780"
 msgstr "Epson PM 780C"
 
-#: src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:6547
 msgid "Epson PX 5500"
 msgstr "Epson PX 5500"
 
-#: src/xml/xmli18n-tmp.h:4307
+#: src/xml/xmli18n-tmp.h:6548
+#, fuzzy
+msgid "Epson PX G5600"
+msgstr "Epson PX G5000"
+
+#: src/xml/xmli18n-tmp.h:6549
 msgid "Epson PX 7000"
 msgstr "Epson PX 7000"
 
-#: src/xml/xmli18n-tmp.h:4308
+#: src/xml/xmli18n-tmp.h:6550
 msgid "Epson PX 9000"
 msgstr "Epson PX 9000"
 
-#: src/xml/xmli18n-tmp.h:4309
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Apollo P-2100"
 msgstr "Apollo P-2100"
 
-#: src/xml/xmli18n-tmp.h:4310
+#: src/xml/xmli18n-tmp.h:6552
 msgid "Apollo P-2150"
 msgstr "Apollo P-2150"
 
-#: src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:6553
 msgid "Apollo P-2200"
 msgstr "Apollo P-2200"
 
-#: src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:6554
 msgid "Apollo P-2250"
 msgstr "Apollo P-2250"
 
-#: src/xml/xmli18n-tmp.h:4313
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Apollo P-2500"
 msgstr "Apollo P-2500"
 
-#: src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:6556
 msgid "Apollo P-2550"
 msgstr "Apollo P-2550"
 
-#: src/xml/xmli18n-tmp.h:4315
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Apollo P-2600"
 msgstr "Apollo P-2600"
 
-#: src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Apollo P-2650"
 msgstr "Apollo P-2650"
 
-#: src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:6559
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:6560
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:6561
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:6562
 msgid "Apple LaserWriter Select 360"
 msgstr "Apple LaserWriter Select 360"
 
-#: src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:6563
 msgid "Brother DCP-1200"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:6564
 #, fuzzy
 msgid "Brother DCP-8045D"
 msgstr "Brother DCP-1200"
 
-#: src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:6565
 msgid "Brother HL-1040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:4324
+#: src/xml/xmli18n-tmp.h:6566
 msgid "Brother HL-1050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:6567
 msgid "Brother HL-1060"
 msgstr "Brother HL-1060"
 
-#: src/xml/xmli18n-tmp.h:4326
+#: src/xml/xmli18n-tmp.h:6568
 msgid "Brother HL-1070"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:4327
+#: src/xml/xmli18n-tmp.h:6569
 msgid "Brother HL-10V"
 msgstr "Brother HL-10V"
 
-#: src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:6570
 msgid "Brother HL-10h"
 msgstr "Brother HL-10h"
 
-#: src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:6571
 msgid "Brother HL-1240"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Brother HL-1250"
 msgstr "Brother HL-1250"
 
-#: src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Brother HL-1260"
 msgstr "Brother HL-1260"
 
-#: src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Brother HL-1270N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:6575
 #, fuzzy
 msgid "Brother HL-1430"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:6576
 msgid "Brother HL-1440"
 msgstr "Brother HL-1440"
 
-#: src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:6577
 #, fuzzy
 msgid "Brother HL-1450"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:6578
 #, fuzzy
 msgid "Brother HL-1470N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:4337
+#: src/xml/xmli18n-tmp.h:6579
 #, fuzzy
 msgid "Brother HL-1650"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:6580
 msgid "Brother HL-1660e"
 msgstr "Brother HL-1660e"
 
-#: src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:6581
 #, fuzzy
 msgid "Brother HL-1670N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:6582
 #, fuzzy
 msgid "Brother HL-1850"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:6583
 #, fuzzy
 msgid "Brother HL-1870N"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:6584
 msgid "Brother HL-2060"
 msgstr "Brother HL-2060"
 
-#: src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:6585
 #, fuzzy
 msgid "Brother HL-2460"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:6586
 #, fuzzy
 msgid "Brother HL-2460N"
 msgstr "Brother HL-1240"
 
-#: src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:6587
 msgid "Brother HL-4Ve"
 msgstr "Brother HL-4Ve"
 
-#: src/xml/xmli18n-tmp.h:4346
+#: src/xml/xmli18n-tmp.h:6588
 #, fuzzy
 msgid "Brother HL-5030"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:6589
 #, fuzzy
 msgid "Brother HL-5040"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:6590
 #, fuzzy
 msgid "Brother HL-5050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:6591
 #, fuzzy
 msgid "Brother HL-5070N"
 msgstr "Brother HL-1070"
 
-#: src/xml/xmli18n-tmp.h:4350
+#: src/xml/xmli18n-tmp.h:6592
 #, fuzzy
 msgid "Brother HL-5140"
 msgstr "Brother HL-1040"
 
-#: src/xml/xmli18n-tmp.h:4351
+#: src/xml/xmli18n-tmp.h:6593
 #, fuzzy
 msgid "Brother HL-5150D"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:6594
 #, fuzzy
 msgid "Brother HL-5170DN"
 msgstr "Brother HL-1270N"
 
-#: src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:6595
 msgid "Brother HL-630"
 msgstr "Brother HL-630"
 
-#: src/xml/xmli18n-tmp.h:4354
+#: src/xml/xmli18n-tmp.h:6596
 msgid "Brother HL-660"
 msgstr "Brother HL-660"
 
-#: src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:6597
 #, fuzzy
 msgid "Brother HL-7050"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:6598
 #, fuzzy
 msgid "Brother HL-7050N"
 msgstr "Brother HL-1050"
 
-#: src/xml/xmli18n-tmp.h:4357
+#: src/xml/xmli18n-tmp.h:6599
 msgid "Brother HL-760"
 msgstr "Brother HL-760"
 
-#: src/xml/xmli18n-tmp.h:4358
+#: src/xml/xmli18n-tmp.h:6600
 msgid "Brother HL-960"
 msgstr "Brother HL-960"
 
-#: src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:6601
 msgid "Brother MFC-6550MC"
 msgstr "Brother MFC-6550MC"
 
-#: src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:6602
 msgid "Brother MFC-8300"
 msgstr "Brother MFC-8300"
 
-#: src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:6603
 msgid "Brother MFC-9500"
 msgstr "Brother MFC-9500"
 
-#: src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:6604
 msgid "Brother MFC-9600"
 msgstr "Brother MFC-9600"
 
-#: src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:6605
 msgid "Canon GP 335"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:6606
 msgid "Canon LBP-4sx"
 msgstr "Canon LBP-4sx"
 
-#: src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:6607
 msgid "Canon LBP-430"
 msgstr "Canon LBP-430"
 
-#: src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:6608
 msgid "Canon LBP-1000"
 msgstr "Canon LBP-1000"
 
-#: src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:6609
 msgid "Canon LBP-1260"
 msgstr "Canon LBP-1260"
 
-#: src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:6610
 msgid "Canon LBP-1760"
 msgstr "Canon LBP-1760"
 
-#: src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:6611
 msgid "Canon imageRunner 330s"
 msgstr "Canon imageRunner 330s"
 
-#: src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:6612
 msgid "Citizen ProJet II"
 msgstr "Citizen ProJet II"
 
-#: src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:6613
 msgid "DEC 1800"
 msgstr "DEC 1800"
 
-#: src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:6614
 msgid "DEC LN17"
 msgstr "DEC LN17"
 
-#: src/xml/xmli18n-tmp.h:4373
+#: src/xml/xmli18n-tmp.h:6615
 msgid "Epson ActionLaser 1100"
 msgstr "Epson ActionLaser 1100"
 
-#: src/xml/xmli18n-tmp.h:4374
+#: src/xml/xmli18n-tmp.h:6616
 msgid "Epson ActionLaser II"
 msgstr "Epson ActionLaser II"
 
-#: src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:6617
 msgid "Epson AcuLaser C2000"
 msgstr "Epson AcuLaser C2000"
 
-#: src/xml/xmli18n-tmp.h:4376
+#: src/xml/xmli18n-tmp.h:6618
 msgid "Epson AcuLaser C2000PS"
 msgstr "Epson AcuLaser C2000PS"
 
-#: src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:6619
 msgid "Epson AcuLaser C8500"
 msgstr "Epson AcuLaser C8500"
 
-#: src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:6620
 msgid "Epson AcuLaser C8500PS"
 msgstr "Epson AcuLaser C8500PS"
 
-#: src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:6621
 msgid "Epson AcuLaser C8600"
 msgstr "Epson AcuLaser C8600"
 
-#: src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:6622
 msgid "Epson AcuLaser C8600PS"
 msgstr "Epson AcuLaser C8600PS"
 
-#: src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:6623
 msgid "Epson EPL-5200"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:6624
 msgid "Epson EPL-5200+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:6625
 msgid "Epson EPL-5700"
 msgstr "Epson EPL-5700"
 
-#: src/xml/xmli18n-tmp.h:4384
+#: src/xml/xmli18n-tmp.h:6626
 msgid "Epson EPL-5700PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:4385
+#: src/xml/xmli18n-tmp.h:6627
 msgid "Epson EPL-5800"
 msgstr "Epson EPL-5800"
 
-#: src/xml/xmli18n-tmp.h:4386
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Epson EPL-5800PS"
 msgstr "Epson EPL-5800PS"
 
-#: src/xml/xmli18n-tmp.h:4387
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Epson EPL-5900"
 msgstr "Epson EPL-5900"
 
-#: src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:6630
 msgid "Epson EPL-5900PS"
 msgstr "Epson EPL-5900PS"
 
-#: src/xml/xmli18n-tmp.h:4389
+#: src/xml/xmli18n-tmp.h:6631
 msgid "Epson EPL-6100"
 msgstr "Epson EPL-6100"
 
-#: src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Epson EPL-6100PS"
 msgstr "Epson EPL-6100PS"
 
-#: src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Epson EPL-7100"
 msgstr "Epson EPL-7100"
 
-#: src/xml/xmli18n-tmp.h:4392
+#: src/xml/xmli18n-tmp.h:6634
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:6635
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:6636
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:6637
 #, fuzzy
 msgid "Epson EPL-N2050PS+"
 msgstr "Epson EPL-5200+"
 
-#: src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:4397
+#: src/xml/xmli18n-tmp.h:6639
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:6640
 #, fuzzy
 msgid "Epson EPL-N2500PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "Epson EPL-5200"
 
-#: src/xml/xmli18n-tmp.h:4400
+#: src/xml/xmli18n-tmp.h:6642
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "Epson EPL-5700PS"
 
-#: src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:6643
 msgid "Fujitsu PrintPartner 10V"
 msgstr "Fujitsu PrintPartner 10V"
 
-#: src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Fujitsu PrintPartner 16DV"
 msgstr "Fujitsu PrintPartner 16DV"
 
-#: src/xml/xmli18n-tmp.h:4403
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Fujitsu PrintPartner 20W"
 msgstr "Fujitsu PrintPartner 20W"
 
-#: src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:6646
 msgid "Fujitsu PrintPartner 8000"
 msgstr "Fujitsu PrintPartner 8000"
 
-#: src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:6647
 msgid "Generic PCL 4 Printer"
 msgstr "Allmän PCL 4-skrivare"
 
-#: src/xml/xmli18n-tmp.h:4406
+#: src/xml/xmli18n-tmp.h:6648
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "Allmän PCL 4-skrivare"
 
-#: src/xml/xmli18n-tmp.h:4407
+#: src/xml/xmli18n-tmp.h:6649
 msgid "Generic PCL 5 Printer"
 msgstr "Allmän PCL 5-skivare"
 
-#: src/xml/xmli18n-tmp.h:4408
+#: src/xml/xmli18n-tmp.h:6650
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "Allmän PCL 5-skivare"
 
-#: src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:6651
 msgid "Generic PCL 5c Printer"
 msgstr "Allmän PCL 5c-skivare"
 
-#: src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:6652
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "Allmän PCL 5c-skivare"
 
-#: src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:6653
 msgid "Generic PCL 5e Printer"
 msgstr "Allmän PCL 5e-skivare"
 
-#: src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:6654
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "Allmän PCL 5e-skivare"
 
-#: src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr "Allmän PCL 6/PCL XL-skrivare"
 
-#: src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:6656
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "Allmän PCL 6/PCL XL-skrivare"
 
-#: src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:6657
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4416
+#: src/xml/xmli18n-tmp.h:6658
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:6659
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:6660
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:6661
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4420
-msgid "Gestetner 3532"
+#: src/xml/xmli18n-tmp.h:6662
+msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4421
-msgid "Gestetner 4235g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:6663
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4423
-msgid "Gestetner 4532"
+#: src/xml/xmli18n-tmp.h:6664
+msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4424
-msgid "Gestetner 4245g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:6665
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:6666
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:6668
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:6669
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:6670
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4431
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:6672
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:6673
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:6674
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:6675
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4436
+#: src/xml/xmli18n-tmp.h:6676
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4437
-msgid "Gestetner DSm635"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4438
-msgid "Gestetner DSm635G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4439
-msgid "Gestetner DSm645"
+#: src/xml/xmli18n-tmp.h:6677
+msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4440
-msgid "Gestetner DS645G"
+#: src/xml/xmli18n-tmp.h:6678
+msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:6679
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:6680
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4443
+#: src/xml/xmli18n-tmp.h:6681
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:6682
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:6683
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4446
-msgid "Gestetner DSm735"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4447
-msgid "Gestetner DSm735G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4448
-msgid "Gestetner DSm745"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4449
-msgid "Gestetner DSm745G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4450
-msgid "Gestetner MP1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4451
-msgid "Gestetner DSm7110"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4452
-msgid "Gestetner MP1350"
+#: src/xml/xmli18n-tmp.h:6684
+msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4453
-msgid "Gestetner DSm7135"
+#: src/xml/xmli18n-tmp.h:6685
+msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4454
-msgid "Gestetner MP1600"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4455
-msgid "Gestetner DSm716"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4456
-msgid "Gestetner MP2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4457
-msgid "Gestetner DSm721d"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4458
-msgid "Gestetner MP2500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4459
-msgid "Gestetner DSm625"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4460
-msgid "Gestetner MP3500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4461
-msgid "Gestetner DSm735e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4462
-msgid "Gestetner MP4500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4463
-msgid "Gestetner DSm745e"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6686
+#, fuzzy
+msgid "Gestetner MP1100/DSm7110"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4464
-msgid "Gestetner MP5500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6687
+#, fuzzy
+msgid "Gestetner MP1350/DSm7135"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4465
-msgid "Gestetner DSm755"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6688
+#, fuzzy
+msgid "Gestetner MP1600/DSm716"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4466
-msgid "Gestetner MP6500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6689
+#, fuzzy
+msgid "Gestetner MP2000/DSm721d"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4467
-msgid "Gestetner DSm765"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6690
+#, fuzzy
+msgid "Gestetner MP2500/DSm625"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4468
-msgid "Gestetner MP7500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6691
+#, fuzzy
+msgid "Gestetner MP3500/DSm735e"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4469
-msgid "Gestetner DSm775"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6692
+#, fuzzy
+msgid "Gestetner MP4500/DSm745e"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4470
-msgid "Gestetner MP9000"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6693
+#, fuzzy
+msgid "Gestetner MP5500/DSm755"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4471
-msgid "Gestetner DSm790"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6694
+#, fuzzy
+msgid "Gestetner MP6500/DSm765"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4472
-msgid "Gestetner MP 161"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6695
+#, fuzzy
+msgid "Gestetner MP7500/DSm775"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4473
-msgid "Gestetner DSm416"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6696
+#, fuzzy
+msgid "Gestetner MP9000/DSm790"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4474
-msgid "Gestetner MP 2510"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6697
+#, fuzzy
+msgid "Gestetner MP 161/DSm416"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4475
-msgid "Gestetner DSm725e"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6698
+#, fuzzy
+msgid "Gestetner MP 2510/DSm725e"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:6699
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:6700
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4478
-msgid "Gestetner MP 3010"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4479
-msgid "Gestetner DSm730e"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6701
+#, fuzzy
+msgid "Gestetner MP 3010/DSm730e"
+msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4480
+#: src/xml/xmli18n-tmp.h:6702
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:6703
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:6704
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:6705
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:6706
 #, fuzzy
 msgid "Gestetner MP 5000"
 msgstr "Epson MC 5000"
 
-#: src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:6707
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:6708
 msgid "HP Business Inkjet 2200"
 msgstr "HP Business Inkjet 2200"
 
-#: src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:6709
 msgid "HP Business Inkjet 2230"
 msgstr "HP Business Inkjet 2230"
 
-#: src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:6710
 msgid "HP Business Inkjet 2250"
 msgstr "HP Business Inkjet 2250"
 
-#: src/xml/xmli18n-tmp.h:4489
+#: src/xml/xmli18n-tmp.h:6711
 msgid "HP Business Inkjet 2250TN"
 msgstr "HP Business Inkjet 2250TN"
 
-#: src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:6712
 msgid "HP Business Inkjet 2280"
 msgstr "HP Business Inkjet 2280"
 
-#: src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:6713
 msgid "HP Color Inkjet Printer CP1160"
 msgstr "HP Color Inkjet Printer CP1160"
 
-#: src/xml/xmli18n-tmp.h:4492
+#: src/xml/xmli18n-tmp.h:6714
 msgid "HP Color Inkjet Printer CP1700"
 msgstr "HP Color Inkjet Printer CP1700"
 
-#: src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:6715
 msgid "HP Color LaserJet 2500"
 msgstr "HP Color LaserJet 2500"
 
-#: src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:6716
 msgid "HP Color LaserJet 4500"
 msgstr "HP Color LaserJet 4500"
 
-#: src/xml/xmli18n-tmp.h:4495
+#: src/xml/xmli18n-tmp.h:6717
 msgid "HP Color LaserJet 4550"
 msgstr "HP Color LaserJet 4550"
 
-#: src/xml/xmli18n-tmp.h:4496
+#: src/xml/xmli18n-tmp.h:6718
 msgid "HP Color LaserJet 4600"
 msgstr "HP Color LaserJet 4600"
 
-#: src/xml/xmli18n-tmp.h:4497
+#: src/xml/xmli18n-tmp.h:6719
 msgid "HP Color LaserJet 5"
 msgstr "HP Color LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:6720
 msgid "HP Color LaserJet 5000"
 msgstr "HP Color LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:6721
 msgid "HP Color LaserJet 5500"
 msgstr "HP Color LaserJet 5500"
 
-#: src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:6722
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP Color LaserJet 8550GN"
 
-#: src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:6723
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:6724
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:6725
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:6726
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:6727
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:4506
+#: src/xml/xmli18n-tmp.h:6728
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:6729
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:4508
+#: src/xml/xmli18n-tmp.h:6730
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C Plus"
 
-#: src/xml/xmli18n-tmp.h:4509
+#: src/xml/xmli18n-tmp.h:6731
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:4510
+#: src/xml/xmli18n-tmp.h:6732
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500CP"
 
-#: src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:6733
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500CP"
 
-#: src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:6734
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet ColorPro CAD"
 
-#: src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:6735
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:6736
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 420C"
 
-#: src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:6737
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 450"
 
-#: src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:6738
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:6739
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:4518
+#: src/xml/xmli18n-tmp.h:6740
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 505J Plus"
 
-#: src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:6741
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 510"
 
-#: src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:6742
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:6743
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:6744
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:4523
+#: src/xml/xmli18n-tmp.h:6745
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 5550"
 
-#: src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:6746
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 5551"
 
-#: src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:6747
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:6748
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 600"
 
-#: src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:6749
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 600C"
 
-#: src/xml/xmli18n-tmp.h:4528
+#: src/xml/xmli18n-tmp.h:6750
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 610C"
 
-#: src/xml/xmli18n-tmp.h:4529
+#: src/xml/xmli18n-tmp.h:6751
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 610CL"
 
-#: src/xml/xmli18n-tmp.h:4530
+#: src/xml/xmli18n-tmp.h:6752
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 6122"
 
-#: src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:6753
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 6127"
 
-#: src/xml/xmli18n-tmp.h:4532
+#: src/xml/xmli18n-tmp.h:6754
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 612C"
 
-#: src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:6755
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 640C"
 
-#: src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:6756
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 648C"
 
-#: src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:6757
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 660C"
 
-#: src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:6758
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 670C"
 
-#: src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:6759
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 670TV"
 
-#: src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:6760
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 672C"
 
-#: src/xml/xmli18n-tmp.h:4539
+#: src/xml/xmli18n-tmp.h:6761
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 680C"
 
-#: src/xml/xmli18n-tmp.h:4540
+#: src/xml/xmli18n-tmp.h:6762
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 682C"
 
-#: src/xml/xmli18n-tmp.h:4541
+#: src/xml/xmli18n-tmp.h:6763
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 690C"
 
-#: src/xml/xmli18n-tmp.h:4542
+#: src/xml/xmli18n-tmp.h:6764
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 692C"
 
-#: src/xml/xmli18n-tmp.h:4543
+#: src/xml/xmli18n-tmp.h:6765
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 693C"
 
-#: src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:6766
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 694C"
 
-#: src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:6767
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 695C"
 
-#: src/xml/xmli18n-tmp.h:4546
+#: src/xml/xmli18n-tmp.h:6768
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 697C"
 
-#: src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:6769
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:6770
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:6771
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 815C"
 
-#: src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:6772
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 816C"
 
-#: src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:6773
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 825C"
 
-#: src/xml/xmli18n-tmp.h:4552
+#: src/xml/xmli18n-tmp.h:6774
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 830C"
 
-#: src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:6775
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 832C"
 
-#: src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:6776
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:6777
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 841C"
 
-#: src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:6778
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:6779
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 843C"
 
-#: src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:6780
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:6781
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:6782
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:6783
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:6784
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 880C"
 
-#: src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:6785
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 882C"
 
-#: src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:6786
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:6787
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:6788
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 916C"
 
-#: src/xml/xmli18n-tmp.h:4567
+#: src/xml/xmli18n-tmp.h:6789
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 920C"
 
-#: src/xml/xmli18n-tmp.h:4568
+#: src/xml/xmli18n-tmp.h:6790
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 9300"
 
-#: src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:6791
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 930C"
 
-#: src/xml/xmli18n-tmp.h:4570
+#: src/xml/xmli18n-tmp.h:6792
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 932C"
 
-#: src/xml/xmli18n-tmp.h:4571
+#: src/xml/xmli18n-tmp.h:6793
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 933C"
 
-#: src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:6794
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 934C"
 
-#: src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:6795
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 935C"
 
-#: src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:6796
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 940C"
 
-#: src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:6797
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 948C"
 
-#: src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:6798
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 950C"
 
-#: src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:6799
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 952C"
 
-#: src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:6800
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 955C"
 
-#: src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:6801
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 957C"
 
-#: src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:6802
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 959C"
 
-#: src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:6803
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 960C"
 
-#: src/xml/xmli18n-tmp.h:4582
+#: src/xml/xmli18n-tmp.h:6804
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 970C"
 
-#: src/xml/xmli18n-tmp.h:4583
+#: src/xml/xmli18n-tmp.h:6805
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 975C"
 
-#: src/xml/xmli18n-tmp.h:4584
+#: src/xml/xmli18n-tmp.h:6806
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 980C"
 
-#: src/xml/xmli18n-tmp.h:4585
+#: src/xml/xmli18n-tmp.h:6807
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 990C"
 
-#: src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:6808
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 995C"
 
-#: src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:6809
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:6810
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:6811
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1125C"
 
-#: src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:6812
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:6813
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:6814
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:4593
+#: src/xml/xmli18n-tmp.h:6815
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600CM"
 
-#: src/xml/xmli18n-tmp.h:4594
+#: src/xml/xmli18n-tmp.h:6816
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 2000"
 
-#: src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:6817
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 2500"
 
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:6818
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 2500CM"
 
-#: src/xml/xmli18n-tmp.h:4597
+#: src/xml/xmli18n-tmp.h:6819
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340C"
 
-#: src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:6820
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 3810"
 
-#: src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:6821
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 3816"
 
-#: src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:6822
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 3820"
 
-#: src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:6823
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 3822"
 
-#: src/xml/xmli18n-tmp.h:4602
+#: src/xml/xmli18n-tmp.h:6824
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:6825
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 2D"
 
-#: src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:6826
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet 2P Plus"
 
-#: src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:6827
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 2P"
 
-#: src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:6828
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:4607
+#: src/xml/xmli18n-tmp.h:6829
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 3D"
 
-#: src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:6830
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 3P w/ PCL5"
 
-#: src/xml/xmli18n-tmp.h:4609
+#: src/xml/xmli18n-tmp.h:6831
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 3P w/PS"
 
-#: src/xml/xmli18n-tmp.h:4610
+#: src/xml/xmli18n-tmp.h:6832
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4 Plus"
 
-#: src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:6833
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4"
 
-#: src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:6834
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4613
+#: src/xml/xmli18n-tmp.h:6835
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4M"
 
-#: src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:6836
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4ML"
 
-#: src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:6837
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4P"
 
-#: src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:6838
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:6839
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:6840
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5"
 
-#: src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:6841
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 5L"
 
-#: src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:6842
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5M"
 
-#: src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:6843
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:6844
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5P"
 
-#: src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:6845
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4624
+#: src/xml/xmli18n-tmp.h:6846
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 6"
 
-#: src/xml/xmli18n-tmp.h:4625
+#: src/xml/xmli18n-tmp.h:6847
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 6L"
 
-#: src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:6848
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 6MP"
 
-#: src/xml/xmli18n-tmp.h:4627
+#: src/xml/xmli18n-tmp.h:6849
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 6P"
 
-#: src/xml/xmli18n-tmp.h:4628
+#: src/xml/xmli18n-tmp.h:6850
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:6851
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:6852
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:6853
 #, fuzzy
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 1012"
 
-#: src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:6854
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:6855
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 1100A"
 
-#: src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:6856
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 1150"
 
-#: src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:6857
 #, fuzzy
 msgid "HP LaserJet 1160"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:4636
+#: src/xml/xmli18n-tmp.h:6858
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:4637
+#: src/xml/xmli18n-tmp.h:6859
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 1220"
 
-#: src/xml/xmli18n-tmp.h:4638
+#: src/xml/xmli18n-tmp.h:6860
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
 msgid "HP LaserJet 1320"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:4640
+#: src/xml/xmli18n-tmp.h:6862
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:6863
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 2100M"
 
-#: src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:6864
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 2200"
 
-#: src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:6865
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:4644
+#: src/xml/xmli18n-tmp.h:6866
 #, fuzzy
 msgid "HP LaserJet 2410"
 msgstr "HP LaserJet 2100"
 
-#: src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
 msgid "HP LaserJet 2420"
 msgstr "HP LaserJet 1220"
 
-#: src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
 msgid "HP LaserJet 2430"
 msgstr "HP LaserJet 2300"
 
-#: src/xml/xmli18n-tmp.h:4647
+#: src/xml/xmli18n-tmp.h:6869
 #, fuzzy
 msgid "HP LaserJet 3015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:4648
+#: src/xml/xmli18n-tmp.h:6870
 #, fuzzy
 msgid "HP LaserJet 3020"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:6871
 #, fuzzy
 msgid "HP LaserJet 3030"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4650
+#: src/xml/xmli18n-tmp.h:6872
 #, fuzzy
 msgid "HP LaserJet 3050"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:6873
 #, fuzzy
 msgid "HP LaserJet 3052"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:6874
 #, fuzzy
 msgid "HP LaserJet 3055"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:6875
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 3200"
 
-#: src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:6876
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 3200m"
 
-#: src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:6877
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 3200se"
 
-#: src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:6878
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:6879
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 3310 MFP"
 
-#: src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:6880
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 3320 MFP"
 
-#: src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:6881
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 3320N MFP"
 
-#: src/xml/xmli18n-tmp.h:4660
+#: src/xml/xmli18n-tmp.h:6882
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 3330 MFP"
 
-#: src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:6883
 #, fuzzy
 msgid "HP LaserJet 3380"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:6884
 #, fuzzy
 msgid "HP LaserJet 3390"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:4663
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "HP LaserJet 3392"
 msgstr "HP LaserJet 2"
 
-#: src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:6886
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:6887
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:6888
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4100"
 
-#: src/xml/xmli18n-tmp.h:4667
+#: src/xml/xmli18n-tmp.h:6889
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:6890
 #, fuzzy
 msgid "HP LaserJet 4240"
 msgstr "HP LaserJet 4200"
 
-#: src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:6891
 #, fuzzy
 msgid "HP LaserJet 4250"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:6892
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4300"
 
-#: src/xml/xmli18n-tmp.h:4671
+#: src/xml/xmli18n-tmp.h:6893
 #, fuzzy
 msgid "HP LaserJet 4345 mfp"
 msgstr "HP LaserJet 3"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:6894
 #, fuzzy
 msgid "HP LaserJet 4350"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:6895
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:6896
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5100"
 
-#: src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "HP LaserJet 5200"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:6898
 #, fuzzy
 msgid "HP LaserJet 5200L"
 msgstr "HP LaserJet 1200"
 
-#: src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:6899
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 8000"
 
-#: src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:6900
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 8100"
 
-#: src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:6901
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 8150"
 
-#: src/xml/xmli18n-tmp.h:4680
+#: src/xml/xmli18n-tmp.h:6902
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:6903
 #, fuzzy
 msgid "HP LaserJet 9040"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:4682
+#: src/xml/xmli18n-tmp.h:6904
 #, fuzzy
 msgid "HP LaserJet 9040 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:4683
+#: src/xml/xmli18n-tmp.h:6905
 #, fuzzy
 msgid "HP LaserJet 9050"
 msgstr "HP LaserJet 4050"
 
-#: src/xml/xmli18n-tmp.h:4684
+#: src/xml/xmli18n-tmp.h:6906
 #, fuzzy
 msgid "HP LaserJet 9050 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "HP LaserJet M3027 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "HP LaserJet M3035 MFP"
 msgstr "HP LaserJet 3300 MFP"
 
-#: src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "HP LaserJet M4345 MFP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "HP LaserJet M5025 MFP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:6911
 #, fuzzy
 msgid "HP LaserJet M5035 MFP"
 msgstr "HP LaserJet 5MP"
 
-#: src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "HP LaserJet P2010"
 msgstr "HP LaserJet 1010"
 
-#: src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:6913
 #, fuzzy
 msgid "HP LaserJet P2015"
 msgstr "HP LaserJet 1015"
 
-#: src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:6914
 #, fuzzy
 msgid "HP LaserJet P3004"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:6915
 #, fuzzy
 msgid "HP LaserJet P3005"
 msgstr "HP LaserJet 1300"
 
-#: src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:6916
 msgid "HP Mopier 240"
 msgstr "HP Mopier 240"
 
-#: src/xml/xmli18n-tmp.h:4695
+#: src/xml/xmli18n-tmp.h:6917
 msgid "HP Mopier 320"
 msgstr "HP Mopier 320"
 
-#: src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:6918
 msgid "HP OfficeJet 300"
 msgstr "HP OfficeJet 300"
 
-#: src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:6919
 msgid "HP OfficeJet 330"
 msgstr "HP OfficeJet 330"
 
-#: src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:6920
 msgid "HP OfficeJet 350"
 msgstr "HP OfficeJet 350"
 
-#: src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:6921
 msgid "HP OfficeJet 500"
 msgstr "HP OfficeJet 500"
 
-#: src/xml/xmli18n-tmp.h:4700
+#: src/xml/xmli18n-tmp.h:6922
 msgid "HP OfficeJet 520"
 msgstr "HP OfficeJet 520"
 
-#: src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:6923
 msgid "HP OfficeJet 570"
 msgstr "HP OfficeJet 570"
 
-#: src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:6924
 msgid "HP OfficeJet 580"
 msgstr "HP OfficeJet 580"
 
-#: src/xml/xmli18n-tmp.h:4703
+#: src/xml/xmli18n-tmp.h:6925
 msgid "HP OfficeJet 590"
 msgstr "HP OfficeJet 590"
 
-#: src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:6926
 msgid "HP OfficeJet 600"
 msgstr "HP OfficeJet 600"
 
-#: src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:6927
 msgid "HP OfficeJet 610"
 msgstr "HP OfficeJet 610"
 
-#: src/xml/xmli18n-tmp.h:4706
+#: src/xml/xmli18n-tmp.h:6928
 msgid "HP OfficeJet 625"
 msgstr "HP OfficeJet 625"
 
-#: src/xml/xmli18n-tmp.h:4707
+#: src/xml/xmli18n-tmp.h:6929
 msgid "HP OfficeJet 630"
 msgstr "HP OfficeJet 630"
 
-#: src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:6930
 msgid "HP OfficeJet 635"
 msgstr "HP OfficeJet 635"
 
-#: src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:6931
 msgid "HP OfficeJet 700"
 msgstr "HP OfficeJet 700"
 
-#: src/xml/xmli18n-tmp.h:4710
+#: src/xml/xmli18n-tmp.h:6932
 msgid "HP OfficeJet 710"
 msgstr "HP OfficeJet 710"
 
-#: src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:6933
 msgid "HP OfficeJet 720"
 msgstr "HP OfficeJet 720"
 
-#: src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:6934
 msgid "HP OfficeJet 725"
 msgstr "HP OfficeJet 725"
 
-#: src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:6935
 msgid "HP OfficeJet 5105"
 msgstr "HP OfficeJet 5105"
 
-#: src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:6936
 msgid "HP OfficeJet 5110"
 msgstr "HP OfficeJet 5110"
 
-#: src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:6937
 msgid "HP OfficeJet 5110xi"
 msgstr "HP OfficeJet 5110xi"
 
-#: src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:6938
 msgid "HP OfficeJet 6105"
 msgstr "HP OfficeJet 6105"
 
-#: src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:6939
 msgid "HP OfficeJet 6110"
 msgstr "HP OfficeJet 6110"
 
-#: src/xml/xmli18n-tmp.h:4718
+#: src/xml/xmli18n-tmp.h:6940
 msgid "HP OfficeJet 7110"
 msgstr "HP OfficeJet 7110"
 
-#: src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:6941
 msgid "HP OfficeJet 7130"
 msgstr "HP OfficeJet 7130"
 
-#: src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:6942
 msgid "HP OfficeJet 7140"
 msgstr "HP OfficeJet 7140"
 
-#: src/xml/xmli18n-tmp.h:4721
+#: src/xml/xmli18n-tmp.h:6943
 msgid "HP OfficeJet D125"
 msgstr "HP OfficeJet D125"
 
-#: src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:6944
 msgid "HP OfficeJet D135"
 msgstr "HP OfficeJet D135"
 
-#: src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:6945
 msgid "HP OfficeJet D145"
 msgstr "HP OfficeJet D145"
 
-#: src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:6946
 msgid "HP OfficeJet D155"
 msgstr "HP OfficeJet D155"
 
-#: src/xml/xmli18n-tmp.h:4725
+#: src/xml/xmli18n-tmp.h:6947
 msgid "HP OfficeJet G55"
 msgstr "HP OfficeJet G55"
 
-#: src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:6948
 msgid "HP OfficeJet G85"
 msgstr "HP OfficeJet G85"
 
-#: src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:6949
 msgid "HP OfficeJet G95"
 msgstr "HP OfficeJet G95"
 
-#: src/xml/xmli18n-tmp.h:4728
+#: src/xml/xmli18n-tmp.h:6950
 msgid "HP OfficeJet K60"
 msgstr "HP OfficeJet K60"
 
-#: src/xml/xmli18n-tmp.h:4729
+#: src/xml/xmli18n-tmp.h:6951
 msgid "HP OfficeJet K60xi"
 msgstr "HP OfficeJet K60xi"
 
-#: src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:6952
 msgid "HP OfficeJet K80"
 msgstr "HP OfficeJet K80"
 
-#: src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:6953
 msgid "HP OfficeJet K80xi"
 msgstr "HP OfficeJet K80xi"
 
-#: src/xml/xmli18n-tmp.h:4732
+#: src/xml/xmli18n-tmp.h:6954
 msgid "HP OfficeJet LX"
 msgstr "HP OfficeJet LX"
 
-#: src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:6955
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP OfficeJet Pro 1150C"
 
-#: src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:6956
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP OfficeJet Pro 1170C"
 
-#: src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:6957
 msgid "HP OfficeJet Pro 1175C"
 msgstr "HP OfficeJet Pro 1175C"
 
-#: src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:6958
 msgid "HP OfficeJet R40"
 msgstr "HP OfficeJet R40"
 
-#: src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:6959
 msgid "HP OfficeJet R45"
 msgstr "HP OfficeJet R45"
 
-#: src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:6960
 msgid "HP OfficeJet R60"
 msgstr "HP OfficeJet R60"
 
-#: src/xml/xmli18n-tmp.h:4739
+#: src/xml/xmli18n-tmp.h:6961
 msgid "HP OfficeJet R65"
 msgstr "HP OfficeJet R65"
 
-#: src/xml/xmli18n-tmp.h:4740
+#: src/xml/xmli18n-tmp.h:6962
 msgid "HP OfficeJet R80"
 msgstr "HP OfficeJet R80"
 
-#: src/xml/xmli18n-tmp.h:4741
+#: src/xml/xmli18n-tmp.h:6963
 msgid "HP OfficeJet T45"
 msgstr "HP OfficeJet T45"
 
-#: src/xml/xmli18n-tmp.h:4742
+#: src/xml/xmli18n-tmp.h:6964
 msgid "HP OfficeJet T65"
 msgstr "HP OfficeJet T65"
 
-#: src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:6965
 msgid "HP OfficeJet V40"
 msgstr "HP OfficeJet V40"
 
-#: src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:6966
 msgid "HP OfficeJet V40xi"
 msgstr "HP OfficeJet V40xi"
 
-#: src/xml/xmli18n-tmp.h:4745
+#: src/xml/xmli18n-tmp.h:6967
 msgid "HP OfficeJet"
 msgstr "HP OfficeJet"
 
-#: src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:6968
 msgid "HP PSC 370"
 msgstr "HP PSC 370"
 
-#: src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:6969
 msgid "HP PSC 380"
 msgstr "HP PSC 380"
 
-#: src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:6970
 msgid "HP PSC 500"
 msgstr "HP PSC 500"
 
-#: src/xml/xmli18n-tmp.h:4749
+#: src/xml/xmli18n-tmp.h:6971
 msgid "HP PSC 750"
 msgstr "HP PSC 750"
 
-#: src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:6972
 msgid "HP PSC 950"
 msgstr "HP PSC 950"
 
-#: src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:6973
 msgid "HP PSC 950xi"
 msgstr "HP PSC 950xi"
 
-#: src/xml/xmli18n-tmp.h:4752
+#: src/xml/xmli18n-tmp.h:6974
 msgid "HP PSC 2110"
 msgstr "HP PSC 2110"
 
-#: src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:6975
 msgid "HP PSC 2150"
 msgstr "HP PSC 2150"
 
-#: src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:6976
 msgid "HP PSC 2210"
 msgstr "HP PSC 2210"
 
-#: src/xml/xmli18n-tmp.h:4755
+#: src/xml/xmli18n-tmp.h:6977
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart 7150"
 
-#: src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:6978
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart 7345"
 
-#: src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:6979
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart 7350"
 
-#: src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:6980
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart 7550"
 
-#: src/xml/xmli18n-tmp.h:4759
+#: src/xml/xmli18n-tmp.h:6981
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P100"
 
-#: src/xml/xmli18n-tmp.h:4760
+#: src/xml/xmli18n-tmp.h:6982
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P130"
 
-#: src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:6983
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P230"
 
-#: src/xml/xmli18n-tmp.h:4762
+#: src/xml/xmli18n-tmp.h:6984
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:6985
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:6986
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1115"
 
-#: src/xml/xmli18n-tmp.h:4765
+#: src/xml/xmli18n-tmp.h:6987
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1215"
 
-#: src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:6988
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1218"
 
-#: src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:6989
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1315"
 
-#: src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:6990
 msgid "HP e-printer e20"
 msgstr "HP e-printer e20"
 
-#: src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:6991
 msgid "IBM 4019"
 msgstr "IBM 4019"
 
-#: src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:6992
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr "IBM 4029 030 LaserPrinter 10"
 
-#: src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:6993
 msgid "IBM 4312"
 msgstr "IBM 4312"
 
-#: src/xml/xmli18n-tmp.h:4772
+#: src/xml/xmli18n-tmp.h:6994
 msgid "IBM Infoprint 12"
 msgstr "IBM Infoprint 12"
 
-#: src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:6995
 msgid "IBM Page Printer 3112"
 msgstr "IBM Page Printer 3112"
 
-#: src/xml/xmli18n-tmp.h:4774
+#: src/xml/xmli18n-tmp.h:6996
 #, fuzzy
 msgid "Infotec 4353 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4775
+#: src/xml/xmli18n-tmp.h:6997
 #, fuzzy
 msgid "Infotec 4452 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4776
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Infotec 4651 MF"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:6999
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:7000
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:7002
 #, fuzzy
 msgid "Infotec IS2035"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:7003
 #, fuzzy
 msgid "Infotec IS2045"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:7004
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:7005
 #, fuzzy
 msgid "Infotec IS2105"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:7006
 #, fuzzy
 msgid "Infotec IS 2015"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:7007
 #, fuzzy
 msgid "Infotec IS 2018"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:7008
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:7009
 #, fuzzy
 msgid "Infotec IS 2060"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:7010
 #, fuzzy
 msgid "Infotec IS 2075"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:7011
 #, fuzzy
 msgid "Infotec IS 2122"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4790
+#: src/xml/xmli18n-tmp.h:7012
 #, fuzzy
 msgid "Infotec IS 2127"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:7013
 #, fuzzy
 msgid "Infotec IS 2132"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:7014
 #, fuzzy
 msgid "Infotec IS 2135"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:7015
 #, fuzzy
 msgid "Infotec IS 2145"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4794
+#: src/xml/xmli18n-tmp.h:7016
 #, fuzzy
 msgid "Infotec IS 2151"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:7017
 #, fuzzy
 msgid "Infotec IS 2160"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:7018
 #, fuzzy
 msgid "Infotec IS 2175"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4797
+#: src/xml/xmli18n-tmp.h:7019
 #, fuzzy
 msgid "Infotec IS 2215"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:7020
 #, fuzzy
 msgid "Infotec IS 2216"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:7021
 #, fuzzy
 msgid "Infotec IS 2220"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:7022
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:7023
 #, fuzzy
 msgid "Infotec IS 2225"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:7024
 #, fuzzy
 msgid "Infotec IS 2230"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:7025
 #, fuzzy
 msgid "Infotec IS 2235"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:7026
 #, fuzzy
 msgid "Infotec IS 2245"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:7027
 #, fuzzy
 msgid "Infotec IS 2255"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:7028
 #, fuzzy
 msgid "Infotec IS 2265"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4807
+#: src/xml/xmli18n-tmp.h:7029
 #, fuzzy
 msgid "Infotec IS 2275"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4808
+#: src/xml/xmli18n-tmp.h:7030
 #, fuzzy
 msgid "Infotec IS 2316"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:7031
 #, fuzzy
 msgid "Infotec IS 2320"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:7032
 #, fuzzy
 msgid "Infotec IS 2325"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:7033
 #, fuzzy
 msgid "Infotec IS 2416"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:7034
 #, fuzzy
 msgid "Infotec IS 2425"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:7035
 #, fuzzy
 msgid "Infotec IS 2430"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:7036
 #, fuzzy
 msgid "Infotec IS 2435"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:7037
 #, fuzzy
 msgid "Infotec IS 2445"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:7038
 #, fuzzy
 msgid "Infotec IS 3090"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:7039
 #, fuzzy
 msgid "Infotec IS 3110"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:7040
 #, fuzzy
 msgid "Infotec IS 3135"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4819
+#: src/xml/xmli18n-tmp.h:7041
 #, fuzzy
 msgid "Infotec MP 2550"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:7042
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:7043
 #, fuzzy
 msgid "Infotec MP 3350"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:7044
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:7045
 #, fuzzy
 msgid "Infotec MP 4000"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:7046
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:7047
 #, fuzzy
 msgid "Infotec MP 5000"
 msgstr "Infotec 4651 MF"
 
-#: src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:7048
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:7049
 msgid "Kyocera F-1010"
 msgstr "Kyocera F-1010"
 
-#: src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:7050
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr "Kyocera FS-600 - KPDL-2"
 
-#: src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:7051
 msgid "Kyocera FS-600"
 msgstr "Kyocera FS-600"
 
-#: src/xml/xmli18n-tmp.h:4830
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Kyocera FS-680"
 msgstr "Kyocera FS-680"
 
-#: src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Kyocera FS-800"
 msgstr "Kyocera FS-800"
 
-#: src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Kyocera FS-1000"
 msgstr "Kyocera FS-1000"
 
-#: src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Kyocera FS-1000+"
 msgstr "Kyocera FS-1000+"
 
-#: src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Kyocera FS-1010"
 msgstr "Kyocera FS-1010"
 
-#: src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:7057
 msgid "Kyocera FS-1050"
 msgstr "Kyocera FS-1050"
 
-#: src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Kyocera FS-1200"
 msgstr "Kyocera FS-1200"
 
-#: src/xml/xmli18n-tmp.h:4837
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Kyocera FS-1600"
 msgstr "Kyocera FS-1600"
 
-#: src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Kyocera FS-1600+"
 msgstr "Kyocera FS-1600+"
 
-#: src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Kyocera FS-1700"
 msgstr "Kyocera FS-1700"
 
-#: src/xml/xmli18n-tmp.h:4840
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Kyocera FS-1700+"
 msgstr "Kyocera FS-1700+"
 
-#: src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Kyocera FS-1750"
 msgstr "Kyocera FS-1750"
 
-#: src/xml/xmli18n-tmp.h:4842
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Kyocera FS-1800"
 msgstr "Kyocera FS-1800"
 
-#: src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Kyocera FS-1800+"
 msgstr "Kyocera FS-1800+"
 
-#: src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Kyocera FS-1900"
 msgstr "Kyocera FS-1900"
 
-#: src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Kyocera FS-3500"
 msgstr "Kyocera FS-3500"
 
-#: src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Kyocera FS-3600"
 msgstr "Kyocera FS-3600"
 
-#: src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Kyocera FS-3600+"
 msgstr "Kyocera FS-3600+"
 
-#: src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Kyocera FS-3700"
 msgstr "Kyocera FS-3700"
 
-#: src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Kyocera FS-3700+"
 msgstr "Kyocera FS-3700+"
 
-#: src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Kyocera FS-3750"
 msgstr "Kyocera FS-3750"
 
-#: src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Kyocera FS-3800"
 msgstr "Kyocera FS-3800"
 
-#: src/xml/xmli18n-tmp.h:4852
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Kyocera FS-5800C"
 msgstr "Kyocera FS-5800C"
 
-#: src/xml/xmli18n-tmp.h:4853
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Kyocera FS-5900C"
 msgstr "Kyocera FS-5900C"
 
-#: src/xml/xmli18n-tmp.h:4854
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Kyocera FS-6500"
 msgstr "Kyocera FS-6500"
 
-#: src/xml/xmli18n-tmp.h:4855
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Kyocera FS-6500+"
 msgstr "Kyocera FS-6500+"
 
-#: src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Kyocera FS-6700"
 msgstr "Kyocera FS-6700"
 
-#: src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Kyocera FS-7000"
 msgstr "Kyocera FS-7000"
 
-#: src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Kyocera FS-7000+"
 msgstr "Kyocera FS-7000+"
 
-#: src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Kyocera FS-8000C"
 msgstr "Kyocera FS-8000C"
 
-#: src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Kyocera FS-9000"
 msgstr "Kyocera FS-9000"
 
-#: src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Kyocera FS-9100DN"
 msgstr "Kyocera FS-9100DN"
 
-#: src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Kyocera FS-9500DN"
 msgstr "Kyocera FS-9500DN"
 
-#: src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Kyocera KM-1530"
 msgstr "Kyocera KM-1530"
 
-#: src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Kyocera KM-1810"
 msgstr "Kyocera KM-1810"
 
-#: src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Kyocera KM-2030"
 msgstr "Kyocera KM-2030"
 
-#: src/xml/xmli18n-tmp.h:4866
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Kyocera KM-2530"
 msgstr "Kyocera KM-2530"
 
-#: src/xml/xmli18n-tmp.h:4867
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Kyocera KM-3530"
 msgstr "Kyocera KM-3530"
 
-#: src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Kyocera KM-4230"
 msgstr "Kyocera KM-4230"
 
-#: src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Kyocera KM-4530"
 msgstr "Kyocera KM-4530"
 
-#: src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Kyocera KM-5230"
 msgstr "Kyocera KM-5230"
 
-#: src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Kyocera KM-5530"
 msgstr "Kyocera KM-5530"
 
-#: src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Kyocera KM-6230"
 msgstr "Kyocera KM-6230"
 
-#: src/xml/xmli18n-tmp.h:4873
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4874
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4883
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4886
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4888
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4890
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4894
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4896
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4903
-msgid "Lanier MP 2500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4904
-msgid "Lanier LD125"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4905
+#: src/xml/xmli18n-tmp.h:7125
 #, fuzzy
-msgid "Lanier MP 1100"
-msgstr "HP LaserJet 1100"
+msgid "Lanier MP2500/LD125"
+msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4906
+#: src/xml/xmli18n-tmp.h:7126
 #, fuzzy
-msgid "Lanier LD1100"
+msgid "Lanier MP 1100/LD1100"
 msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4907
-msgid "Lanier MP 1350"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4908
-msgid "Lanier LD1135"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4909
-msgid "Lanier MP 1600"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4910
-msgid "Lanier LD316"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4911
-msgid "Lanier MP 161"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4912
-msgid "Lanier LD016"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4913
-msgid "Lanier MP 2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4914
-msgid "Lanier LD320d"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4915
-msgid "Lanier MP 2510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4916
-msgid "Lanier LD325"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4917
-msgid "Lanier MP 2550B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4918
-msgid "Lanier LD425B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4919
-msgid "Lanier MP 2550"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4920
-msgid "Lanier LD425"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7127
+#, fuzzy
+msgid "Lanier MP 1350/LD1135"
+msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4921
-msgid "Lanier MP 3010"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7128
+#, fuzzy
+msgid "Lanier MP 1600/LD316"
+msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4922
-msgid "Lanier LD330"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7129
+#, fuzzy
+msgid "Lanier MP 161/LD016"
+msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4923
-msgid "Lanier MP 3350B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7130
+#, fuzzy
+msgid "Lanier MP 2000/LD320d"
+msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:4924
-msgid "Lanier LD433B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7131
+#, fuzzy
+msgid "Lanier MP 2510/LD325"
+msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:7132
 #, fuzzy
-msgid "Lanier MP 3350"
+msgid "Lanier MP 2550B/LD425B"
 msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4926
-msgid "Lanier LD433"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7133
+#, fuzzy
+msgid "Lanier MP 2550/LD425"
+msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4927
-msgid "Lanier MP 3500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7134
+#, fuzzy
+msgid "Lanier MP 3010/LD330"
+msgstr "HP LaserJet 1100"
 
-#: src/xml/xmli18n-tmp.h:4928
-msgid "Lanier LD335"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7135
+#, fuzzy
+msgid "Lanier MP 3350B/LD433B"
+msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4929
-msgid "Lanier MP 4000B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7136
+#, fuzzy
+msgid "Lanier MP 3350/LD433"
+msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4930
-msgid "Lanier LD040B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7137
+#, fuzzy
+msgid "Lanier MP 3500/LD335"
+msgstr "Canon GP 335"
 
-#: src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:7138
 #, fuzzy
-msgid "Lanier MP 4000"
+msgid "Lanier MP 4000B/LD040B"
 msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:4932
-msgid "Lanier LD040"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4933
-msgid "Lanier MP 4500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4934
-msgid "Lanier LD345"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4935
-msgid "Lanier MP 5000B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7139
+#, fuzzy
+msgid "Lanier MP 4000/LD040"
+msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:4936
-msgid "Lanier LD050B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7140
+#, fuzzy
+msgid "Lanier MP 4500/LD345"
+msgstr "HP LaserJet 4000"
 
-#: src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:7141
 #, fuzzy
-msgid "Lanier MP 5000"
+msgid "Lanier MP 5000B/LD050B"
 msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4938
-msgid "Lanier LD050"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4939
-msgid "Lanier MP 5500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4940
-msgid "Lanier LD255"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4941
-msgid "Lanier MP 6500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7142
+#, fuzzy
+msgid "Lanier MP 5000/LD050"
+msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4942
-msgid "Lanier LD265"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7143
+#, fuzzy
+msgid "Lanier MP 5500/LD255"
+msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4943
-msgid "Lanier MP 7500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7144
+#, fuzzy
+msgid "Lanier MP 6500/LD265"
+msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4944
-msgid "Lanier LD275"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7145
+#, fuzzy
+msgid "Lanier MP 7500/LD275"
+msgstr "HP LaserJet 5000"
 
-#: src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:7146
 #, fuzzy
-msgid "Lanier MP 9000"
+msgid "Lanier MP 9000/LD190"
 msgstr "HP LaserJet 9000"
 
-#: src/xml/xmli18n-tmp.h:4946
-msgid "Lanier LD190"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:7148
 msgid "Lexmark Optra E"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Lexmark Optra E+"
 msgstr "Lexmark Optra E+"
 
-#: src/xml/xmli18n-tmp.h:4950
+#: src/xml/xmli18n-tmp.h:7150
 #, fuzzy
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:7151
 #, fuzzy
 msgid "Lexmark Optra E321"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:4952
+#: src/xml/xmli18n-tmp.h:7152
 #, fuzzy
 msgid "Lexmark Optra E323"
 msgstr "Lexmark Optra E"
 
-#: src/xml/xmli18n-tmp.h:4953
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Lexmark Valuewriter 300"
 msgstr "Lexmark Valuewriter 300"
 
-#: src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Minolta PagePro 6"
 msgstr "Minolta PagePro 6"
 
-#: src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:7155
 msgid "Minolta PagePro 6e"
 msgstr "Minolta PagePro 6e"
 
-#: src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Minolta PagePro 6ex"
 msgstr "Minolta PagePro 6ex"
 
-#: src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Minolta PagePro 8"
 msgstr "Minolta PagePro 8"
 
-#: src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Minolta PagePro 8L"
 msgstr "Minolta PagePro 8L"
 
-#: src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Minolta PagePro 1100"
 msgstr "Minolta PagePro 1100"
 
-#: src/xml/xmli18n-tmp.h:4960
+#: src/xml/xmli18n-tmp.h:7160
 msgid "NEC SuperScript 660i"
 msgstr "NEC SuperScript 660i"
 
-#: src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:7161
 msgid "NEC SuperScript 860"
 msgstr "NEC SuperScript 860"
 
-#: src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:7162
 msgid "NEC SuperScript 870"
 msgstr "NEC SuperScript 870"
 
-#: src/xml/xmli18n-tmp.h:4963
+#: src/xml/xmli18n-tmp.h:7163
 msgid "NEC SuperScript 1260"
 msgstr "NEC SuperScript 1260"
 
-#: src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:7164
 msgid "NEC SuperScript 1400"
 msgstr "NEC SuperScript 1400"
 
-#: src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:7165
 msgid "NEC SuperScript 1800"
 msgstr "NEC SuperScript 1800"
 
-#: src/xml/xmli18n-tmp.h:4966
-msgid "NRG 10515"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4967
-msgid "NRG 10518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4968
-msgid "NRG 10512"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4969
-msgid "NRG 2205"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4970
-msgid "NRG 2238"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4971
-msgid "NRG 2212"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4972
-msgid "NRG 2705"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4973
-msgid "NRG 2738"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4974
-msgid "NRG 2712"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4975
-msgid "NRG 3205"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4976
-msgid "NRG 3238"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4977
-msgid "NRG 3212"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4978
-msgid "NRG 3525"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4979
-msgid "NRG 3508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4980
-msgid "NRG 3502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4981
-msgid "NRG 3545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4982
-msgid "NRG 3518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4983
-msgid "NRG 3532"
+#: src/xml/xmli18n-tmp.h:7166
+msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4984
-msgid "NRG 4525"
+#: src/xml/xmli18n-tmp.h:7167
+msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4985
-msgid "NRG 4508"
+#: src/xml/xmli18n-tmp.h:7168
+msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4986
-msgid "NRG 4502"
+#: src/xml/xmli18n-tmp.h:7169
+msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4987
-msgid "NRG 4545"
+#: src/xml/xmli18n-tmp.h:7170
+msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4988
-msgid "NRG 4518"
+#: src/xml/xmli18n-tmp.h:7171
+msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4989
-msgid "NRG 4532"
+#: src/xml/xmli18n-tmp.h:7172
+msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4990
-msgid "NRG 6002"
+#: src/xml/xmli18n-tmp.h:7173
+msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4991
-msgid "NRG 6005"
+#: src/xml/xmli18n-tmp.h:7174
+msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4992
-msgid "NRG 6008"
+#: src/xml/xmli18n-tmp.h:7175
+msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4993
-msgid "NRG 7502"
+#: src/xml/xmli18n-tmp.h:7176
+msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4994
-msgid "NRG 7505"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4995
-msgid "NRG 7508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4996
-msgid "NRG 9005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4997
-msgid "NRG 9008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4998
-msgid "NRG 9002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:7177
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:7178
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5001
+#: src/xml/xmli18n-tmp.h:7179
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:7180
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:7181
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:7182
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:7183
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5006
+#: src/xml/xmli18n-tmp.h:7184
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:7185
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:7186
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5009
+#: src/xml/xmli18n-tmp.h:7187
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:7188
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:7189
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:7190
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:7191
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:7192
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5015
+#: src/xml/xmli18n-tmp.h:7193
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5016
+#: src/xml/xmli18n-tmp.h:7194
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5017
+#: src/xml/xmli18n-tmp.h:7195
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:7196
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:7197
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:7198
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:7199
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:7200
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:7201
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:7202
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5025
+#: src/xml/xmli18n-tmp.h:7203
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:7204
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:7205
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5028
+#: src/xml/xmli18n-tmp.h:7206
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:7207
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:7208
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:7209
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:7210
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5033
+#: src/xml/xmli18n-tmp.h:7211
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:7212
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:7213
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:7214
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:7215
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:7216
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:7217
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5040
+#: src/xml/xmli18n-tmp.h:7218
 #, fuzzy
 msgid "Oki OL400"
 msgstr "Okidata OL400"
 
-#: src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:7219
 #, fuzzy
 msgid "Oki OL400e"
 msgstr "Okidata OL400e"
 
-#: src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:7220
 #, fuzzy
 msgid "Oki OL400ex"
 msgstr "Okidata OL400ex"
 
-#: src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:7221
 #, fuzzy
 msgid "Oki OL410e"
 msgstr "Okidata OL410e"
 
-#: src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:7222
 #, fuzzy
 msgid "Oki OL600e"
 msgstr "Okidata OL600e"
 
-#: src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:7223
 #, fuzzy
 msgid "Oki OL610e/S"
 msgstr "Okidata OL610e/S"
 
-#: src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:7224
 #, fuzzy
 msgid "Oki OL800"
 msgstr "Okidata OL800"
 
-#: src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:7225
 #, fuzzy
 msgid "Oki OL810ex"
 msgstr "Okidata OL810ex"
 
-#: src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:7226
 #, fuzzy
 msgid "Oki Okipage 6e"
 msgstr "Okidata Okipage 6e"
 
-#: src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:7227
 #, fuzzy
 msgid "Oki Okipage 6ex"
 msgstr "Okidata Okipage 6ex"
 
-#: src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:7228
 #, fuzzy
 msgid "Oki Okipage 8p"
 msgstr "Okidata Okipage 8p"
 
-#: src/xml/xmli18n-tmp.h:5051
+#: src/xml/xmli18n-tmp.h:7229
 #, fuzzy
 msgid "Oki Okipage 10e"
 msgstr "Okidata Okipage 10e"
 
-#: src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:7230
 #, fuzzy
 msgid "Oki Okipage 10ex"
 msgstr "Okidata Okipage 10ex"
 
-#: src/xml/xmli18n-tmp.h:5053
+#: src/xml/xmli18n-tmp.h:7231
 #, fuzzy
 msgid "Oki Okipage 14ex"
 msgstr "Okidata Okipage 14ex"
 
-#: src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Okidata Super 6e"
 
-#: src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Olivetti JP350S"
 msgstr "Olivetti JP350S"
 
-#: src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:7234
 msgid "Olivetti PG 306"
 msgstr "Olivetti PG 306"
 
-#: src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:7235
 msgid "PCPI 1030"
 msgstr "PCPI 1030"
 
-#: src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Panasonic KX-P4410"
 msgstr "Panasonic KX-P4410"
 
-#: src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Panasonic KX-P4450"
 msgstr "Panasonic KX-P4450"
 
-#: src/xml/xmli18n-tmp.h:5060
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Panasonic KX-P6150"
 msgstr "Panasonic KX-P6150"
 
-#: src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Panasonic KX-P6500"
 msgstr "Panasonic KX-P6500"
 
-#: src/xml/xmli18n-tmp.h:5062
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Raven LP-410"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5063
+#: src/xml/xmli18n-tmp.h:7241
 #, fuzzy
 msgid "Ricoh Aficio 1022"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:7242
 #, fuzzy
 msgid "Ricoh Aficio 1027"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:7243
 #, fuzzy
 msgid "Ricoh Aficio 1032"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:7244
 #, fuzzy
 msgid "Ricoh Aficio 1035"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:7245
 #, fuzzy
 msgid "Ricoh Aficio 1045"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:7246
 #, fuzzy
 msgid "Ricoh Aficio 1060"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:7247
 #, fuzzy
 msgid "Ricoh Aficio 1075"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:7248
 #, fuzzy
 msgid "Ricoh Aficio 1515"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:7249
 #, fuzzy
 msgid "Ricoh Aficio 2015"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5072
+#: src/xml/xmli18n-tmp.h:7250
 #, fuzzy
 msgid "Ricoh Aficio 2016"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:7251
 #, fuzzy
 msgid "Ricoh Aficio 2018"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5074
+#: src/xml/xmli18n-tmp.h:7252
 #, fuzzy
 msgid "Ricoh Aficio 2018D"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5075
+#: src/xml/xmli18n-tmp.h:7253
 #, fuzzy
 msgid "Ricoh Aficio 2020"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5076
+#: src/xml/xmli18n-tmp.h:7254
 #, fuzzy
 msgid "Ricoh Aficio 2020D"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:7255
 #, fuzzy
 msgid "Ricoh Aficio 2022"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:7256
 #, fuzzy
 msgid "Ricoh Aficio 2027"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:7257
 #, fuzzy
 msgid "Ricoh Aficio 2032"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:7258
 #, fuzzy
 msgid "Ricoh Aficio 2035"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5081
+#: src/xml/xmli18n-tmp.h:7259
 #, fuzzy
 msgid "Ricoh Aficio 2035e"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:7260
 #, fuzzy
 msgid "Ricoh Aficio 2045"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:7261
 #, fuzzy
 msgid "Ricoh Aficio 2045e"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:7262
 #, fuzzy
 msgid "Ricoh Aficio 2051"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:7263
 #, fuzzy
 msgid "Ricoh Aficio 2060"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5086
+#: src/xml/xmli18n-tmp.h:7264
 #, fuzzy
 msgid "Ricoh Aficio 2075"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:7265
 #, fuzzy
 msgid "Ricoh Aficio 2090"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5088
+#: src/xml/xmli18n-tmp.h:7266
 #, fuzzy
 msgid "Ricoh Aficio 2105"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:7267
 msgid "Ricoh Aficio 220"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5090
+#: src/xml/xmli18n-tmp.h:7268
 #, fuzzy
 msgid "Ricoh Aficio 3025"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5091
+#: src/xml/xmli18n-tmp.h:7269
 #, fuzzy
 msgid "Ricoh Aficio 3030"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:7270
 #, fuzzy
 msgid "Ricoh Aficio 3035"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5093
+#: src/xml/xmli18n-tmp.h:7271
 #, fuzzy
 msgid "Ricoh Aficio 3045"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Ricoh Aficio 401"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Ricoh Aficio 700"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:7274
 #, fuzzy
 msgid "Ricoh Aficio MP 1100"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:7275
 #, fuzzy
 msgid "Ricoh Aficio MP 1350"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:7276
 #, fuzzy
 msgid "Ricoh Aficio MP 1600"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5099
+#: src/xml/xmli18n-tmp.h:7277
 #, fuzzy
 msgid "Ricoh Aficio MP 161"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:7278
 #, fuzzy
 msgid "Ricoh Aficio MP 2000"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:7279
 #, fuzzy
 msgid "Ricoh Aficio MP 2500"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:7280
 #, fuzzy
 msgid "Ricoh Aficio MP 2510"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5103
+#: src/xml/xmli18n-tmp.h:7281
 #, fuzzy
 msgid "Ricoh Aficio MP 2550"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5104
+#: src/xml/xmli18n-tmp.h:7282
 #, fuzzy
 msgid "Ricoh Aficio MP 2550B"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:7283
 #, fuzzy
 msgid "Ricoh Aficio MP 3010"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:7284
 #, fuzzy
 msgid "Ricoh Aficio MP 3350"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5107
+#: src/xml/xmli18n-tmp.h:7285
 #, fuzzy
 msgid "Ricoh Aficio MP 3350B"
 msgstr "Ricoh Aficio 220"
 
-#: src/xml/xmli18n-tmp.h:5108
+#: src/xml/xmli18n-tmp.h:7286
 #, fuzzy
 msgid "Ricoh Aficio MP 3500"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:7287
 #, fuzzy
 msgid "Ricoh Aficio MP 4000"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5110
+#: src/xml/xmli18n-tmp.h:7288
 #, fuzzy
 msgid "Ricoh Aficio MP 4000B"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:7289
 #, fuzzy
 msgid "Ricoh Aficio MP 4500"
 msgstr "Ricoh Aficio 401"
 
-#: src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:7290
 #, fuzzy
 msgid "Ricoh Aficio MP 5000"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:7291
 #, fuzzy
 msgid "Ricoh Aficio MP 5000B"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:7292
 #, fuzzy
 msgid "Ricoh Aficio MP 5500"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:7293
 #, fuzzy
 msgid "Ricoh Aficio MP 6500"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:7294
 #, fuzzy
 msgid "Ricoh Aficio MP 7500"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:7295
 #, fuzzy
 msgid "Ricoh Aficio MP 9000"
 msgstr "Ricoh Aficio 700"
 
-#: src/xml/xmli18n-tmp.h:5118
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Samsung ML-85"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:7297
 #, fuzzy
 msgid "Samsung ML-1250"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:5120
+#: src/xml/xmli18n-tmp.h:7298
 #, fuzzy
 msgid "Samsung ML-1450"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:7299
 #, fuzzy
 msgid "Samsung ML-1450PS"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:7300
 #, fuzzy
 msgid "Samsung ML-1650"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:7301
 #, fuzzy
 msgid "Samsung ML-1651N"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:7302
 #, fuzzy
 msgid "Samsung ML-1750"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:7303
 #, fuzzy
 msgid "Samsung ML-2150"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:5126
+#: src/xml/xmli18n-tmp.h:7304
 #, fuzzy
 msgid "Samsung ML-2150PS"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:5127
+#: src/xml/xmli18n-tmp.h:7305
 #, fuzzy
 msgid "Samsung ML-2151N"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:7306
 #, fuzzy
 msgid "Samsung ML-2151NPS"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:7307
 #, fuzzy
 msgid "Samsung ML-2152W"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:7308
 #, fuzzy
 msgid "Samsung ML-2152WPS"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5131
+#: src/xml/xmli18n-tmp.h:7309
 #, fuzzy
 msgid "Samsung ML-2250"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:7310
 #, fuzzy
 msgid "Samsung ML-2550"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:5133
+#: src/xml/xmli18n-tmp.h:7311
 #, fuzzy
 msgid "Samsung ML-2551N"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5134
+#: src/xml/xmli18n-tmp.h:7312
 #, fuzzy
 msgid "Samsung ML-2552W"
 msgstr "Samsung ML-85"
 
-#: src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Samsung ML-4600"
 msgstr "Samsung ML-4600"
 
-#: src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Samsung ML-5000a"
 msgstr "Samsung ML-5000a"
 
-#: src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Samsung ML-6000"
 msgstr "Samsung ML-6000"
 
-#: src/xml/xmli18n-tmp.h:5138
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Samsung ML-6100"
 msgstr "Samsung ML-6100"
 
-#: src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Samsung ML-7000"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Samsung ML-7000N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Samsung ML-7000P"
 msgstr "Samsung ML-7000P"
 
-#: src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Samsung ML-7050"
 msgstr "Samsung ML-7050"
 
-#: src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:7321
 #, fuzzy
 msgid "Samsung ML-7300"
 msgstr "Samsung ML-7000"
 
-#: src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:7322
 #, fuzzy
 msgid "Samsung ML-7300N"
 msgstr "Samsung ML-7000N"
 
-#: src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Samsung QL-5100A"
 msgstr "Samsung QL-5100A"
 
-#: src/xml/xmli18n-tmp.h:5146
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Samsung QL-6050"
 msgstr "Samsung QL-6050"
 
-#: src/xml/xmli18n-tmp.h:5147
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5150
-msgid "Savin 2535"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5151
-msgid "Savin 2235"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5152
-msgid "Savin 2545"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7328
+#, fuzzy
+msgid "Savin 2535/2235"
+msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:5153
-msgid "Savin 2245"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7329
+#, fuzzy
+msgid "Savin 2545/2245"
+msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:5154
+#: src/xml/xmli18n-tmp.h:7330
 #, fuzzy
 msgid "Savin 2560"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:5155
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:7333
 #, fuzzy
 msgid "Savin 40105"
 msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5158
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5160
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5163
-msgid "Savin 4035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5164
-msgid "Savin 4135g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5165
-msgid "Savin 4035e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5166
-msgid "Savin 4135eG"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5167
-msgid "Savin 4045"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7339
+#, fuzzy
+msgid "Savin 4035/4135g"
+msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5168
-msgid "Savin 4145g"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7340
+#, fuzzy
+msgid "Savin 4035e/4135eG"
+msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5169
-msgid "Savin 4045e"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7341
+#, fuzzy
+msgid "Savin 4045/4145g"
+msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5170
-msgid "Savin 4145eG"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7342
+#, fuzzy
+msgid "Savin 4045e/4145eG"
+msgstr "Raven LP-410"
 
-#: src/xml/xmli18n-tmp.h:5171
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:7344
 #, fuzzy
 msgid "Savin 4060"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:5173
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5174
+#: src/xml/xmli18n-tmp.h:7346
 #, fuzzy
 msgid "Savin 4090"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:7348
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5177
+#: src/xml/xmli18n-tmp.h:7349
 #, fuzzy
 msgid "Savin 8020"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:7353
 #, fuzzy
 msgid "Savin 8030"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5183
-msgid "Savin 8035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5184
-msgid "Savin 8035g"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7355
+#, fuzzy
+msgid "Savin 8035/8035g"
+msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5186
-msgid "Savin 8045"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5187
-msgid "Savin 8045g"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7357
+#, fuzzy
+msgid "Savin 8045/8045g"
+msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5190
+#: src/xml/xmli18n-tmp.h:7360
 #, fuzzy
 msgid "Savin 8065"
 msgstr "Canon BJC-85"
 
-#: src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5192
+#: src/xml/xmli18n-tmp.h:7362
 #, fuzzy
 msgid "Savin 8090"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5194
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:7370
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5201
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:7373
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:7374
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5205
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5206
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Seiko SpeedJET 200"
 msgstr "Seiko SpeedJET 200"
 
-#: src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Sharp AR-161"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:7378
 #, fuzzy
 msgid "Sharp AR-M257"
 msgstr "Sharp AR-161"
 
-#: src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:7379
 msgid "Sony IJP-V100"
 msgstr "Sony IJP-V100"
 
-#: src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Star LS-04"
 msgstr "Star LS-04"
 
-#: src/xml/xmli18n-tmp.h:5211
+#: src/xml/xmli18n-tmp.h:7381
 msgid "Star LaserPrinter 8"
 msgstr "Star LaserPrinter 8"
 
-#: src/xml/xmli18n-tmp.h:5212
+#: src/xml/xmli18n-tmp.h:7382
 msgid "Tally MT908"
 msgstr "Tally MT908"
 
-#: src/xml/xmli18n-tmp.h:5213
+#: src/xml/xmli18n-tmp.h:7383
 msgid "Xerox Able 1406"
 msgstr "Xerox Able 1406"
 
-#: src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Xerox DocuPrint 4508"
 msgstr "Xerox DocuPrint 4508"
 
-#: src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Xerox DocuPrint C20"
 msgstr "Xerox DocuPrint C20"
 
-#: src/xml/xmli18n-tmp.h:5216
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Xerox DocuPrint N4512"
 msgstr "Xerox DocuPrint N4512"
 
-#: src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Xerox DocuPrint N4512PS"
 msgstr "Xerox DocuPrint N4512PS"
 
-#: src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Xerox DocuPrint P12"
 msgstr "Xerox DocuPrint P12"
 
-#: src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Xerox DocuPrint P1202"
 msgstr "Xerox DocuPrint P1202"
 
-#: src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Xerox DocuPrint P8e"
 msgstr "Xerox DocuPrint P8e"
 
-#: src/xml/xmli18n-tmp.h:5221
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Xerox Document Centre 400"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:7392
 #, fuzzy
 msgid "Xerox WorkCentre M118"
 msgstr "Xerox Document Centre 400"
 
-#: src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5224
+#: src/xml/xmli18n-tmp.h:7394
 #, fuzzy
 msgid "Lexmark X73"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:5225
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:5227
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:7399
 msgid "Olympus P-10"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:5230
+#: src/xml/xmli18n-tmp.h:7400
 msgid "Olympus P-11"
 msgstr "Olympus P-11"
 
-#: src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:7401
 msgid "Olympus P-200"
 msgstr "Olympus P-200"
 
-#: src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:7402
 msgid "Olympus P-300"
 msgstr "Olympus P-300"
 
-#: src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:7403
 msgid "Olympus P-300E"
 msgstr "Olympus P-300E"
 
-#: src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:7404
 msgid "Olympus P-300U"
 msgstr "Olympus P-300U"
 
-#: src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:7405
 msgid "Olympus P-330E"
 msgstr "Olympus P-330E"
 
-#: src/xml/xmli18n-tmp.h:5236
+#: src/xml/xmli18n-tmp.h:7406
 msgid "Olympus P-330NE"
 msgstr "Olympus P-330NE"
 
-#: src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:7407
 msgid "Olympus P-400"
 msgstr "Olympus P-400"
 
-#: src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:7408
 msgid "Olympus P-440"
 msgstr "Olympus P-440"
 
-#: src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:7409
 #, fuzzy
 msgid "Olympus P-S100"
 msgstr "Olympus P-10"
 
-#: src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:7410
 #, fuzzy
 msgid "Canon CP-10"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:7411
 msgid "Canon CP-100"
 msgstr "Canon CP-100"
 
-#: src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:7412
 msgid "Canon CP-200"
 msgstr "Canon CP-200"
 
-#: src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:7413
 msgid "Canon CP-220"
 msgstr "Canon CP-220"
 
-#: src/xml/xmli18n-tmp.h:5244
+#: src/xml/xmli18n-tmp.h:7414
 msgid "Canon CP-300"
 msgstr "Canon CP-300"
 
-#: src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:7415
 msgid "Canon CP-330"
 msgstr "Canon CP-330"
 
-#: src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:7416
 msgid "Canon SELPHY-CP-400"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:5247
+#: src/xml/xmli18n-tmp.h:7417
 msgid "Canon SELPHY-CP-500"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:7418
 msgid "Canon SELPHY-CP-510"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:5249
+#: src/xml/xmli18n-tmp.h:7419
+#, fuzzy
+msgid "Canon SELPHY-CP-520"
+msgstr "Canon SELPHY-CP-500"
+
+#: src/xml/xmli18n-tmp.h:7420
 msgid "Canon SELPHY-CP-600"
 msgstr "Canon SELPHY-CP-600"
 
-#: src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:7421
 msgid "Canon SELPHY-CP-710"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:7422
 #, fuzzy
 msgid "Canon SELPHY-CP-720"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:5252
+#: src/xml/xmli18n-tmp.h:7423
 #, fuzzy
 msgid "Canon SELPHY-CP-730"
 msgstr "Canon SELPHY-CP-710"
 
-#: src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:7424
 #, fuzzy
 msgid "Canon SELPHY-CP-740"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:7425
 #, fuzzy
 msgid "Canon SELPHY-CP-750"
 msgstr "Canon SELPHY-CP-500"
 
-#: src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:7426
 #, fuzzy
 msgid "Canon SELPHY ES1"
 msgstr "Canon SELPHY-CP-510"
 
-#: src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:7427
 #, fuzzy
 msgid "Canon SELPHY ES2"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:7428
 #, fuzzy
 msgid "Canon SELPHY ES20"
 msgstr "Canon SELPHY-CP-400"
 
-#: src/xml/xmli18n-tmp.h:5258
+#: src/xml/xmli18n-tmp.h:7429
 #, fuzzy
 msgid "Sony DPP-EX5"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:5259
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:7432
 #, fuzzy
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:7433
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DR150"
 
-#: src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:7434
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:7435
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix-CX-550"
 
-#: src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:7436
 #, fuzzy
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm Printpix-CX-400"
 
-#: src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:7438
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5268
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Dai Nippon Printing DS40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Dai Nippon Printing DS80"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "RAW DATA 16 bit"
 msgstr "RÃ… DATA 16-bitar"
 
-#: src/xml/xmli18n-tmp.h:5269
+#: src/xml/xmli18n-tmp.h:7442
 msgid "RAW DATA 8 bit"
 msgstr "RÃ… DATA 8-bitar"
 
+#, fuzzy
+#~ msgid "Epson Stylus Offixe TX300F"
+#~ msgstr "Epson Stylus CX3100"
+
+#, fuzzy
+#~ msgid "Lanier LD1100"
+#~ msgstr "HP LaserJet 1100"
+
 #~ msgid "ISOLatin1"
 #~ msgstr "ISOLatin1"
 
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index ee58a10..8577fd7 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 985caf3..0afd01c 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: gimp-print-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2008-12-21 22:25-0500\n"
+"POT-Creation-Date: 2009-07-26 19:14-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"
@@ -17,7 +17,7 @@ msgstr ""
 #. TRANSLATORS: "EvenTone" is the proper name, rather than a
 #. descriptive name, of this algorithm.
 #: src/main/dither-main.c:46 src/main/print-color.c:49
-#: src/main/print-escp2.c:2109 src/main/print-pcl.c:1779
+#: src/main/print-escp2.c:2314 src/main/print-pcl.c:1779
 msgid "Default"
 msgstr "�設"
 
@@ -91,15 +91,15 @@ msgstr "密度"
 
 #: src/main/dither-main.c:91 src/main/print-canon.c:300
 #: src/main/print-canon.c:308 src/main/print-canon.c:316
-#: src/main/print-canon.c:324 src/main/print-escp2.c:439
-#: src/main/print-escp2.c:447 src/main/print-escp2.c:455
-#: src/main/print-escp2.c:463 src/main/print-escp2.c:471
-#: src/main/print-escp2.c:479 src/main/print-escp2.c:487
-#: src/main/print-escp2.c:495 src/main/print-lexmark.c:325
+#: src/main/print-canon.c:324 src/main/print-escp2.c:445
+#: src/main/print-escp2.c:453 src/main/print-escp2.c:461
+#: 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-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:1769
-#: src/main/print-olympus.c:1777 src/main/print-olympus.c:1785
-#: src/main/print-olympus.c:1793 src/main/print-pcl.c:1324
+#: src/main/print-lexmark.c:349 src/main/print-olympus.c:1935
+#: src/main/print-olympus.c:1943 src/main/print-olympus.c:1951
+#: src/main/print-olympus.c:1959 src/main/print-pcl.c:1324
 #: src/main/print-pcl.c:1332 src/main/print-pcl.c:1340
 #: src/main/print-pcl.c:1348
 msgid "Output Level Adjustment"
@@ -157,7 +157,7 @@ msgid "Dither algorithm"
 msgstr "擬色�算方�"
 
 #: src/main/print-canon.c:199 src/main/print-escp2.c:165
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1704
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1866
 #: src/main/print-pcl.c:1253 src/main/print-ps.c:74
 msgid "Page Size"
 msgstr "��尺寸"
@@ -174,8 +174,8 @@ msgstr "��尺寸"
 #: src/main/print-escp2.c:254 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:1704 src/main/print-olympus.c:1710
-#: src/main/print-olympus.c:1716 src/main/print-olympus.c:1722
+#: src/main/print-olympus.c:1866 src/main/print-olympus.c:1872
+#: src/main/print-olympus.c:1878 src/main/print-olympus.c:1884
 #: src/main/print-pcl.c:1253 src/main/print-pcl.c:1259
 #: src/main/print-pcl.c:1265 src/main/print-pcl.c:1277
 #: src/main/print-pcl.c:1301 src/main/print-ps.c:68 src/main/print-ps.c:74
@@ -184,31 +184,31 @@ msgid "Basic Printer Setup"
 msgstr "基本�表機設定"
 
 #: src/main/print-canon.c:200 src/main/print-escp2.c:166
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1705
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1867
 #: src/main/print-pcl.c:1254 src/main/print-ps.c:75
 msgid "Size of the paper being printed to"
 msgstr "列�時使用的紙張尺寸"
 
 #: src/main/print-canon.c:205 src/main/print-escp2.c:171
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1710
-#: src/main/print-pcl.c:1259 src/cups/genppd.c:1339 src/cups/genppd.c:2001
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1872
+#: src/main/print-pcl.c:1259 src/cups/genppd.c:1372 src/cups/genppd.c:2035
 msgid "Media Type"
 msgstr "紙張類別"
 
 #: src/main/print-canon.c:206 src/main/print-escp2.c:172
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1711
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1873
 #: src/main/print-pcl.c:1260
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "紙張的類別 (普通紙�相紙等等)"
 
 #: src/main/print-canon.c:211 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1716
-#: src/main/print-pcl.c:1265 src/cups/genppd.c:1368 src/cups/genppd.c:2020
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1878
+#: src/main/print-pcl.c:1265 src/cups/genppd.c:1401 src/cups/genppd.c:2054
 msgid "Media Source"
 msgstr "紙張來�"
 
 #: src/main/print-canon.c:212 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1717
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1879
 #: src/main/print-pcl.c:1266
 msgid "Source (input slot) of the media"
 msgstr "�紙匣或者紙張的來�"
@@ -245,8 +245,8 @@ msgstr ""
 #: src/main/print-canon.c:235 src/main/print-canon.c:241
 #: src/main/print-canon.c:253 src/main/print-escp2.c:207
 #: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1740
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1906
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr "進階�表機設定"
@@ -261,25 +261,25 @@ msgid "CD Vertical Fine Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:247 src/main/print-escp2.c:219
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1722
-#: src/main/print-pcl.c:1277 src/cups/genppd.c:1446 src/cups/genppd.c:2056
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1884
+#: src/main/print-pcl.c:1277 src/cups/genppd.c:1479 src/cups/genppd.c:2090
 msgid "Resolution"
 msgstr "解�度"
 
 #: src/main/print-canon.c:248 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1723
+#: src/main/print-olympus.c:1885
 msgid "Resolution and quality of the print"
 msgstr "列�時的解�度��質"
 
 #: src/main/print-canon.c:253 src/main/print-escp2.c:230
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1728
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1890
 #: src/main/print-pcl.c:1283 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "墨水類別"
 
 #: src/main/print-canon.c:254 src/main/print-escp2.c:231
 #: src/main/print-escp2.c:243 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1729 src/main/print-pcl.c:1284
+#: src/main/print-olympus.c:1891 src/main/print-pcl.c:1284
 #: src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "�表機墨水的類型"
@@ -297,32 +297,33 @@ msgstr ""
 #: 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-escp2.c:320 src/main/print-escp2.c:767
-#: src/main/print-escp2.c:775 src/main/print-escp2.c:783
-#: src/main/print-escp2.c:799 src/main/print-escp2.c:807
-#: src/main/print-escp2.c:815 src/main/print-escp2.c:823
-#: src/main/print-escp2.c:831 src/main/print-escp2.c:839
+#: src/main/print-escp2.c:320 src/main/print-escp2.c:326
+#: src/main/print-escp2.c:893 src/main/print-escp2.c:901
+#: src/main/print-escp2.c:909 src/main/print-escp2.c:925
+#: src/main/print-escp2.c:933 src/main/print-escp2.c:941
+#: src/main/print-escp2.c:949 src/main/print-escp2.c:957
+#: src/main/print-escp2.c:965 src/main/print-escp2.c:973
 #: src/main/print-lexmark.c:296 src/main/print-pcl.c:1289
 msgid "Advanced Printer Functionality"
 msgstr "進階�表機功能"
 
-#: src/main/print-canon.c:265 src/main/print-escp2.c:326
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1746
+#: src/main/print-canon.c:265 src/main/print-escp2.c:332
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1912
 #: src/main/print-pcl.c:1295 src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "列�模�"
 
 #: src/main/print-canon.c:265 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:326
-#: src/main/print-escp2.c:332 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1746 src/main/print-pcl.c:1295
+#: src/main/print-color.c:208 src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338 src/main/print-lexmark.c:302
+#: src/main/print-olympus.c:1912 src/main/print-pcl.c:1295
 #: src/main/print-ps.c:86 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr ""
 
-#: src/main/print-canon.c:266 src/main/print-escp2.c:327
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1747
+#: src/main/print-canon.c:266 src/main/print-escp2.c:333
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1913
 #: src/main/print-pcl.c:1296 src/main/print-ps.c:87 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
@@ -350,77 +351,84 @@ msgstr "列��質"
 msgid "Basic Output Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:300 src/main/print-escp2.c:439
+#: src/main/print-canon.c:300 src/main/print-escp2.c:445
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1324
 msgid "Cyan Density"
 msgstr "氰�色密度"
 
-#: src/main/print-canon.c:301 src/main/print-escp2.c:440
+#: src/main/print-canon.c:301 src/main/print-escp2.c:446
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1325
 msgid "Adjust the cyan density"
 msgstr "調整氰�色色彩密度"
 
-#: src/main/print-canon.c:308 src/main/print-escp2.c:447
+#: src/main/print-canon.c:308 src/main/print-escp2.c:453
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1332
 msgid "Magenta Density"
 msgstr "洋紅色密度"
 
-#: src/main/print-canon.c:309 src/main/print-escp2.c:448
+#: src/main/print-canon.c:309 src/main/print-escp2.c:454
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1333
 msgid "Adjust the magenta density"
 msgstr "調整洋紅色色彩密度"
 
-#: src/main/print-canon.c:316 src/main/print-escp2.c:455
+#: src/main/print-canon.c:316 src/main/print-escp2.c:461
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1340
 msgid "Yellow Density"
 msgstr "黃色密度"
 
-#: src/main/print-canon.c:317 src/main/print-escp2.c:456
+#: src/main/print-canon.c:317 src/main/print-escp2.c:462
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1341
 msgid "Adjust the yellow density"
 msgstr "調整黃色色彩密度"
 
-#: src/main/print-canon.c:324 src/main/print-escp2.c:463
+#: src/main/print-canon.c:324 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1348
 msgid "Black Density"
 msgstr "黑色密度"
 
-#: src/main/print-canon.c:325 src/main/print-escp2.c:464
+#: src/main/print-canon.c:325 src/main/print-escp2.c:470
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1349
 msgid "Adjust the black density"
 msgstr "調整黑色色彩密度"
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:333
-#: src/main/print-escp2.c:535 src/main/print-escp2.c:536
+#: src/main/print-escp2.c:541 src/main/print-escp2.c:542
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1356 src/main/print-pcl.c:1357
 msgid "Light Cyan Transition"
 msgstr ""
 
 #: src/main/print-canon.c:332 src/main/print-canon.c:340
-#: src/main/print-canon.c:348 src/main/print-escp2.c:503
-#: src/main/print-escp2.c:511 src/main/print-escp2.c:519
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:535
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:551
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:567
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:583
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:599
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:615
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:631
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:647
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:663
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:679
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:695
-#: src/main/print-escp2.c:703 src/main/print-escp2.c:711
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:727
-#: src/main/print-escp2.c:735 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1356
-#: src/main/print-pcl.c:1364
+#: src/main/print-canon.c:348 src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517 src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:541
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:557
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:573
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:589
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:605
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:621
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:637
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:653
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:669
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:685
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:701
+#: src/main/print-escp2.c:709 src/main/print-escp2.c:717
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:733
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:749
+#: src/main/print-escp2.c:757 src/main/print-escp2.c:765
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:781
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:797
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:813
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:829
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:845
+#: src/main/print-escp2.c:853 src/main/print-escp2.c:861
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1356 src/main/print-pcl.c:1364
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
 #: src/main/print-canon.c:340 src/main/print-canon.c:341
-#: src/main/print-escp2.c:567 src/main/print-escp2.c:568
+#: src/main/print-escp2.c:573 src/main/print-escp2.c:574
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1364 src/main/print-pcl.c:1365
 msgid "Light Magenta Transition"
@@ -430,14 +438,14 @@ msgstr ""
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:368 src/main/print-escp2.c:2283
-#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:3609
-#: src/xml/xmli18n-tmp.h:3614 src/xml/xmli18n-tmp.h:3620
-#: src/xml/xmli18n-tmp.h:3627
+#: src/main/print-canon.c:368 src/main/print-escp2.c:2488
+#: src/main/print-pcl.c:1590 src/xml/xmli18n-tmp.h:5846
+#: src/xml/xmli18n-tmp.h:5851 src/xml/xmli18n-tmp.h:5857
+#: src/xml/xmli18n-tmp.h:5864
 msgid "Off"
 msgstr ""
 
-#: src/main/print-canon.c:369 src/main/print-escp2.c:2285
+#: src/main/print-canon.c:369 src/main/print-escp2.c:2490
 #: src/main/print-pcl.c:1591
 msgid "Long Edge (Standard)"
 msgstr ""
@@ -446,64 +454,65 @@ msgstr ""
 msgid "Short Edge (Flip)"
 msgstr ""
 
-#: src/main/print-canon.c:646 src/main/print-escp2.c:2005
-#: src/xml/xmli18n-tmp.h:3676
+#: src/main/print-canon.c:646 src/main/print-escp2.c:2210
+#: src/xml/xmli18n-tmp.h:5913
 msgid "CD - 5 inch"
 msgstr "5 �光碟"
 
-#: src/main/print-canon.c:648 src/main/print-escp2.c:2007
-#: src/xml/xmli18n-tmp.h:3677
+#: src/main/print-canon.c:648 src/main/print-escp2.c:2212
+#: src/xml/xmli18n-tmp.h:5914
 msgid "CD - 3 inch"
 msgstr "3 �光碟"
 
-#: src/main/print-canon.c:650 src/main/print-escp2.c:2009
-#: src/xml/xmli18n-tmp.h:3678
+#: src/main/print-canon.c:650 src/main/print-escp2.c:2214
+#: src/xml/xmli18n-tmp.h:5915
 #, fuzzy
 msgid "CD - Custom"
 msgstr "自�"
 
-#: src/main/print-canon.c:673 src/main/print-escp2.c:2034
-#: src/cups/genppd.c:1323 src/cups/genppd.c:1572 src/cups/genppd.c:1988
-#: src/cups/genppd.c:2079
+#: src/main/print-canon.c:673 src/main/print-escp2.c:2239
+#: src/cups/genppd.c:1356 src/cups/genppd.c:1605 src/cups/genppd.c:2022
+#: src/cups/genppd.c:2113
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-canon.c:675 src/main/print-escp2.c:2036
+#: src/main/print-canon.c:675 src/main/print-escp2.c:2241
 msgid "Print To Hub"
 msgstr ""
 
-#: src/main/print-canon.c:790 src/main/print-escp2.c:2447
-#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2001
+#: src/main/print-canon.c:790 src/main/print-escp2.c:2652
+#: src/main/print-lexmark.c:1279 src/main/print-olympus.c:2167
 #: src/main/print-pcl.c:1904 src/main/print-ps.c:329 src/main/print-raw.c:135
 #: src/gutenprintui2/panel.c:291
 msgid "Color"
 msgstr "彩色"
 
-#: src/main/print-canon.c:792 src/main/print-escp2.c:2449
+#: src/main/print-canon.c:792 src/main/print-escp2.c:2654
 #: src/main/print-lexmark.c:1281 src/main/print-pcl.c:1906
 #: src/main/print-ps.c:331 src/main/print-raw.c:137
 msgid "Black and White"
 msgstr "黑白"
 
-#: src/main/print-canon.c:831 src/main/print-escp2.c:2089
+#: src/main/print-canon.c:831 src/main/print-escp2.c:2294
 #: src/main/print-pcl.c:1797 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr ""
 
-#: src/main/print-canon.c:833 src/main/print-escp2.c:2131
-#: src/main/print-escp2.c:2229 src/main/print-escp2.c:2241
+#: src/main/print-canon.c:833 src/main/print-escp2.c:2336
+#: src/main/print-escp2.c:2434 src/main/print-escp2.c:2446
 #: src/main/print-pcl.c:236 src/main/print-pcl.c:279 src/main/print-pcl.c:281
 #: src/main/generic-options.c:36 src/gutenprintui2/panel.c:2841
-#: src/xml/xmli18n-tmp.h:1213 src/xml/xmli18n-tmp.h:1215
-#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1219
-#: src/xml/xmli18n-tmp.h:3158 src/xml/xmli18n-tmp.h:3163
-#: src/xml/xmli18n-tmp.h:3167 src/xml/xmli18n-tmp.h:3170
-#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3177
-#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3461
-#: src/xml/xmli18n-tmp.h:3464 src/xml/xmli18n-tmp.h:3632
-#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3648
-#: src/xml/xmli18n-tmp.h:3657 src/xml/xmli18n-tmp.h:3665
+#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1625
+#: src/xml/xmli18n-tmp.h:1627 src/xml/xmli18n-tmp.h:1629
+#: src/xml/xmli18n-tmp.h:3699 src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:3708 src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:3713 src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:3722 src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5126 src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:5869 src/xml/xmli18n-tmp.h:5876
+#: src/xml/xmli18n-tmp.h:5885 src/xml/xmli18n-tmp.h:5894
+#: src/xml/xmli18n-tmp.h:5902
 msgid "Standard"
 msgstr "標準"
 
@@ -540,7 +549,7 @@ msgid "Pre-Dithered"
 msgstr ""
 
 #: src/main/print-color.c:121 src/gutenprintui2/panel.c:292
-#: src/cups/genppd.c:1268 src/cups/genppd.c:1971
+#: src/cups/genppd.c:1301 src/cups/genppd.c:2005
 msgid "Grayscale"
 msgstr "�階"
 
@@ -556,11 +565,11 @@ msgstr "RGB"
 msgid "CMY"
 msgstr "CMY"
 
-#: src/main/print-color.c:129 src/cups/genppd.c:1299 src/cups/genppd.c:1978
+#: src/main/print-color.c:129 src/cups/genppd.c:1332 src/cups/genppd.c:2012
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/main/print-color.c:131 src/cups/genppd.c:1306 src/cups/genppd.c:1979
+#: src/main/print-color.c:131 src/cups/genppd.c:1339 src/cups/genppd.c:2013
 msgid "KCMY"
 msgstr "KCMY"
 
@@ -620,7 +629,7 @@ msgid "Output image type"
 msgstr "輸出影�類型"
 
 #: src/main/print-color.c:208 src/main/print-color.c:209
-#: src/main/print-escp2.c:332
+#: src/main/print-escp2.c:338
 msgid "Raw Channels"
 msgstr ""
 
@@ -683,56 +692,208 @@ msgstr "程�使用的 Gamma 值"
 
 #: src/main/print-color.c:266 src/gutenprintui2/panel.c:2355
 #: src/escputil/escputil.c:997 src/escputil/escputil.c:1017
-#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:1812
-#: src/xml/xmli18n-tmp.h:1823 src/xml/xmli18n-tmp.h:1836
-#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1863
-#: src/xml/xmli18n-tmp.h:1876 src/xml/xmli18n-tmp.h:1889
-#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1918
-#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1949
-#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1975
-#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:1999
-#: src/xml/xmli18n-tmp.h:2013 src/xml/xmli18n-tmp.h:2027
-#: src/xml/xmli18n-tmp.h:2039 src/xml/xmli18n-tmp.h:2051
-#: src/xml/xmli18n-tmp.h:2064 src/xml/xmli18n-tmp.h:2076
-#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2102
-#: src/xml/xmli18n-tmp.h:2116 src/xml/xmli18n-tmp.h:2130
-#: src/xml/xmli18n-tmp.h:2143 src/xml/xmli18n-tmp.h:2156
-#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2184
-#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2210
-#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2236
-#: src/xml/xmli18n-tmp.h:2249 src/xml/xmli18n-tmp.h:2262
-#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2290
-#: src/xml/xmli18n-tmp.h:2305 src/xml/xmli18n-tmp.h:2320
-#: src/xml/xmli18n-tmp.h:2332 src/xml/xmli18n-tmp.h:2343
-#: src/xml/xmli18n-tmp.h:2356 src/xml/xmli18n-tmp.h:2369
-#: src/xml/xmli18n-tmp.h:2380 src/xml/xmli18n-tmp.h:2392
-#: src/xml/xmli18n-tmp.h:2404 src/xml/xmli18n-tmp.h:2415
-#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2442
-#: src/xml/xmli18n-tmp.h:2454 src/xml/xmli18n-tmp.h:2466
-#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2496
-#: src/xml/xmli18n-tmp.h:2509 src/xml/xmli18n-tmp.h:2522
-#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2549
-#: src/xml/xmli18n-tmp.h:2561 src/xml/xmli18n-tmp.h:2574
-#: src/xml/xmli18n-tmp.h:2586 src/xml/xmli18n-tmp.h:2598
-#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2623
-#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2653
-#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2683
-#: src/xml/xmli18n-tmp.h:2697 src/xml/xmli18n-tmp.h:2715
-#: src/xml/xmli18n-tmp.h:2732 src/xml/xmli18n-tmp.h:2745
-#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
-#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2803
-#: src/xml/xmli18n-tmp.h:2816 src/xml/xmli18n-tmp.h:2828
-#: src/xml/xmli18n-tmp.h:2840 src/xml/xmli18n-tmp.h:2854
-#: src/xml/xmli18n-tmp.h:2869 src/xml/xmli18n-tmp.h:2881
-#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2915
-#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2943
-#: src/xml/xmli18n-tmp.h:2959 src/xml/xmli18n-tmp.h:2976
-#: src/xml/xmli18n-tmp.h:2984 src/xml/xmli18n-tmp.h:3004
-#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3032
-#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3062
-#: src/xml/xmli18n-tmp.h:3076 src/xml/xmli18n-tmp.h:3093
-#: src/xml/xmli18n-tmp.h:3107 src/xml/xmli18n-tmp.h:3125
-#: src/xml/xmli18n-tmp.h:3141
+#: src/escputil/escputil.c:1286 src/xml/xmli18n-tmp.h:2336
+#: src/xml/xmli18n-tmp.h:2347 src/xml/xmli18n-tmp.h:2360
+#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2387
+#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2413
+#: src/xml/xmli18n-tmp.h:2426 src/xml/xmli18n-tmp.h:2442
+#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2473
+#: src/xml/xmli18n-tmp.h:2486 src/xml/xmli18n-tmp.h:2499
+#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2523
+#: src/xml/xmli18n-tmp.h:2537 src/xml/xmli18n-tmp.h:2551
+#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2575
+#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
+#: src/xml/xmli18n-tmp.h:2615 src/xml/xmli18n-tmp.h:2626
+#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2654
+#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2680
+#: src/xml/xmli18n-tmp.h:2694 src/xml/xmli18n-tmp.h:2708
+#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2734
+#: src/xml/xmli18n-tmp.h:2747 src/xml/xmli18n-tmp.h:2760
+#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2786
+#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2814
+#: src/xml/xmli18n-tmp.h:2829 src/xml/xmli18n-tmp.h:2844
+#: src/xml/xmli18n-tmp.h:2856 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2893
+#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2916
+#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2939
+#: src/xml/xmli18n-tmp.h:2952 src/xml/xmli18n-tmp.h:2966
+#: src/xml/xmli18n-tmp.h:2978 src/xml/xmli18n-tmp.h:2990
+#: src/xml/xmli18n-tmp.h:3005 src/xml/xmli18n-tmp.h:3020
+#: src/xml/xmli18n-tmp.h:3033 src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3061 src/xml/xmli18n-tmp.h:3073
+#: src/xml/xmli18n-tmp.h:3085 src/xml/xmli18n-tmp.h:3098
+#: src/xml/xmli18n-tmp.h:3110 src/xml/xmli18n-tmp.h:3122
+#: src/xml/xmli18n-tmp.h:3134 src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3177
+#: src/xml/xmli18n-tmp.h:3193 src/xml/xmli18n-tmp.h:3207
+#: src/xml/xmli18n-tmp.h:3221 src/xml/xmli18n-tmp.h:3239
+#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3269
+#: src/xml/xmli18n-tmp.h:3289 src/xml/xmli18n-tmp.h:3302
+#: src/xml/xmli18n-tmp.h:3317 src/xml/xmli18n-tmp.h:3327
+#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3352
+#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3377
+#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
+#: src/xml/xmli18n-tmp.h:3421 src/xml/xmli18n-tmp.h:3438
+#: src/xml/xmli18n-tmp.h:3453 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3499
+#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3527
+#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3555
+#: src/xml/xmli18n-tmp.h:3566 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3616
+#: src/xml/xmli18n-tmp.h:3630 src/xml/xmli18n-tmp.h:3648
+#: src/xml/xmli18n-tmp.h:3664 src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:3743 src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:3756 src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:3766 src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:3775 src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:3794 src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:3805 src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:3815 src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:3826 src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:3836 src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:3847 src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:3869 src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:3880 src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:3902 src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:3913 src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:3937 src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:3948 src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:3959 src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:3970 src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:3983 src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:3998 src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:4013 src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:4023 src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:4038 src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:4053 src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:4064 src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:4075 src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:4088 src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:4103 src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:4118 src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:4128 src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:4143 src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:4158 src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:4169 src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:4180 src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:4193 src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:4203 src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:4229 src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:4239 src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:4262 src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:4275 src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:4285 src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:4294 src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:4309 src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:4324 src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:4337 src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:4347 src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:4356 src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:4370 src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:4387 src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:4400 src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:4416 src/xml/xmli18n-tmp.h:4421
+#: src/xml/xmli18n-tmp.h:4425 src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:4440 src/xml/xmli18n-tmp.h:4449
+#: src/xml/xmli18n-tmp.h:4456 src/xml/xmli18n-tmp.h:4462
+#: src/xml/xmli18n-tmp.h:4469 src/xml/xmli18n-tmp.h:4473
+#: src/xml/xmli18n-tmp.h:4485 src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:4494 src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:4509 src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:4527 src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:4540 src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:4551 src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:4568 src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:4583 src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:4596 src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:4607 src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:4625 src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:4638 src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:4649 src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:4666 src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:4681 src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:4694 src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:4705 src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:4717 src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:4728 src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:4740 src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:4751 src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:4762 src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:4773 src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:4807 src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:4818 src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:4829 src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:4840 src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:4874 src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:4885 src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:4896 src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:4907 src/xml/xmli18n-tmp.h:4935
+#: src/xml/xmli18n-tmp.h:4941 src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:4952 src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:4963 src/xml/xmli18n-tmp.h:4967
+#: src/xml/xmli18n-tmp.h:4974 src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:5006 src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:5017 src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:5041 src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:5052 src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:5063 src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:5074 src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:5088 src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:5099 src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:5110 src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:5121 src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:5134 src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:5147 src/xml/xmli18n-tmp.h:5152
+#: src/xml/xmli18n-tmp.h:5159 src/xml/xmli18n-tmp.h:5165
+#: src/xml/xmli18n-tmp.h:5171 src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:5182 src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:5193 src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:5204 src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:5238 src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:5249 src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:5260 src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:5271 src/xml/xmli18n-tmp.h:5299
+#: src/xml/xmli18n-tmp.h:5305 src/xml/xmli18n-tmp.h:5312
+#: src/xml/xmli18n-tmp.h:5316 src/xml/xmli18n-tmp.h:5322
+#: src/xml/xmli18n-tmp.h:5327 src/xml/xmli18n-tmp.h:5331
+#: src/xml/xmli18n-tmp.h:5338 src/xml/xmli18n-tmp.h:5347
+#: src/xml/xmli18n-tmp.h:5354 src/xml/xmli18n-tmp.h:5360
+#: src/xml/xmli18n-tmp.h:5367 src/xml/xmli18n-tmp.h:5371
+#: src/xml/xmli18n-tmp.h:5383 src/xml/xmli18n-tmp.h:5388
+#: src/xml/xmli18n-tmp.h:5392 src/xml/xmli18n-tmp.h:5399
+#: src/xml/xmli18n-tmp.h:5407 src/xml/xmli18n-tmp.h:5416
+#: src/xml/xmli18n-tmp.h:5423 src/xml/xmli18n-tmp.h:5429
+#: src/xml/xmli18n-tmp.h:5436 src/xml/xmli18n-tmp.h:5440
+#: src/xml/xmli18n-tmp.h:5452 src/xml/xmli18n-tmp.h:5457
+#: src/xml/xmli18n-tmp.h:5461 src/xml/xmli18n-tmp.h:5468
+#: src/xml/xmli18n-tmp.h:5476 src/xml/xmli18n-tmp.h:5486
+#: src/xml/xmli18n-tmp.h:5494 src/xml/xmli18n-tmp.h:5501
+#: src/xml/xmli18n-tmp.h:5507 src/xml/xmli18n-tmp.h:5514
+#: src/xml/xmli18n-tmp.h:5518 src/xml/xmli18n-tmp.h:5525
+#: src/xml/xmli18n-tmp.h:5535 src/xml/xmli18n-tmp.h:5543
+#: src/xml/xmli18n-tmp.h:5550 src/xml/xmli18n-tmp.h:5556
+#: src/xml/xmli18n-tmp.h:5563 src/xml/xmli18n-tmp.h:5567
+#: src/xml/xmli18n-tmp.h:5574 src/xml/xmli18n-tmp.h:5582
+#: src/xml/xmli18n-tmp.h:5586 src/xml/xmli18n-tmp.h:5592
+#: src/xml/xmli18n-tmp.h:5597 src/xml/xmli18n-tmp.h:5615
+#: src/xml/xmli18n-tmp.h:5619 src/xml/xmli18n-tmp.h:5625
+#: src/xml/xmli18n-tmp.h:5630 src/xml/xmli18n-tmp.h:5649
+#: src/xml/xmli18n-tmp.h:5656 src/xml/xmli18n-tmp.h:5662
+#: src/xml/xmli18n-tmp.h:5669 src/xml/xmli18n-tmp.h:5673
+#: src/xml/xmli18n-tmp.h:5685 src/xml/xmli18n-tmp.h:5690
+#: src/xml/xmli18n-tmp.h:5694 src/xml/xmli18n-tmp.h:5701
+#: src/xml/xmli18n-tmp.h:5709 src/xml/xmli18n-tmp.h:5718
+#: src/xml/xmli18n-tmp.h:5725 src/xml/xmli18n-tmp.h:5731
+#: src/xml/xmli18n-tmp.h:5738 src/xml/xmli18n-tmp.h:5742
+#: src/xml/xmli18n-tmp.h:5754 src/xml/xmli18n-tmp.h:5759
+#: src/xml/xmli18n-tmp.h:5763 src/xml/xmli18n-tmp.h:5770
+#: src/xml/xmli18n-tmp.h:5778 src/xml/xmli18n-tmp.h:5786
+#: src/xml/xmli18n-tmp.h:5790 src/xml/xmli18n-tmp.h:5796
+#: src/xml/xmli18n-tmp.h:5801 src/xml/xmli18n-tmp.h:5807
+#: src/xml/xmli18n-tmp.h:5811 src/xml/xmli18n-tmp.h:5817
+#: src/xml/xmli18n-tmp.h:5822 src/xml/xmli18n-tmp.h:5828
+#: src/xml/xmli18n-tmp.h:5832 src/xml/xmli18n-tmp.h:5838
+#: src/xml/xmli18n-tmp.h:5843
 msgid "Cyan"
 msgstr "æ°°è—�"
 
@@ -742,56 +903,208 @@ msgstr "調整氰�色 gamma 值"
 
 #: src/main/print-color.c:274 src/gutenprintui2/panel.c:2362
 #: src/escputil/escputil.c:998 src/escputil/escputil.c:1018
-#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:1813
-#: src/xml/xmli18n-tmp.h:1824 src/xml/xmli18n-tmp.h:1837
-#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1864
-#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1890
-#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1919
-#: src/xml/xmli18n-tmp.h:1935 src/xml/xmli18n-tmp.h:1950
-#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1976
-#: src/xml/xmli18n-tmp.h:1988 src/xml/xmli18n-tmp.h:2000
-#: src/xml/xmli18n-tmp.h:2014 src/xml/xmli18n-tmp.h:2028
-#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2052
-#: src/xml/xmli18n-tmp.h:2065 src/xml/xmli18n-tmp.h:2077
-#: src/xml/xmli18n-tmp.h:2092 src/xml/xmli18n-tmp.h:2103
-#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2131
-#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2157
-#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2185
-#: src/xml/xmli18n-tmp.h:2198 src/xml/xmli18n-tmp.h:2211
-#: src/xml/xmli18n-tmp.h:2224 src/xml/xmli18n-tmp.h:2237
-#: src/xml/xmli18n-tmp.h:2250 src/xml/xmli18n-tmp.h:2263
-#: src/xml/xmli18n-tmp.h:2276 src/xml/xmli18n-tmp.h:2291
-#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2321
-#: src/xml/xmli18n-tmp.h:2333 src/xml/xmli18n-tmp.h:2344
-#: src/xml/xmli18n-tmp.h:2357 src/xml/xmli18n-tmp.h:2370
-#: src/xml/xmli18n-tmp.h:2381 src/xml/xmli18n-tmp.h:2393
-#: src/xml/xmli18n-tmp.h:2405 src/xml/xmli18n-tmp.h:2416
-#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2443
-#: src/xml/xmli18n-tmp.h:2455 src/xml/xmli18n-tmp.h:2467
-#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2497
-#: src/xml/xmli18n-tmp.h:2510 src/xml/xmli18n-tmp.h:2523
-#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2550
-#: src/xml/xmli18n-tmp.h:2562 src/xml/xmli18n-tmp.h:2575
-#: src/xml/xmli18n-tmp.h:2587 src/xml/xmli18n-tmp.h:2599
-#: src/xml/xmli18n-tmp.h:2611 src/xml/xmli18n-tmp.h:2624
-#: src/xml/xmli18n-tmp.h:2639 src/xml/xmli18n-tmp.h:2652
-#: src/xml/xmli18n-tmp.h:2670 src/xml/xmli18n-tmp.h:2684
-#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2714
-#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2747
-#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2780
-#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2804
-#: src/xml/xmli18n-tmp.h:2817 src/xml/xmli18n-tmp.h:2829
-#: src/xml/xmli18n-tmp.h:2841 src/xml/xmli18n-tmp.h:2855
-#: src/xml/xmli18n-tmp.h:2870 src/xml/xmli18n-tmp.h:2882
-#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2914
-#: src/xml/xmli18n-tmp.h:2931 src/xml/xmli18n-tmp.h:2944
-#: src/xml/xmli18n-tmp.h:2958 src/xml/xmli18n-tmp.h:2975
-#: src/xml/xmli18n-tmp.h:2985 src/xml/xmli18n-tmp.h:3005
-#: src/xml/xmli18n-tmp.h:3019 src/xml/xmli18n-tmp.h:3033
-#: src/xml/xmli18n-tmp.h:3042 src/xml/xmli18n-tmp.h:3060
-#: src/xml/xmli18n-tmp.h:3077 src/xml/xmli18n-tmp.h:3094
-#: src/xml/xmli18n-tmp.h:3108 src/xml/xmli18n-tmp.h:3124
-#: src/xml/xmli18n-tmp.h:3140
+#: src/escputil/escputil.c:1287 src/xml/xmli18n-tmp.h:2337
+#: src/xml/xmli18n-tmp.h:2348 src/xml/xmli18n-tmp.h:2361
+#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2388
+#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2414
+#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2443
+#: src/xml/xmli18n-tmp.h:2459 src/xml/xmli18n-tmp.h:2474
+#: src/xml/xmli18n-tmp.h:2487 src/xml/xmli18n-tmp.h:2500
+#: src/xml/xmli18n-tmp.h:2512 src/xml/xmli18n-tmp.h:2524
+#: src/xml/xmli18n-tmp.h:2538 src/xml/xmli18n-tmp.h:2552
+#: src/xml/xmli18n-tmp.h:2564 src/xml/xmli18n-tmp.h:2576
+#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2601
+#: src/xml/xmli18n-tmp.h:2616 src/xml/xmli18n-tmp.h:2627
+#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2655
+#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2681
+#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2709
+#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2735
+#: src/xml/xmli18n-tmp.h:2748 src/xml/xmli18n-tmp.h:2761
+#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2787
+#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2815
+#: src/xml/xmli18n-tmp.h:2830 src/xml/xmli18n-tmp.h:2845
+#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2868
+#: src/xml/xmli18n-tmp.h:2881 src/xml/xmli18n-tmp.h:2894
+#: src/xml/xmli18n-tmp.h:2905 src/xml/xmli18n-tmp.h:2917
+#: src/xml/xmli18n-tmp.h:2929 src/xml/xmli18n-tmp.h:2940
+#: src/xml/xmli18n-tmp.h:2953 src/xml/xmli18n-tmp.h:2967
+#: src/xml/xmli18n-tmp.h:2979 src/xml/xmli18n-tmp.h:2991
+#: src/xml/xmli18n-tmp.h:3006 src/xml/xmli18n-tmp.h:3021
+#: src/xml/xmli18n-tmp.h:3034 src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3062 src/xml/xmli18n-tmp.h:3074
+#: src/xml/xmli18n-tmp.h:3086 src/xml/xmli18n-tmp.h:3099
+#: src/xml/xmli18n-tmp.h:3111 src/xml/xmli18n-tmp.h:3123
+#: src/xml/xmli18n-tmp.h:3135 src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:3163 src/xml/xmli18n-tmp.h:3176
+#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3208
+#: src/xml/xmli18n-tmp.h:3220 src/xml/xmli18n-tmp.h:3238
+#: src/xml/xmli18n-tmp.h:3257 src/xml/xmli18n-tmp.h:3271
+#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3304
+#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
+#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3353
+#: src/xml/xmli18n-tmp.h:3365 src/xml/xmli18n-tmp.h:3378
+#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
+#: src/xml/xmli18n-tmp.h:3420 src/xml/xmli18n-tmp.h:3437
+#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3467
+#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3498
+#: src/xml/xmli18n-tmp.h:3508 src/xml/xmli18n-tmp.h:3528
+#: src/xml/xmli18n-tmp.h:3542 src/xml/xmli18n-tmp.h:3556
+#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:3600 src/xml/xmli18n-tmp.h:3617
+#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3647
+#: src/xml/xmli18n-tmp.h:3663 src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:3751 src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:3761 src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:3772 src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:3784 src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:3795 src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:3806 src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:3816 src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:3827 src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:3837 src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:3848 src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:3870 src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:3881 src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:3903 src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:3914 src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:3939 src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:3949 src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:3960 src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:3972 src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:3984 src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:3999 src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:4014 src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:4024 src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:4039 src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:4054 src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:4065 src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:4076 src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:4089 src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:4104 src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:4119 src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:4129 src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:4144 src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:4159 src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:4170 src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:4181 src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:4194 src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:4204 src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:4230 src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:4240 src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:4264 src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:4276 src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:4286 src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:4296 src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:4311 src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:4326 src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:4338 src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:4348 src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:4358 src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:4372 src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:4389 src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:4401 src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:4417 src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:4427 src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:4442 src/xml/xmli18n-tmp.h:4451
+#: src/xml/xmli18n-tmp.h:4458 src/xml/xmli18n-tmp.h:4464
+#: src/xml/xmli18n-tmp.h:4470 src/xml/xmli18n-tmp.h:4474
+#: src/xml/xmli18n-tmp.h:4486 src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:4496 src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:4511 src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:4529 src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:4542 src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:4552 src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:4570 src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:4585 src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:4597 src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:4609 src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:4627 src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:4640 src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:4650 src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:4668 src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:4683 src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:4695 src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:4707 src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:4718 src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:4729 src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:4742 src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:4752 src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:4763 src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:4775 src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:4809 src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:4819 src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:4830 src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:4842 src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:4876 src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:4886 src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:4897 src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:4909 src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:4943 src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:4953 src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:4964 src/xml/xmli18n-tmp.h:4969
+#: src/xml/xmli18n-tmp.h:4976 src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:5007 src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:5018 src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:5043 src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:5053 src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:5064 src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:5076 src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:5090 src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:5100 src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:5111 src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:5123 src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:5135 src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:5148 src/xml/xmli18n-tmp.h:5153
+#: src/xml/xmli18n-tmp.h:5160 src/xml/xmli18n-tmp.h:5167
+#: src/xml/xmli18n-tmp.h:5173 src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:5183 src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:5194 src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:5206 src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:5240 src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:5250 src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:5261 src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:5273 src/xml/xmli18n-tmp.h:5301
+#: src/xml/xmli18n-tmp.h:5307 src/xml/xmli18n-tmp.h:5313
+#: src/xml/xmli18n-tmp.h:5317 src/xml/xmli18n-tmp.h:5323
+#: src/xml/xmli18n-tmp.h:5328 src/xml/xmli18n-tmp.h:5333
+#: src/xml/xmli18n-tmp.h:5340 src/xml/xmli18n-tmp.h:5349
+#: src/xml/xmli18n-tmp.h:5356 src/xml/xmli18n-tmp.h:5362
+#: src/xml/xmli18n-tmp.h:5368 src/xml/xmli18n-tmp.h:5372
+#: src/xml/xmli18n-tmp.h:5384 src/xml/xmli18n-tmp.h:5389
+#: src/xml/xmli18n-tmp.h:5394 src/xml/xmli18n-tmp.h:5401
+#: src/xml/xmli18n-tmp.h:5409 src/xml/xmli18n-tmp.h:5418
+#: src/xml/xmli18n-tmp.h:5425 src/xml/xmli18n-tmp.h:5431
+#: src/xml/xmli18n-tmp.h:5437 src/xml/xmli18n-tmp.h:5441
+#: src/xml/xmli18n-tmp.h:5453 src/xml/xmli18n-tmp.h:5458
+#: src/xml/xmli18n-tmp.h:5463 src/xml/xmli18n-tmp.h:5470
+#: src/xml/xmli18n-tmp.h:5478 src/xml/xmli18n-tmp.h:5488
+#: src/xml/xmli18n-tmp.h:5496 src/xml/xmli18n-tmp.h:5503
+#: src/xml/xmli18n-tmp.h:5509 src/xml/xmli18n-tmp.h:5515
+#: src/xml/xmli18n-tmp.h:5519 src/xml/xmli18n-tmp.h:5527
+#: src/xml/xmli18n-tmp.h:5537 src/xml/xmli18n-tmp.h:5545
+#: src/xml/xmli18n-tmp.h:5552 src/xml/xmli18n-tmp.h:5558
+#: src/xml/xmli18n-tmp.h:5564 src/xml/xmli18n-tmp.h:5568
+#: src/xml/xmli18n-tmp.h:5576 src/xml/xmli18n-tmp.h:5583
+#: src/xml/xmli18n-tmp.h:5587 src/xml/xmli18n-tmp.h:5593
+#: src/xml/xmli18n-tmp.h:5598 src/xml/xmli18n-tmp.h:5616
+#: src/xml/xmli18n-tmp.h:5620 src/xml/xmli18n-tmp.h:5626
+#: src/xml/xmli18n-tmp.h:5631 src/xml/xmli18n-tmp.h:5651
+#: src/xml/xmli18n-tmp.h:5658 src/xml/xmli18n-tmp.h:5664
+#: src/xml/xmli18n-tmp.h:5670 src/xml/xmli18n-tmp.h:5674
+#: src/xml/xmli18n-tmp.h:5686 src/xml/xmli18n-tmp.h:5691
+#: src/xml/xmli18n-tmp.h:5696 src/xml/xmli18n-tmp.h:5703
+#: src/xml/xmli18n-tmp.h:5711 src/xml/xmli18n-tmp.h:5720
+#: src/xml/xmli18n-tmp.h:5727 src/xml/xmli18n-tmp.h:5733
+#: src/xml/xmli18n-tmp.h:5739 src/xml/xmli18n-tmp.h:5743
+#: src/xml/xmli18n-tmp.h:5755 src/xml/xmli18n-tmp.h:5760
+#: src/xml/xmli18n-tmp.h:5765 src/xml/xmli18n-tmp.h:5772
+#: src/xml/xmli18n-tmp.h:5780 src/xml/xmli18n-tmp.h:5787
+#: src/xml/xmli18n-tmp.h:5791 src/xml/xmli18n-tmp.h:5797
+#: src/xml/xmli18n-tmp.h:5802 src/xml/xmli18n-tmp.h:5808
+#: src/xml/xmli18n-tmp.h:5812 src/xml/xmli18n-tmp.h:5818
+#: src/xml/xmli18n-tmp.h:5823 src/xml/xmli18n-tmp.h:5829
+#: src/xml/xmli18n-tmp.h:5833 src/xml/xmli18n-tmp.h:5839
+#: src/xml/xmli18n-tmp.h:5844
 msgid "Magenta"
 msgstr "æ´‹ç´…"
 
@@ -801,56 +1114,208 @@ msgstr "調整洋紅色 gamma 值"
 
 #: src/main/print-color.c:282 src/gutenprintui2/panel.c:2369
 #: src/escputil/escputil.c:999 src/escputil/escputil.c:1019
-#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:1814
-#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1838
-#: src/xml/xmli18n-tmp.h:1851 src/xml/xmli18n-tmp.h:1865
-#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1891
-#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1920
-#: src/xml/xmli18n-tmp.h:1936 src/xml/xmli18n-tmp.h:1951
-#: src/xml/xmli18n-tmp.h:1964 src/xml/xmli18n-tmp.h:1977
-#: src/xml/xmli18n-tmp.h:1989 src/xml/xmli18n-tmp.h:2001
-#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2029
-#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2053
-#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2078
-#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2104
-#: src/xml/xmli18n-tmp.h:2118 src/xml/xmli18n-tmp.h:2132
-#: src/xml/xmli18n-tmp.h:2145 src/xml/xmli18n-tmp.h:2158
-#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2186
-#: src/xml/xmli18n-tmp.h:2199 src/xml/xmli18n-tmp.h:2212
-#: src/xml/xmli18n-tmp.h:2225 src/xml/xmli18n-tmp.h:2238
-#: src/xml/xmli18n-tmp.h:2251 src/xml/xmli18n-tmp.h:2264
-#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2292
-#: src/xml/xmli18n-tmp.h:2307 src/xml/xmli18n-tmp.h:2322
-#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:2345
-#: src/xml/xmli18n-tmp.h:2358 src/xml/xmli18n-tmp.h:2371
-#: src/xml/xmli18n-tmp.h:2382 src/xml/xmli18n-tmp.h:2394
-#: src/xml/xmli18n-tmp.h:2406 src/xml/xmli18n-tmp.h:2417
-#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2444
-#: src/xml/xmli18n-tmp.h:2456 src/xml/xmli18n-tmp.h:2468
-#: src/xml/xmli18n-tmp.h:2483 src/xml/xmli18n-tmp.h:2498
-#: src/xml/xmli18n-tmp.h:2511 src/xml/xmli18n-tmp.h:2524
-#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2551
-#: src/xml/xmli18n-tmp.h:2563 src/xml/xmli18n-tmp.h:2576
-#: src/xml/xmli18n-tmp.h:2588 src/xml/xmli18n-tmp.h:2600
-#: src/xml/xmli18n-tmp.h:2612 src/xml/xmli18n-tmp.h:2625
-#: src/xml/xmli18n-tmp.h:2640 src/xml/xmli18n-tmp.h:2651
-#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2685
-#: src/xml/xmli18n-tmp.h:2695 src/xml/xmli18n-tmp.h:2713
-#: src/xml/xmli18n-tmp.h:2734 src/xml/xmli18n-tmp.h:2749
-#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2779
-#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2805
-#: src/xml/xmli18n-tmp.h:2818 src/xml/xmli18n-tmp.h:2830
-#: src/xml/xmli18n-tmp.h:2842 src/xml/xmli18n-tmp.h:2856
-#: src/xml/xmli18n-tmp.h:2871 src/xml/xmli18n-tmp.h:2883
-#: src/xml/xmli18n-tmp.h:2893 src/xml/xmli18n-tmp.h:2910
-#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:2945
-#: src/xml/xmli18n-tmp.h:2960 src/xml/xmli18n-tmp.h:2974
-#: src/xml/xmli18n-tmp.h:2986 src/xml/xmli18n-tmp.h:3006
-#: src/xml/xmli18n-tmp.h:3020 src/xml/xmli18n-tmp.h:3034
-#: src/xml/xmli18n-tmp.h:3041 src/xml/xmli18n-tmp.h:3061
-#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3095
-#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3120
-#: src/xml/xmli18n-tmp.h:3136
+#: src/escputil/escputil.c:1288 src/xml/xmli18n-tmp.h:2338
+#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
+#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2389
+#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2415
+#: src/xml/xmli18n-tmp.h:2428 src/xml/xmli18n-tmp.h:2444
+#: src/xml/xmli18n-tmp.h:2460 src/xml/xmli18n-tmp.h:2475
+#: src/xml/xmli18n-tmp.h:2488 src/xml/xmli18n-tmp.h:2501
+#: src/xml/xmli18n-tmp.h:2513 src/xml/xmli18n-tmp.h:2525
+#: src/xml/xmli18n-tmp.h:2539 src/xml/xmli18n-tmp.h:2553
+#: src/xml/xmli18n-tmp.h:2565 src/xml/xmli18n-tmp.h:2577
+#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2602
+#: src/xml/xmli18n-tmp.h:2617 src/xml/xmli18n-tmp.h:2628
+#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2656
+#: src/xml/xmli18n-tmp.h:2669 src/xml/xmli18n-tmp.h:2682
+#: src/xml/xmli18n-tmp.h:2696 src/xml/xmli18n-tmp.h:2710
+#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2736
+#: src/xml/xmli18n-tmp.h:2749 src/xml/xmli18n-tmp.h:2762
+#: src/xml/xmli18n-tmp.h:2775 src/xml/xmli18n-tmp.h:2788
+#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2816
+#: src/xml/xmli18n-tmp.h:2831 src/xml/xmli18n-tmp.h:2846
+#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2869
+#: src/xml/xmli18n-tmp.h:2882 src/xml/xmli18n-tmp.h:2895
+#: src/xml/xmli18n-tmp.h:2906 src/xml/xmli18n-tmp.h:2918
+#: src/xml/xmli18n-tmp.h:2930 src/xml/xmli18n-tmp.h:2941
+#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2968
+#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2992
+#: src/xml/xmli18n-tmp.h:3007 src/xml/xmli18n-tmp.h:3022
+#: src/xml/xmli18n-tmp.h:3035 src/xml/xmli18n-tmp.h:3048
+#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3075
+#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3100
+#: src/xml/xmli18n-tmp.h:3112 src/xml/xmli18n-tmp.h:3124
+#: src/xml/xmli18n-tmp.h:3136 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:3164 src/xml/xmli18n-tmp.h:3175
+#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3209
+#: src/xml/xmli18n-tmp.h:3219 src/xml/xmli18n-tmp.h:3237
+#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3273
+#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:3315 src/xml/xmli18n-tmp.h:3329
+#: src/xml/xmli18n-tmp.h:3342 src/xml/xmli18n-tmp.h:3354
+#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3379
+#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
+#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3433
+#: src/xml/xmli18n-tmp.h:3455 src/xml/xmli18n-tmp.h:3468
+#: src/xml/xmli18n-tmp.h:3483 src/xml/xmli18n-tmp.h:3497
+#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3529
+#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3557
+#: src/xml/xmli18n-tmp.h:3564 src/xml/xmli18n-tmp.h:3584
+#: src/xml/xmli18n-tmp.h:3601 src/xml/xmli18n-tmp.h:3618
+#: src/xml/xmli18n-tmp.h:3632 src/xml/xmli18n-tmp.h:3643
+#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:3747 src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:3758 src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:3768 src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:3779 src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:3792 src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:3802 src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:3813 src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:3823 src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:3834 src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:3844 src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:3867 src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:3877 src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:3900 src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:3910 src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:3935 src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:3946 src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:3956 src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:3967 src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:3979 src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:3992 src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:4005 src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:4019 src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:4031 src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:4049 src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:4062 src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:4072 src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:4082 src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:4097 src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:4110 src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:4124 src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:4136 src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:4154 src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:4167 src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:4177 src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:4187 src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:4199 src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:4210 src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:4235 src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:4246 src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:4272 src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:4281 src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:4292 src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:4305 src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:4321 src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:4334 src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:4343 src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:4354 src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:4367 src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:4384 src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:4397 src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:4406 src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:4423 src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:4436 src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:4453 src/xml/xmli18n-tmp.h:4460
+#: src/xml/xmli18n-tmp.h:4466 src/xml/xmli18n-tmp.h:4471
+#: src/xml/xmli18n-tmp.h:4475 src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:4492 src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:4505 src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:4523 src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:4538 src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:4549 src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:4562 src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:4580 src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:4593 src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:4602 src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:4621 src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:4636 src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:4647 src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:4660 src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:4678 src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:4691 src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:4700 src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:4715 src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:4725 src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:4738 src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:4749 src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:4759 src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:4770 src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:4805 src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:4816 src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:4826 src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:4837 src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:4872 src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:4883 src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:4893 src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:4904 src/xml/xmli18n-tmp.h:4911
+#: src/xml/xmli18n-tmp.h:4939 src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:4950 src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:4960 src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:4971 src/xml/xmli18n-tmp.h:4978
+#: src/xml/xmli18n-tmp.h:5004 src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:5014 src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:5039 src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:5050 src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:5060 src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:5071 src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:5086 src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:5097 src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:5107 src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:5118 src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:5131 src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:5142 src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:5154 src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:5169 src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:5180 src/xml/xmli18n-tmp.h:5184
+#: src/xml/xmli18n-tmp.h:5190 src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:5201 src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:5236 src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:5247 src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:5257 src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:5268 src/xml/xmli18n-tmp.h:5275
+#: src/xml/xmli18n-tmp.h:5303 src/xml/xmli18n-tmp.h:5309
+#: src/xml/xmli18n-tmp.h:5314 src/xml/xmli18n-tmp.h:5318
+#: src/xml/xmli18n-tmp.h:5324 src/xml/xmli18n-tmp.h:5329
+#: src/xml/xmli18n-tmp.h:5335 src/xml/xmli18n-tmp.h:5342
+#: src/xml/xmli18n-tmp.h:5351 src/xml/xmli18n-tmp.h:5358
+#: src/xml/xmli18n-tmp.h:5364 src/xml/xmli18n-tmp.h:5369
+#: src/xml/xmli18n-tmp.h:5373 src/xml/xmli18n-tmp.h:5385
+#: src/xml/xmli18n-tmp.h:5390 src/xml/xmli18n-tmp.h:5396
+#: src/xml/xmli18n-tmp.h:5403 src/xml/xmli18n-tmp.h:5411
+#: src/xml/xmli18n-tmp.h:5420 src/xml/xmli18n-tmp.h:5427
+#: src/xml/xmli18n-tmp.h:5433 src/xml/xmli18n-tmp.h:5438
+#: src/xml/xmli18n-tmp.h:5442 src/xml/xmli18n-tmp.h:5454
+#: src/xml/xmli18n-tmp.h:5459 src/xml/xmli18n-tmp.h:5465
+#: src/xml/xmli18n-tmp.h:5472 src/xml/xmli18n-tmp.h:5480
+#: src/xml/xmli18n-tmp.h:5490 src/xml/xmli18n-tmp.h:5498
+#: src/xml/xmli18n-tmp.h:5505 src/xml/xmli18n-tmp.h:5511
+#: src/xml/xmli18n-tmp.h:5516 src/xml/xmli18n-tmp.h:5520
+#: src/xml/xmli18n-tmp.h:5529 src/xml/xmli18n-tmp.h:5539
+#: src/xml/xmli18n-tmp.h:5547 src/xml/xmli18n-tmp.h:5554
+#: src/xml/xmli18n-tmp.h:5560 src/xml/xmli18n-tmp.h:5565
+#: src/xml/xmli18n-tmp.h:5569 src/xml/xmli18n-tmp.h:5578
+#: src/xml/xmli18n-tmp.h:5584 src/xml/xmli18n-tmp.h:5588
+#: src/xml/xmli18n-tmp.h:5594 src/xml/xmli18n-tmp.h:5599
+#: src/xml/xmli18n-tmp.h:5617 src/xml/xmli18n-tmp.h:5621
+#: src/xml/xmli18n-tmp.h:5627 src/xml/xmli18n-tmp.h:5632
+#: src/xml/xmli18n-tmp.h:5653 src/xml/xmli18n-tmp.h:5660
+#: src/xml/xmli18n-tmp.h:5666 src/xml/xmli18n-tmp.h:5671
+#: src/xml/xmli18n-tmp.h:5675 src/xml/xmli18n-tmp.h:5687
+#: src/xml/xmli18n-tmp.h:5692 src/xml/xmli18n-tmp.h:5698
+#: src/xml/xmli18n-tmp.h:5705 src/xml/xmli18n-tmp.h:5713
+#: src/xml/xmli18n-tmp.h:5722 src/xml/xmli18n-tmp.h:5729
+#: src/xml/xmli18n-tmp.h:5735 src/xml/xmli18n-tmp.h:5740
+#: src/xml/xmli18n-tmp.h:5744 src/xml/xmli18n-tmp.h:5756
+#: src/xml/xmli18n-tmp.h:5761 src/xml/xmli18n-tmp.h:5767
+#: src/xml/xmli18n-tmp.h:5774 src/xml/xmli18n-tmp.h:5782
+#: src/xml/xmli18n-tmp.h:5788 src/xml/xmli18n-tmp.h:5792
+#: src/xml/xmli18n-tmp.h:5798 src/xml/xmli18n-tmp.h:5803
+#: src/xml/xmli18n-tmp.h:5809 src/xml/xmli18n-tmp.h:5813
+#: src/xml/xmli18n-tmp.h:5819 src/xml/xmli18n-tmp.h:5824
+#: src/xml/xmli18n-tmp.h:5830 src/xml/xmli18n-tmp.h:5834
+#: src/xml/xmli18n-tmp.h:5840 src/xml/xmli18n-tmp.h:5845
 msgid "Yellow"
 msgstr "黃"
 
@@ -860,9 +1325,17 @@ msgstr "調整黃色 gamma 值"
 
 #: src/main/print-color.c:290 src/gutenprintui2/panel.c:2383
 #: src/escputil/escputil.c:1006 src/escputil/escputil.c:1025
-#: src/xml/xmli18n-tmp.h:2656 src/xml/xmli18n-tmp.h:2700
-#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2795
-#: src/xml/xmli18n-tmp.h:3046
+#: src/xml/xmli18n-tmp.h:3180 src/xml/xmli18n-tmp.h:3224
+#: src/xml/xmli18n-tmp.h:3242 src/xml/xmli18n-tmp.h:3319
+#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:3993 src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:4041 src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:4056 src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:4091 src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:4137 src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:4155 src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:4188 src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:5155
 msgid "Red"
 msgstr "ç´…"
 
@@ -880,8 +1353,13 @@ msgstr "調整綠色 gamma 值"
 
 #: src/main/print-color.c:306 src/gutenprintui2/panel.c:2397
 #: src/escputil/escputil.c:1007 src/escputil/escputil.c:1026
-#: src/xml/xmli18n-tmp.h:2657 src/xml/xmli18n-tmp.h:2701
-#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2796
+#: src/xml/xmli18n-tmp.h:3181 src/xml/xmli18n-tmp.h:3225
+#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3320
+#: src/xml/xmli18n-tmp.h:3987 src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:4033 src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:4051 src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:4084 src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:5156
 msgid "Blue"
 msgstr "è—�"
 
@@ -892,53 +1370,183 @@ msgstr "調整�色 gamma 值"
 #: src/main/print-color.c:314 src/main/print-lexmark.c:613
 #: src/gutenprintui2/panel.c:2376 src/escputil/escputil.c:994
 #: src/escputil/escputil.c:1016 src/escputil/escputil.c:1285
-#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1822
-#: src/xml/xmli18n-tmp.h:1835 src/xml/xmli18n-tmp.h:1848
-#: src/xml/xmli18n-tmp.h:1862 src/xml/xmli18n-tmp.h:1875
-#: src/xml/xmli18n-tmp.h:1888 src/xml/xmli18n-tmp.h:1901
-#: src/xml/xmli18n-tmp.h:1917 src/xml/xmli18n-tmp.h:1933
-#: src/xml/xmli18n-tmp.h:1948 src/xml/xmli18n-tmp.h:1961
-#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1986
-#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2012
-#: src/xml/xmli18n-tmp.h:2026 src/xml/xmli18n-tmp.h:2038
-#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2063
-#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2090
-#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2115
-#: src/xml/xmli18n-tmp.h:2129 src/xml/xmli18n-tmp.h:2142
-#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2169
-#: src/xml/xmli18n-tmp.h:2183 src/xml/xmli18n-tmp.h:2196
-#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2222
-#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2248
-#: src/xml/xmli18n-tmp.h:2261 src/xml/xmli18n-tmp.h:2274
-#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2304
-#: src/xml/xmli18n-tmp.h:2319 src/xml/xmli18n-tmp.h:2331
-#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
-#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
-#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2403
-#: src/xml/xmli18n-tmp.h:2414 src/xml/xmli18n-tmp.h:2420
-#: src/xml/xmli18n-tmp.h:2427 src/xml/xmli18n-tmp.h:2441
-#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2465
-#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2495
-#: src/xml/xmli18n-tmp.h:2508 src/xml/xmli18n-tmp.h:2521
-#: src/xml/xmli18n-tmp.h:2536 src/xml/xmli18n-tmp.h:2548
-#: src/xml/xmli18n-tmp.h:2560 src/xml/xmli18n-tmp.h:2573
-#: src/xml/xmli18n-tmp.h:2585 src/xml/xmli18n-tmp.h:2597
-#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2622
-#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2672
-#: src/xml/xmli18n-tmp.h:2682 src/xml/xmli18n-tmp.h:2731
-#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2764
-#: src/xml/xmli18n-tmp.h:2781 src/xml/xmli18n-tmp.h:2794
-#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2815
-#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2839
-#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2868
-#: src/xml/xmli18n-tmp.h:2880 src/xml/xmli18n-tmp.h:2894
-#: src/xml/xmli18n-tmp.h:2911 src/xml/xmli18n-tmp.h:2929
-#: src/xml/xmli18n-tmp.h:2942 src/xml/xmli18n-tmp.h:2977
-#: src/xml/xmli18n-tmp.h:2983 src/xml/xmli18n-tmp.h:3003
-#: src/xml/xmli18n-tmp.h:3017 src/xml/xmli18n-tmp.h:3031
-#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3079
-#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3110
-#: src/xml/xmli18n-tmp.h:3121 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2346
+#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2372
+#: src/xml/xmli18n-tmp.h:2386 src/xml/xmli18n-tmp.h:2399
+#: src/xml/xmli18n-tmp.h:2412 src/xml/xmli18n-tmp.h:2425
+#: src/xml/xmli18n-tmp.h:2441 src/xml/xmli18n-tmp.h:2457
+#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2485
+#: src/xml/xmli18n-tmp.h:2498 src/xml/xmli18n-tmp.h:2510
+#: src/xml/xmli18n-tmp.h:2522 src/xml/xmli18n-tmp.h:2536
+#: src/xml/xmli18n-tmp.h:2550 src/xml/xmli18n-tmp.h:2562
+#: src/xml/xmli18n-tmp.h:2574 src/xml/xmli18n-tmp.h:2587
+#: src/xml/xmli18n-tmp.h:2599 src/xml/xmli18n-tmp.h:2614
+#: src/xml/xmli18n-tmp.h:2625 src/xml/xmli18n-tmp.h:2639
+#: src/xml/xmli18n-tmp.h:2653 src/xml/xmli18n-tmp.h:2666
+#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
+#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2720
+#: src/xml/xmli18n-tmp.h:2733 src/xml/xmli18n-tmp.h:2746
+#: src/xml/xmli18n-tmp.h:2759 src/xml/xmli18n-tmp.h:2772
+#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2798
+#: src/xml/xmli18n-tmp.h:2813 src/xml/xmli18n-tmp.h:2828
+#: src/xml/xmli18n-tmp.h:2843 src/xml/xmli18n-tmp.h:2855
+#: src/xml/xmli18n-tmp.h:2866 src/xml/xmli18n-tmp.h:2879
+#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2903
+#: src/xml/xmli18n-tmp.h:2915 src/xml/xmli18n-tmp.h:2927
+#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2944
+#: src/xml/xmli18n-tmp.h:2951 src/xml/xmli18n-tmp.h:2965
+#: src/xml/xmli18n-tmp.h:2977 src/xml/xmli18n-tmp.h:2989
+#: src/xml/xmli18n-tmp.h:3004 src/xml/xmli18n-tmp.h:3019
+#: src/xml/xmli18n-tmp.h:3032 src/xml/xmli18n-tmp.h:3045
+#: src/xml/xmli18n-tmp.h:3060 src/xml/xmli18n-tmp.h:3072
+#: src/xml/xmli18n-tmp.h:3084 src/xml/xmli18n-tmp.h:3097
+#: src/xml/xmli18n-tmp.h:3109 src/xml/xmli18n-tmp.h:3121
+#: src/xml/xmli18n-tmp.h:3133 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3196
+#: src/xml/xmli18n-tmp.h:3206 src/xml/xmli18n-tmp.h:3255
+#: src/xml/xmli18n-tmp.h:3268 src/xml/xmli18n-tmp.h:3288
+#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3318
+#: src/xml/xmli18n-tmp.h:3326 src/xml/xmli18n-tmp.h:3339
+#: src/xml/xmli18n-tmp.h:3351 src/xml/xmli18n-tmp.h:3363
+#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3391
+#: src/xml/xmli18n-tmp.h:3403 src/xml/xmli18n-tmp.h:3417
+#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3452
+#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3500
+#: src/xml/xmli18n-tmp.h:3506 src/xml/xmli18n-tmp.h:3526
+#: src/xml/xmli18n-tmp.h:3540 src/xml/xmli18n-tmp.h:3554
+#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3602
+#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3633
+#: src/xml/xmli18n-tmp.h:3644 src/xml/xmli18n-tmp.h:3660
+#: src/xml/xmli18n-tmp.h:3680 src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:3755 src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:3770 src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:3789 src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:3804 src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:3819 src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:3831 src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:3846 src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:3858 src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:3873 src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:3885 src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:3897 src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:3912 src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:3924 src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:3943 src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:3958 src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:3982 src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:4008 src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:4022 src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:4037 src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:4059 src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:4074 src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:4087 src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:4113 src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:4127 src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:4142 src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:4164 src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:4179 src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:4192 src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:4207 src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:4219 src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:4228 src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:4243 src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:4255 src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:4274 src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:4289 src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:4308 src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:4336 src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:4351 src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:4369 src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:4386 src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:4408 src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:4413 src/xml/xmli18n-tmp.h:4420
+#: src/xml/xmli18n-tmp.h:4431 src/xml/xmli18n-tmp.h:4438
+#: src/xml/xmli18n-tmp.h:4447 src/xml/xmli18n-tmp.h:4455
+#: src/xml/xmli18n-tmp.h:4468 src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:4480 src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:4489 src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:4507 src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:4525 src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:4546 src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:4565 src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:4582 src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:4604 src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:4623 src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:4644 src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:4663 src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:4680 src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:4702 src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:4721 src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:4733 src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:4755 src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:4772 src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:4786 src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:4800 src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:4822 src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:4839 src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:4853 src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:4867 src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:4889 src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:4906 src/xml/xmli18n-tmp.h:4914
+#: src/xml/xmli18n-tmp.h:4920 src/xml/xmli18n-tmp.h:4926
+#: src/xml/xmli18n-tmp.h:4934 src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:4956 src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:4973 src/xml/xmli18n-tmp.h:4981
+#: src/xml/xmli18n-tmp.h:4987 src/xml/xmli18n-tmp.h:4993
+#: src/xml/xmli18n-tmp.h:5001 src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:5016 src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:5028 src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:5047 src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:5062 src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:5081 src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:5103 src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:5120 src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:5133 src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:5146 src/xml/xmli18n-tmp.h:5151
+#: src/xml/xmli18n-tmp.h:5158 src/xml/xmli18n-tmp.h:5164
+#: src/xml/xmli18n-tmp.h:5177 src/xml/xmli18n-tmp.h:5186
+#: src/xml/xmli18n-tmp.h:5192 src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:5211 src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:5223 src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:5244 src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:5259 src/xml/xmli18n-tmp.h:5270
+#: src/xml/xmli18n-tmp.h:5278 src/xml/xmli18n-tmp.h:5284
+#: src/xml/xmli18n-tmp.h:5290 src/xml/xmli18n-tmp.h:5298
+#: src/xml/xmli18n-tmp.h:5311 src/xml/xmli18n-tmp.h:5320
+#: src/xml/xmli18n-tmp.h:5326 src/xml/xmli18n-tmp.h:5337
+#: src/xml/xmli18n-tmp.h:5345 src/xml/xmli18n-tmp.h:5353
+#: src/xml/xmli18n-tmp.h:5366 src/xml/xmli18n-tmp.h:5375
+#: src/xml/xmli18n-tmp.h:5378 src/xml/xmli18n-tmp.h:5380
+#: src/xml/xmli18n-tmp.h:5387 src/xml/xmli18n-tmp.h:5398
+#: src/xml/xmli18n-tmp.h:5405 src/xml/xmli18n-tmp.h:5414
+#: src/xml/xmli18n-tmp.h:5422 src/xml/xmli18n-tmp.h:5435
+#: src/xml/xmli18n-tmp.h:5444 src/xml/xmli18n-tmp.h:5447
+#: src/xml/xmli18n-tmp.h:5449 src/xml/xmli18n-tmp.h:5456
+#: src/xml/xmli18n-tmp.h:5467 src/xml/xmli18n-tmp.h:5474
+#: src/xml/xmli18n-tmp.h:5483 src/xml/xmli18n-tmp.h:5492
+#: src/xml/xmli18n-tmp.h:5500 src/xml/xmli18n-tmp.h:5513
+#: src/xml/xmli18n-tmp.h:5522 src/xml/xmli18n-tmp.h:5532
+#: src/xml/xmli18n-tmp.h:5541 src/xml/xmli18n-tmp.h:5549
+#: src/xml/xmli18n-tmp.h:5562 src/xml/xmli18n-tmp.h:5571
+#: src/xml/xmli18n-tmp.h:5581 src/xml/xmli18n-tmp.h:5590
+#: src/xml/xmli18n-tmp.h:5596 src/xml/xmli18n-tmp.h:5602
+#: src/xml/xmli18n-tmp.h:5608 src/xml/xmli18n-tmp.h:5614
+#: src/xml/xmli18n-tmp.h:5623 src/xml/xmli18n-tmp.h:5629
+#: src/xml/xmli18n-tmp.h:5635 src/xml/xmli18n-tmp.h:5641
+#: src/xml/xmli18n-tmp.h:5647 src/xml/xmli18n-tmp.h:5655
+#: src/xml/xmli18n-tmp.h:5668 src/xml/xmli18n-tmp.h:5677
+#: src/xml/xmli18n-tmp.h:5680 src/xml/xmli18n-tmp.h:5682
+#: src/xml/xmli18n-tmp.h:5689 src/xml/xmli18n-tmp.h:5700
+#: src/xml/xmli18n-tmp.h:5707 src/xml/xmli18n-tmp.h:5716
+#: src/xml/xmli18n-tmp.h:5724 src/xml/xmli18n-tmp.h:5737
+#: src/xml/xmli18n-tmp.h:5746 src/xml/xmli18n-tmp.h:5749
+#: src/xml/xmli18n-tmp.h:5751 src/xml/xmli18n-tmp.h:5758
+#: src/xml/xmli18n-tmp.h:5769 src/xml/xmli18n-tmp.h:5776
+#: src/xml/xmli18n-tmp.h:5785 src/xml/xmli18n-tmp.h:5794
+#: src/xml/xmli18n-tmp.h:5800 src/xml/xmli18n-tmp.h:5806
+#: src/xml/xmli18n-tmp.h:5815 src/xml/xmli18n-tmp.h:5821
+#: src/xml/xmli18n-tmp.h:5827 src/xml/xmli18n-tmp.h:5836
+#: src/xml/xmli18n-tmp.h:5842
 msgid "Black"
 msgstr "黑"
 
@@ -946,7 +1554,7 @@ msgstr "黑"
 msgid "Adjust the black gamma"
 msgstr "調整黑色 gamma 值"
 
-#: src/main/print-color.c:322 src/main/print-olympus.c:1769
+#: src/main/print-color.c:322 src/main/print-olympus.c:1935
 msgid "Cyan Balance"
 msgstr "氰�色平衡"
 
@@ -959,7 +1567,7 @@ msgstr ""
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:330 src/main/print-olympus.c:1777
+#: src/main/print-color.c:330 src/main/print-olympus.c:1943
 msgid "Magenta Balance"
 msgstr "洋紅色平衡"
 
@@ -967,7 +1575,7 @@ msgstr "洋紅色平衡"
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:338 src/main/print-olympus.c:1785
+#: src/main/print-color.c:338 src/main/print-olympus.c:1951
 msgid "Yellow Balance"
 msgstr "黃色平衡"
 
@@ -994,11 +1602,11 @@ msgstr ""
 #: src/main/print-color.c:357 src/main/print-color.c:365
 #: src/main/print-color.c:373 src/main/print-color.c:381
 #: src/main/print-color.c:421 src/main/print-color.c:553
-#: src/main/print-escp2.c:338 src/main/print-escp2.c:344
-#: src/main/print-escp2.c:350 src/main/print-escp2.c:356
-#: src/main/print-escp2.c:362 src/main/print-escp2.c:368
-#: src/main/print-escp2.c:743 src/main/print-escp2.c:751
-#: src/main/print-escp2.c:759
+#: src/main/print-escp2.c:344 src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356 src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368 src/main/print-escp2.c:374
+#: src/main/print-escp2.c:869 src/main/print-escp2.c:877
+#: src/main/print-escp2.c:885
 msgid "Advanced Output Control"
 msgstr ""
 
@@ -1006,27 +1614,27 @@ msgstr ""
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:365 src/main/print-escp2.c:743
+#: src/main/print-color.c:365 src/main/print-escp2.c:869
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:366 src/main/print-escp2.c:744
+#: src/main/print-color.c:366 src/main/print-escp2.c:870
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:373 src/main/print-escp2.c:751
+#: src/main/print-color.c:373 src/main/print-escp2.c:877
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:374 src/main/print-escp2.c:752
+#: src/main/print-color.c:374 src/main/print-escp2.c:878
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:381 src/main/print-escp2.c:759
+#: src/main/print-color.c:381 src/main/print-escp2.c:885
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:382 src/main/print-escp2.c:760
+#: src/main/print-color.c:382 src/main/print-escp2.c:886
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
@@ -1275,11 +1883,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:254 src/main/print-olympus.c:1740
+#: src/main/print-escp2.c:254 src/main/print-olympus.c:1906
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:255 src/main/print-olympus.c:1741
+#: src/main/print-escp2.c:255 src/main/print-olympus.c:1907
 msgid "Print without borders"
 msgstr ""
 
@@ -1292,7 +1900,7 @@ msgid "Interleave pattern to use"
 msgstr ""
 
 #: src/main/print-escp2.c:266 src/main/print-escp2.c:267
-#: src/cups/genppd.c:1567 src/cups/genppd.c:2078
+#: src/cups/genppd.c:1600 src/cups/genppd.c:2112
 msgid "Output Order"
 msgstr ""
 
@@ -1333,349 +1941,457 @@ msgid "Has multiple choices of ink cartridges"
 msgstr ""
 
 #: src/main/print-escp2.c:320 src/main/print-escp2.c:321
+msgid "Raw Channel Names"
+msgstr ""
+
+#: src/main/print-escp2.c:326 src/main/print-escp2.c:327
 msgid "Channel Names"
 msgstr ""
 
-#: src/main/print-escp2.c:333
+#: src/main/print-escp2.c:339
 msgid "Raw Channel Count"
 msgstr ""
 
-#: src/main/print-escp2.c:338
+#: src/main/print-escp2.c:344
 msgid "Cyan Map"
 msgstr ""
 
-#: src/main/print-escp2.c:339
+#: src/main/print-escp2.c:345
 msgid "Adjust the cyan map"
 msgstr ""
 
-#: src/main/print-escp2.c:344
+#: src/main/print-escp2.c:350
 msgid "Magenta Map"
 msgstr ""
 
-#: src/main/print-escp2.c:345
+#: src/main/print-escp2.c:351
 msgid "Adjust the magenta map"
 msgstr ""
 
-#: src/main/print-escp2.c:350
+#: src/main/print-escp2.c:356
 msgid "Yellow Map"
 msgstr ""
 
-#: src/main/print-escp2.c:351
+#: src/main/print-escp2.c:357
 msgid "Adjust the yellow map"
 msgstr ""
 
-#: src/main/print-escp2.c:356
+#: src/main/print-escp2.c:362
 msgid "Blue Map"
 msgstr ""
 
-#: src/main/print-escp2.c:357
+#: src/main/print-escp2.c:363
 msgid "Adjust the blue map"
 msgstr ""
 
-#: src/main/print-escp2.c:362
+#: src/main/print-escp2.c:368
 msgid "Orange Map"
 msgstr ""
 
-#: src/main/print-escp2.c:363
+#: src/main/print-escp2.c:369
 #, fuzzy
 msgid "Adjust the orange map"
 msgstr "調整紅色 gamma 值"
 
-#: src/main/print-escp2.c:368
+#: src/main/print-escp2.c:374
 msgid "Red Map"
 msgstr ""
 
-#: src/main/print-escp2.c:369
+#: src/main/print-escp2.c:375
 msgid "Adjust the red map"
 msgstr ""
 
-#: src/main/print-escp2.c:471
+#: src/main/print-escp2.c:477
 msgid "Red Density"
 msgstr "紅色密度"
 
-#: src/main/print-escp2.c:472
+#: src/main/print-escp2.c:478
 msgid "Adjust the red density"
 msgstr "調整紅色色彩密度"
 
-#: src/main/print-escp2.c:479
+#: src/main/print-escp2.c:485
 msgid "Blue Density"
 msgstr "�色密度"
 
-#: src/main/print-escp2.c:480
+#: src/main/print-escp2.c:486
 msgid "Adjust the blue density"
 msgstr "調整�色色彩密度"
 
-#: src/main/print-escp2.c:487
+#: src/main/print-escp2.c:493
 #, fuzzy
 msgid "Orange Density"
 msgstr "氰�色密度"
 
-#: src/main/print-escp2.c:488
+#: src/main/print-escp2.c:494
 #, fuzzy
 msgid "Adjust the orange density"
 msgstr "調整紅色色彩密度"
 
-#: src/main/print-escp2.c:495
+#: src/main/print-escp2.c:501
 msgid "Gloss Level"
 msgstr ""
 
-#: src/main/print-escp2.c:496
+#: src/main/print-escp2.c:502
 msgid "Adjust the gloss level"
 msgstr ""
 
-#: src/main/print-escp2.c:503
+#: src/main/print-escp2.c:509
 msgid "Drop Size Small"
 msgstr ""
 
-#: src/main/print-escp2.c:504
+#: src/main/print-escp2.c:510
 msgid "Drop Size 1 (small)"
 msgstr ""
 
-#: src/main/print-escp2.c:511
+#: src/main/print-escp2.c:517
 msgid "Drop Size Medium"
 msgstr ""
 
-#: src/main/print-escp2.c:512
+#: src/main/print-escp2.c:518
 msgid "Drop Size 2 (medium)"
 msgstr ""
 
-#: src/main/print-escp2.c:519
+#: src/main/print-escp2.c:525
 msgid "Drop Size Large"
 msgstr ""
 
-#: src/main/print-escp2.c:520
+#: src/main/print-escp2.c:526
 msgid "Drop Size 3 (large)"
 msgstr ""
 
-#: src/main/print-escp2.c:527 src/main/print-escp2.c:528
+#: src/main/print-escp2.c:533 src/main/print-escp2.c:534
 msgid "Light Cyan Value"
 msgstr ""
 
-#: src/main/print-escp2.c:543 src/main/print-escp2.c:544
+#: src/main/print-escp2.c:549 src/main/print-escp2.c:550
 #, fuzzy
 msgid "Light Cyan Density Scale"
 msgstr "氰�色密度"
 
-#: src/main/print-escp2.c:551 src/main/print-escp2.c:552
+#: src/main/print-escp2.c:557 src/main/print-escp2.c:558
 #, fuzzy
 msgid "Light Magenta Value"
 msgstr "洋紅色平衡"
 
-#: src/main/print-escp2.c:559 src/main/print-escp2.c:560
+#: src/main/print-escp2.c:565 src/main/print-escp2.c:566
 #, fuzzy
 msgid "Light Magenta Density Scale"
 msgstr "洋紅色密度"
 
-#: src/main/print-escp2.c:575 src/main/print-escp2.c:576
+#: src/main/print-escp2.c:581 src/main/print-escp2.c:582
 #, fuzzy
 msgid "Dark Yellow Value"
 msgstr "黃色平衡"
 
-#: src/main/print-escp2.c:583 src/main/print-escp2.c:584
+#: src/main/print-escp2.c:589 src/main/print-escp2.c:590
 msgid "Dark Yellow Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:591 src/main/print-escp2.c:592
+#: src/main/print-escp2.c:597 src/main/print-escp2.c:598
 #, fuzzy
 msgid "Dark Yellow Density Scale"
 msgstr "黃色密度"
 
-#: src/main/print-escp2.c:599 src/main/print-escp2.c:600
-#: src/main/print-escp2.c:623 src/main/print-escp2.c:624
+#: src/main/print-escp2.c:605 src/main/print-escp2.c:606
+#: src/main/print-escp2.c:629 src/main/print-escp2.c:630
 #, fuzzy
 msgid "Gray Value"
 msgstr "�階"
 
-#: src/main/print-escp2.c:607 src/main/print-escp2.c:608
-#: src/main/print-escp2.c:631 src/main/print-escp2.c:632
+#: src/main/print-escp2.c:613 src/main/print-escp2.c:614
+#: src/main/print-escp2.c:637 src/main/print-escp2.c:638
 msgid "Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:615 src/main/print-escp2.c:616
-#: src/main/print-escp2.c:639 src/main/print-escp2.c:640
+#: src/main/print-escp2.c:621 src/main/print-escp2.c:622
+#: src/main/print-escp2.c:645 src/main/print-escp2.c:646
 #, fuzzy
 msgid "Gray Density Scale"
 msgstr "�階"
 
-#: src/main/print-escp2.c:647 src/main/print-escp2.c:648
-#: src/main/print-escp2.c:719 src/main/print-escp2.c:720
+#: src/main/print-escp2.c:653 src/main/print-escp2.c:654
+#: src/main/print-escp2.c:725 src/main/print-escp2.c:726
 msgid "Light Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:655 src/main/print-escp2.c:656
-#: src/main/print-escp2.c:727 src/main/print-escp2.c:728
+#: src/main/print-escp2.c:661 src/main/print-escp2.c:662
+#: src/main/print-escp2.c:733 src/main/print-escp2.c:734
 msgid "Light Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:663 src/main/print-escp2.c:664
-#: src/main/print-escp2.c:735 src/main/print-escp2.c:736
+#: src/main/print-escp2.c:669 src/main/print-escp2.c:670
+#: src/main/print-escp2.c:741 src/main/print-escp2.c:742
 msgid "Light Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:671 src/main/print-escp2.c:672
+#: src/main/print-escp2.c:677 src/main/print-escp2.c:678
 msgid "Dark Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:679 src/main/print-escp2.c:680
+#: src/main/print-escp2.c:685 src/main/print-escp2.c:686
 msgid "Dark Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:687 src/main/print-escp2.c:688
+#: src/main/print-escp2.c:693 src/main/print-escp2.c:694
 msgid "Dark Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:695
+#: src/main/print-escp2.c:701
 #, fuzzy
 msgid "Mid Gray Value"
 msgstr "�階"
 
-#: src/main/print-escp2.c:696
+#: src/main/print-escp2.c:702
 msgid "Medium Gray Value"
 msgstr ""
 
-#: src/main/print-escp2.c:703
+#: src/main/print-escp2.c:709
 msgid "Mid Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:704
+#: src/main/print-escp2.c:710
 msgid "Medium Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:711
+#: src/main/print-escp2.c:717
 msgid "Mid Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:712
+#: src/main/print-escp2.c:718
 msgid "Medium Gray Density Scale"
 msgstr ""
 
-#: src/main/print-escp2.c:767
+#: src/main/print-escp2.c:749
+#, fuzzy
+msgid "Hextone Gray 5 Value"
+msgstr "�階"
+
+#: src/main/print-escp2.c:750
+msgid "Hextone Gray 5 (Darkest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:757
+msgid "Hextone Gray 5 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:758
+msgid "Hextone Gray 5 (Darkest) Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:765
+#, fuzzy
+msgid "Hextone Gray 5 Density Scale"
+msgstr "�階"
+
+#: src/main/print-escp2.c:766
+#, fuzzy
+msgid "Hextone Gray 5 (Darkest) Density Scale"
+msgstr "�階"
+
+#: src/main/print-escp2.c:773 src/main/print-escp2.c:774
+#, fuzzy
+msgid "Hextone Gray 4 Value"
+msgstr "�階"
+
+#: src/main/print-escp2.c:781 src/main/print-escp2.c:782
+msgid "Hextone Gray 4 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:789 src/main/print-escp2.c:790
+#, fuzzy
+msgid "Hextone Gray 4 Density Scale"
+msgstr "�階"
+
+#: src/main/print-escp2.c:797 src/main/print-escp2.c:798
+#, fuzzy
+msgid "Hextone Gray 3 Value"
+msgstr "�階"
+
+#: src/main/print-escp2.c:805 src/main/print-escp2.c:806
+msgid "Hextone Gray 3 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:813 src/main/print-escp2.c:814
+#, fuzzy
+msgid "Hextone Gray 3 Density Scale"
+msgstr "�階"
+
+#: src/main/print-escp2.c:821 src/main/print-escp2.c:822
+#, fuzzy
+msgid "Hextone Gray 2 Value"
+msgstr "�階"
+
+#: src/main/print-escp2.c:829 src/main/print-escp2.c:830
+msgid "Hextone Gray 2 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:837 src/main/print-escp2.c:838
+#, fuzzy
+msgid "Hextone Gray 2 Density Scale"
+msgstr "�階"
+
+#: src/main/print-escp2.c:845
+#, fuzzy
+msgid "Hextone Gray 1 Value"
+msgstr "�階"
+
+#: src/main/print-escp2.c:846
+msgid "Hextone Gray 1 (Lightest) Value"
+msgstr ""
+
+#: src/main/print-escp2.c:853
+msgid "Hextone Gray 1 Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:854
+msgid "Hextone Gray 1 (Lightest) Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:861
+#, fuzzy
+msgid "Hextone Gray 1 Density Scale"
+msgstr "�階"
+
+#: src/main/print-escp2.c:862
+#, fuzzy
+msgid "Hextone Gray 1 (Lightest) Density Scale"
+msgstr "洋紅色密度"
+
+#: src/main/print-escp2.c:893
 msgid "Drying Time Per Page"
 msgstr ""
 
-#: src/main/print-escp2.c:768
+#: src/main/print-escp2.c:894
 msgid "Set drying time per page"
 msgstr ""
 
-#: src/main/print-escp2.c:775
+#: src/main/print-escp2.c:901
 msgid "Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:776
+#: src/main/print-escp2.c:902
 msgid "Set drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:783
+#: src/main/print-escp2.c:909
 msgid "Minimum Drying Time Per Scan"
 msgstr ""
 
-#: src/main/print-escp2.c:784
+#: src/main/print-escp2.c:910
 msgid "Set minimum drying time per scan"
 msgstr ""
 
-#: src/main/print-escp2.c:799
+#: src/main/print-escp2.c:925
+msgid "Quality Enhancement"
+msgstr ""
+
+#: src/main/print-escp2.c:926
+msgid "Enhance print quality by additional passes"
+msgstr ""
+
+#: src/main/print-escp2.c:933
 #, fuzzy
 msgid "Paper Thickness"
 msgstr "紙張尺寸"
 
-#: src/main/print-escp2.c:800
+#: src/main/print-escp2.c:934
 msgid "Set printer paper thickness"
 msgstr ""
 
-#: src/main/print-escp2.c:807
+#: src/main/print-escp2.c:941
 #, fuzzy
 msgid "Vacuum Intensity"
 msgstr "黑色密度"
 
-#: src/main/print-escp2.c:808
+#: src/main/print-escp2.c:942
 msgid "Set vacuum intensity (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:815
+#: src/main/print-escp2.c:949
 msgid "Feed Sequence"
 msgstr ""
 
-#: src/main/print-escp2.c:816
+#: src/main/print-escp2.c:950
 msgid "Set paper feed sequence (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:823
+#: src/main/print-escp2.c:957
 #, fuzzy
 msgid "Print Method"
 msgstr "列�模�"
 
-#: src/main/print-escp2.c:824
+#: src/main/print-escp2.c:958
 msgid "Set print method (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:831
+#: src/main/print-escp2.c:965
 #, fuzzy
 msgid "Platen Gap"
 msgstr "普通紙張"
 
-#: src/main/print-escp2.c:832
+#: src/main/print-escp2.c:966
 msgid "Set platen gap (printer-specific)"
 msgstr ""
 
-#: src/main/print-escp2.c:839
+#: src/main/print-escp2.c:973
 msgid "Feed Adjustment"
 msgstr ""
 
-#: src/main/print-escp2.c:840
-#, c-format
+#: src/main/print-escp2.c:975
+#, no-c-format
 msgid "Set paper feed adjustment (0.01% units)"
 msgstr ""
 
-#: src/main/print-escp2.c:1992
+#: src/main/print-escp2.c:2197
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1994
+#: src/main/print-escp2.c:2199
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:2208 src/cups/genppd.c:1484 src/cups/genppd.c:2059
+#: src/main/print-escp2.c:2413 src/cups/genppd.c:1517 src/cups/genppd.c:2093
 msgid "Automatic"
 msgstr "自動"
 
-#: src/main/print-escp2.c:2210
+#: src/main/print-escp2.c:2415
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:2212
+#: src/main/print-escp2.c:2417
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:2243
+#: src/main/print-escp2.c:2448
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2245
+#: src/main/print-escp2.c:2450
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2247
+#: src/main/print-escp2.c:2452
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:2249
+#: src/main/print-escp2.c:2454
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:2251
+#: src/main/print-escp2.c:2456
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2287
+#: src/main/print-escp2.c:2492
 msgid "Short Edge(Flip)"
 msgstr ""
 
-#: src/main/print-escp2.c:2858
+#: src/main/print-escp2.c:3100
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:4107 src/main/print-olympus.c:2472
+#: src/main/print-escp2.c:4355 src/main/print-olympus.c:2641
 #: src/main/print-raw.c:218
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1729,368 +2445,385 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3205
-#: src/xml/xmli18n-tmp.h:3211 src/xml/xmli18n-tmp.h:3217
-#: src/xml/xmli18n-tmp.h:3225 src/xml/xmli18n-tmp.h:3233
-#: src/xml/xmli18n-tmp.h:3243 src/xml/xmli18n-tmp.h:3255
-#: src/xml/xmli18n-tmp.h:3267 src/xml/xmli18n-tmp.h:3276
-#: src/xml/xmli18n-tmp.h:3288 src/xml/xmli18n-tmp.h:3295
-#: src/xml/xmli18n-tmp.h:3305 src/xml/xmli18n-tmp.h:3315
-#: src/xml/xmli18n-tmp.h:3327 src/xml/xmli18n-tmp.h:3339
-#: src/xml/xmli18n-tmp.h:3353 src/xml/xmli18n-tmp.h:3368
-#: src/xml/xmli18n-tmp.h:3376 src/xml/xmli18n-tmp.h:3380
-#: src/xml/xmli18n-tmp.h:3388 src/xml/xmli18n-tmp.h:3400
-#: src/xml/xmli18n-tmp.h:3412 src/xml/xmli18n-tmp.h:3424
-#: src/xml/xmli18n-tmp.h:3434 src/xml/xmli18n-tmp.h:3444
-#: src/xml/xmli18n-tmp.h:3454 src/xml/xmli18n-tmp.h:3472
-#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3496
-#: src/xml/xmli18n-tmp.h:3507 src/xml/xmli18n-tmp.h:3521
-#: src/xml/xmli18n-tmp.h:3536 src/xml/xmli18n-tmp.h:3544
-#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3556
-#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:3581
-#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3598
-#: src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3754 src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:3809 src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:3863 src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:3942 src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:4058 src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:4163 src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:4227 src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:4335 src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:4467 src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:4594 src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:4692 src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:4745 src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:4879 src/xml/xmli18n-tmp.h:4946
+#: src/xml/xmli18n-tmp.h:5000 src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:5093 src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:5243 src/xml/xmli18n-tmp.h:5310
+#: src/xml/xmli18n-tmp.h:5365 src/xml/xmli18n-tmp.h:5434
+#: src/xml/xmli18n-tmp.h:5512 src/xml/xmli18n-tmp.h:5561
+#: src/xml/xmli18n-tmp.h:5580 src/xml/xmli18n-tmp.h:5613
+#: src/xml/xmli18n-tmp.h:5667 src/xml/xmli18n-tmp.h:5736
+#: src/xml/xmli18n-tmp.h:5784 src/xml/xmli18n-tmp.h:5805
+#: src/xml/xmli18n-tmp.h:5826
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3206
-#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3218
-#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3234
-#: src/xml/xmli18n-tmp.h:3244 src/xml/xmli18n-tmp.h:3251
-#: src/xml/xmli18n-tmp.h:3256 src/xml/xmli18n-tmp.h:3268
-#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3289
-#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3306
-#: src/xml/xmli18n-tmp.h:3316 src/xml/xmli18n-tmp.h:3328
-#: src/xml/xmli18n-tmp.h:3340 src/xml/xmli18n-tmp.h:3354
-#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3377
-#: src/xml/xmli18n-tmp.h:3381 src/xml/xmli18n-tmp.h:3389
-#: src/xml/xmli18n-tmp.h:3401 src/xml/xmli18n-tmp.h:3413
-#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3435
-#: src/xml/xmli18n-tmp.h:3445 src/xml/xmli18n-tmp.h:3455
-#: src/xml/xmli18n-tmp.h:3473 src/xml/xmli18n-tmp.h:3485
-#: src/xml/xmli18n-tmp.h:3497 src/xml/xmli18n-tmp.h:3508
-#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3537
-#: src/xml/xmli18n-tmp.h:3545 src/xml/xmli18n-tmp.h:3549
-#: src/xml/xmli18n-tmp.h:3557 src/xml/xmli18n-tmp.h:3568
-#: src/xml/xmli18n-tmp.h:3582 src/xml/xmli18n-tmp.h:3593
-#: src/xml/xmli18n-tmp.h:3599 src/xml/xmli18n-tmp.h:3605
+#: src/xml/xmli18n-tmp.h:3759 src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:3814 src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:3868 src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:3947 src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:4002 src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:4107 src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:4196 src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:4278 src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:4403 src/xml/xmli18n-tmp.h:4472
+#: src/xml/xmli18n-tmp.h:4550 src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:4648 src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:4716 src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:4817 src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:4951 src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:5051 src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:5181 src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:5315 src/xml/xmli18n-tmp.h:5370
+#: src/xml/xmli18n-tmp.h:5439 src/xml/xmli18n-tmp.h:5517
+#: src/xml/xmli18n-tmp.h:5566 src/xml/xmli18n-tmp.h:5585
+#: src/xml/xmli18n-tmp.h:5618 src/xml/xmli18n-tmp.h:5672
+#: src/xml/xmli18n-tmp.h:5741 src/xml/xmli18n-tmp.h:5789
+#: src/xml/xmli18n-tmp.h:5810 src/xml/xmli18n-tmp.h:5831
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/xml/xmli18n-tmp.h:3195 src/xml/xmli18n-tmp.h:3241
-#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3265
-#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3286
-#: src/xml/xmli18n-tmp.h:3313 src/xml/xmli18n-tmp.h:3325
-#: src/xml/xmli18n-tmp.h:3337 src/xml/xmli18n-tmp.h:3351
-#: src/xml/xmli18n-tmp.h:3366 src/xml/xmli18n-tmp.h:3374
-#: src/xml/xmli18n-tmp.h:3386 src/xml/xmli18n-tmp.h:3398
-#: src/xml/xmli18n-tmp.h:3410 src/xml/xmli18n-tmp.h:3422
-#: src/xml/xmli18n-tmp.h:3442 src/xml/xmli18n-tmp.h:3452
-#: src/xml/xmli18n-tmp.h:3465 src/xml/xmli18n-tmp.h:3470
-#: src/xml/xmli18n-tmp.h:3482 src/xml/xmli18n-tmp.h:3494
-#: src/xml/xmli18n-tmp.h:3505 src/xml/xmli18n-tmp.h:3519
-#: src/xml/xmli18n-tmp.h:3534 src/xml/xmli18n-tmp.h:3542
-#: src/xml/xmli18n-tmp.h:3565 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3741 src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:3981 src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:4086 src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:4260 src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:4385 src/xml/xmli18n-tmp.h:4454
+#: src/xml/xmli18n-tmp.h:4532 src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:4630 src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:4732 src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:4866 src/xml/xmli18n-tmp.h:4933
+#: src/xml/xmli18n-tmp.h:5033 src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:5138 src/xml/xmli18n-tmp.h:5163
+#: src/xml/xmli18n-tmp.h:5230 src/xml/xmli18n-tmp.h:5297
+#: src/xml/xmli18n-tmp.h:5352 src/xml/xmli18n-tmp.h:5421
+#: src/xml/xmli18n-tmp.h:5499 src/xml/xmli18n-tmp.h:5548
+#: src/xml/xmli18n-tmp.h:5654 src/xml/xmli18n-tmp.h:5723
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/xml/xmli18n-tmp.h:3196 src/xml/xmli18n-tmp.h:3242
-#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3266
-#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3287
-#: src/xml/xmli18n-tmp.h:3314 src/xml/xmli18n-tmp.h:3326
-#: src/xml/xmli18n-tmp.h:3338 src/xml/xmli18n-tmp.h:3352
-#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3375
-#: src/xml/xmli18n-tmp.h:3387 src/xml/xmli18n-tmp.h:3399
-#: src/xml/xmli18n-tmp.h:3411 src/xml/xmli18n-tmp.h:3423
-#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3453
-#: src/xml/xmli18n-tmp.h:3471 src/xml/xmli18n-tmp.h:3483
-#: src/xml/xmli18n-tmp.h:3495 src/xml/xmli18n-tmp.h:3506
-#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3535
-#: src/xml/xmli18n-tmp.h:3543 src/xml/xmli18n-tmp.h:3566
-#: src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3748 src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:3989 src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:4094 src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:4267 src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:4392 src/xml/xmli18n-tmp.h:4461
+#: src/xml/xmli18n-tmp.h:4539 src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:4637 src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:4739 src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:4873 src/xml/xmli18n-tmp.h:4940
+#: src/xml/xmli18n-tmp.h:5040 src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:5170 src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:5304 src/xml/xmli18n-tmp.h:5359
+#: src/xml/xmli18n-tmp.h:5428 src/xml/xmli18n-tmp.h:5506
+#: src/xml/xmli18n-tmp.h:5555 src/xml/xmli18n-tmp.h:5661
+#: src/xml/xmli18n-tmp.h:5730
 msgid "Five Color Photo Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:856 src/xml/xmli18n-tmp.h:1
-#: src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:142
-#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:256
-#: src/xml/xmli18n-tmp.h:300 src/xml/xmli18n-tmp.h:344
-#: src/xml/xmli18n-tmp.h:382 src/xml/xmli18n-tmp.h:442
-#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:559
-#: src/xml/xmli18n-tmp.h:616 src/xml/xmli18n-tmp.h:654
-#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:755
-#: src/xml/xmli18n-tmp.h:815 src/xml/xmli18n-tmp.h:849
-#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:963
-#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1077
-#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1170
-#: src/xml/xmli18n-tmp.h:1220 src/xml/xmli18n-tmp.h:1277
-#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1376
-#: src/xml/xmli18n-tmp.h:1439 src/xml/xmli18n-tmp.h:1502
-#: src/xml/xmli18n-tmp.h:1562 src/xml/xmli18n-tmp.h:1619
-#: src/xml/xmli18n-tmp.h:1676 src/xml/xmli18n-tmp.h:1739
-#: src/xml/xmli18n-tmp.h:1773
+#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:131
+#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:283
+#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:403
+#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:485
+#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:605
+#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:757
+#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:833
+#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:956
+#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1050
+#: src/xml/xmli18n-tmp.h:1145 src/xml/xmli18n-tmp.h:1240
+#: src/xml/xmli18n-tmp.h:1335 src/xml/xmli18n-tmp.h:1449
+#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1580
+#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1725
+#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1862
+#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1988
+#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2124
+#: src/xml/xmli18n-tmp.h:2200 src/xml/xmli18n-tmp.h:2263
+#: src/xml/xmli18n-tmp.h:2297
 msgid "Plain Paper"
 msgstr "普通紙張"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:55
-#: src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:151
-#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:262
-#: src/xml/xmli18n-tmp.h:306 src/xml/xmli18n-tmp.h:350
-#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:448
-#: src/xml/xmli18n-tmp.h:511 src/xml/xmli18n-tmp.h:568
-#: src/xml/xmli18n-tmp.h:622 src/xml/xmli18n-tmp.h:660
-#: src/xml/xmli18n-tmp.h:701 src/xml/xmli18n-tmp.h:761
-#: src/xml/xmli18n-tmp.h:819 src/xml/xmli18n-tmp.h:858
-#: src/xml/xmli18n-tmp.h:915 src/xml/xmli18n-tmp.h:972
-#: src/xml/xmli18n-tmp.h:1029 src/xml/xmli18n-tmp.h:1086
-#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1176
-#: src/xml/xmli18n-tmp.h:1229 src/xml/xmli18n-tmp.h:1286
-#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1385
-#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1508
-#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1628
-#: src/xml/xmli18n-tmp.h:1685 src/xml/xmli18n-tmp.h:1743
-#: src/xml/xmli18n-tmp.h:1779
+#: src/main/print-lexmark.c:860 src/xml/xmli18n-tmp.h:7
+#: src/xml/xmli18n-tmp.h:101 src/xml/xmli18n-tmp.h:143
+#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:295
+#: src/xml/xmli18n-tmp.h:365 src/xml/xmli18n-tmp.h:409
+#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:491
+#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:617
+#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:763
+#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:842
+#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:962
+#: src/xml/xmli18n-tmp.h:1020 src/xml/xmli18n-tmp.h:1065
+#: src/xml/xmli18n-tmp.h:1160 src/xml/xmli18n-tmp.h:1255
+#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1464
+#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1586
+#: src/xml/xmli18n-tmp.h:1645 src/xml/xmli18n-tmp.h:1740
+#: src/xml/xmli18n-tmp.h:1826 src/xml/xmli18n-tmp.h:1871
+#: src/xml/xmli18n-tmp.h:1934 src/xml/xmli18n-tmp.h:1994
+#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2136
+#: src/xml/xmli18n-tmp.h:2209 src/xml/xmli18n-tmp.h:2267
+#: src/xml/xmli18n-tmp.h:2303
 msgid "Glossy Film"
 msgstr "光�膠片"
 
-#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:7
-#: src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:97 src/xml/xmli18n-tmp.h:154
-#: src/xml/xmli18n-tmp.h:211 src/xml/xmli18n-tmp.h:264
-#: src/xml/xmli18n-tmp.h:308 src/xml/xmli18n-tmp.h:352
-#: src/xml/xmli18n-tmp.h:391 src/xml/xmli18n-tmp.h:451
-#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:571
-#: src/xml/xmli18n-tmp.h:624 src/xml/xmli18n-tmp.h:662
-#: src/xml/xmli18n-tmp.h:704 src/xml/xmli18n-tmp.h:764
-#: src/xml/xmli18n-tmp.h:821 src/xml/xmli18n-tmp.h:861
-#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:975
-#: src/xml/xmli18n-tmp.h:1032 src/xml/xmli18n-tmp.h:1089
-#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1178
-#: src/xml/xmli18n-tmp.h:1232 src/xml/xmli18n-tmp.h:1289
-#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1388
-#: src/xml/xmli18n-tmp.h:1451 src/xml/xmli18n-tmp.h:1511
-#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1631
-#: src/xml/xmli18n-tmp.h:1688 src/xml/xmli18n-tmp.h:1745
-#: src/xml/xmli18n-tmp.h:1781
+#: src/main/print-lexmark.c:864 src/xml/xmli18n-tmp.h:9
+#: src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:103
+#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:223
+#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:367
+#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:455
+#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:554
+#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:697
+#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:803
+#: src/xml/xmli18n-tmp.h:845 src/xml/xmli18n-tmp.h:905
+#: src/xml/xmli18n-tmp.h:965 src/xml/xmli18n-tmp.h:1022
+#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1165
+#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1359
+#: src/xml/xmli18n-tmp.h:1469 src/xml/xmli18n-tmp.h:1550
+#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1650
+#: src/xml/xmli18n-tmp.h:1745 src/xml/xmli18n-tmp.h:1828
+#: src/xml/xmli18n-tmp.h:1874 src/xml/xmli18n-tmp.h:1937
+#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2064
+#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2212
+#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2305
 msgid "Transparencies"
 msgstr "�明膠片"
 
-#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:9
-#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:100
-#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:214
-#: src/xml/xmli18n-tmp.h:266 src/xml/xmli18n-tmp.h:310
-#: src/xml/xmli18n-tmp.h:354 src/xml/xmli18n-tmp.h:394
-#: src/xml/xmli18n-tmp.h:454 src/xml/xmli18n-tmp.h:517
-#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:626
-#: src/xml/xmli18n-tmp.h:664 src/xml/xmli18n-tmp.h:707
-#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:823
-#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:921
-#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:1035
-#: src/xml/xmli18n-tmp.h:1092 src/xml/xmli18n-tmp.h:1142
-#: src/xml/xmli18n-tmp.h:1180 src/xml/xmli18n-tmp.h:1235
-#: src/xml/xmli18n-tmp.h:1292 src/xml/xmli18n-tmp.h:1344
-#: src/xml/xmli18n-tmp.h:1391 src/xml/xmli18n-tmp.h:1454
-#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1577
-#: src/xml/xmli18n-tmp.h:1634 src/xml/xmli18n-tmp.h:1691
-#: src/xml/xmli18n-tmp.h:1747 src/xml/xmli18n-tmp.h:1783
+#: src/main/print-lexmark.c:868 src/xml/xmli18n-tmp.h:11
+#: src/xml/xmli18n-tmp.h:55 src/xml/xmli18n-tmp.h:105
+#: src/xml/xmli18n-tmp.h:151 src/xml/xmli18n-tmp.h:227
+#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:369
+#: src/xml/xmli18n-tmp.h:413 src/xml/xmli18n-tmp.h:457
+#: src/xml/xmli18n-tmp.h:497 src/xml/xmli18n-tmp.h:557
+#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:701
+#: src/xml/xmli18n-tmp.h:767 src/xml/xmli18n-tmp.h:805
+#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:908
+#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:1024
+#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1170
+#: src/xml/xmli18n-tmp.h:1265 src/xml/xmli18n-tmp.h:1365
+#: src/xml/xmli18n-tmp.h:1474 src/xml/xmli18n-tmp.h:1552
+#: src/xml/xmli18n-tmp.h:1590 src/xml/xmli18n-tmp.h:1655
+#: src/xml/xmli18n-tmp.h:1750 src/xml/xmli18n-tmp.h:1830
+#: src/xml/xmli18n-tmp.h:1877 src/xml/xmli18n-tmp.h:1940
+#: src/xml/xmli18n-tmp.h:2000 src/xml/xmli18n-tmp.h:2068
+#: src/xml/xmli18n-tmp.h:2144 src/xml/xmli18n-tmp.h:2215
+#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2307
 msgid "Envelopes"
 msgstr "ä¿¡å°�"
 
 # (Abel) from fuji, epson
-#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:13
-#: src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:106
-#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:220
-#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:314
-#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:400
-#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:523
-#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:630
-#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:713
-#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:827
-#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:927
-#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:1041
-#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1146
-#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1241
-#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1348
-#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1460
-#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1583
-#: src/xml/xmli18n-tmp.h:1640 src/xml/xmli18n-tmp.h:1697
-#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1787
+#: src/main/print-lexmark.c:872 src/xml/xmli18n-tmp.h:15
+#: src/xml/xmli18n-tmp.h:59 src/xml/xmli18n-tmp.h:109
+#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:235
+#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:373
+#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:461
+#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:563
+#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:709
+#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:809
+#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:914
+#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:1028
+#: src/xml/xmli18n-tmp.h:1085 src/xml/xmli18n-tmp.h:1180
+#: src/xml/xmli18n-tmp.h:1275 src/xml/xmli18n-tmp.h:1377
+#: src/xml/xmli18n-tmp.h:1484 src/xml/xmli18n-tmp.h:1556
+#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1665
+#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1834
+#: src/xml/xmli18n-tmp.h:1883 src/xml/xmli18n-tmp.h:1946
+#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2076
+#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2221
+#: src/xml/xmli18n-tmp.h:2275 src/xml/xmli18n-tmp.h:2311
 msgid "Matte Paper"
 msgstr "雪�銅版紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:19
-#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:112
-#: src/xml/xmli18n-tmp.h:169 src/xml/xmli18n-tmp.h:226
-#: src/xml/xmli18n-tmp.h:276 src/xml/xmli18n-tmp.h:320
-#: src/xml/xmli18n-tmp.h:362 src/xml/xmli18n-tmp.h:406
-#: src/xml/xmli18n-tmp.h:466 src/xml/xmli18n-tmp.h:529
-#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:634
-#: src/xml/xmli18n-tmp.h:672 src/xml/xmli18n-tmp.h:719
-#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:831
-#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:933
-#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:1047
-#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1150
-#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1247
-#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1352
-#: src/xml/xmli18n-tmp.h:1403 src/xml/xmli18n-tmp.h:1466
-#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1589
-#: src/xml/xmli18n-tmp.h:1646 src/xml/xmli18n-tmp.h:1703
-#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1791
+#: src/main/print-lexmark.c:876 src/xml/xmli18n-tmp.h:21
+#: src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:113
+#: src/xml/xmli18n-tmp.h:167 src/xml/xmli18n-tmp.h:243
+#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:379
+#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:465
+#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:569
+#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:717
+#: src/xml/xmli18n-tmp.h:775 src/xml/xmli18n-tmp.h:813
+#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:920
+#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:1032
+#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1190
+#: src/xml/xmli18n-tmp.h:1285 src/xml/xmli18n-tmp.h:1389
+#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1560
+#: src/xml/xmli18n-tmp.h:1598 src/xml/xmli18n-tmp.h:1675
+#: src/xml/xmli18n-tmp.h:1770 src/xml/xmli18n-tmp.h:1838
+#: src/xml/xmli18n-tmp.h:1889 src/xml/xmli18n-tmp.h:1952
+#: src/xml/xmli18n-tmp.h:2012 src/xml/xmli18n-tmp.h:2084
+#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2227
+#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2315
 msgid "Inkjet Paper"
 msgstr "噴墨專用紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:21
-#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:115
-#: src/xml/xmli18n-tmp.h:172 src/xml/xmli18n-tmp.h:229
-#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:322
-#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:409
-#: src/xml/xmli18n-tmp.h:469 src/xml/xmli18n-tmp.h:532
-#: src/xml/xmli18n-tmp.h:589 src/xml/xmli18n-tmp.h:636
-#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:722
-#: src/xml/xmli18n-tmp.h:782 src/xml/xmli18n-tmp.h:833
-#: src/xml/xmli18n-tmp.h:879 src/xml/xmli18n-tmp.h:936
-#: src/xml/xmli18n-tmp.h:993 src/xml/xmli18n-tmp.h:1050
-#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1152
-#: src/xml/xmli18n-tmp.h:1190 src/xml/xmli18n-tmp.h:1250
-#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1354
-#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1469
-#: src/xml/xmli18n-tmp.h:1529 src/xml/xmli18n-tmp.h:1592
-#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1706
-#: src/xml/xmli18n-tmp.h:1757 src/xml/xmli18n-tmp.h:1793
+#: src/main/print-lexmark.c:880 src/xml/xmli18n-tmp.h:23
+#: src/xml/xmli18n-tmp.h:67 src/xml/xmli18n-tmp.h:115
+#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:247
+#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:381
+#: src/xml/xmli18n-tmp.h:425 src/xml/xmli18n-tmp.h:467
+#: src/xml/xmli18n-tmp.h:512 src/xml/xmli18n-tmp.h:572
+#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:721
+#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:815
+#: src/xml/xmli18n-tmp.h:863 src/xml/xmli18n-tmp.h:923
+#: src/xml/xmli18n-tmp.h:983 src/xml/xmli18n-tmp.h:1034
+#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1195
+#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1395
+#: src/xml/xmli18n-tmp.h:1499 src/xml/xmli18n-tmp.h:1562
+#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1680
+#: src/xml/xmli18n-tmp.h:1775 src/xml/xmli18n-tmp.h:1840
+#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1955
+#: src/xml/xmli18n-tmp.h:2015 src/xml/xmli18n-tmp.h:2088
+#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2230
+#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2317
 msgid "Photo Quality Inkjet Paper"
 msgstr "優質噴墨專用紙"
 
-#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:23
-#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:118
-#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:232
-#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:324
-#: src/xml/xmli18n-tmp.h:366 src/xml/xmli18n-tmp.h:412
-#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:535
-#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:638
-#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:725
-#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:835
-#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:939
-#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:1053
-#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1154
-#: src/xml/xmli18n-tmp.h:1192 src/xml/xmli18n-tmp.h:1253
-#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1356
-#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1472
-#: src/xml/xmli18n-tmp.h:1532 src/xml/xmli18n-tmp.h:1595
-#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1709
-#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1795
+#: src/main/print-lexmark.c:884 src/xml/xmli18n-tmp.h:25
+#: src/xml/xmli18n-tmp.h:69 src/xml/xmli18n-tmp.h:117
+#: src/xml/xmli18n-tmp.h:175 src/xml/xmli18n-tmp.h:251
+#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:383
+#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:469
+#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:575
+#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:725
+#: src/xml/xmli18n-tmp.h:779 src/xml/xmli18n-tmp.h:817
+#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:926
+#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:1036
+#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1200
+#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1401
+#: src/xml/xmli18n-tmp.h:1504 src/xml/xmli18n-tmp.h:1564
+#: src/xml/xmli18n-tmp.h:1602 src/xml/xmli18n-tmp.h:1685
+#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1842
+#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1958
+#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2092
+#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2233
+#: src/xml/xmli18n-tmp.h:2283 src/xml/xmli18n-tmp.h:2319
 msgid "Photo Paper"
 msgstr "相紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:25
-#: src/xml/xmli18n-tmp.h:73 src/xml/xmli18n-tmp.h:121
-#: src/xml/xmli18n-tmp.h:178 src/xml/xmli18n-tmp.h:235
-#: src/xml/xmli18n-tmp.h:282 src/xml/xmli18n-tmp.h:326
-#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:415
-#: src/xml/xmli18n-tmp.h:475 src/xml/xmli18n-tmp.h:538
-#: src/xml/xmli18n-tmp.h:595 src/xml/xmli18n-tmp.h:640
-#: src/xml/xmli18n-tmp.h:678 src/xml/xmli18n-tmp.h:728
-#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:837
-#: src/xml/xmli18n-tmp.h:885 src/xml/xmli18n-tmp.h:942
-#: src/xml/xmli18n-tmp.h:999 src/xml/xmli18n-tmp.h:1056
-#: src/xml/xmli18n-tmp.h:1113 src/xml/xmli18n-tmp.h:1156
-#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1212
-#: src/xml/xmli18n-tmp.h:1216 src/xml/xmli18n-tmp.h:1256
-#: src/xml/xmli18n-tmp.h:1313 src/xml/xmli18n-tmp.h:1358
-#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1475
-#: src/xml/xmli18n-tmp.h:1535 src/xml/xmli18n-tmp.h:1598
-#: src/xml/xmli18n-tmp.h:1655 src/xml/xmli18n-tmp.h:1712
-#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1797
+#: src/main/print-lexmark.c:888 src/xml/xmli18n-tmp.h:27
+#: src/xml/xmli18n-tmp.h:71 src/xml/xmli18n-tmp.h:119
+#: src/xml/xmli18n-tmp.h:179 src/xml/xmli18n-tmp.h:255
+#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:385
+#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:471
+#: src/xml/xmli18n-tmp.h:518 src/xml/xmli18n-tmp.h:578
+#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:729
+#: src/xml/xmli18n-tmp.h:781 src/xml/xmli18n-tmp.h:819
+#: src/xml/xmli18n-tmp.h:869 src/xml/xmli18n-tmp.h:929
+#: src/xml/xmli18n-tmp.h:989 src/xml/xmli18n-tmp.h:1038
+#: src/xml/xmli18n-tmp.h:1110 src/xml/xmli18n-tmp.h:1205
+#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1407
+#: src/xml/xmli18n-tmp.h:1509 src/xml/xmli18n-tmp.h:1566
+#: src/xml/xmli18n-tmp.h:1604 src/xml/xmli18n-tmp.h:1622
+#: src/xml/xmli18n-tmp.h:1626 src/xml/xmli18n-tmp.h:1690
+#: src/xml/xmli18n-tmp.h:1785 src/xml/xmli18n-tmp.h:1844
+#: src/xml/xmli18n-tmp.h:1898 src/xml/xmli18n-tmp.h:1961
+#: src/xml/xmli18n-tmp.h:2021 src/xml/xmli18n-tmp.h:2096
+#: src/xml/xmli18n-tmp.h:2172 src/xml/xmli18n-tmp.h:2236
+#: src/xml/xmli18n-tmp.h:2285 src/xml/xmli18n-tmp.h:2321
 msgid "Premium Glossy Photo Paper"
 msgstr "頂級光�相紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:39
-#: src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:127
-#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:241
-#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:332
-#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:421
-#: src/xml/xmli18n-tmp.h:481 src/xml/xmli18n-tmp.h:544
-#: src/xml/xmli18n-tmp.h:601 src/xml/xmli18n-tmp.h:644
-#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:734
-#: src/xml/xmli18n-tmp.h:794 src/xml/xmli18n-tmp.h:841
-#: src/xml/xmli18n-tmp.h:891 src/xml/xmli18n-tmp.h:948
-#: src/xml/xmli18n-tmp.h:1005 src/xml/xmli18n-tmp.h:1062
-#: src/xml/xmli18n-tmp.h:1119 src/xml/xmli18n-tmp.h:1160
-#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1262
-#: src/xml/xmli18n-tmp.h:1319 src/xml/xmli18n-tmp.h:1362
-#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1481
-#: src/xml/xmli18n-tmp.h:1541 src/xml/xmli18n-tmp.h:1604
-#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1718
-#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1801
+#: src/main/print-lexmark.c:892 src/xml/xmli18n-tmp.h:33
+#: src/xml/xmli18n-tmp.h:85 src/xml/xmli18n-tmp.h:123
+#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:263
+#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:391
+#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:475
+#: src/xml/xmli18n-tmp.h:524 src/xml/xmli18n-tmp.h:584
+#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:737
+#: src/xml/xmli18n-tmp.h:785 src/xml/xmli18n-tmp.h:823
+#: src/xml/xmli18n-tmp.h:875 src/xml/xmli18n-tmp.h:935
+#: src/xml/xmli18n-tmp.h:995 src/xml/xmli18n-tmp.h:1042
+#: src/xml/xmli18n-tmp.h:1120 src/xml/xmli18n-tmp.h:1215
+#: src/xml/xmli18n-tmp.h:1310 src/xml/xmli18n-tmp.h:1419
+#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1570
+#: src/xml/xmli18n-tmp.h:1608 src/xml/xmli18n-tmp.h:1700
+#: src/xml/xmli18n-tmp.h:1795 src/xml/xmli18n-tmp.h:1848
+#: src/xml/xmli18n-tmp.h:1904 src/xml/xmli18n-tmp.h:1967
+#: src/xml/xmli18n-tmp.h:2027 src/xml/xmli18n-tmp.h:2104
+#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2242
+#: src/xml/xmli18n-tmp.h:2289 src/xml/xmli18n-tmp.h:2325
 msgid "Premium Luster Photo Paper"
 msgstr "精�光�相紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:45
-#: src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:130
-#: src/xml/xmli18n-tmp.h:187 src/xml/xmli18n-tmp.h:244
-#: src/xml/xmli18n-tmp.h:292 src/xml/xmli18n-tmp.h:336
-#: src/xml/xmli18n-tmp.h:374 src/xml/xmli18n-tmp.h:430
-#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:547
-#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:646
-#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:743
-#: src/xml/xmli18n-tmp.h:803 src/xml/xmli18n-tmp.h:843
-#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:951
-#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1065
-#: src/xml/xmli18n-tmp.h:1122 src/xml/xmli18n-tmp.h:1162
-#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1265
-#: src/xml/xmli18n-tmp.h:1322 src/xml/xmli18n-tmp.h:1368
-#: src/xml/xmli18n-tmp.h:1427 src/xml/xmli18n-tmp.h:1490
-#: src/xml/xmli18n-tmp.h:1550 src/xml/xmli18n-tmp.h:1607
-#: src/xml/xmli18n-tmp.h:1664 src/xml/xmli18n-tmp.h:1727
-#: src/xml/xmli18n-tmp.h:1767 src/xml/xmli18n-tmp.h:1803
+#: src/main/print-lexmark.c:896 src/xml/xmli18n-tmp.h:39
+#: src/xml/xmli18n-tmp.h:91 src/xml/xmli18n-tmp.h:125
+#: src/xml/xmli18n-tmp.h:191 src/xml/xmli18n-tmp.h:267
+#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:395
+#: src/xml/xmli18n-tmp.h:439 src/xml/xmli18n-tmp.h:477
+#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:593
+#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:741
+#: src/xml/xmli18n-tmp.h:787 src/xml/xmli18n-tmp.h:825
+#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:944
+#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1044
+#: src/xml/xmli18n-tmp.h:1125 src/xml/xmli18n-tmp.h:1220
+#: src/xml/xmli18n-tmp.h:1315 src/xml/xmli18n-tmp.h:1425
+#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1572
+#: src/xml/xmli18n-tmp.h:1614 src/xml/xmli18n-tmp.h:1705
+#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1854
+#: src/xml/xmli18n-tmp.h:1913 src/xml/xmli18n-tmp.h:1976
+#: src/xml/xmli18n-tmp.h:2036 src/xml/xmli18n-tmp.h:2108
+#: src/xml/xmli18n-tmp.h:2184 src/xml/xmli18n-tmp.h:2251
+#: src/xml/xmli18n-tmp.h:2291 src/xml/xmli18n-tmp.h:2327
 msgid "Photo Quality Glossy Paper"
 msgstr "光�紙"
 
-#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:133
-#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:247
-#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:338
-#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:433
-#: src/xml/xmli18n-tmp.h:493 src/xml/xmli18n-tmp.h:550
-#: src/xml/xmli18n-tmp.h:607 src/xml/xmli18n-tmp.h:648
-#: src/xml/xmli18n-tmp.h:686 src/xml/xmli18n-tmp.h:746
-#: src/xml/xmli18n-tmp.h:806 src/xml/xmli18n-tmp.h:897
-#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:1011
-#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1125
-#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1206
-#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1325
-#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1430
-#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1553
-#: src/xml/xmli18n-tmp.h:1610 src/xml/xmli18n-tmp.h:1667
-#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1805
+#: src/main/print-lexmark.c:900 src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:271
+#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:397
+#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:479
+#: src/xml/xmli18n-tmp.h:536 src/xml/xmli18n-tmp.h:596
+#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:745
+#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:827
+#: src/xml/xmli18n-tmp.h:887 src/xml/xmli18n-tmp.h:947
+#: src/xml/xmli18n-tmp.h:1007 src/xml/xmli18n-tmp.h:1130
+#: src/xml/xmli18n-tmp.h:1225 src/xml/xmli18n-tmp.h:1320
+#: src/xml/xmli18n-tmp.h:1431 src/xml/xmli18n-tmp.h:1529
+#: src/xml/xmli18n-tmp.h:1574 src/xml/xmli18n-tmp.h:1616
+#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1805
+#: src/xml/xmli18n-tmp.h:1856 src/xml/xmli18n-tmp.h:1916
+#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2039
+#: src/xml/xmli18n-tmp.h:2112 src/xml/xmli18n-tmp.h:2188
+#: src/xml/xmli18n-tmp.h:2254 src/xml/xmli18n-tmp.h:2329
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:49
-#: src/xml/xmli18n-tmp.h:83 src/xml/xmli18n-tmp.h:139
-#: src/xml/xmli18n-tmp.h:196 src/xml/xmli18n-tmp.h:253
-#: src/xml/xmli18n-tmp.h:298 src/xml/xmli18n-tmp.h:342
-#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:439
-#: src/xml/xmli18n-tmp.h:499 src/xml/xmli18n-tmp.h:556
-#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:652
-#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:752
-#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:847
-#: src/xml/xmli18n-tmp.h:903 src/xml/xmli18n-tmp.h:960
-#: src/xml/xmli18n-tmp.h:1017 src/xml/xmli18n-tmp.h:1074
-#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1168
-#: src/xml/xmli18n-tmp.h:1210 src/xml/xmli18n-tmp.h:1214
-#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1274
-#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1374
-#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1499
-#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1616
-#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1736
-#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1809
+#: src/main/print-lexmark.c:904 src/xml/xmli18n-tmp.h:45
+#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:129
+#: src/xml/xmli18n-tmp.h:203 src/xml/xmli18n-tmp.h:279
+#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:401
+#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:483
+#: src/xml/xmli18n-tmp.h:542 src/xml/xmli18n-tmp.h:602
+#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:753
+#: src/xml/xmli18n-tmp.h:793 src/xml/xmli18n-tmp.h:831
+#: src/xml/xmli18n-tmp.h:893 src/xml/xmli18n-tmp.h:953
+#: src/xml/xmli18n-tmp.h:1013 src/xml/xmli18n-tmp.h:1048
+#: src/xml/xmli18n-tmp.h:1140 src/xml/xmli18n-tmp.h:1235
+#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1443
+#: src/xml/xmli18n-tmp.h:1539 src/xml/xmli18n-tmp.h:1578
+#: src/xml/xmli18n-tmp.h:1620 src/xml/xmli18n-tmp.h:1624
+#: src/xml/xmli18n-tmp.h:1628 src/xml/xmli18n-tmp.h:1720
+#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1860
+#: src/xml/xmli18n-tmp.h:1922 src/xml/xmli18n-tmp.h:1985
+#: src/xml/xmli18n-tmp.h:2045 src/xml/xmli18n-tmp.h:2120
+#: src/xml/xmli18n-tmp.h:2196 src/xml/xmli18n-tmp.h:2260
+#: src/xml/xmli18n-tmp.h:2295 src/xml/xmli18n-tmp.h:2333
 msgid "Other"
 msgstr "其它"
 
@@ -2106,52 +2839,56 @@ msgstr ""
 msgid "Manual without Pause"
 msgstr ""
 
-#: src/main/print-olympus.c:279
+#: src/main/print-olympus.c:281
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:280 src/cups/genppd.c:1685 src/cups/genppd.c:1713
-#: src/cups/genppd.c:1745 src/cups/genppd.c:1800 src/cups/genppd.c:1846
-#: src/cups/genppd.c:2147 src/cups/genppd.c:2160 src/cups/genppd.c:2183
-#: src/cups/genppd.c:2204 src/cups/genppd.c:2221
+#: src/main/print-olympus.c:282 src/cups/genppd.c:1718 src/cups/genppd.c:1746
+#: src/cups/genppd.c:1778 src/cups/genppd.c:1833 src/cups/genppd.c:1879
+#: src/cups/genppd.c:2181 src/cups/genppd.c:2194 src/cups/genppd.c:2217
+#: src/cups/genppd.c:2238 src/cups/genppd.c:2255
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:965 src/main/print-olympus.c:1028
-#: src/main/print-olympus.c:1132
+#: src/main/print-olympus.c:998 src/main/print-olympus.c:1061
+#: src/main/print-olympus.c:1165
 msgid "Glossy"
 msgstr "光�"
 
-#: src/main/print-olympus.c:966 src/main/print-olympus.c:1029
-#: src/main/print-olympus.c:1133
+#: src/main/print-olympus.c:999 src/main/print-olympus.c:1062
+#: src/main/print-olympus.c:1166
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:1030 src/main/print-olympus.c:1134
+#: src/main/print-olympus.c:1063 src/main/print-olympus.c:1167
 msgid "Matte"
 msgstr ""
 
-#: src/main/print-olympus.c:1734 src/main/print-olympus.c:1735
+#. TRANSLATORS: 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.
+#: src/main/print-olympus.c:1900 src/main/print-olympus.c:1901
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1770
+#: src/main/print-olympus.c:1936
 msgid "Adjust the cyan balance"
 msgstr "調整氰�色色彩平衡"
 
-#: src/main/print-olympus.c:1778
+#: src/main/print-olympus.c:1944
 msgid "Adjust the magenta balance"
 msgstr "調整洋紅色色彩平衡"
 
-#: src/main/print-olympus.c:1786
+#: src/main/print-olympus.c:1952
 msgid "Adjust the yellow balance"
 msgstr "調整黃色色彩平衡"
 
-#: src/main/print-olympus.c:1793
+#: src/main/print-olympus.c:1959
 msgid "Black Balance"
 msgstr "黑色平衡"
 
-#: src/main/print-olympus.c:1794
+#: src/main/print-olympus.c:1960
 msgid "Adjust the black balance"
 msgstr "調整黑色色彩平衡"
 
@@ -2183,7 +2920,7 @@ msgstr ""
 msgid "Quick-dry Transparency"
 msgstr ""
 
-#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:3687
+#: src/main/print-pcl.c:237 src/xml/xmli18n-tmp.h:5925
 msgid "Manual"
 msgstr "自�"
 
@@ -2268,23 +3005,23 @@ msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
 #: src/main/print-pcl.c:278 src/main/generic-options.c:35
-#: src/xml/xmli18n-tmp.h:3631 src/xml/xmli18n-tmp.h:3638
-#: src/xml/xmli18n-tmp.h:3647 src/xml/xmli18n-tmp.h:3656
-#: src/xml/xmli18n-tmp.h:3664
+#: src/xml/xmli18n-tmp.h:5868 src/xml/xmli18n-tmp.h:5875
+#: src/xml/xmli18n-tmp.h:5884 src/xml/xmli18n-tmp.h:5893
+#: src/xml/xmli18n-tmp.h:5901
 msgid "Draft"
 msgstr ""
 
 #: src/main/print-pcl.c:280 src/main/generic-options.c:37
-#: src/xml/xmli18n-tmp.h:3633 src/xml/xmli18n-tmp.h:3641
-#: src/xml/xmli18n-tmp.h:3649 src/xml/xmli18n-tmp.h:3658
-#: src/xml/xmli18n-tmp.h:3666
+#: src/xml/xmli18n-tmp.h:5870 src/xml/xmli18n-tmp.h:5878
+#: src/xml/xmli18n-tmp.h:5886 src/xml/xmli18n-tmp.h:5895
+#: src/xml/xmli18n-tmp.h:5903
 msgid "High"
 msgstr ""
 
 #: src/main/print-pcl.c:282 src/main/print-pcl.c:283
-#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:3634
-#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3650
-#: src/xml/xmli18n-tmp.h:3659 src/xml/xmli18n-tmp.h:3667
+#: src/main/generic-options.c:38 src/xml/xmli18n-tmp.h:5871
+#: src/xml/xmli18n-tmp.h:5877 src/xml/xmli18n-tmp.h:5887
+#: src/xml/xmli18n-tmp.h:5896 src/xml/xmli18n-tmp.h:5904
 msgid "Photo"
 msgstr "相片"
 
@@ -2317,15 +3054,15 @@ msgstr ""
 msgid "None; please provide a PPD file"
 msgstr ""
 
-#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:3671
+#: src/main/print-ps.c:352 src/xml/xmli18n-tmp.h:5908
 msgid "Letter"
 msgstr "Letter"
 
-#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:3708
+#: src/main/print-ps.c:354 src/xml/xmli18n-tmp.h:5946
 msgid "A4"
 msgstr "A4"
 
-#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:3823
+#: src/main/print-ps.c:356 src/xml/xmli18n-tmp.h:6061
 msgid "Custom"
 msgstr "自�"
 
@@ -2333,33 +3070,42 @@ msgstr "自�"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:3629
-#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3654
+#: src/main/print-weave.c:1511
+msgid "Fatal error!"
+msgstr ""
+
+#: src/main/print-weave.c:1547
+msgid ""
+"Please report the above information to gimp-print-devel@lists.sourceforge.net"
+msgstr ""
+
+#: src/main/generic-options.c:33 src/xml/xmli18n-tmp.h:5866
+#: src/xml/xmli18n-tmp.h:5882 src/xml/xmli18n-tmp.h:5891
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:3630
-#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3655
-#: src/xml/xmli18n-tmp.h:3663
+#: src/main/generic-options.c:34 src/xml/xmli18n-tmp.h:5867
+#: src/xml/xmli18n-tmp.h:5883 src/xml/xmli18n-tmp.h:5892
+#: src/xml/xmli18n-tmp.h:5900
 msgid "Economy"
 msgstr ""
 
-#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:3635
-#: src/xml/xmli18n-tmp.h:3642 src/xml/xmli18n-tmp.h:3651
-#: src/xml/xmli18n-tmp.h:3660 src/xml/xmli18n-tmp.h:3668
+#: src/main/generic-options.c:39 src/xml/xmli18n-tmp.h:5872
+#: src/xml/xmli18n-tmp.h:5879 src/xml/xmli18n-tmp.h:5888
+#: src/xml/xmli18n-tmp.h:5897 src/xml/xmli18n-tmp.h:5905
 msgid "Super Photo"
 msgstr ""
 
-#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:3636
-#: src/xml/xmli18n-tmp.h:3643 src/xml/xmli18n-tmp.h:3652
-#: src/xml/xmli18n-tmp.h:3661 src/xml/xmli18n-tmp.h:3669
+#: src/main/generic-options.c:40 src/xml/xmli18n-tmp.h:5873
+#: src/xml/xmli18n-tmp.h:5880 src/xml/xmli18n-tmp.h:5889
+#: src/xml/xmli18n-tmp.h:5898 src/xml/xmli18n-tmp.h:5906
 msgid "Ultra Photo"
 msgstr ""
 
-#: src/main/generic-options.c:41 src/cups/genppd.c:1326 src/cups/genppd.c:1989
-#: src/xml/xmli18n-tmp.h:3637 src/xml/xmli18n-tmp.h:3644
-#: src/xml/xmli18n-tmp.h:3653 src/xml/xmli18n-tmp.h:3662
-#: src/xml/xmli18n-tmp.h:3670
+#: src/main/generic-options.c:41 src/cups/genppd.c:1359 src/cups/genppd.c:2023
+#: src/xml/xmli18n-tmp.h:5874 src/xml/xmli18n-tmp.h:5881
+#: src/xml/xmli18n-tmp.h:5890 src/xml/xmli18n-tmp.h:5899
+#: src/xml/xmli18n-tmp.h:5907
 msgid "Best"
 msgstr ""
 
@@ -3067,84 +3813,84 @@ msgstr ""
 #. TRANSLATORS: Specify the language of the PPD translation.
 #. * Use the English name of your language here, e.g. "Swedish" instead of
 #. * "Svenska".
-#: src/cups/genppd.c:960
+#: src/cups/genppd.c:993
 msgid "English"
 msgstr ""
 
-#: src/cups/genppd.c:1159 src/cups/genppd.c:1175 src/cups/genppd.c:1934
-#: src/cups/genppd.c:1935
+#: src/cups/genppd.c:1192 src/cups/genppd.c:1208 src/cups/genppd.c:1968
+#: src/cups/genppd.c:1969
 #, fuzzy
 msgid "Media Size"
 msgstr "紙張尺寸："
 
-#: src/cups/genppd.c:1248 src/cups/genppd.c:1970
+#: src/cups/genppd.c:1281 src/cups/genppd.c:2004
 #, fuzzy
 msgid "Color Model"
 msgstr "彩色"
 
-#: src/cups/genppd.c:1275 src/cups/genppd.c:1972
+#: src/cups/genppd.c:1308 src/cups/genppd.c:2006
 #, fuzzy
 msgid "Inverted Grayscale"
 msgstr "�階"
 
-#: src/cups/genppd.c:1285 src/cups/genppd.c:1976
+#: src/cups/genppd.c:1318 src/cups/genppd.c:2010
 #, fuzzy
 msgid "RGB Color"
 msgstr "彩色"
 
-#: src/cups/genppd.c:1292 src/cups/genppd.c:1977
+#: src/cups/genppd.c:1325 src/cups/genppd.c:2011
 msgid "CMY Color"
 msgstr "CMY 色系"
 
-#: src/cups/genppd.c:1317 src/cups/genppd.c:1987
+#: src/cups/genppd.c:1350 src/cups/genppd.c:2021
 #, fuzzy
 msgid "Color Precision"
 msgstr "色彩修正"
 
-#: src/cups/genppd.c:1573 src/cups/genppd.c:2080
+#: src/cups/genppd.c:1606 src/cups/genppd.c:2114
 msgid "Reverse"
 msgstr ""
 
-#: src/cups/genppd.c:1590 src/cups/genppd.c:2096
+#: src/cups/genppd.c:1623 src/cups/genppd.c:2130
 #, fuzzy
 msgid "2-Sided Printing"
 msgstr "雙�列�"
 
-#: src/cups/genppd.c:1615 src/cups/genppd.c:2113
+#: src/cups/genppd.c:1648 src/cups/genppd.c:2147
 msgid "Shrink Page If Necessary to Fit Borders"
 msgstr ""
 
-#: src/cups/genppd.c:1620 src/cups/genppd.c:2114
+#: src/cups/genppd.c:1653 src/cups/genppd.c:2148
 msgid "Shrink (print the whole page)"
 msgstr ""
 
-#: src/cups/genppd.c:1621 src/cups/genppd.c:2115
+#: src/cups/genppd.c:1654 src/cups/genppd.c:2149
 msgid "Crop (preserve dimensions)"
 msgstr ""
 
-#: src/cups/genppd.c:1622 src/cups/genppd.c:2116
+#: src/cups/genppd.c:1655 src/cups/genppd.c:2150
 msgid "Expand (use maximum page area)"
 msgstr ""
 
-#: src/cups/genppd.c:1716 src/cups/genppd.c:2162
+#: src/cups/genppd.c:1749 src/cups/genppd.c:2196
 msgid "No"
 msgstr "�"
 
-#: src/cups/genppd.c:1718 src/cups/genppd.c:2164
+#: src/cups/genppd.c:1751 src/cups/genppd.c:2198
 msgid "Yes"
 msgstr "是"
 
-#: src/cups/genppd.c:1757 src/cups/genppd.c:1820 src/cups/genppd.c:1864
-#: src/cups/genppd.c:2185 src/cups/genppd.c:2215 src/cups/genppd.c:2232
+#: src/cups/genppd.c:1790 src/cups/genppd.c:1853 src/cups/genppd.c:1897
+#: src/cups/genppd.c:2219 src/cups/genppd.c:2249 src/cups/genppd.c:2266
 #, fuzzy
 msgid "Value"
 msgstr "è—�"
 
-#: src/cups/genppd.c:1762 src/cups/genppd.c:2189
+#: src/cups/genppd.c:1795 src/cups/genppd.c:2223
 msgid "Fine Adjustment"
 msgstr ""
 
-#: src/cups/genppd.c:1805 src/cups/genppd.c:2209
+#: src/cups/genppd.c:1838 src/cups/genppd.c:2243
 #, c-format
 msgid "%.1f mm"
 msgstr ""
@@ -3380,51 +4126,61 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:383
-#: src/xml/xmli18n-tmp.h:386 src/xml/xmli18n-tmp.h:389
-#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:395
-#: src/xml/xmli18n-tmp.h:398 src/xml/xmli18n-tmp.h:401
-#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:407
-#: src/xml/xmli18n-tmp.h:410 src/xml/xmli18n-tmp.h:413
-#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:419
-#: src/xml/xmli18n-tmp.h:422 src/xml/xmli18n-tmp.h:425
-#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:431
-#: src/xml/xmli18n-tmp.h:434 src/xml/xmli18n-tmp.h:437
-#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:443
-#: src/xml/xmli18n-tmp.h:446 src/xml/xmli18n-tmp.h:449
-#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:455
-#: src/xml/xmli18n-tmp.h:458 src/xml/xmli18n-tmp.h:461
-#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:467
-#: src/xml/xmli18n-tmp.h:470 src/xml/xmli18n-tmp.h:473
-#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:479
-#: src/xml/xmli18n-tmp.h:482 src/xml/xmli18n-tmp.h:485
-#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:491
-#: src/xml/xmli18n-tmp.h:494 src/xml/xmli18n-tmp.h:497
-#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:756
-#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:762
-#: src/xml/xmli18n-tmp.h:765 src/xml/xmli18n-tmp.h:768
-#: src/xml/xmli18n-tmp.h:771 src/xml/xmli18n-tmp.h:774
-#: src/xml/xmli18n-tmp.h:777 src/xml/xmli18n-tmp.h:780
-#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:786
-#: src/xml/xmli18n-tmp.h:789 src/xml/xmli18n-tmp.h:792
-#: src/xml/xmli18n-tmp.h:795 src/xml/xmli18n-tmp.h:798
-#: src/xml/xmli18n-tmp.h:801 src/xml/xmli18n-tmp.h:804
-#: src/xml/xmli18n-tmp.h:807 src/xml/xmli18n-tmp.h:810
-#: src/xml/xmli18n-tmp.h:813 src/xml/xmli18n-tmp.h:1503
-#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1509
-#: src/xml/xmli18n-tmp.h:1512 src/xml/xmli18n-tmp.h:1515
-#: src/xml/xmli18n-tmp.h:1518 src/xml/xmli18n-tmp.h:1521
-#: src/xml/xmli18n-tmp.h:1524 src/xml/xmli18n-tmp.h:1527
-#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1533
-#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1539
-#: src/xml/xmli18n-tmp.h:1542 src/xml/xmli18n-tmp.h:1545
-#: src/xml/xmli18n-tmp.h:1548 src/xml/xmli18n-tmp.h:1551
-#: src/xml/xmli18n-tmp.h:1554 src/xml/xmli18n-tmp.h:1557
-#: src/xml/xmli18n-tmp.h:1560 src/xml/xmli18n-tmp.h:2655
-#: src/xml/xmli18n-tmp.h:2699 src/xml/xmli18n-tmp.h:2717
-#: src/xml/xmli18n-tmp.h:3045 src/xml/xmli18n-tmp.h:3252
-#: src/xml/xmli18n-tmp.h:3273 src/xml/xmli18n-tmp.h:3363
-#: src/xml/xmli18n-tmp.h:3531
+#: src/escputil/escputil.c:995 src/xml/xmli18n-tmp.h:486
+#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
+#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
+#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:504
+#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
+#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
+#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
+#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
+#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
+#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
+#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
+#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
+#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
+#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
+#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
+#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
+#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
+#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
+#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
+#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
+#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:897
+#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:903
+#: src/xml/xmli18n-tmp.h:906 src/xml/xmli18n-tmp.h:909
+#: src/xml/xmli18n-tmp.h:912 src/xml/xmli18n-tmp.h:915
+#: src/xml/xmli18n-tmp.h:918 src/xml/xmli18n-tmp.h:921
+#: src/xml/xmli18n-tmp.h:924 src/xml/xmli18n-tmp.h:927
+#: src/xml/xmli18n-tmp.h:930 src/xml/xmli18n-tmp.h:933
+#: src/xml/xmli18n-tmp.h:936 src/xml/xmli18n-tmp.h:939
+#: src/xml/xmli18n-tmp.h:942 src/xml/xmli18n-tmp.h:945
+#: src/xml/xmli18n-tmp.h:948 src/xml/xmli18n-tmp.h:951
+#: src/xml/xmli18n-tmp.h:954 src/xml/xmli18n-tmp.h:957
+#: src/xml/xmli18n-tmp.h:960 src/xml/xmli18n-tmp.h:963
+#: src/xml/xmli18n-tmp.h:966 src/xml/xmli18n-tmp.h:969
+#: src/xml/xmli18n-tmp.h:972 src/xml/xmli18n-tmp.h:975
+#: src/xml/xmli18n-tmp.h:978 src/xml/xmli18n-tmp.h:981
+#: src/xml/xmli18n-tmp.h:984 src/xml/xmli18n-tmp.h:987
+#: src/xml/xmli18n-tmp.h:990 src/xml/xmli18n-tmp.h:993
+#: src/xml/xmli18n-tmp.h:996 src/xml/xmli18n-tmp.h:999
+#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1005
+#: src/xml/xmli18n-tmp.h:1008 src/xml/xmli18n-tmp.h:1011
+#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1989
+#: src/xml/xmli18n-tmp.h:1992 src/xml/xmli18n-tmp.h:1995
+#: src/xml/xmli18n-tmp.h:1998 src/xml/xmli18n-tmp.h:2001
+#: src/xml/xmli18n-tmp.h:2004 src/xml/xmli18n-tmp.h:2007
+#: src/xml/xmli18n-tmp.h:2010 src/xml/xmli18n-tmp.h:2013
+#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2019
+#: src/xml/xmli18n-tmp.h:2022 src/xml/xmli18n-tmp.h:2025
+#: src/xml/xmli18n-tmp.h:2028 src/xml/xmli18n-tmp.h:2031
+#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2037
+#: src/xml/xmli18n-tmp.h:2040 src/xml/xmli18n-tmp.h:2043
+#: src/xml/xmli18n-tmp.h:2046 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3223 src/xml/xmli18n-tmp.h:3241
+#: src/xml/xmli18n-tmp.h:3568 src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:4085 src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:4612 src/xml/xmli18n-tmp.h:5481
 msgid "Photo Black"
 msgstr ""
 
@@ -3435,125 +4191,297 @@ msgid "Unknown"
 msgstr "�詳"
 
 #: src/escputil/escputil.c:1000 src/escputil/escputil.c:1289
-#: src/xml/xmli18n-tmp.h:1905 src/xml/xmli18n-tmp.h:1921
-#: src/xml/xmli18n-tmp.h:1937 src/xml/xmli18n-tmp.h:2002
-#: src/xml/xmli18n-tmp.h:2016 src/xml/xmli18n-tmp.h:2079
-#: src/xml/xmli18n-tmp.h:2105 src/xml/xmli18n-tmp.h:2119
-#: src/xml/xmli18n-tmp.h:2159 src/xml/xmli18n-tmp.h:2173
-#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2200
-#: src/xml/xmli18n-tmp.h:2213 src/xml/xmli18n-tmp.h:2226
-#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2293
-#: src/xml/xmli18n-tmp.h:2308 src/xml/xmli18n-tmp.h:2346
-#: src/xml/xmli18n-tmp.h:2359 src/xml/xmli18n-tmp.h:2418
-#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2445
-#: src/xml/xmli18n-tmp.h:2457 src/xml/xmli18n-tmp.h:2469
-#: src/xml/xmli18n-tmp.h:2484 src/xml/xmli18n-tmp.h:2512
-#: src/xml/xmli18n-tmp.h:2525 src/xml/xmli18n-tmp.h:2564
-#: src/xml/xmli18n-tmp.h:2577 src/xml/xmli18n-tmp.h:2626
-#: src/xml/xmli18n-tmp.h:2641 src/xml/xmli18n-tmp.h:2746
-#: src/xml/xmli18n-tmp.h:2762 src/xml/xmli18n-tmp.h:2843
-#: src/xml/xmli18n-tmp.h:2857 src/xml/xmli18n-tmp.h:2895
-#: src/xml/xmli18n-tmp.h:2912 src/xml/xmli18n-tmp.h:2946
-#: src/xml/xmli18n-tmp.h:3001 src/xml/xmli18n-tmp.h:3015
-#: src/xml/xmli18n-tmp.h:3029 src/xml/xmli18n-tmp.h:3122
-#: src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:2429 src/xml/xmli18n-tmp.h:2445
+#: src/xml/xmli18n-tmp.h:2461 src/xml/xmli18n-tmp.h:2526
+#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2603
+#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2643
+#: src/xml/xmli18n-tmp.h:2683 src/xml/xmli18n-tmp.h:2697
+#: src/xml/xmli18n-tmp.h:2711 src/xml/xmli18n-tmp.h:2724
+#: src/xml/xmli18n-tmp.h:2737 src/xml/xmli18n-tmp.h:2750
+#: src/xml/xmli18n-tmp.h:2802 src/xml/xmli18n-tmp.h:2817
+#: src/xml/xmli18n-tmp.h:2832 src/xml/xmli18n-tmp.h:2870
+#: src/xml/xmli18n-tmp.h:2883 src/xml/xmli18n-tmp.h:2942
+#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2969
+#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3036
+#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3088
+#: src/xml/xmli18n-tmp.h:3101 src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3270
+#: src/xml/xmli18n-tmp.h:3286 src/xml/xmli18n-tmp.h:3380
+#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3435
+#: src/xml/xmli18n-tmp.h:3469 src/xml/xmli18n-tmp.h:3524
+#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3552
+#: src/xml/xmli18n-tmp.h:3645 src/xml/xmli18n-tmp.h:3661
+#: src/xml/xmli18n-tmp.h:3678 src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:3750 src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:3782 src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:3932 src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:3964 src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:4263 src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:4295 src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:4310 src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:4325 src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:4357 src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:4371 src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:4388 src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:4426 src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:4441 src/xml/xmli18n-tmp.h:4450
+#: src/xml/xmli18n-tmp.h:4457 src/xml/xmli18n-tmp.h:4463
+#: src/xml/xmli18n-tmp.h:4495 src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:4510 src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:4528 src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:4541 src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:4569 src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:4584 src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:4608 src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:4626 src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:4639 src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:4667 src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:4682 src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:4706 src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:4741 src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:4774 src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:4808 src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:4841 src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:4875 src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:4908 src/xml/xmli18n-tmp.h:4936
+#: src/xml/xmli18n-tmp.h:4942 src/xml/xmli18n-tmp.h:4968
+#: src/xml/xmli18n-tmp.h:4975 src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:5042 src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:5075 src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:5089 src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:5122 src/xml/xmli18n-tmp.h:5166
+#: src/xml/xmli18n-tmp.h:5172 src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:5205 src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:5239 src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:5272 src/xml/xmli18n-tmp.h:5300
+#: src/xml/xmli18n-tmp.h:5306 src/xml/xmli18n-tmp.h:5332
+#: src/xml/xmli18n-tmp.h:5339 src/xml/xmli18n-tmp.h:5348
+#: src/xml/xmli18n-tmp.h:5355 src/xml/xmli18n-tmp.h:5361
+#: src/xml/xmli18n-tmp.h:5393 src/xml/xmli18n-tmp.h:5400
+#: src/xml/xmli18n-tmp.h:5408 src/xml/xmli18n-tmp.h:5417
+#: src/xml/xmli18n-tmp.h:5424 src/xml/xmli18n-tmp.h:5430
+#: src/xml/xmli18n-tmp.h:5462 src/xml/xmli18n-tmp.h:5469
+#: src/xml/xmli18n-tmp.h:5477 src/xml/xmli18n-tmp.h:5487
+#: src/xml/xmli18n-tmp.h:5495 src/xml/xmli18n-tmp.h:5502
+#: src/xml/xmli18n-tmp.h:5508 src/xml/xmli18n-tmp.h:5526
+#: src/xml/xmli18n-tmp.h:5536 src/xml/xmli18n-tmp.h:5544
+#: src/xml/xmli18n-tmp.h:5551 src/xml/xmli18n-tmp.h:5557
+#: src/xml/xmli18n-tmp.h:5575 src/xml/xmli18n-tmp.h:5650
+#: src/xml/xmli18n-tmp.h:5657 src/xml/xmli18n-tmp.h:5663
+#: src/xml/xmli18n-tmp.h:5695 src/xml/xmli18n-tmp.h:5702
+#: src/xml/xmli18n-tmp.h:5710 src/xml/xmli18n-tmp.h:5719
+#: src/xml/xmli18n-tmp.h:5726 src/xml/xmli18n-tmp.h:5732
+#: src/xml/xmli18n-tmp.h:5764 src/xml/xmli18n-tmp.h:5771
+#: src/xml/xmli18n-tmp.h:5779
 msgid "Light Cyan"
 msgstr ""
 
 #: src/escputil/escputil.c:1001 src/escputil/escputil.c:1290
-#: src/xml/xmli18n-tmp.h:1906 src/xml/xmli18n-tmp.h:1922
-#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:2003
-#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2080
-#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2120
-#: src/xml/xmli18n-tmp.h:2160 src/xml/xmli18n-tmp.h:2174
-#: src/xml/xmli18n-tmp.h:2188 src/xml/xmli18n-tmp.h:2201
-#: src/xml/xmli18n-tmp.h:2214 src/xml/xmli18n-tmp.h:2227
-#: src/xml/xmli18n-tmp.h:2279 src/xml/xmli18n-tmp.h:2294
-#: src/xml/xmli18n-tmp.h:2309 src/xml/xmli18n-tmp.h:2347
-#: src/xml/xmli18n-tmp.h:2360 src/xml/xmli18n-tmp.h:2419
-#: src/xml/xmli18n-tmp.h:2432 src/xml/xmli18n-tmp.h:2446
-#: src/xml/xmli18n-tmp.h:2458 src/xml/xmli18n-tmp.h:2470
-#: src/xml/xmli18n-tmp.h:2485 src/xml/xmli18n-tmp.h:2513
-#: src/xml/xmli18n-tmp.h:2526 src/xml/xmli18n-tmp.h:2565
-#: src/xml/xmli18n-tmp.h:2578 src/xml/xmli18n-tmp.h:2627
-#: src/xml/xmli18n-tmp.h:2642 src/xml/xmli18n-tmp.h:2748
-#: src/xml/xmli18n-tmp.h:2761 src/xml/xmli18n-tmp.h:2844
-#: src/xml/xmli18n-tmp.h:2858 src/xml/xmli18n-tmp.h:2896
-#: src/xml/xmli18n-tmp.h:2913 src/xml/xmli18n-tmp.h:2947
-#: src/xml/xmli18n-tmp.h:3000 src/xml/xmli18n-tmp.h:3014
-#: src/xml/xmli18n-tmp.h:3028 src/xml/xmli18n-tmp.h:3123
-#: src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:2430 src/xml/xmli18n-tmp.h:2446
+#: src/xml/xmli18n-tmp.h:2462 src/xml/xmli18n-tmp.h:2527
+#: src/xml/xmli18n-tmp.h:2541 src/xml/xmli18n-tmp.h:2604
+#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2644
+#: src/xml/xmli18n-tmp.h:2684 src/xml/xmli18n-tmp.h:2698
+#: src/xml/xmli18n-tmp.h:2712 src/xml/xmli18n-tmp.h:2725
+#: src/xml/xmli18n-tmp.h:2738 src/xml/xmli18n-tmp.h:2751
+#: src/xml/xmli18n-tmp.h:2803 src/xml/xmli18n-tmp.h:2818
+#: src/xml/xmli18n-tmp.h:2833 src/xml/xmli18n-tmp.h:2871
+#: src/xml/xmli18n-tmp.h:2884 src/xml/xmli18n-tmp.h:2943
+#: src/xml/xmli18n-tmp.h:2956 src/xml/xmli18n-tmp.h:2970
+#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2994
+#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3037
+#: src/xml/xmli18n-tmp.h:3050 src/xml/xmli18n-tmp.h:3089
+#: src/xml/xmli18n-tmp.h:3102 src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3272
+#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3381
+#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3436
+#: src/xml/xmli18n-tmp.h:3470 src/xml/xmli18n-tmp.h:3523
+#: src/xml/xmli18n-tmp.h:3537 src/xml/xmli18n-tmp.h:3551
+#: src/xml/xmli18n-tmp.h:3646 src/xml/xmli18n-tmp.h:3662
+#: src/xml/xmli18n-tmp.h:3746 src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:3778 src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:3934 src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:3966 src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:4265 src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:4297 src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:4312 src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:4327 src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:4359 src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:4373 src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:4390 src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:4428 src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:4443 src/xml/xmli18n-tmp.h:4452
+#: src/xml/xmli18n-tmp.h:4459 src/xml/xmli18n-tmp.h:4465
+#: src/xml/xmli18n-tmp.h:4497 src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:4512 src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:4530 src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:4543 src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:4571 src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:4586 src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:4610 src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:4628 src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:4641 src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:4669 src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:4684 src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:4708 src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:4743 src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:4776 src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:4810 src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:4843 src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:4877 src/xml/xmli18n-tmp.h:4903
+#: src/xml/xmli18n-tmp.h:4910 src/xml/xmli18n-tmp.h:4938
+#: src/xml/xmli18n-tmp.h:4944 src/xml/xmli18n-tmp.h:4970
+#: src/xml/xmli18n-tmp.h:4977 src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:5044 src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:5077 src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:5091 src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:5124 src/xml/xmli18n-tmp.h:5168
+#: src/xml/xmli18n-tmp.h:5174 src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:5207 src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:5241 src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:5274 src/xml/xmli18n-tmp.h:5302
+#: src/xml/xmli18n-tmp.h:5308 src/xml/xmli18n-tmp.h:5334
+#: src/xml/xmli18n-tmp.h:5341 src/xml/xmli18n-tmp.h:5350
+#: src/xml/xmli18n-tmp.h:5357 src/xml/xmli18n-tmp.h:5363
+#: src/xml/xmli18n-tmp.h:5395 src/xml/xmli18n-tmp.h:5402
+#: src/xml/xmli18n-tmp.h:5410 src/xml/xmli18n-tmp.h:5419
+#: src/xml/xmli18n-tmp.h:5426 src/xml/xmli18n-tmp.h:5432
+#: src/xml/xmli18n-tmp.h:5464 src/xml/xmli18n-tmp.h:5471
+#: src/xml/xmli18n-tmp.h:5479 src/xml/xmli18n-tmp.h:5489
+#: src/xml/xmli18n-tmp.h:5497 src/xml/xmli18n-tmp.h:5504
+#: src/xml/xmli18n-tmp.h:5510 src/xml/xmli18n-tmp.h:5528
+#: src/xml/xmli18n-tmp.h:5538 src/xml/xmli18n-tmp.h:5546
+#: src/xml/xmli18n-tmp.h:5553 src/xml/xmli18n-tmp.h:5559
+#: src/xml/xmli18n-tmp.h:5577 src/xml/xmli18n-tmp.h:5652
+#: src/xml/xmli18n-tmp.h:5659 src/xml/xmli18n-tmp.h:5665
+#: src/xml/xmli18n-tmp.h:5697 src/xml/xmli18n-tmp.h:5704
+#: src/xml/xmli18n-tmp.h:5712 src/xml/xmli18n-tmp.h:5721
+#: src/xml/xmli18n-tmp.h:5728 src/xml/xmli18n-tmp.h:5734
+#: src/xml/xmli18n-tmp.h:5766 src/xml/xmli18n-tmp.h:5773
+#: src/xml/xmli18n-tmp.h:5781
 msgid "Light Magenta"
 msgstr ""
 
-#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2433
-#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:3002
-#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3030
+#: src/escputil/escputil.c:1004 src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3287 src/xml/xmli18n-tmp.h:3525
+#: src/xml/xmli18n-tmp.h:3539 src/xml/xmli18n-tmp.h:3553
+#: src/xml/xmli18n-tmp.h:3679 src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:4409 src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:4439 src/xml/xmli18n-tmp.h:4448
+#: src/xml/xmli18n-tmp.h:4478 src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:4508 src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:4526 src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:4566 src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:4605 src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:4624 src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:4664 src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:4703 src/xml/xmli18n-tmp.h:5346
+#: src/xml/xmli18n-tmp.h:5376 src/xml/xmli18n-tmp.h:5381
+#: src/xml/xmli18n-tmp.h:5406 src/xml/xmli18n-tmp.h:5415
+#: src/xml/xmli18n-tmp.h:5445 src/xml/xmli18n-tmp.h:5450
+#: src/xml/xmli18n-tmp.h:5475 src/xml/xmli18n-tmp.h:5484
+#: src/xml/xmli18n-tmp.h:5493 src/xml/xmli18n-tmp.h:5523
+#: src/xml/xmli18n-tmp.h:5533 src/xml/xmli18n-tmp.h:5542
+#: src/xml/xmli18n-tmp.h:5572 src/xml/xmli18n-tmp.h:5648
+#: src/xml/xmli18n-tmp.h:5678 src/xml/xmli18n-tmp.h:5683
+#: src/xml/xmli18n-tmp.h:5708 src/xml/xmli18n-tmp.h:5717
+#: src/xml/xmli18n-tmp.h:5747 src/xml/xmli18n-tmp.h:5752
+#: src/xml/xmli18n-tmp.h:5777
 msgid "Light Black"
 msgstr ""
 
-#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:384
-#: src/xml/xmli18n-tmp.h:387 src/xml/xmli18n-tmp.h:390
-#: src/xml/xmli18n-tmp.h:393 src/xml/xmli18n-tmp.h:396
-#: src/xml/xmli18n-tmp.h:399 src/xml/xmli18n-tmp.h:402
-#: src/xml/xmli18n-tmp.h:405 src/xml/xmli18n-tmp.h:408
-#: src/xml/xmli18n-tmp.h:411 src/xml/xmli18n-tmp.h:414
-#: src/xml/xmli18n-tmp.h:417 src/xml/xmli18n-tmp.h:420
-#: src/xml/xmli18n-tmp.h:423 src/xml/xmli18n-tmp.h:426
-#: src/xml/xmli18n-tmp.h:429 src/xml/xmli18n-tmp.h:432
-#: src/xml/xmli18n-tmp.h:435 src/xml/xmli18n-tmp.h:438
-#: src/xml/xmli18n-tmp.h:441 src/xml/xmli18n-tmp.h:444
-#: src/xml/xmli18n-tmp.h:447 src/xml/xmli18n-tmp.h:450
-#: src/xml/xmli18n-tmp.h:453 src/xml/xmli18n-tmp.h:456
-#: src/xml/xmli18n-tmp.h:459 src/xml/xmli18n-tmp.h:462
-#: src/xml/xmli18n-tmp.h:465 src/xml/xmli18n-tmp.h:468
-#: src/xml/xmli18n-tmp.h:471 src/xml/xmli18n-tmp.h:474
-#: src/xml/xmli18n-tmp.h:477 src/xml/xmli18n-tmp.h:480
-#: src/xml/xmli18n-tmp.h:483 src/xml/xmli18n-tmp.h:486
-#: src/xml/xmli18n-tmp.h:489 src/xml/xmli18n-tmp.h:492
-#: src/xml/xmli18n-tmp.h:495 src/xml/xmli18n-tmp.h:498
-#: src/xml/xmli18n-tmp.h:501 src/xml/xmli18n-tmp.h:757
-#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:763
-#: src/xml/xmli18n-tmp.h:766 src/xml/xmli18n-tmp.h:769
-#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:775
-#: src/xml/xmli18n-tmp.h:778 src/xml/xmli18n-tmp.h:781
-#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:787
-#: src/xml/xmli18n-tmp.h:790 src/xml/xmli18n-tmp.h:793
-#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:799
-#: src/xml/xmli18n-tmp.h:802 src/xml/xmli18n-tmp.h:805
-#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:811
-#: src/xml/xmli18n-tmp.h:814 src/xml/xmli18n-tmp.h:1504
-#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1510
-#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1516
-#: src/xml/xmli18n-tmp.h:1519 src/xml/xmli18n-tmp.h:1522
-#: src/xml/xmli18n-tmp.h:1525 src/xml/xmli18n-tmp.h:1528
-#: src/xml/xmli18n-tmp.h:1531 src/xml/xmli18n-tmp.h:1534
-#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1540
-#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:1546
-#: src/xml/xmli18n-tmp.h:1549 src/xml/xmli18n-tmp.h:1552
-#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1558
-#: src/xml/xmli18n-tmp.h:1561 src/xml/xmli18n-tmp.h:2654
-#: src/xml/xmli18n-tmp.h:2698 src/xml/xmli18n-tmp.h:2716
-#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3264
-#: src/xml/xmli18n-tmp.h:3285 src/xml/xmli18n-tmp.h:3371
-#: src/xml/xmli18n-tmp.h:3539
+#: src/escputil/escputil.c:1005 src/xml/xmli18n-tmp.h:487
+#: src/xml/xmli18n-tmp.h:490 src/xml/xmli18n-tmp.h:493
+#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:499
+#: src/xml/xmli18n-tmp.h:502 src/xml/xmli18n-tmp.h:505
+#: src/xml/xmli18n-tmp.h:508 src/xml/xmli18n-tmp.h:511
+#: src/xml/xmli18n-tmp.h:514 src/xml/xmli18n-tmp.h:517
+#: src/xml/xmli18n-tmp.h:520 src/xml/xmli18n-tmp.h:523
+#: src/xml/xmli18n-tmp.h:526 src/xml/xmli18n-tmp.h:529
+#: src/xml/xmli18n-tmp.h:532 src/xml/xmli18n-tmp.h:535
+#: src/xml/xmli18n-tmp.h:538 src/xml/xmli18n-tmp.h:541
+#: src/xml/xmli18n-tmp.h:544 src/xml/xmli18n-tmp.h:547
+#: src/xml/xmli18n-tmp.h:550 src/xml/xmli18n-tmp.h:553
+#: src/xml/xmli18n-tmp.h:556 src/xml/xmli18n-tmp.h:559
+#: src/xml/xmli18n-tmp.h:562 src/xml/xmli18n-tmp.h:565
+#: src/xml/xmli18n-tmp.h:568 src/xml/xmli18n-tmp.h:571
+#: src/xml/xmli18n-tmp.h:574 src/xml/xmli18n-tmp.h:577
+#: src/xml/xmli18n-tmp.h:580 src/xml/xmli18n-tmp.h:583
+#: src/xml/xmli18n-tmp.h:586 src/xml/xmli18n-tmp.h:589
+#: src/xml/xmli18n-tmp.h:592 src/xml/xmli18n-tmp.h:595
+#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:601
+#: src/xml/xmli18n-tmp.h:604 src/xml/xmli18n-tmp.h:898
+#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
+#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
+#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
+#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
+#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
+#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
+#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
+#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
+#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
+#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
+#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
+#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
+#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
+#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
+#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
+#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
+#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
+#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
+#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
+#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1990
+#: src/xml/xmli18n-tmp.h:1993 src/xml/xmli18n-tmp.h:1996
+#: src/xml/xmli18n-tmp.h:1999 src/xml/xmli18n-tmp.h:2002
+#: src/xml/xmli18n-tmp.h:2005 src/xml/xmli18n-tmp.h:2008
+#: src/xml/xmli18n-tmp.h:2011 src/xml/xmli18n-tmp.h:2014
+#: src/xml/xmli18n-tmp.h:2017 src/xml/xmli18n-tmp.h:2020
+#: src/xml/xmli18n-tmp.h:2023 src/xml/xmli18n-tmp.h:2026
+#: src/xml/xmli18n-tmp.h:2029 src/xml/xmli18n-tmp.h:2032
+#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2038
+#: src/xml/xmli18n-tmp.h:2041 src/xml/xmli18n-tmp.h:2044
+#: src/xml/xmli18n-tmp.h:2047 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3240
+#: src/xml/xmli18n-tmp.h:3567 src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:4044 src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:4563 src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:5530
 msgid "Matte Black"
 msgstr ""
 
-#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:2658
-#: src/xml/xmli18n-tmp.h:2702 src/xml/xmli18n-tmp.h:2720
-#: src/xml/xmli18n-tmp.h:3048
+#: src/escputil/escputil.c:1008 src/xml/xmli18n-tmp.h:3182
+#: src/xml/xmli18n-tmp.h:3226 src/xml/xmli18n-tmp.h:3244
+#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:3995 src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:4006 src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:4020 src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:4034 src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:4093 src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:4106 src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:4116 src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:4131 src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:4148
 msgid "Gloss Optimizer"
 msgstr ""
 
-#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:2760
-#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3013
-#: src/xml/xmli18n-tmp.h:3027
+#: src/escputil/escputil.c:1009 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:3522 src/xml/xmli18n-tmp.h:3536
+#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3676
+#: src/xml/xmli18n-tmp.h:4518 src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:4567 src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:4616 src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:4665 src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:5485 src/xml/xmli18n-tmp.h:5524
+#: src/xml/xmli18n-tmp.h:5534 src/xml/xmli18n-tmp.h:5573
 msgid "Light Light Black"
 msgstr ""
 
 #: src/escputil/escputil.c:1010 src/escputil/escputil.c:1029
-#: src/xml/xmli18n-tmp.h:3047
+#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:4099 src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:4147 src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:4162 src/xml/xmli18n-tmp.h:4189
 msgid "Orange"
 msgstr ""
 
@@ -4103,8590 +5031,8759 @@ msgstr "列�中..."
 #: src/xml/xmli18n-tmp.h:68 src/xml/xmli18n-tmp.h:70 src/xml/xmli18n-tmp.h:72
 #: src/xml/xmli18n-tmp.h:74 src/xml/xmli18n-tmp.h:76 src/xml/xmli18n-tmp.h:78
 #: src/xml/xmli18n-tmp.h:80 src/xml/xmli18n-tmp.h:82 src/xml/xmli18n-tmp.h:84
-#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:92
-#: src/xml/xmli18n-tmp.h:95 src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:101
-#: src/xml/xmli18n-tmp.h:104 src/xml/xmli18n-tmp.h:107
-#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:113
-#: src/xml/xmli18n-tmp.h:116 src/xml/xmli18n-tmp.h:119
-#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:125
-#: src/xml/xmli18n-tmp.h:128 src/xml/xmli18n-tmp.h:131
-#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:137
-#: src/xml/xmli18n-tmp.h:140 src/xml/xmli18n-tmp.h:143
-#: src/xml/xmli18n-tmp.h:146 src/xml/xmli18n-tmp.h:149
-#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:155
-#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:161
-#: src/xml/xmli18n-tmp.h:164 src/xml/xmli18n-tmp.h:167
-#: src/xml/xmli18n-tmp.h:170 src/xml/xmli18n-tmp.h:173
-#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:179
-#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:185
-#: src/xml/xmli18n-tmp.h:188 src/xml/xmli18n-tmp.h:191
-#: src/xml/xmli18n-tmp.h:194 src/xml/xmli18n-tmp.h:197
-#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:203
-#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:209
-#: src/xml/xmli18n-tmp.h:212 src/xml/xmli18n-tmp.h:215
-#: src/xml/xmli18n-tmp.h:218 src/xml/xmli18n-tmp.h:221
-#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:227
-#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:233
-#: src/xml/xmli18n-tmp.h:236 src/xml/xmli18n-tmp.h:239
-#: src/xml/xmli18n-tmp.h:242 src/xml/xmli18n-tmp.h:245
-#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:251
-#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:257
-#: src/xml/xmli18n-tmp.h:259 src/xml/xmli18n-tmp.h:261
-#: src/xml/xmli18n-tmp.h:263 src/xml/xmli18n-tmp.h:265
-#: src/xml/xmli18n-tmp.h:267 src/xml/xmli18n-tmp.h:269
-#: src/xml/xmli18n-tmp.h:271 src/xml/xmli18n-tmp.h:273
-#: src/xml/xmli18n-tmp.h:275 src/xml/xmli18n-tmp.h:277
-#: src/xml/xmli18n-tmp.h:279 src/xml/xmli18n-tmp.h:281
-#: src/xml/xmli18n-tmp.h:283 src/xml/xmli18n-tmp.h:285
-#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:289
-#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:293
-#: src/xml/xmli18n-tmp.h:295 src/xml/xmli18n-tmp.h:297
-#: src/xml/xmli18n-tmp.h:299 src/xml/xmli18n-tmp.h:301
-#: src/xml/xmli18n-tmp.h:303 src/xml/xmli18n-tmp.h:305
-#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:309
-#: src/xml/xmli18n-tmp.h:311 src/xml/xmli18n-tmp.h:313
-#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:317
-#: src/xml/xmli18n-tmp.h:319 src/xml/xmli18n-tmp.h:321
-#: src/xml/xmli18n-tmp.h:323 src/xml/xmli18n-tmp.h:325
-#: src/xml/xmli18n-tmp.h:327 src/xml/xmli18n-tmp.h:329
-#: src/xml/xmli18n-tmp.h:331 src/xml/xmli18n-tmp.h:333
-#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:337
-#: src/xml/xmli18n-tmp.h:339 src/xml/xmli18n-tmp.h:341
-#: src/xml/xmli18n-tmp.h:343 src/xml/xmli18n-tmp.h:345
-#: src/xml/xmli18n-tmp.h:347 src/xml/xmli18n-tmp.h:349
-#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:353
-#: src/xml/xmli18n-tmp.h:355 src/xml/xmli18n-tmp.h:357
-#: src/xml/xmli18n-tmp.h:359 src/xml/xmli18n-tmp.h:361
-#: src/xml/xmli18n-tmp.h:363 src/xml/xmli18n-tmp.h:365
-#: src/xml/xmli18n-tmp.h:367 src/xml/xmli18n-tmp.h:369
-#: src/xml/xmli18n-tmp.h:371 src/xml/xmli18n-tmp.h:373
-#: src/xml/xmli18n-tmp.h:375 src/xml/xmli18n-tmp.h:377
-#: src/xml/xmli18n-tmp.h:379 src/xml/xmli18n-tmp.h:381
-#: src/xml/xmli18n-tmp.h:503 src/xml/xmli18n-tmp.h:506
-#: src/xml/xmli18n-tmp.h:509 src/xml/xmli18n-tmp.h:512
-#: src/xml/xmli18n-tmp.h:515 src/xml/xmli18n-tmp.h:518
-#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:524
-#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:530
-#: src/xml/xmli18n-tmp.h:533 src/xml/xmli18n-tmp.h:536
-#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:542
-#: src/xml/xmli18n-tmp.h:545 src/xml/xmli18n-tmp.h:548
-#: src/xml/xmli18n-tmp.h:551 src/xml/xmli18n-tmp.h:554
-#: src/xml/xmli18n-tmp.h:557 src/xml/xmli18n-tmp.h:560
-#: src/xml/xmli18n-tmp.h:563 src/xml/xmli18n-tmp.h:566
-#: src/xml/xmli18n-tmp.h:569 src/xml/xmli18n-tmp.h:572
-#: src/xml/xmli18n-tmp.h:575 src/xml/xmli18n-tmp.h:578
-#: src/xml/xmli18n-tmp.h:581 src/xml/xmli18n-tmp.h:584
-#: src/xml/xmli18n-tmp.h:587 src/xml/xmli18n-tmp.h:590
-#: src/xml/xmli18n-tmp.h:593 src/xml/xmli18n-tmp.h:596
-#: src/xml/xmli18n-tmp.h:599 src/xml/xmli18n-tmp.h:602
-#: src/xml/xmli18n-tmp.h:605 src/xml/xmli18n-tmp.h:608
-#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:614
-#: src/xml/xmli18n-tmp.h:617 src/xml/xmli18n-tmp.h:619
-#: src/xml/xmli18n-tmp.h:621 src/xml/xmli18n-tmp.h:623
-#: src/xml/xmli18n-tmp.h:625 src/xml/xmli18n-tmp.h:627
-#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:631
-#: src/xml/xmli18n-tmp.h:633 src/xml/xmli18n-tmp.h:635
-#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:639
-#: src/xml/xmli18n-tmp.h:641 src/xml/xmli18n-tmp.h:643
-#: src/xml/xmli18n-tmp.h:645 src/xml/xmli18n-tmp.h:647
-#: src/xml/xmli18n-tmp.h:649 src/xml/xmli18n-tmp.h:651
-#: src/xml/xmli18n-tmp.h:653 src/xml/xmli18n-tmp.h:655
-#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:659
-#: src/xml/xmli18n-tmp.h:661 src/xml/xmli18n-tmp.h:663
-#: src/xml/xmli18n-tmp.h:665 src/xml/xmli18n-tmp.h:667
-#: src/xml/xmli18n-tmp.h:669 src/xml/xmli18n-tmp.h:671
-#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:675
-#: src/xml/xmli18n-tmp.h:677 src/xml/xmli18n-tmp.h:679
-#: src/xml/xmli18n-tmp.h:681 src/xml/xmli18n-tmp.h:683
-#: src/xml/xmli18n-tmp.h:685 src/xml/xmli18n-tmp.h:687
-#: src/xml/xmli18n-tmp.h:689 src/xml/xmli18n-tmp.h:691
+#: src/xml/xmli18n-tmp.h:86 src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:90
+#: src/xml/xmli18n-tmp.h:92 src/xml/xmli18n-tmp.h:94 src/xml/xmli18n-tmp.h:96
+#: src/xml/xmli18n-tmp.h:98 src/xml/xmli18n-tmp.h:100
+#: src/xml/xmli18n-tmp.h:102 src/xml/xmli18n-tmp.h:104
+#: src/xml/xmli18n-tmp.h:106 src/xml/xmli18n-tmp.h:108
+#: src/xml/xmli18n-tmp.h:110 src/xml/xmli18n-tmp.h:112
+#: src/xml/xmli18n-tmp.h:114 src/xml/xmli18n-tmp.h:116
+#: src/xml/xmli18n-tmp.h:118 src/xml/xmli18n-tmp.h:120
+#: src/xml/xmli18n-tmp.h:122 src/xml/xmli18n-tmp.h:124
+#: src/xml/xmli18n-tmp.h:126 src/xml/xmli18n-tmp.h:128
+#: src/xml/xmli18n-tmp.h:130 src/xml/xmli18n-tmp.h:132
+#: src/xml/xmli18n-tmp.h:136 src/xml/xmli18n-tmp.h:140
+#: src/xml/xmli18n-tmp.h:144 src/xml/xmli18n-tmp.h:148
+#: src/xml/xmli18n-tmp.h:152 src/xml/xmli18n-tmp.h:156
+#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:164
+#: src/xml/xmli18n-tmp.h:168 src/xml/xmli18n-tmp.h:172
+#: src/xml/xmli18n-tmp.h:176 src/xml/xmli18n-tmp.h:180
+#: src/xml/xmli18n-tmp.h:184 src/xml/xmli18n-tmp.h:188
+#: src/xml/xmli18n-tmp.h:192 src/xml/xmli18n-tmp.h:196
+#: src/xml/xmli18n-tmp.h:200 src/xml/xmli18n-tmp.h:204
+#: src/xml/xmli18n-tmp.h:208 src/xml/xmli18n-tmp.h:212
+#: src/xml/xmli18n-tmp.h:216 src/xml/xmli18n-tmp.h:220
+#: src/xml/xmli18n-tmp.h:224 src/xml/xmli18n-tmp.h:228
+#: src/xml/xmli18n-tmp.h:232 src/xml/xmli18n-tmp.h:236
+#: src/xml/xmli18n-tmp.h:240 src/xml/xmli18n-tmp.h:244
+#: src/xml/xmli18n-tmp.h:248 src/xml/xmli18n-tmp.h:252
+#: src/xml/xmli18n-tmp.h:256 src/xml/xmli18n-tmp.h:260
+#: src/xml/xmli18n-tmp.h:264 src/xml/xmli18n-tmp.h:268
+#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:276
+#: src/xml/xmli18n-tmp.h:280 src/xml/xmli18n-tmp.h:284
+#: src/xml/xmli18n-tmp.h:288 src/xml/xmli18n-tmp.h:292
+#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:300
+#: src/xml/xmli18n-tmp.h:304 src/xml/xmli18n-tmp.h:308
+#: src/xml/xmli18n-tmp.h:312 src/xml/xmli18n-tmp.h:316
+#: src/xml/xmli18n-tmp.h:320 src/xml/xmli18n-tmp.h:324
+#: src/xml/xmli18n-tmp.h:328 src/xml/xmli18n-tmp.h:332
+#: src/xml/xmli18n-tmp.h:336 src/xml/xmli18n-tmp.h:340
+#: src/xml/xmli18n-tmp.h:344 src/xml/xmli18n-tmp.h:348
+#: src/xml/xmli18n-tmp.h:352 src/xml/xmli18n-tmp.h:356
+#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:362
+#: src/xml/xmli18n-tmp.h:364 src/xml/xmli18n-tmp.h:366
+#: src/xml/xmli18n-tmp.h:368 src/xml/xmli18n-tmp.h:370
+#: src/xml/xmli18n-tmp.h:372 src/xml/xmli18n-tmp.h:374
+#: src/xml/xmli18n-tmp.h:376 src/xml/xmli18n-tmp.h:378
+#: src/xml/xmli18n-tmp.h:380 src/xml/xmli18n-tmp.h:382
+#: src/xml/xmli18n-tmp.h:384 src/xml/xmli18n-tmp.h:386
+#: src/xml/xmli18n-tmp.h:388 src/xml/xmli18n-tmp.h:390
+#: src/xml/xmli18n-tmp.h:392 src/xml/xmli18n-tmp.h:394
+#: src/xml/xmli18n-tmp.h:396 src/xml/xmli18n-tmp.h:398
+#: src/xml/xmli18n-tmp.h:400 src/xml/xmli18n-tmp.h:402
+#: src/xml/xmli18n-tmp.h:404 src/xml/xmli18n-tmp.h:406
+#: src/xml/xmli18n-tmp.h:408 src/xml/xmli18n-tmp.h:410
+#: src/xml/xmli18n-tmp.h:412 src/xml/xmli18n-tmp.h:414
+#: src/xml/xmli18n-tmp.h:416 src/xml/xmli18n-tmp.h:418
+#: src/xml/xmli18n-tmp.h:420 src/xml/xmli18n-tmp.h:422
+#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:426
+#: src/xml/xmli18n-tmp.h:428 src/xml/xmli18n-tmp.h:430
+#: src/xml/xmli18n-tmp.h:432 src/xml/xmli18n-tmp.h:434
+#: src/xml/xmli18n-tmp.h:436 src/xml/xmli18n-tmp.h:438
+#: src/xml/xmli18n-tmp.h:440 src/xml/xmli18n-tmp.h:442
+#: src/xml/xmli18n-tmp.h:444 src/xml/xmli18n-tmp.h:446
+#: src/xml/xmli18n-tmp.h:448 src/xml/xmli18n-tmp.h:450
+#: src/xml/xmli18n-tmp.h:452 src/xml/xmli18n-tmp.h:454
+#: src/xml/xmli18n-tmp.h:456 src/xml/xmli18n-tmp.h:458
+#: src/xml/xmli18n-tmp.h:460 src/xml/xmli18n-tmp.h:462
+#: src/xml/xmli18n-tmp.h:464 src/xml/xmli18n-tmp.h:466
+#: src/xml/xmli18n-tmp.h:468 src/xml/xmli18n-tmp.h:470
+#: src/xml/xmli18n-tmp.h:472 src/xml/xmli18n-tmp.h:474
+#: src/xml/xmli18n-tmp.h:476 src/xml/xmli18n-tmp.h:478
+#: src/xml/xmli18n-tmp.h:480 src/xml/xmli18n-tmp.h:482
+#: src/xml/xmli18n-tmp.h:484 src/xml/xmli18n-tmp.h:606
+#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:614
+#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:622
+#: src/xml/xmli18n-tmp.h:626 src/xml/xmli18n-tmp.h:630
+#: src/xml/xmli18n-tmp.h:634 src/xml/xmli18n-tmp.h:638
+#: src/xml/xmli18n-tmp.h:642 src/xml/xmli18n-tmp.h:646
+#: src/xml/xmli18n-tmp.h:650 src/xml/xmli18n-tmp.h:654
+#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:662
+#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:670
+#: src/xml/xmli18n-tmp.h:674 src/xml/xmli18n-tmp.h:678
+#: src/xml/xmli18n-tmp.h:682 src/xml/xmli18n-tmp.h:686
+#: src/xml/xmli18n-tmp.h:690 src/xml/xmli18n-tmp.h:694
+#: src/xml/xmli18n-tmp.h:698 src/xml/xmli18n-tmp.h:702
+#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:710
+#: src/xml/xmli18n-tmp.h:714 src/xml/xmli18n-tmp.h:718
+#: src/xml/xmli18n-tmp.h:722 src/xml/xmli18n-tmp.h:726
+#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:734
+#: src/xml/xmli18n-tmp.h:738 src/xml/xmli18n-tmp.h:742
+#: src/xml/xmli18n-tmp.h:746 src/xml/xmli18n-tmp.h:750
+#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:758
+#: src/xml/xmli18n-tmp.h:760 src/xml/xmli18n-tmp.h:762
+#: src/xml/xmli18n-tmp.h:764 src/xml/xmli18n-tmp.h:766
+#: src/xml/xmli18n-tmp.h:768 src/xml/xmli18n-tmp.h:770
+#: src/xml/xmli18n-tmp.h:772 src/xml/xmli18n-tmp.h:774
+#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:778
+#: src/xml/xmli18n-tmp.h:780 src/xml/xmli18n-tmp.h:782
+#: src/xml/xmli18n-tmp.h:784 src/xml/xmli18n-tmp.h:786
+#: src/xml/xmli18n-tmp.h:788 src/xml/xmli18n-tmp.h:790
+#: src/xml/xmli18n-tmp.h:792 src/xml/xmli18n-tmp.h:794
+#: src/xml/xmli18n-tmp.h:796 src/xml/xmli18n-tmp.h:798
+#: src/xml/xmli18n-tmp.h:800 src/xml/xmli18n-tmp.h:802
+#: src/xml/xmli18n-tmp.h:804 src/xml/xmli18n-tmp.h:806
+#: src/xml/xmli18n-tmp.h:808 src/xml/xmli18n-tmp.h:810
+#: src/xml/xmli18n-tmp.h:812 src/xml/xmli18n-tmp.h:814
 #: src/xml/xmli18n-tmp.h:816 src/xml/xmli18n-tmp.h:818
 #: src/xml/xmli18n-tmp.h:820 src/xml/xmli18n-tmp.h:822
 #: src/xml/xmli18n-tmp.h:824 src/xml/xmli18n-tmp.h:826
 #: src/xml/xmli18n-tmp.h:828 src/xml/xmli18n-tmp.h:830
-#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:834
-#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:838
-#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:842
-#: src/xml/xmli18n-tmp.h:844 src/xml/xmli18n-tmp.h:846
-#: src/xml/xmli18n-tmp.h:848 src/xml/xmli18n-tmp.h:850
-#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
-#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
-#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
-#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
-#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
-#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
-#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
-#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:898
-#: src/xml/xmli18n-tmp.h:901 src/xml/xmli18n-tmp.h:904
-#: src/xml/xmli18n-tmp.h:907 src/xml/xmli18n-tmp.h:910
-#: src/xml/xmli18n-tmp.h:913 src/xml/xmli18n-tmp.h:916
-#: src/xml/xmli18n-tmp.h:919 src/xml/xmli18n-tmp.h:922
-#: src/xml/xmli18n-tmp.h:925 src/xml/xmli18n-tmp.h:928
-#: src/xml/xmli18n-tmp.h:931 src/xml/xmli18n-tmp.h:934
-#: src/xml/xmli18n-tmp.h:937 src/xml/xmli18n-tmp.h:940
-#: src/xml/xmli18n-tmp.h:943 src/xml/xmli18n-tmp.h:946
-#: src/xml/xmli18n-tmp.h:949 src/xml/xmli18n-tmp.h:952
-#: src/xml/xmli18n-tmp.h:955 src/xml/xmli18n-tmp.h:958
-#: src/xml/xmli18n-tmp.h:961 src/xml/xmli18n-tmp.h:964
-#: src/xml/xmli18n-tmp.h:967 src/xml/xmli18n-tmp.h:970
-#: src/xml/xmli18n-tmp.h:973 src/xml/xmli18n-tmp.h:976
-#: src/xml/xmli18n-tmp.h:979 src/xml/xmli18n-tmp.h:982
-#: src/xml/xmli18n-tmp.h:985 src/xml/xmli18n-tmp.h:988
-#: src/xml/xmli18n-tmp.h:991 src/xml/xmli18n-tmp.h:994
-#: src/xml/xmli18n-tmp.h:997 src/xml/xmli18n-tmp.h:1000
-#: src/xml/xmli18n-tmp.h:1003 src/xml/xmli18n-tmp.h:1006
-#: src/xml/xmli18n-tmp.h:1009 src/xml/xmli18n-tmp.h:1012
-#: src/xml/xmli18n-tmp.h:1015 src/xml/xmli18n-tmp.h:1018
-#: src/xml/xmli18n-tmp.h:1021 src/xml/xmli18n-tmp.h:1024
-#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1030
-#: src/xml/xmli18n-tmp.h:1033 src/xml/xmli18n-tmp.h:1036
-#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1042
-#: src/xml/xmli18n-tmp.h:1045 src/xml/xmli18n-tmp.h:1048
-#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1054
-#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1060
-#: src/xml/xmli18n-tmp.h:1063 src/xml/xmli18n-tmp.h:1066
-#: src/xml/xmli18n-tmp.h:1069 src/xml/xmli18n-tmp.h:1072
-#: src/xml/xmli18n-tmp.h:1075 src/xml/xmli18n-tmp.h:1078
-#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1084
-#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1090
-#: src/xml/xmli18n-tmp.h:1093 src/xml/xmli18n-tmp.h:1096
-#: src/xml/xmli18n-tmp.h:1099 src/xml/xmli18n-tmp.h:1102
-#: src/xml/xmli18n-tmp.h:1105 src/xml/xmli18n-tmp.h:1108
-#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1114
-#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1120
-#: src/xml/xmli18n-tmp.h:1123 src/xml/xmli18n-tmp.h:1126
-#: src/xml/xmli18n-tmp.h:1129 src/xml/xmli18n-tmp.h:1132
-#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1137
-#: src/xml/xmli18n-tmp.h:1139 src/xml/xmli18n-tmp.h:1141
-#: src/xml/xmli18n-tmp.h:1143 src/xml/xmli18n-tmp.h:1145
-#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1149
-#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1153
-#: src/xml/xmli18n-tmp.h:1155 src/xml/xmli18n-tmp.h:1157
-#: src/xml/xmli18n-tmp.h:1159 src/xml/xmli18n-tmp.h:1161
-#: src/xml/xmli18n-tmp.h:1163 src/xml/xmli18n-tmp.h:1165
-#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1169
-#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1173
-#: src/xml/xmli18n-tmp.h:1175 src/xml/xmli18n-tmp.h:1177
-#: src/xml/xmli18n-tmp.h:1179 src/xml/xmli18n-tmp.h:1181
-#: src/xml/xmli18n-tmp.h:1183 src/xml/xmli18n-tmp.h:1185
-#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1189
-#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1193
-#: src/xml/xmli18n-tmp.h:1195 src/xml/xmli18n-tmp.h:1197
-#: src/xml/xmli18n-tmp.h:1199 src/xml/xmli18n-tmp.h:1201
-#: src/xml/xmli18n-tmp.h:1203 src/xml/xmli18n-tmp.h:1205
-#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1209
-#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1221
-#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1227
-#: src/xml/xmli18n-tmp.h:1230 src/xml/xmli18n-tmp.h:1233
-#: src/xml/xmli18n-tmp.h:1236 src/xml/xmli18n-tmp.h:1239
-#: src/xml/xmli18n-tmp.h:1242 src/xml/xmli18n-tmp.h:1245
-#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1251
-#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1257
-#: src/xml/xmli18n-tmp.h:1260 src/xml/xmli18n-tmp.h:1263
-#: src/xml/xmli18n-tmp.h:1266 src/xml/xmli18n-tmp.h:1269
-#: src/xml/xmli18n-tmp.h:1272 src/xml/xmli18n-tmp.h:1275
-#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1281
-#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1287
-#: src/xml/xmli18n-tmp.h:1290 src/xml/xmli18n-tmp.h:1293
-#: src/xml/xmli18n-tmp.h:1296 src/xml/xmli18n-tmp.h:1299
-#: src/xml/xmli18n-tmp.h:1302 src/xml/xmli18n-tmp.h:1305
-#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1311
-#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1317
-#: src/xml/xmli18n-tmp.h:1320 src/xml/xmli18n-tmp.h:1323
-#: src/xml/xmli18n-tmp.h:1326 src/xml/xmli18n-tmp.h:1329
-#: src/xml/xmli18n-tmp.h:1332 src/xml/xmli18n-tmp.h:1335
-#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1339
-#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1343
-#: src/xml/xmli18n-tmp.h:1345 src/xml/xmli18n-tmp.h:1347
-#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1351
-#: src/xml/xmli18n-tmp.h:1353 src/xml/xmli18n-tmp.h:1355
-#: src/xml/xmli18n-tmp.h:1357 src/xml/xmli18n-tmp.h:1359
-#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1363
-#: src/xml/xmli18n-tmp.h:1365 src/xml/xmli18n-tmp.h:1367
-#: src/xml/xmli18n-tmp.h:1369 src/xml/xmli18n-tmp.h:1371
-#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1375
-#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1566
-#: src/xml/xmli18n-tmp.h:1569 src/xml/xmli18n-tmp.h:1572
-#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1578
-#: src/xml/xmli18n-tmp.h:1581 src/xml/xmli18n-tmp.h:1584
-#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1590
-#: src/xml/xmli18n-tmp.h:1593 src/xml/xmli18n-tmp.h:1596
-#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1602
-#: src/xml/xmli18n-tmp.h:1605 src/xml/xmli18n-tmp.h:1608
-#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1614
-#: src/xml/xmli18n-tmp.h:1617 src/xml/xmli18n-tmp.h:1620
-#: src/xml/xmli18n-tmp.h:1623 src/xml/xmli18n-tmp.h:1626
-#: src/xml/xmli18n-tmp.h:1629 src/xml/xmli18n-tmp.h:1632
-#: src/xml/xmli18n-tmp.h:1635 src/xml/xmli18n-tmp.h:1638
-#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1644
-#: src/xml/xmli18n-tmp.h:1647 src/xml/xmli18n-tmp.h:1650
-#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1656
-#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1662
-#: src/xml/xmli18n-tmp.h:1665 src/xml/xmli18n-tmp.h:1668
-#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1674
-#: src/xml/xmli18n-tmp.h:1740 src/xml/xmli18n-tmp.h:1742
-#: src/xml/xmli18n-tmp.h:1744 src/xml/xmli18n-tmp.h:1746
-#: src/xml/xmli18n-tmp.h:1748 src/xml/xmli18n-tmp.h:1750
-#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1754
-#: src/xml/xmli18n-tmp.h:1756 src/xml/xmli18n-tmp.h:1758
-#: src/xml/xmli18n-tmp.h:1760 src/xml/xmli18n-tmp.h:1762
-#: src/xml/xmli18n-tmp.h:1764 src/xml/xmli18n-tmp.h:1766
-#: src/xml/xmli18n-tmp.h:1768 src/xml/xmli18n-tmp.h:1770
-#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1774
-#: src/xml/xmli18n-tmp.h:1776 src/xml/xmli18n-tmp.h:1778
-#: src/xml/xmli18n-tmp.h:1780 src/xml/xmli18n-tmp.h:1782
-#: src/xml/xmli18n-tmp.h:1784 src/xml/xmli18n-tmp.h:1786
-#: src/xml/xmli18n-tmp.h:1788 src/xml/xmli18n-tmp.h:1790
-#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1794
-#: src/xml/xmli18n-tmp.h:1796 src/xml/xmli18n-tmp.h:1798
-#: src/xml/xmli18n-tmp.h:1800 src/xml/xmli18n-tmp.h:1802
-#: src/xml/xmli18n-tmp.h:1804 src/xml/xmli18n-tmp.h:1806
-#: src/xml/xmli18n-tmp.h:1808 src/xml/xmli18n-tmp.h:1810
-#: src/xml/xmli18n-tmp.h:3194 src/xml/xmli18n-tmp.h:3204
-#: src/xml/xmli18n-tmp.h:3210 src/xml/xmli18n-tmp.h:3216
-#: src/xml/xmli18n-tmp.h:3224 src/xml/xmli18n-tmp.h:3232
-#: src/xml/xmli18n-tmp.h:3240 src/xml/xmli18n-tmp.h:3250
-#: src/xml/xmli18n-tmp.h:3294 src/xml/xmli18n-tmp.h:3302
-#: src/xml/xmli18n-tmp.h:3304 src/xml/xmli18n-tmp.h:3312
-#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3379
-#: src/xml/xmli18n-tmp.h:3385 src/xml/xmli18n-tmp.h:3397
-#: src/xml/xmli18n-tmp.h:3409 src/xml/xmli18n-tmp.h:3421
-#: src/xml/xmli18n-tmp.h:3433 src/xml/xmli18n-tmp.h:3441
-#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3469
-#: src/xml/xmli18n-tmp.h:3481 src/xml/xmli18n-tmp.h:3493
-#: src/xml/xmli18n-tmp.h:3547 src/xml/xmli18n-tmp.h:3555
-#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3597
-#: src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:832 src/xml/xmli18n-tmp.h:1017
+#: src/xml/xmli18n-tmp.h:1019 src/xml/xmli18n-tmp.h:1021
+#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1025
+#: src/xml/xmli18n-tmp.h:1027 src/xml/xmli18n-tmp.h:1029
+#: src/xml/xmli18n-tmp.h:1031 src/xml/xmli18n-tmp.h:1033
+#: src/xml/xmli18n-tmp.h:1035 src/xml/xmli18n-tmp.h:1037
+#: src/xml/xmli18n-tmp.h:1039 src/xml/xmli18n-tmp.h:1041
+#: src/xml/xmli18n-tmp.h:1043 src/xml/xmli18n-tmp.h:1045
+#: src/xml/xmli18n-tmp.h:1047 src/xml/xmli18n-tmp.h:1049
+#: src/xml/xmli18n-tmp.h:1051 src/xml/xmli18n-tmp.h:1056
+#: src/xml/xmli18n-tmp.h:1061 src/xml/xmli18n-tmp.h:1066
+#: src/xml/xmli18n-tmp.h:1071 src/xml/xmli18n-tmp.h:1076
+#: src/xml/xmli18n-tmp.h:1081 src/xml/xmli18n-tmp.h:1086
+#: src/xml/xmli18n-tmp.h:1091 src/xml/xmli18n-tmp.h:1096
+#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1106
+#: src/xml/xmli18n-tmp.h:1111 src/xml/xmli18n-tmp.h:1116
+#: src/xml/xmli18n-tmp.h:1121 src/xml/xmli18n-tmp.h:1126
+#: src/xml/xmli18n-tmp.h:1131 src/xml/xmli18n-tmp.h:1136
+#: src/xml/xmli18n-tmp.h:1141 src/xml/xmli18n-tmp.h:1146
+#: src/xml/xmli18n-tmp.h:1151 src/xml/xmli18n-tmp.h:1156
+#: src/xml/xmli18n-tmp.h:1161 src/xml/xmli18n-tmp.h:1166
+#: src/xml/xmli18n-tmp.h:1171 src/xml/xmli18n-tmp.h:1176
+#: src/xml/xmli18n-tmp.h:1181 src/xml/xmli18n-tmp.h:1186
+#: src/xml/xmli18n-tmp.h:1191 src/xml/xmli18n-tmp.h:1196
+#: src/xml/xmli18n-tmp.h:1201 src/xml/xmli18n-tmp.h:1206
+#: src/xml/xmli18n-tmp.h:1211 src/xml/xmli18n-tmp.h:1216
+#: src/xml/xmli18n-tmp.h:1221 src/xml/xmli18n-tmp.h:1226
+#: src/xml/xmli18n-tmp.h:1231 src/xml/xmli18n-tmp.h:1236
+#: src/xml/xmli18n-tmp.h:1241 src/xml/xmli18n-tmp.h:1246
+#: src/xml/xmli18n-tmp.h:1251 src/xml/xmli18n-tmp.h:1256
+#: src/xml/xmli18n-tmp.h:1261 src/xml/xmli18n-tmp.h:1266
+#: src/xml/xmli18n-tmp.h:1271 src/xml/xmli18n-tmp.h:1276
+#: src/xml/xmli18n-tmp.h:1281 src/xml/xmli18n-tmp.h:1286
+#: src/xml/xmli18n-tmp.h:1291 src/xml/xmli18n-tmp.h:1296
+#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1306
+#: src/xml/xmli18n-tmp.h:1311 src/xml/xmli18n-tmp.h:1316
+#: src/xml/xmli18n-tmp.h:1321 src/xml/xmli18n-tmp.h:1326
+#: src/xml/xmli18n-tmp.h:1331 src/xml/xmli18n-tmp.h:1336
+#: src/xml/xmli18n-tmp.h:1342 src/xml/xmli18n-tmp.h:1348
+#: src/xml/xmli18n-tmp.h:1354 src/xml/xmli18n-tmp.h:1360
+#: src/xml/xmli18n-tmp.h:1366 src/xml/xmli18n-tmp.h:1372
+#: src/xml/xmli18n-tmp.h:1378 src/xml/xmli18n-tmp.h:1384
+#: src/xml/xmli18n-tmp.h:1390 src/xml/xmli18n-tmp.h:1396
+#: src/xml/xmli18n-tmp.h:1402 src/xml/xmli18n-tmp.h:1408
+#: src/xml/xmli18n-tmp.h:1414 src/xml/xmli18n-tmp.h:1420
+#: src/xml/xmli18n-tmp.h:1426 src/xml/xmli18n-tmp.h:1432
+#: src/xml/xmli18n-tmp.h:1438 src/xml/xmli18n-tmp.h:1444
+#: src/xml/xmli18n-tmp.h:1450 src/xml/xmli18n-tmp.h:1455
+#: src/xml/xmli18n-tmp.h:1460 src/xml/xmli18n-tmp.h:1465
+#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1475
+#: src/xml/xmli18n-tmp.h:1480 src/xml/xmli18n-tmp.h:1485
+#: src/xml/xmli18n-tmp.h:1490 src/xml/xmli18n-tmp.h:1495
+#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1505
+#: src/xml/xmli18n-tmp.h:1510 src/xml/xmli18n-tmp.h:1515
+#: src/xml/xmli18n-tmp.h:1520 src/xml/xmli18n-tmp.h:1525
+#: src/xml/xmli18n-tmp.h:1530 src/xml/xmli18n-tmp.h:1535
+#: src/xml/xmli18n-tmp.h:1540 src/xml/xmli18n-tmp.h:1545
+#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1549
+#: src/xml/xmli18n-tmp.h:1551 src/xml/xmli18n-tmp.h:1553
+#: src/xml/xmli18n-tmp.h:1555 src/xml/xmli18n-tmp.h:1557
+#: src/xml/xmli18n-tmp.h:1559 src/xml/xmli18n-tmp.h:1561
+#: src/xml/xmli18n-tmp.h:1563 src/xml/xmli18n-tmp.h:1565
+#: src/xml/xmli18n-tmp.h:1567 src/xml/xmli18n-tmp.h:1569
+#: src/xml/xmli18n-tmp.h:1571 src/xml/xmli18n-tmp.h:1573
+#: src/xml/xmli18n-tmp.h:1575 src/xml/xmli18n-tmp.h:1577
+#: src/xml/xmli18n-tmp.h:1579 src/xml/xmli18n-tmp.h:1581
+#: src/xml/xmli18n-tmp.h:1583 src/xml/xmli18n-tmp.h:1585
+#: src/xml/xmli18n-tmp.h:1587 src/xml/xmli18n-tmp.h:1589
+#: src/xml/xmli18n-tmp.h:1591 src/xml/xmli18n-tmp.h:1593
+#: src/xml/xmli18n-tmp.h:1595 src/xml/xmli18n-tmp.h:1597
+#: src/xml/xmli18n-tmp.h:1599 src/xml/xmli18n-tmp.h:1601
+#: src/xml/xmli18n-tmp.h:1603 src/xml/xmli18n-tmp.h:1605
+#: src/xml/xmli18n-tmp.h:1607 src/xml/xmli18n-tmp.h:1609
+#: src/xml/xmli18n-tmp.h:1611 src/xml/xmli18n-tmp.h:1613
+#: src/xml/xmli18n-tmp.h:1615 src/xml/xmli18n-tmp.h:1617
+#: src/xml/xmli18n-tmp.h:1619 src/xml/xmli18n-tmp.h:1621
+#: src/xml/xmli18n-tmp.h:1631 src/xml/xmli18n-tmp.h:1636
+#: src/xml/xmli18n-tmp.h:1641 src/xml/xmli18n-tmp.h:1646
+#: src/xml/xmli18n-tmp.h:1651 src/xml/xmli18n-tmp.h:1656
+#: src/xml/xmli18n-tmp.h:1661 src/xml/xmli18n-tmp.h:1666
+#: src/xml/xmli18n-tmp.h:1671 src/xml/xmli18n-tmp.h:1676
+#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1686
+#: src/xml/xmli18n-tmp.h:1691 src/xml/xmli18n-tmp.h:1696
+#: src/xml/xmli18n-tmp.h:1701 src/xml/xmli18n-tmp.h:1706
+#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1716
+#: src/xml/xmli18n-tmp.h:1721 src/xml/xmli18n-tmp.h:1726
+#: src/xml/xmli18n-tmp.h:1731 src/xml/xmli18n-tmp.h:1736
+#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1746
+#: src/xml/xmli18n-tmp.h:1751 src/xml/xmli18n-tmp.h:1756
+#: src/xml/xmli18n-tmp.h:1761 src/xml/xmli18n-tmp.h:1766
+#: src/xml/xmli18n-tmp.h:1771 src/xml/xmli18n-tmp.h:1776
+#: src/xml/xmli18n-tmp.h:1781 src/xml/xmli18n-tmp.h:1786
+#: src/xml/xmli18n-tmp.h:1791 src/xml/xmli18n-tmp.h:1796
+#: src/xml/xmli18n-tmp.h:1801 src/xml/xmli18n-tmp.h:1806
+#: src/xml/xmli18n-tmp.h:1811 src/xml/xmli18n-tmp.h:1816
+#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1823
+#: src/xml/xmli18n-tmp.h:1825 src/xml/xmli18n-tmp.h:1827
+#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1831
+#: src/xml/xmli18n-tmp.h:1833 src/xml/xmli18n-tmp.h:1835
+#: src/xml/xmli18n-tmp.h:1837 src/xml/xmli18n-tmp.h:1839
+#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1843
+#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1847
+#: src/xml/xmli18n-tmp.h:1849 src/xml/xmli18n-tmp.h:1851
+#: src/xml/xmli18n-tmp.h:1853 src/xml/xmli18n-tmp.h:1855
+#: src/xml/xmli18n-tmp.h:1857 src/xml/xmli18n-tmp.h:1859
+#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:2049
+#: src/xml/xmli18n-tmp.h:2053 src/xml/xmli18n-tmp.h:2057
+#: src/xml/xmli18n-tmp.h:2061 src/xml/xmli18n-tmp.h:2065
+#: src/xml/xmli18n-tmp.h:2069 src/xml/xmli18n-tmp.h:2073
+#: src/xml/xmli18n-tmp.h:2077 src/xml/xmli18n-tmp.h:2081
+#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2089
+#: src/xml/xmli18n-tmp.h:2093 src/xml/xmli18n-tmp.h:2097
+#: src/xml/xmli18n-tmp.h:2101 src/xml/xmli18n-tmp.h:2105
+#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2113
+#: src/xml/xmli18n-tmp.h:2117 src/xml/xmli18n-tmp.h:2121
+#: src/xml/xmli18n-tmp.h:2125 src/xml/xmli18n-tmp.h:2129
+#: src/xml/xmli18n-tmp.h:2133 src/xml/xmli18n-tmp.h:2137
+#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2145
+#: src/xml/xmli18n-tmp.h:2149 src/xml/xmli18n-tmp.h:2153
+#: src/xml/xmli18n-tmp.h:2157 src/xml/xmli18n-tmp.h:2161
+#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2169
+#: src/xml/xmli18n-tmp.h:2173 src/xml/xmli18n-tmp.h:2177
+#: src/xml/xmli18n-tmp.h:2181 src/xml/xmli18n-tmp.h:2185
+#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2193
+#: src/xml/xmli18n-tmp.h:2197 src/xml/xmli18n-tmp.h:2264
+#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2268
+#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2272
+#: src/xml/xmli18n-tmp.h:2274 src/xml/xmli18n-tmp.h:2276
+#: src/xml/xmli18n-tmp.h:2278 src/xml/xmli18n-tmp.h:2280
+#: src/xml/xmli18n-tmp.h:2282 src/xml/xmli18n-tmp.h:2284
+#: src/xml/xmli18n-tmp.h:2286 src/xml/xmli18n-tmp.h:2288
+#: src/xml/xmli18n-tmp.h:2290 src/xml/xmli18n-tmp.h:2292
+#: src/xml/xmli18n-tmp.h:2294 src/xml/xmli18n-tmp.h:2296
+#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2300
+#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2304
+#: src/xml/xmli18n-tmp.h:2306 src/xml/xmli18n-tmp.h:2308
+#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2312
+#: src/xml/xmli18n-tmp.h:2314 src/xml/xmli18n-tmp.h:2316
+#: src/xml/xmli18n-tmp.h:2318 src/xml/xmli18n-tmp.h:2320
+#: src/xml/xmli18n-tmp.h:2322 src/xml/xmli18n-tmp.h:2324
+#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2328
+#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2332
+#: src/xml/xmli18n-tmp.h:2334 src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:3787 src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:3829 src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:3895 src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:3975 src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:4223 src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:4259 src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:4710 src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:4798 src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:4932 src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:5032 src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:5162 src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:5296 src/xml/xmli18n-tmp.h:5579
+#: src/xml/xmli18n-tmp.h:5612 src/xml/xmli18n-tmp.h:5783
+#: src/xml/xmli18n-tmp.h:5804 src/xml/xmli18n-tmp.h:5825
 msgid "EPSON Standard Inks"
 msgstr ""
 
 # (Abel) from fuji, epson
-#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:258 src/xml/xmli18n-tmp.h:302
+#: src/xml/xmli18n-tmp.h:3 src/xml/xmli18n-tmp.h:49 src/xml/xmli18n-tmp.h:361
+#: src/xml/xmli18n-tmp.h:405
 #, fuzzy
 msgid "Bright White Paper"
 msgstr "雪�銅版紙"
 
-#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:53 src/xml/xmli18n-tmp.h:91
-#: src/xml/xmli18n-tmp.h:148 src/xml/xmli18n-tmp.h:205
-#: src/xml/xmli18n-tmp.h:260 src/xml/xmli18n-tmp.h:304
-#: src/xml/xmli18n-tmp.h:348 src/xml/xmli18n-tmp.h:385
-#: src/xml/xmli18n-tmp.h:445 src/xml/xmli18n-tmp.h:508
-#: src/xml/xmli18n-tmp.h:565 src/xml/xmli18n-tmp.h:620
-#: src/xml/xmli18n-tmp.h:658 src/xml/xmli18n-tmp.h:698
-#: src/xml/xmli18n-tmp.h:758 src/xml/xmli18n-tmp.h:817
-#: src/xml/xmli18n-tmp.h:855 src/xml/xmli18n-tmp.h:912
-#: src/xml/xmli18n-tmp.h:969 src/xml/xmli18n-tmp.h:1026
-#: src/xml/xmli18n-tmp.h:1083 src/xml/xmli18n-tmp.h:1136
-#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1226
-#: src/xml/xmli18n-tmp.h:1283 src/xml/xmli18n-tmp.h:1338
-#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1445
-#: src/xml/xmli18n-tmp.h:1505 src/xml/xmli18n-tmp.h:1568
-#: src/xml/xmli18n-tmp.h:1625 src/xml/xmli18n-tmp.h:1682
-#: src/xml/xmli18n-tmp.h:1741 src/xml/xmli18n-tmp.h:1777
-#: src/xml/xmli18n-tmp.h:3675
+#: src/xml/xmli18n-tmp.h:5 src/xml/xmli18n-tmp.h:51 src/xml/xmli18n-tmp.h:99
+#: src/xml/xmli18n-tmp.h:139 src/xml/xmli18n-tmp.h:215
+#: src/xml/xmli18n-tmp.h:291 src/xml/xmli18n-tmp.h:363
+#: src/xml/xmli18n-tmp.h:407 src/xml/xmli18n-tmp.h:451
+#: src/xml/xmli18n-tmp.h:488 src/xml/xmli18n-tmp.h:548
+#: src/xml/xmli18n-tmp.h:613 src/xml/xmli18n-tmp.h:689
+#: src/xml/xmli18n-tmp.h:761 src/xml/xmli18n-tmp.h:799
+#: src/xml/xmli18n-tmp.h:839 src/xml/xmli18n-tmp.h:899
+#: src/xml/xmli18n-tmp.h:959 src/xml/xmli18n-tmp.h:1018
+#: src/xml/xmli18n-tmp.h:1060 src/xml/xmli18n-tmp.h:1155
+#: src/xml/xmli18n-tmp.h:1250 src/xml/xmli18n-tmp.h:1347
+#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1546
+#: src/xml/xmli18n-tmp.h:1584 src/xml/xmli18n-tmp.h:1640
+#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1824
+#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1931
+#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
+#: src/xml/xmli18n-tmp.h:2132 src/xml/xmli18n-tmp.h:2206
+#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2301
+#: src/xml/xmli18n-tmp.h:5912
 msgid "Postcard"
 msgstr "明信片"
 
-#: src/xml/xmli18n-tmp.h:11 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:103
-#: src/xml/xmli18n-tmp.h:160 src/xml/xmli18n-tmp.h:217
-#: src/xml/xmli18n-tmp.h:268 src/xml/xmli18n-tmp.h:312
-#: src/xml/xmli18n-tmp.h:356 src/xml/xmli18n-tmp.h:397
-#: src/xml/xmli18n-tmp.h:457 src/xml/xmli18n-tmp.h:520
-#: src/xml/xmli18n-tmp.h:577 src/xml/xmli18n-tmp.h:628
-#: src/xml/xmli18n-tmp.h:666 src/xml/xmli18n-tmp.h:710
-#: src/xml/xmli18n-tmp.h:770 src/xml/xmli18n-tmp.h:825
-#: src/xml/xmli18n-tmp.h:867 src/xml/xmli18n-tmp.h:924
-#: src/xml/xmli18n-tmp.h:981 src/xml/xmli18n-tmp.h:1038
-#: src/xml/xmli18n-tmp.h:1095 src/xml/xmli18n-tmp.h:1144
-#: src/xml/xmli18n-tmp.h:1182 src/xml/xmli18n-tmp.h:1238
-#: src/xml/xmli18n-tmp.h:1295 src/xml/xmli18n-tmp.h:1346
-#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1457
-#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1580
-#: src/xml/xmli18n-tmp.h:1637 src/xml/xmli18n-tmp.h:1694
-#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1785
+#: src/xml/xmli18n-tmp.h:13 src/xml/xmli18n-tmp.h:57 src/xml/xmli18n-tmp.h:107
+#: src/xml/xmli18n-tmp.h:155 src/xml/xmli18n-tmp.h:231
+#: src/xml/xmli18n-tmp.h:307 src/xml/xmli18n-tmp.h:371
+#: src/xml/xmli18n-tmp.h:415 src/xml/xmli18n-tmp.h:459
+#: src/xml/xmli18n-tmp.h:500 src/xml/xmli18n-tmp.h:560
+#: src/xml/xmli18n-tmp.h:629 src/xml/xmli18n-tmp.h:705
+#: src/xml/xmli18n-tmp.h:769 src/xml/xmli18n-tmp.h:807
+#: src/xml/xmli18n-tmp.h:851 src/xml/xmli18n-tmp.h:911
+#: src/xml/xmli18n-tmp.h:971 src/xml/xmli18n-tmp.h:1026
+#: src/xml/xmli18n-tmp.h:1080 src/xml/xmli18n-tmp.h:1175
+#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1371
+#: src/xml/xmli18n-tmp.h:1479 src/xml/xmli18n-tmp.h:1554
+#: src/xml/xmli18n-tmp.h:1592 src/xml/xmli18n-tmp.h:1660
+#: src/xml/xmli18n-tmp.h:1755 src/xml/xmli18n-tmp.h:1832
+#: src/xml/xmli18n-tmp.h:1880 src/xml/xmli18n-tmp.h:1943
+#: src/xml/xmli18n-tmp.h:2003 src/xml/xmli18n-tmp.h:2072
+#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2218
+#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2309
 msgid "Back Light Film"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:15 src/xml/xmli18n-tmp.h:65 src/xml/xmli18n-tmp.h:109
-#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:223
-#: src/xml/xmli18n-tmp.h:272 src/xml/xmli18n-tmp.h:316
-#: src/xml/xmli18n-tmp.h:360 src/xml/xmli18n-tmp.h:403
-#: src/xml/xmli18n-tmp.h:463 src/xml/xmli18n-tmp.h:526
-#: src/xml/xmli18n-tmp.h:583 src/xml/xmli18n-tmp.h:632
-#: src/xml/xmli18n-tmp.h:670 src/xml/xmli18n-tmp.h:716
-#: src/xml/xmli18n-tmp.h:776 src/xml/xmli18n-tmp.h:829
-#: src/xml/xmli18n-tmp.h:873 src/xml/xmli18n-tmp.h:930
-#: src/xml/xmli18n-tmp.h:987 src/xml/xmli18n-tmp.h:1044
-#: src/xml/xmli18n-tmp.h:1101 src/xml/xmli18n-tmp.h:1148
-#: src/xml/xmli18n-tmp.h:1186 src/xml/xmli18n-tmp.h:1244
-#: src/xml/xmli18n-tmp.h:1301 src/xml/xmli18n-tmp.h:1350
-#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1463
-#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1586
-#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1700
-#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1789
+#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:61 src/xml/xmli18n-tmp.h:111
+#: src/xml/xmli18n-tmp.h:163 src/xml/xmli18n-tmp.h:239
+#: src/xml/xmli18n-tmp.h:315 src/xml/xmli18n-tmp.h:375
+#: src/xml/xmli18n-tmp.h:419 src/xml/xmli18n-tmp.h:463
+#: src/xml/xmli18n-tmp.h:506 src/xml/xmli18n-tmp.h:566
+#: src/xml/xmli18n-tmp.h:637 src/xml/xmli18n-tmp.h:713
+#: src/xml/xmli18n-tmp.h:773 src/xml/xmli18n-tmp.h:811
+#: src/xml/xmli18n-tmp.h:857 src/xml/xmli18n-tmp.h:917
+#: src/xml/xmli18n-tmp.h:977 src/xml/xmli18n-tmp.h:1030
+#: src/xml/xmli18n-tmp.h:1090 src/xml/xmli18n-tmp.h:1185
+#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1383
+#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1558
+#: src/xml/xmli18n-tmp.h:1596 src/xml/xmli18n-tmp.h:1670
+#: src/xml/xmli18n-tmp.h:1765 src/xml/xmli18n-tmp.h:1836
+#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1949
+#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2080
+#: src/xml/xmli18n-tmp.h:2156 src/xml/xmli18n-tmp.h:2224
+#: src/xml/xmli18n-tmp.h:2277 src/xml/xmli18n-tmp.h:2313
 msgid "Matte Paper Heavyweight"
 msgstr ""
 
 # (Abel) from Epson
-#: src/xml/xmli18n-tmp.h:17 src/xml/xmli18n-tmp.h:274
-#: src/xml/xmli18n-tmp.h:318
+#: src/xml/xmli18n-tmp.h:19 src/xml/xmli18n-tmp.h:63 src/xml/xmli18n-tmp.h:377
+#: src/xml/xmli18n-tmp.h:421
 #, fuzzy
 msgid "Premium Presentation Paper Matte"
 msgstr "精�光�相紙"
 
-# (Abel) from Epson
-#: src/xml/xmli18n-tmp.h:27
+# (Abel) from Canon
+#: src/xml/xmli18n-tmp.h:29 src/xml/xmli18n-tmp.h:77 src/xml/xmli18n-tmp.h:387
+#: src/xml/xmli18n-tmp.h:431
 #, fuzzy
-msgid "Premium Glossy Photo Paper 170 wt"
-msgstr "頂級光�相紙"
+msgid "Ultra Glossy Photo Paper"
+msgstr "影�寫真光澤紙"
+
+# (Abel) from Epson
+#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:79 src/xml/xmli18n-tmp.h:121
+#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:259
+#: src/xml/xmli18n-tmp.h:335 src/xml/xmli18n-tmp.h:389
+#: src/xml/xmli18n-tmp.h:433 src/xml/xmli18n-tmp.h:473
+#: src/xml/xmli18n-tmp.h:521 src/xml/xmli18n-tmp.h:581
+#: src/xml/xmli18n-tmp.h:657 src/xml/xmli18n-tmp.h:733
+#: src/xml/xmli18n-tmp.h:783 src/xml/xmli18n-tmp.h:821
+#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:932
+#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:1040
+#: src/xml/xmli18n-tmp.h:1115 src/xml/xmli18n-tmp.h:1210
+#: src/xml/xmli18n-tmp.h:1305 src/xml/xmli18n-tmp.h:1413
+#: src/xml/xmli18n-tmp.h:1514 src/xml/xmli18n-tmp.h:1568
+#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1695
+#: src/xml/xmli18n-tmp.h:1790 src/xml/xmli18n-tmp.h:1846
+#: src/xml/xmli18n-tmp.h:1901 src/xml/xmli18n-tmp.h:1964
+#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2100
+#: src/xml/xmli18n-tmp.h:2176 src/xml/xmli18n-tmp.h:2239
+#: src/xml/xmli18n-tmp.h:2287 src/xml/xmli18n-tmp.h:2323
+msgid "Premium Semigloss Photo Paper"
+msgstr "頂級柔光相紙"
 
 # (Abel) from Epson
-#: src/xml/xmli18n-tmp.h:29
+#: src/xml/xmli18n-tmp.h:35 src/xml/xmli18n-tmp.h:89 src/xml/xmli18n-tmp.h:393
+#: src/xml/xmli18n-tmp.h:437
 #, fuzzy
-msgid "Premium Glossy Photo Paper 250 wt"
+msgid "Ultra Premium Photo Paper Luster"
 msgstr "頂級光�相紙"
 
-# (Abel) from Canon
-#: src/xml/xmli18n-tmp.h:31 src/xml/xmli18n-tmp.h:284
-#: src/xml/xmli18n-tmp.h:328
+#: src/xml/xmli18n-tmp.h:37
+msgid "CD or DVD"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:93 src/xml/xmli18n-tmp.h:127
+#: src/xml/xmli18n-tmp.h:199 src/xml/xmli18n-tmp.h:275
+#: src/xml/xmli18n-tmp.h:351 src/xml/xmli18n-tmp.h:399
+#: src/xml/xmli18n-tmp.h:443 src/xml/xmli18n-tmp.h:481
+#: src/xml/xmli18n-tmp.h:539 src/xml/xmli18n-tmp.h:599
+#: src/xml/xmli18n-tmp.h:673 src/xml/xmli18n-tmp.h:749
+#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:829
+#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:950
+#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1046
+#: src/xml/xmli18n-tmp.h:1135 src/xml/xmli18n-tmp.h:1230
+#: src/xml/xmli18n-tmp.h:1325 src/xml/xmli18n-tmp.h:1437
+#: src/xml/xmli18n-tmp.h:1534 src/xml/xmli18n-tmp.h:1576
+#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1715
+#: src/xml/xmli18n-tmp.h:1810 src/xml/xmli18n-tmp.h:1858
+#: src/xml/xmli18n-tmp.h:1919 src/xml/xmli18n-tmp.h:1982
+#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2116
+#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2257
+#: src/xml/xmli18n-tmp.h:2293 src/xml/xmli18n-tmp.h:2331
+msgid "ColorLife Paper"
+msgstr ""
+
+# (Abel) from Epson
+#: src/xml/xmli18n-tmp.h:73
 #, fuzzy
-msgid "Ultra Glossy Photo Paper"
-msgstr "影�寫真光澤紙"
+msgid "Premium Glossy Photo Paper 170 wt"
+msgstr "頂級光�相紙"
 
 # (Abel) from Epson
-#: src/xml/xmli18n-tmp.h:33 src/xml/xmli18n-tmp.h:75 src/xml/xmli18n-tmp.h:124
-#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:238
-#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:330
-#: src/xml/xmli18n-tmp.h:370 src/xml/xmli18n-tmp.h:418
-#: src/xml/xmli18n-tmp.h:478 src/xml/xmli18n-tmp.h:541
-#: src/xml/xmli18n-tmp.h:598 src/xml/xmli18n-tmp.h:642
-#: src/xml/xmli18n-tmp.h:680 src/xml/xmli18n-tmp.h:731
-#: src/xml/xmli18n-tmp.h:791 src/xml/xmli18n-tmp.h:839
-#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:945
-#: src/xml/xmli18n-tmp.h:1002 src/xml/xmli18n-tmp.h:1059
-#: src/xml/xmli18n-tmp.h:1116 src/xml/xmli18n-tmp.h:1158
-#: src/xml/xmli18n-tmp.h:1196 src/xml/xmli18n-tmp.h:1259
-#: src/xml/xmli18n-tmp.h:1316 src/xml/xmli18n-tmp.h:1360
-#: src/xml/xmli18n-tmp.h:1415 src/xml/xmli18n-tmp.h:1478
-#: src/xml/xmli18n-tmp.h:1538 src/xml/xmli18n-tmp.h:1601
-#: src/xml/xmli18n-tmp.h:1658 src/xml/xmli18n-tmp.h:1715
-#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1799
-msgid "Premium Semigloss Photo Paper"
-msgstr "頂級柔光相紙"
+#: src/xml/xmli18n-tmp.h:75
+#, fuzzy
+msgid "Premium Glossy Photo Paper 250 wt"
+msgstr "頂級光�相紙"
 
 # (Abel) from Epson
-#: src/xml/xmli18n-tmp.h:35
+#: src/xml/xmli18n-tmp.h:81
 #, fuzzy
 msgid "Premium Semigloss Photo Paper 170 wt"
 msgstr "頂級柔光相紙"
 
 # (Abel) from Epson
-#: src/xml/xmli18n-tmp.h:37
+#: src/xml/xmli18n-tmp.h:83
 #, fuzzy
 msgid "Premium Semigloss Photo Paper 250 wt"
 msgstr "頂級柔光相紙"
 
 # (Abel) from Epson
-#: src/xml/xmli18n-tmp.h:41
+#: src/xml/xmli18n-tmp.h:87
 #, fuzzy
 msgid "Premium Luster Photo Paper 250 wt"
 msgstr "精�光�相紙"
 
-# (Abel) from Epson
-#: src/xml/xmli18n-tmp.h:43 src/xml/xmli18n-tmp.h:290
-#: src/xml/xmli18n-tmp.h:334
-#, fuzzy
-msgid "Ultra Premium Photo Paper Luster"
-msgstr "頂級光�相紙"
-
-#: src/xml/xmli18n-tmp.h:47 src/xml/xmli18n-tmp.h:81 src/xml/xmli18n-tmp.h:136
-#: src/xml/xmli18n-tmp.h:193 src/xml/xmli18n-tmp.h:250
-#: src/xml/xmli18n-tmp.h:296 src/xml/xmli18n-tmp.h:340
-#: src/xml/xmli18n-tmp.h:378 src/xml/xmli18n-tmp.h:436
-#: src/xml/xmli18n-tmp.h:496 src/xml/xmli18n-tmp.h:553
-#: src/xml/xmli18n-tmp.h:610 src/xml/xmli18n-tmp.h:650
-#: src/xml/xmli18n-tmp.h:688 src/xml/xmli18n-tmp.h:749
-#: src/xml/xmli18n-tmp.h:809 src/xml/xmli18n-tmp.h:845
-#: src/xml/xmli18n-tmp.h:900 src/xml/xmli18n-tmp.h:957
-#: src/xml/xmli18n-tmp.h:1014 src/xml/xmli18n-tmp.h:1071
-#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1166
-#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1271
-#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1372
-#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1496
-#: src/xml/xmli18n-tmp.h:1556 src/xml/xmli18n-tmp.h:1613
-#: src/xml/xmli18n-tmp.h:1670 src/xml/xmli18n-tmp.h:1733
-#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1807
-msgid "ColorLife Paper"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:87 src/xml/xmli18n-tmp.h:90 src/xml/xmli18n-tmp.h:93
-#: src/xml/xmli18n-tmp.h:96 src/xml/xmli18n-tmp.h:99 src/xml/xmli18n-tmp.h:102
-#: src/xml/xmli18n-tmp.h:105 src/xml/xmli18n-tmp.h:108
-#: src/xml/xmli18n-tmp.h:111 src/xml/xmli18n-tmp.h:114
-#: src/xml/xmli18n-tmp.h:117 src/xml/xmli18n-tmp.h:120
-#: src/xml/xmli18n-tmp.h:123 src/xml/xmli18n-tmp.h:126
-#: src/xml/xmli18n-tmp.h:129 src/xml/xmli18n-tmp.h:132
-#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:138
-#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:144
-#: src/xml/xmli18n-tmp.h:147 src/xml/xmli18n-tmp.h:150
-#: src/xml/xmli18n-tmp.h:153 src/xml/xmli18n-tmp.h:156
-#: src/xml/xmli18n-tmp.h:159 src/xml/xmli18n-tmp.h:162
-#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:168
-#: src/xml/xmli18n-tmp.h:171 src/xml/xmli18n-tmp.h:174
-#: src/xml/xmli18n-tmp.h:177 src/xml/xmli18n-tmp.h:180
-#: src/xml/xmli18n-tmp.h:183 src/xml/xmli18n-tmp.h:186
-#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:192
-#: src/xml/xmli18n-tmp.h:195 src/xml/xmli18n-tmp.h:198
-#: src/xml/xmli18n-tmp.h:201 src/xml/xmli18n-tmp.h:204
-#: src/xml/xmli18n-tmp.h:207 src/xml/xmli18n-tmp.h:210
-#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:216
-#: src/xml/xmli18n-tmp.h:219 src/xml/xmli18n-tmp.h:222
-#: src/xml/xmli18n-tmp.h:225 src/xml/xmli18n-tmp.h:228
-#: src/xml/xmli18n-tmp.h:231 src/xml/xmli18n-tmp.h:234
-#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:240
-#: src/xml/xmli18n-tmp.h:243 src/xml/xmli18n-tmp.h:246
-#: src/xml/xmli18n-tmp.h:249 src/xml/xmli18n-tmp.h:252
-#: src/xml/xmli18n-tmp.h:255 src/xml/xmli18n-tmp.h:504
-#: src/xml/xmli18n-tmp.h:507 src/xml/xmli18n-tmp.h:510
-#: src/xml/xmli18n-tmp.h:513 src/xml/xmli18n-tmp.h:516
-#: src/xml/xmli18n-tmp.h:519 src/xml/xmli18n-tmp.h:522
-#: src/xml/xmli18n-tmp.h:525 src/xml/xmli18n-tmp.h:528
-#: src/xml/xmli18n-tmp.h:531 src/xml/xmli18n-tmp.h:534
-#: src/xml/xmli18n-tmp.h:537 src/xml/xmli18n-tmp.h:540
-#: src/xml/xmli18n-tmp.h:543 src/xml/xmli18n-tmp.h:546
-#: src/xml/xmli18n-tmp.h:549 src/xml/xmli18n-tmp.h:552
-#: src/xml/xmli18n-tmp.h:555 src/xml/xmli18n-tmp.h:558
-#: src/xml/xmli18n-tmp.h:561 src/xml/xmli18n-tmp.h:564
-#: src/xml/xmli18n-tmp.h:567 src/xml/xmli18n-tmp.h:570
-#: src/xml/xmli18n-tmp.h:573 src/xml/xmli18n-tmp.h:576
-#: src/xml/xmli18n-tmp.h:579 src/xml/xmli18n-tmp.h:582
-#: src/xml/xmli18n-tmp.h:585 src/xml/xmli18n-tmp.h:588
-#: src/xml/xmli18n-tmp.h:591 src/xml/xmli18n-tmp.h:594
-#: src/xml/xmli18n-tmp.h:597 src/xml/xmli18n-tmp.h:600
-#: src/xml/xmli18n-tmp.h:603 src/xml/xmli18n-tmp.h:606
-#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:612
-#: src/xml/xmli18n-tmp.h:615 src/xml/xmli18n-tmp.h:851
-#: src/xml/xmli18n-tmp.h:854 src/xml/xmli18n-tmp.h:857
-#: src/xml/xmli18n-tmp.h:860 src/xml/xmli18n-tmp.h:863
-#: src/xml/xmli18n-tmp.h:866 src/xml/xmli18n-tmp.h:869
-#: src/xml/xmli18n-tmp.h:872 src/xml/xmli18n-tmp.h:875
-#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:881
-#: src/xml/xmli18n-tmp.h:884 src/xml/xmli18n-tmp.h:887
-#: src/xml/xmli18n-tmp.h:890 src/xml/xmli18n-tmp.h:893
-#: src/xml/xmli18n-tmp.h:896 src/xml/xmli18n-tmp.h:899
-#: src/xml/xmli18n-tmp.h:902 src/xml/xmli18n-tmp.h:905
-#: src/xml/xmli18n-tmp.h:908 src/xml/xmli18n-tmp.h:911
-#: src/xml/xmli18n-tmp.h:914 src/xml/xmli18n-tmp.h:917
-#: src/xml/xmli18n-tmp.h:920 src/xml/xmli18n-tmp.h:923
-#: src/xml/xmli18n-tmp.h:926 src/xml/xmli18n-tmp.h:929
-#: src/xml/xmli18n-tmp.h:932 src/xml/xmli18n-tmp.h:935
-#: src/xml/xmli18n-tmp.h:938 src/xml/xmli18n-tmp.h:941
-#: src/xml/xmli18n-tmp.h:944 src/xml/xmli18n-tmp.h:947
-#: src/xml/xmli18n-tmp.h:950 src/xml/xmli18n-tmp.h:953
-#: src/xml/xmli18n-tmp.h:956 src/xml/xmli18n-tmp.h:959
-#: src/xml/xmli18n-tmp.h:962 src/xml/xmli18n-tmp.h:965
-#: src/xml/xmli18n-tmp.h:968 src/xml/xmli18n-tmp.h:971
-#: src/xml/xmli18n-tmp.h:974 src/xml/xmli18n-tmp.h:977
-#: src/xml/xmli18n-tmp.h:980 src/xml/xmli18n-tmp.h:983
-#: src/xml/xmli18n-tmp.h:986 src/xml/xmli18n-tmp.h:989
-#: src/xml/xmli18n-tmp.h:992 src/xml/xmli18n-tmp.h:995
-#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1001
-#: src/xml/xmli18n-tmp.h:1004 src/xml/xmli18n-tmp.h:1007
-#: src/xml/xmli18n-tmp.h:1010 src/xml/xmli18n-tmp.h:1013
-#: src/xml/xmli18n-tmp.h:1016 src/xml/xmli18n-tmp.h:1019
-#: src/xml/xmli18n-tmp.h:1022 src/xml/xmli18n-tmp.h:1025
-#: src/xml/xmli18n-tmp.h:1028 src/xml/xmli18n-tmp.h:1031
-#: src/xml/xmli18n-tmp.h:1034 src/xml/xmli18n-tmp.h:1037
-#: src/xml/xmli18n-tmp.h:1040 src/xml/xmli18n-tmp.h:1043
-#: src/xml/xmli18n-tmp.h:1046 src/xml/xmli18n-tmp.h:1049
-#: src/xml/xmli18n-tmp.h:1052 src/xml/xmli18n-tmp.h:1055
-#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1061
-#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1067
-#: src/xml/xmli18n-tmp.h:1070 src/xml/xmli18n-tmp.h:1073
-#: src/xml/xmli18n-tmp.h:1076 src/xml/xmli18n-tmp.h:1079
-#: src/xml/xmli18n-tmp.h:1082 src/xml/xmli18n-tmp.h:1085
-#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1091
-#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1097
-#: src/xml/xmli18n-tmp.h:1100 src/xml/xmli18n-tmp.h:1103
-#: src/xml/xmli18n-tmp.h:1106 src/xml/xmli18n-tmp.h:1109
-#: src/xml/xmli18n-tmp.h:1112 src/xml/xmli18n-tmp.h:1115
-#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1121
-#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1127
-#: src/xml/xmli18n-tmp.h:1130 src/xml/xmli18n-tmp.h:1133
-#: src/xml/xmli18n-tmp.h:1222 src/xml/xmli18n-tmp.h:1225
-#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1231
-#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1237
-#: src/xml/xmli18n-tmp.h:1240 src/xml/xmli18n-tmp.h:1243
-#: src/xml/xmli18n-tmp.h:1246 src/xml/xmli18n-tmp.h:1249
-#: src/xml/xmli18n-tmp.h:1252 src/xml/xmli18n-tmp.h:1255
-#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1261
-#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1267
-#: src/xml/xmli18n-tmp.h:1270 src/xml/xmli18n-tmp.h:1273
-#: src/xml/xmli18n-tmp.h:1276 src/xml/xmli18n-tmp.h:1279
-#: src/xml/xmli18n-tmp.h:1282 src/xml/xmli18n-tmp.h:1285
-#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1291
-#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1297
-#: src/xml/xmli18n-tmp.h:1300 src/xml/xmli18n-tmp.h:1303
-#: src/xml/xmli18n-tmp.h:1306 src/xml/xmli18n-tmp.h:1309
-#: src/xml/xmli18n-tmp.h:1312 src/xml/xmli18n-tmp.h:1315
-#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1321
-#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1327
-#: src/xml/xmli18n-tmp.h:1330 src/xml/xmli18n-tmp.h:1333
-#: src/xml/xmli18n-tmp.h:1564 src/xml/xmli18n-tmp.h:1567
-#: src/xml/xmli18n-tmp.h:1570 src/xml/xmli18n-tmp.h:1573
-#: src/xml/xmli18n-tmp.h:1576 src/xml/xmli18n-tmp.h:1579
-#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1585
-#: src/xml/xmli18n-tmp.h:1588 src/xml/xmli18n-tmp.h:1591
-#: src/xml/xmli18n-tmp.h:1594 src/xml/xmli18n-tmp.h:1597
-#: src/xml/xmli18n-tmp.h:1600 src/xml/xmli18n-tmp.h:1603
-#: src/xml/xmli18n-tmp.h:1606 src/xml/xmli18n-tmp.h:1609
-#: src/xml/xmli18n-tmp.h:1612 src/xml/xmli18n-tmp.h:1615
-#: src/xml/xmli18n-tmp.h:1618 src/xml/xmli18n-tmp.h:1621
-#: src/xml/xmli18n-tmp.h:1624 src/xml/xmli18n-tmp.h:1627
-#: src/xml/xmli18n-tmp.h:1630 src/xml/xmli18n-tmp.h:1633
-#: src/xml/xmli18n-tmp.h:1636 src/xml/xmli18n-tmp.h:1639
-#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1645
-#: src/xml/xmli18n-tmp.h:1648 src/xml/xmli18n-tmp.h:1651
-#: src/xml/xmli18n-tmp.h:1654 src/xml/xmli18n-tmp.h:1657
-#: src/xml/xmli18n-tmp.h:1660 src/xml/xmli18n-tmp.h:1663
-#: src/xml/xmli18n-tmp.h:1666 src/xml/xmli18n-tmp.h:1669
-#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1675
-#: src/xml/xmli18n-tmp.h:3222 src/xml/xmli18n-tmp.h:3223
-#: src/xml/xmli18n-tmp.h:3230 src/xml/xmli18n-tmp.h:3231
-#: src/xml/xmli18n-tmp.h:3238 src/xml/xmli18n-tmp.h:3239
-#: src/xml/xmli18n-tmp.h:3300 src/xml/xmli18n-tmp.h:3301
-#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3311
-#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3396
-#: src/xml/xmli18n-tmp.h:3407 src/xml/xmli18n-tmp.h:3408
-#: src/xml/xmli18n-tmp.h:3419 src/xml/xmli18n-tmp.h:3420
-#: src/xml/xmli18n-tmp.h:3431 src/xml/xmli18n-tmp.h:3432
-#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3440
-#: src/xml/xmli18n-tmp.h:3479 src/xml/xmli18n-tmp.h:3480
-#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3492
-#: src/xml/xmli18n-tmp.h:3553 src/xml/xmli18n-tmp.h:3554
-#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:133 src/xml/xmli18n-tmp.h:137
+#: src/xml/xmli18n-tmp.h:141 src/xml/xmli18n-tmp.h:145
+#: src/xml/xmli18n-tmp.h:149 src/xml/xmli18n-tmp.h:153
+#: src/xml/xmli18n-tmp.h:157 src/xml/xmli18n-tmp.h:161
+#: src/xml/xmli18n-tmp.h:165 src/xml/xmli18n-tmp.h:169
+#: src/xml/xmli18n-tmp.h:173 src/xml/xmli18n-tmp.h:177
+#: src/xml/xmli18n-tmp.h:181 src/xml/xmli18n-tmp.h:185
+#: src/xml/xmli18n-tmp.h:189 src/xml/xmli18n-tmp.h:193
+#: src/xml/xmli18n-tmp.h:197 src/xml/xmli18n-tmp.h:201
+#: src/xml/xmli18n-tmp.h:205 src/xml/xmli18n-tmp.h:209
+#: src/xml/xmli18n-tmp.h:213 src/xml/xmli18n-tmp.h:217
+#: src/xml/xmli18n-tmp.h:221 src/xml/xmli18n-tmp.h:225
+#: src/xml/xmli18n-tmp.h:229 src/xml/xmli18n-tmp.h:233
+#: src/xml/xmli18n-tmp.h:237 src/xml/xmli18n-tmp.h:241
+#: src/xml/xmli18n-tmp.h:245 src/xml/xmli18n-tmp.h:249
+#: src/xml/xmli18n-tmp.h:253 src/xml/xmli18n-tmp.h:257
+#: src/xml/xmli18n-tmp.h:261 src/xml/xmli18n-tmp.h:265
+#: src/xml/xmli18n-tmp.h:269 src/xml/xmli18n-tmp.h:273
+#: src/xml/xmli18n-tmp.h:277 src/xml/xmli18n-tmp.h:281
+#: src/xml/xmli18n-tmp.h:285 src/xml/xmli18n-tmp.h:289
+#: src/xml/xmli18n-tmp.h:293 src/xml/xmli18n-tmp.h:297
+#: src/xml/xmli18n-tmp.h:301 src/xml/xmli18n-tmp.h:305
+#: src/xml/xmli18n-tmp.h:309 src/xml/xmli18n-tmp.h:313
+#: src/xml/xmli18n-tmp.h:317 src/xml/xmli18n-tmp.h:321
+#: src/xml/xmli18n-tmp.h:325 src/xml/xmli18n-tmp.h:329
+#: src/xml/xmli18n-tmp.h:333 src/xml/xmli18n-tmp.h:337
+#: src/xml/xmli18n-tmp.h:341 src/xml/xmli18n-tmp.h:345
+#: src/xml/xmli18n-tmp.h:349 src/xml/xmli18n-tmp.h:353
+#: src/xml/xmli18n-tmp.h:357 src/xml/xmli18n-tmp.h:607
+#: src/xml/xmli18n-tmp.h:611 src/xml/xmli18n-tmp.h:615
+#: src/xml/xmli18n-tmp.h:619 src/xml/xmli18n-tmp.h:623
+#: src/xml/xmli18n-tmp.h:627 src/xml/xmli18n-tmp.h:631
+#: src/xml/xmli18n-tmp.h:635 src/xml/xmli18n-tmp.h:639
+#: src/xml/xmli18n-tmp.h:643 src/xml/xmli18n-tmp.h:647
+#: src/xml/xmli18n-tmp.h:651 src/xml/xmli18n-tmp.h:655
+#: src/xml/xmli18n-tmp.h:659 src/xml/xmli18n-tmp.h:663
+#: src/xml/xmli18n-tmp.h:667 src/xml/xmli18n-tmp.h:671
+#: src/xml/xmli18n-tmp.h:675 src/xml/xmli18n-tmp.h:679
+#: src/xml/xmli18n-tmp.h:683 src/xml/xmli18n-tmp.h:687
+#: src/xml/xmli18n-tmp.h:691 src/xml/xmli18n-tmp.h:695
+#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:703
+#: src/xml/xmli18n-tmp.h:707 src/xml/xmli18n-tmp.h:711
+#: src/xml/xmli18n-tmp.h:715 src/xml/xmli18n-tmp.h:719
+#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:727
+#: src/xml/xmli18n-tmp.h:731 src/xml/xmli18n-tmp.h:735
+#: src/xml/xmli18n-tmp.h:739 src/xml/xmli18n-tmp.h:743
+#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:751
+#: src/xml/xmli18n-tmp.h:755 src/xml/xmli18n-tmp.h:1052
+#: src/xml/xmli18n-tmp.h:1057 src/xml/xmli18n-tmp.h:1062
+#: src/xml/xmli18n-tmp.h:1067 src/xml/xmli18n-tmp.h:1072
+#: src/xml/xmli18n-tmp.h:1077 src/xml/xmli18n-tmp.h:1082
+#: src/xml/xmli18n-tmp.h:1087 src/xml/xmli18n-tmp.h:1092
+#: src/xml/xmli18n-tmp.h:1097 src/xml/xmli18n-tmp.h:1102
+#: src/xml/xmli18n-tmp.h:1107 src/xml/xmli18n-tmp.h:1112
+#: src/xml/xmli18n-tmp.h:1117 src/xml/xmli18n-tmp.h:1122
+#: src/xml/xmli18n-tmp.h:1127 src/xml/xmli18n-tmp.h:1132
+#: src/xml/xmli18n-tmp.h:1137 src/xml/xmli18n-tmp.h:1142
+#: src/xml/xmli18n-tmp.h:1147 src/xml/xmli18n-tmp.h:1152
+#: src/xml/xmli18n-tmp.h:1157 src/xml/xmli18n-tmp.h:1162
+#: src/xml/xmli18n-tmp.h:1167 src/xml/xmli18n-tmp.h:1172
+#: src/xml/xmli18n-tmp.h:1177 src/xml/xmli18n-tmp.h:1182
+#: src/xml/xmli18n-tmp.h:1187 src/xml/xmli18n-tmp.h:1192
+#: src/xml/xmli18n-tmp.h:1197 src/xml/xmli18n-tmp.h:1202
+#: src/xml/xmli18n-tmp.h:1207 src/xml/xmli18n-tmp.h:1212
+#: src/xml/xmli18n-tmp.h:1217 src/xml/xmli18n-tmp.h:1222
+#: src/xml/xmli18n-tmp.h:1227 src/xml/xmli18n-tmp.h:1232
+#: src/xml/xmli18n-tmp.h:1237 src/xml/xmli18n-tmp.h:1242
+#: src/xml/xmli18n-tmp.h:1247 src/xml/xmli18n-tmp.h:1252
+#: src/xml/xmli18n-tmp.h:1257 src/xml/xmli18n-tmp.h:1262
+#: src/xml/xmli18n-tmp.h:1267 src/xml/xmli18n-tmp.h:1272
+#: src/xml/xmli18n-tmp.h:1277 src/xml/xmli18n-tmp.h:1282
+#: src/xml/xmli18n-tmp.h:1287 src/xml/xmli18n-tmp.h:1292
+#: src/xml/xmli18n-tmp.h:1297 src/xml/xmli18n-tmp.h:1302
+#: src/xml/xmli18n-tmp.h:1307 src/xml/xmli18n-tmp.h:1312
+#: src/xml/xmli18n-tmp.h:1317 src/xml/xmli18n-tmp.h:1322
+#: src/xml/xmli18n-tmp.h:1327 src/xml/xmli18n-tmp.h:1332
+#: src/xml/xmli18n-tmp.h:1337 src/xml/xmli18n-tmp.h:1343
+#: src/xml/xmli18n-tmp.h:1349 src/xml/xmli18n-tmp.h:1355
+#: src/xml/xmli18n-tmp.h:1361 src/xml/xmli18n-tmp.h:1367
+#: src/xml/xmli18n-tmp.h:1373 src/xml/xmli18n-tmp.h:1379
+#: src/xml/xmli18n-tmp.h:1385 src/xml/xmli18n-tmp.h:1391
+#: src/xml/xmli18n-tmp.h:1397 src/xml/xmli18n-tmp.h:1403
+#: src/xml/xmli18n-tmp.h:1409 src/xml/xmli18n-tmp.h:1415
+#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1427
+#: src/xml/xmli18n-tmp.h:1433 src/xml/xmli18n-tmp.h:1439
+#: src/xml/xmli18n-tmp.h:1445 src/xml/xmli18n-tmp.h:1451
+#: src/xml/xmli18n-tmp.h:1456 src/xml/xmli18n-tmp.h:1461
+#: src/xml/xmli18n-tmp.h:1466 src/xml/xmli18n-tmp.h:1471
+#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1481
+#: src/xml/xmli18n-tmp.h:1486 src/xml/xmli18n-tmp.h:1491
+#: src/xml/xmli18n-tmp.h:1496 src/xml/xmli18n-tmp.h:1501
+#: src/xml/xmli18n-tmp.h:1506 src/xml/xmli18n-tmp.h:1511
+#: src/xml/xmli18n-tmp.h:1516 src/xml/xmli18n-tmp.h:1521
+#: src/xml/xmli18n-tmp.h:1526 src/xml/xmli18n-tmp.h:1531
+#: src/xml/xmli18n-tmp.h:1536 src/xml/xmli18n-tmp.h:1541
+#: src/xml/xmli18n-tmp.h:1632 src/xml/xmli18n-tmp.h:1637
+#: src/xml/xmli18n-tmp.h:1642 src/xml/xmli18n-tmp.h:1647
+#: src/xml/xmli18n-tmp.h:1652 src/xml/xmli18n-tmp.h:1657
+#: src/xml/xmli18n-tmp.h:1662 src/xml/xmli18n-tmp.h:1667
+#: src/xml/xmli18n-tmp.h:1672 src/xml/xmli18n-tmp.h:1677
+#: src/xml/xmli18n-tmp.h:1682 src/xml/xmli18n-tmp.h:1687
+#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1697
+#: src/xml/xmli18n-tmp.h:1702 src/xml/xmli18n-tmp.h:1707
+#: src/xml/xmli18n-tmp.h:1712 src/xml/xmli18n-tmp.h:1717
+#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1727
+#: src/xml/xmli18n-tmp.h:1732 src/xml/xmli18n-tmp.h:1737
+#: src/xml/xmli18n-tmp.h:1742 src/xml/xmli18n-tmp.h:1747
+#: src/xml/xmli18n-tmp.h:1752 src/xml/xmli18n-tmp.h:1757
+#: src/xml/xmli18n-tmp.h:1762 src/xml/xmli18n-tmp.h:1767
+#: src/xml/xmli18n-tmp.h:1772 src/xml/xmli18n-tmp.h:1777
+#: src/xml/xmli18n-tmp.h:1782 src/xml/xmli18n-tmp.h:1787
+#: src/xml/xmli18n-tmp.h:1792 src/xml/xmli18n-tmp.h:1797
+#: src/xml/xmli18n-tmp.h:1802 src/xml/xmli18n-tmp.h:1807
+#: src/xml/xmli18n-tmp.h:1812 src/xml/xmli18n-tmp.h:1817
+#: src/xml/xmli18n-tmp.h:2050 src/xml/xmli18n-tmp.h:2054
+#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2062
+#: src/xml/xmli18n-tmp.h:2066 src/xml/xmli18n-tmp.h:2070
+#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2078
+#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2086
+#: src/xml/xmli18n-tmp.h:2090 src/xml/xmli18n-tmp.h:2094
+#: src/xml/xmli18n-tmp.h:2098 src/xml/xmli18n-tmp.h:2102
+#: src/xml/xmli18n-tmp.h:2106 src/xml/xmli18n-tmp.h:2110
+#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2118
+#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2126
+#: src/xml/xmli18n-tmp.h:2130 src/xml/xmli18n-tmp.h:2134
+#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2142
+#: src/xml/xmli18n-tmp.h:2146 src/xml/xmli18n-tmp.h:2150
+#: src/xml/xmli18n-tmp.h:2154 src/xml/xmli18n-tmp.h:2158
+#: src/xml/xmli18n-tmp.h:2162 src/xml/xmli18n-tmp.h:2166
+#: src/xml/xmli18n-tmp.h:2170 src/xml/xmli18n-tmp.h:2174
+#: src/xml/xmli18n-tmp.h:2178 src/xml/xmli18n-tmp.h:2182
+#: src/xml/xmli18n-tmp.h:2186 src/xml/xmli18n-tmp.h:2190
+#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2198
+#: src/xml/xmli18n-tmp.h:3850 src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:3857 src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:3884 src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:3916 src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:3923 src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:4212 src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:4247 src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:4254 src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:4779 src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:4845 src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:4852 src/xml/xmli18n-tmp.h:4912
+#: src/xml/xmli18n-tmp.h:4913 src/xml/xmli18n-tmp.h:4919
+#: src/xml/xmli18n-tmp.h:4979 src/xml/xmli18n-tmp.h:4980
+#: src/xml/xmli18n-tmp.h:4986 src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:5021 src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:5209 src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:5216 src/xml/xmli18n-tmp.h:5276
+#: src/xml/xmli18n-tmp.h:5277 src/xml/xmli18n-tmp.h:5283
+#: src/xml/xmli18n-tmp.h:5600 src/xml/xmli18n-tmp.h:5601
+#: src/xml/xmli18n-tmp.h:5607 src/xml/xmli18n-tmp.h:5633
+#: src/xml/xmli18n-tmp.h:5634 src/xml/xmli18n-tmp.h:5640
 msgid "Quadtone"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:88 src/xml/xmli18n-tmp.h:145
-#: src/xml/xmli18n-tmp.h:202 src/xml/xmli18n-tmp.h:346
-#: src/xml/xmli18n-tmp.h:505 src/xml/xmli18n-tmp.h:562
-#: src/xml/xmli18n-tmp.h:618 src/xml/xmli18n-tmp.h:656
-#: src/xml/xmli18n-tmp.h:695 src/xml/xmli18n-tmp.h:852
-#: src/xml/xmli18n-tmp.h:909 src/xml/xmli18n-tmp.h:966
-#: src/xml/xmli18n-tmp.h:1023 src/xml/xmli18n-tmp.h:1080
-#: src/xml/xmli18n-tmp.h:1172 src/xml/xmli18n-tmp.h:1223
-#: src/xml/xmli18n-tmp.h:1280 src/xml/xmli18n-tmp.h:1336
-#: src/xml/xmli18n-tmp.h:1379 src/xml/xmli18n-tmp.h:1442
-#: src/xml/xmli18n-tmp.h:1565 src/xml/xmli18n-tmp.h:1622
-#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1775
+#: src/xml/xmli18n-tmp.h:134 src/xml/xmli18n-tmp.h:138
+#: src/xml/xmli18n-tmp.h:142 src/xml/xmli18n-tmp.h:146
+#: src/xml/xmli18n-tmp.h:150 src/xml/xmli18n-tmp.h:154
+#: src/xml/xmli18n-tmp.h:158 src/xml/xmli18n-tmp.h:162
+#: src/xml/xmli18n-tmp.h:166 src/xml/xmli18n-tmp.h:170
+#: src/xml/xmli18n-tmp.h:174 src/xml/xmli18n-tmp.h:178
+#: src/xml/xmli18n-tmp.h:182 src/xml/xmli18n-tmp.h:186
+#: src/xml/xmli18n-tmp.h:190 src/xml/xmli18n-tmp.h:194
+#: src/xml/xmli18n-tmp.h:198 src/xml/xmli18n-tmp.h:202
+#: src/xml/xmli18n-tmp.h:206 src/xml/xmli18n-tmp.h:210
+#: src/xml/xmli18n-tmp.h:214 src/xml/xmli18n-tmp.h:218
+#: src/xml/xmli18n-tmp.h:222 src/xml/xmli18n-tmp.h:226
+#: src/xml/xmli18n-tmp.h:230 src/xml/xmli18n-tmp.h:234
+#: src/xml/xmli18n-tmp.h:238 src/xml/xmli18n-tmp.h:242
+#: src/xml/xmli18n-tmp.h:246 src/xml/xmli18n-tmp.h:250
+#: src/xml/xmli18n-tmp.h:254 src/xml/xmli18n-tmp.h:258
+#: src/xml/xmli18n-tmp.h:262 src/xml/xmli18n-tmp.h:266
+#: src/xml/xmli18n-tmp.h:270 src/xml/xmli18n-tmp.h:274
+#: src/xml/xmli18n-tmp.h:278 src/xml/xmli18n-tmp.h:282
+#: src/xml/xmli18n-tmp.h:286 src/xml/xmli18n-tmp.h:290
+#: src/xml/xmli18n-tmp.h:294 src/xml/xmli18n-tmp.h:298
+#: src/xml/xmli18n-tmp.h:302 src/xml/xmli18n-tmp.h:306
+#: src/xml/xmli18n-tmp.h:310 src/xml/xmli18n-tmp.h:314
+#: src/xml/xmli18n-tmp.h:318 src/xml/xmli18n-tmp.h:322
+#: src/xml/xmli18n-tmp.h:326 src/xml/xmli18n-tmp.h:330
+#: src/xml/xmli18n-tmp.h:334 src/xml/xmli18n-tmp.h:338
+#: src/xml/xmli18n-tmp.h:342 src/xml/xmli18n-tmp.h:346
+#: src/xml/xmli18n-tmp.h:350 src/xml/xmli18n-tmp.h:354
+#: src/xml/xmli18n-tmp.h:358 src/xml/xmli18n-tmp.h:608
+#: src/xml/xmli18n-tmp.h:612 src/xml/xmli18n-tmp.h:616
+#: src/xml/xmli18n-tmp.h:620 src/xml/xmli18n-tmp.h:624
+#: src/xml/xmli18n-tmp.h:628 src/xml/xmli18n-tmp.h:632
+#: src/xml/xmli18n-tmp.h:636 src/xml/xmli18n-tmp.h:640
+#: src/xml/xmli18n-tmp.h:644 src/xml/xmli18n-tmp.h:648
+#: src/xml/xmli18n-tmp.h:652 src/xml/xmli18n-tmp.h:656
+#: src/xml/xmli18n-tmp.h:660 src/xml/xmli18n-tmp.h:664
+#: src/xml/xmli18n-tmp.h:668 src/xml/xmli18n-tmp.h:672
+#: src/xml/xmli18n-tmp.h:676 src/xml/xmli18n-tmp.h:680
+#: src/xml/xmli18n-tmp.h:684 src/xml/xmli18n-tmp.h:688
+#: src/xml/xmli18n-tmp.h:692 src/xml/xmli18n-tmp.h:696
+#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:704
+#: src/xml/xmli18n-tmp.h:708 src/xml/xmli18n-tmp.h:712
+#: src/xml/xmli18n-tmp.h:716 src/xml/xmli18n-tmp.h:720
+#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:728
+#: src/xml/xmli18n-tmp.h:732 src/xml/xmli18n-tmp.h:736
+#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:744
+#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:752
+#: src/xml/xmli18n-tmp.h:756 src/xml/xmli18n-tmp.h:1053
+#: src/xml/xmli18n-tmp.h:1058 src/xml/xmli18n-tmp.h:1063
+#: src/xml/xmli18n-tmp.h:1068 src/xml/xmli18n-tmp.h:1073
+#: src/xml/xmli18n-tmp.h:1078 src/xml/xmli18n-tmp.h:1083
+#: src/xml/xmli18n-tmp.h:1088 src/xml/xmli18n-tmp.h:1093
+#: src/xml/xmli18n-tmp.h:1098 src/xml/xmli18n-tmp.h:1103
+#: src/xml/xmli18n-tmp.h:1108 src/xml/xmli18n-tmp.h:1113
+#: src/xml/xmli18n-tmp.h:1118 src/xml/xmli18n-tmp.h:1123
+#: src/xml/xmli18n-tmp.h:1128 src/xml/xmli18n-tmp.h:1133
+#: src/xml/xmli18n-tmp.h:1138 src/xml/xmli18n-tmp.h:1143
+#: src/xml/xmli18n-tmp.h:1148 src/xml/xmli18n-tmp.h:1153
+#: src/xml/xmli18n-tmp.h:1158 src/xml/xmli18n-tmp.h:1163
+#: src/xml/xmli18n-tmp.h:1168 src/xml/xmli18n-tmp.h:1173
+#: src/xml/xmli18n-tmp.h:1178 src/xml/xmli18n-tmp.h:1183
+#: src/xml/xmli18n-tmp.h:1188 src/xml/xmli18n-tmp.h:1193
+#: src/xml/xmli18n-tmp.h:1198 src/xml/xmli18n-tmp.h:1203
+#: src/xml/xmli18n-tmp.h:1208 src/xml/xmli18n-tmp.h:1213
+#: src/xml/xmli18n-tmp.h:1218 src/xml/xmli18n-tmp.h:1223
+#: src/xml/xmli18n-tmp.h:1228 src/xml/xmli18n-tmp.h:1233
+#: src/xml/xmli18n-tmp.h:1238 src/xml/xmli18n-tmp.h:1243
+#: src/xml/xmli18n-tmp.h:1248 src/xml/xmli18n-tmp.h:1253
+#: src/xml/xmli18n-tmp.h:1258 src/xml/xmli18n-tmp.h:1263
+#: src/xml/xmli18n-tmp.h:1268 src/xml/xmli18n-tmp.h:1273
+#: src/xml/xmli18n-tmp.h:1278 src/xml/xmli18n-tmp.h:1283
+#: src/xml/xmli18n-tmp.h:1288 src/xml/xmli18n-tmp.h:1293
+#: src/xml/xmli18n-tmp.h:1298 src/xml/xmli18n-tmp.h:1303
+#: src/xml/xmli18n-tmp.h:1308 src/xml/xmli18n-tmp.h:1313
+#: src/xml/xmli18n-tmp.h:1318 src/xml/xmli18n-tmp.h:1323
+#: src/xml/xmli18n-tmp.h:1328 src/xml/xmli18n-tmp.h:1333
+#: src/xml/xmli18n-tmp.h:1338 src/xml/xmli18n-tmp.h:1344
+#: src/xml/xmli18n-tmp.h:1350 src/xml/xmli18n-tmp.h:1356
+#: src/xml/xmli18n-tmp.h:1362 src/xml/xmli18n-tmp.h:1368
+#: src/xml/xmli18n-tmp.h:1374 src/xml/xmli18n-tmp.h:1380
+#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1392
+#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1404
+#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1416
+#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1428
+#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1440
+#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1452
+#: src/xml/xmli18n-tmp.h:1457 src/xml/xmli18n-tmp.h:1462
+#: src/xml/xmli18n-tmp.h:1467 src/xml/xmli18n-tmp.h:1472
+#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1482
+#: src/xml/xmli18n-tmp.h:1487 src/xml/xmli18n-tmp.h:1492
+#: src/xml/xmli18n-tmp.h:1497 src/xml/xmli18n-tmp.h:1502
+#: src/xml/xmli18n-tmp.h:1507 src/xml/xmli18n-tmp.h:1512
+#: src/xml/xmli18n-tmp.h:1517 src/xml/xmli18n-tmp.h:1522
+#: src/xml/xmli18n-tmp.h:1527 src/xml/xmli18n-tmp.h:1532
+#: src/xml/xmli18n-tmp.h:1537 src/xml/xmli18n-tmp.h:1542
+#: src/xml/xmli18n-tmp.h:1633 src/xml/xmli18n-tmp.h:1638
+#: src/xml/xmli18n-tmp.h:1643 src/xml/xmli18n-tmp.h:1648
+#: src/xml/xmli18n-tmp.h:1653 src/xml/xmli18n-tmp.h:1658
+#: src/xml/xmli18n-tmp.h:1663 src/xml/xmli18n-tmp.h:1668
+#: src/xml/xmli18n-tmp.h:1673 src/xml/xmli18n-tmp.h:1678
+#: src/xml/xmli18n-tmp.h:1683 src/xml/xmli18n-tmp.h:1688
+#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1698
+#: src/xml/xmli18n-tmp.h:1703 src/xml/xmli18n-tmp.h:1708
+#: src/xml/xmli18n-tmp.h:1713 src/xml/xmli18n-tmp.h:1718
+#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1728
+#: src/xml/xmli18n-tmp.h:1733 src/xml/xmli18n-tmp.h:1738
+#: src/xml/xmli18n-tmp.h:1743 src/xml/xmli18n-tmp.h:1748
+#: src/xml/xmli18n-tmp.h:1753 src/xml/xmli18n-tmp.h:1758
+#: src/xml/xmli18n-tmp.h:1763 src/xml/xmli18n-tmp.h:1768
+#: src/xml/xmli18n-tmp.h:1773 src/xml/xmli18n-tmp.h:1778
+#: src/xml/xmli18n-tmp.h:1783 src/xml/xmli18n-tmp.h:1788
+#: src/xml/xmli18n-tmp.h:1793 src/xml/xmli18n-tmp.h:1798
+#: src/xml/xmli18n-tmp.h:1803 src/xml/xmli18n-tmp.h:1808
+#: src/xml/xmli18n-tmp.h:1813 src/xml/xmli18n-tmp.h:1818
+#: src/xml/xmli18n-tmp.h:2051 src/xml/xmli18n-tmp.h:2055
+#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2063
+#: src/xml/xmli18n-tmp.h:2067 src/xml/xmli18n-tmp.h:2071
+#: src/xml/xmli18n-tmp.h:2075 src/xml/xmli18n-tmp.h:2079
+#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2087
+#: src/xml/xmli18n-tmp.h:2091 src/xml/xmli18n-tmp.h:2095
+#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2103
+#: src/xml/xmli18n-tmp.h:2107 src/xml/xmli18n-tmp.h:2111
+#: src/xml/xmli18n-tmp.h:2115 src/xml/xmli18n-tmp.h:2119
+#: src/xml/xmli18n-tmp.h:2123 src/xml/xmli18n-tmp.h:2127
+#: src/xml/xmli18n-tmp.h:2131 src/xml/xmli18n-tmp.h:2135
+#: src/xml/xmli18n-tmp.h:2139 src/xml/xmli18n-tmp.h:2143
+#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2151
+#: src/xml/xmli18n-tmp.h:2155 src/xml/xmli18n-tmp.h:2159
+#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2167
+#: src/xml/xmli18n-tmp.h:2171 src/xml/xmli18n-tmp.h:2175
+#: src/xml/xmli18n-tmp.h:2179 src/xml/xmli18n-tmp.h:2183
+#: src/xml/xmli18n-tmp.h:2187 src/xml/xmli18n-tmp.h:2191
+#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2199
+msgid "MISQuadtone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:135 src/xml/xmli18n-tmp.h:211
+#: src/xml/xmli18n-tmp.h:287 src/xml/xmli18n-tmp.h:449
+#: src/xml/xmli18n-tmp.h:609 src/xml/xmli18n-tmp.h:685
+#: src/xml/xmli18n-tmp.h:759 src/xml/xmli18n-tmp.h:797
+#: src/xml/xmli18n-tmp.h:836 src/xml/xmli18n-tmp.h:1055
+#: src/xml/xmli18n-tmp.h:1150 src/xml/xmli18n-tmp.h:1245
+#: src/xml/xmli18n-tmp.h:1341 src/xml/xmli18n-tmp.h:1454
+#: src/xml/xmli18n-tmp.h:1582 src/xml/xmli18n-tmp.h:1635
+#: src/xml/xmli18n-tmp.h:1730 src/xml/xmli18n-tmp.h:1822
+#: src/xml/xmli18n-tmp.h:1865 src/xml/xmli18n-tmp.h:1928
+#: src/xml/xmli18n-tmp.h:2052 src/xml/xmli18n-tmp.h:2128
+#: src/xml/xmli18n-tmp.h:2203 src/xml/xmli18n-tmp.h:2299
 msgid "Plain Paper Fast Load"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:424 src/xml/xmli18n-tmp.h:484
-#: src/xml/xmli18n-tmp.h:737 src/xml/xmli18n-tmp.h:797
-#: src/xml/xmli18n-tmp.h:1200 src/xml/xmli18n-tmp.h:1364
-#: src/xml/xmli18n-tmp.h:1421 src/xml/xmli18n-tmp.h:1484
-#: src/xml/xmli18n-tmp.h:1544 src/xml/xmli18n-tmp.h:1721
+#: src/xml/xmli18n-tmp.h:527 src/xml/xmli18n-tmp.h:587
+#: src/xml/xmli18n-tmp.h:878 src/xml/xmli18n-tmp.h:938
+#: src/xml/xmli18n-tmp.h:998 src/xml/xmli18n-tmp.h:1610
+#: src/xml/xmli18n-tmp.h:1850 src/xml/xmli18n-tmp.h:1907
+#: src/xml/xmli18n-tmp.h:1970 src/xml/xmli18n-tmp.h:2030
+#: src/xml/xmli18n-tmp.h:2245
 msgid "Archival Matte Paper"
 msgstr ""
 
 # (Abel) from Epson
-#: src/xml/xmli18n-tmp.h:427 src/xml/xmli18n-tmp.h:487
-#: src/xml/xmli18n-tmp.h:740 src/xml/xmli18n-tmp.h:800
-#: src/xml/xmli18n-tmp.h:1202 src/xml/xmli18n-tmp.h:1366
-#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1487
-#: src/xml/xmli18n-tmp.h:1547 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:530 src/xml/xmli18n-tmp.h:590
+#: src/xml/xmli18n-tmp.h:881 src/xml/xmli18n-tmp.h:941
+#: src/xml/xmli18n-tmp.h:1001 src/xml/xmli18n-tmp.h:1612
+#: src/xml/xmli18n-tmp.h:1852 src/xml/xmli18n-tmp.h:1910
+#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:2033
+#: src/xml/xmli18n-tmp.h:2248
 msgid "Watercolor Paper - Radiant White"
 msgstr "水彩紙-亮白色"
 
-#: src/xml/xmli18n-tmp.h:693 src/xml/xmli18n-tmp.h:696
-#: src/xml/xmli18n-tmp.h:699 src/xml/xmli18n-tmp.h:702
-#: src/xml/xmli18n-tmp.h:705 src/xml/xmli18n-tmp.h:708
-#: src/xml/xmli18n-tmp.h:711 src/xml/xmli18n-tmp.h:714
-#: src/xml/xmli18n-tmp.h:717 src/xml/xmli18n-tmp.h:720
-#: src/xml/xmli18n-tmp.h:723 src/xml/xmli18n-tmp.h:726
-#: src/xml/xmli18n-tmp.h:729 src/xml/xmli18n-tmp.h:732
-#: src/xml/xmli18n-tmp.h:735 src/xml/xmli18n-tmp.h:738
-#: src/xml/xmli18n-tmp.h:741 src/xml/xmli18n-tmp.h:744
-#: src/xml/xmli18n-tmp.h:747 src/xml/xmli18n-tmp.h:750
-#: src/xml/xmli18n-tmp.h:753 src/xml/xmli18n-tmp.h:1377
-#: src/xml/xmli18n-tmp.h:1380 src/xml/xmli18n-tmp.h:1383
-#: src/xml/xmli18n-tmp.h:1386 src/xml/xmli18n-tmp.h:1389
-#: src/xml/xmli18n-tmp.h:1392 src/xml/xmli18n-tmp.h:1395
-#: src/xml/xmli18n-tmp.h:1398 src/xml/xmli18n-tmp.h:1401
-#: src/xml/xmli18n-tmp.h:1404 src/xml/xmli18n-tmp.h:1407
-#: src/xml/xmli18n-tmp.h:1410 src/xml/xmli18n-tmp.h:1413
-#: src/xml/xmli18n-tmp.h:1416 src/xml/xmli18n-tmp.h:1419
-#: src/xml/xmli18n-tmp.h:1422 src/xml/xmli18n-tmp.h:1425
-#: src/xml/xmli18n-tmp.h:1428 src/xml/xmli18n-tmp.h:1431
-#: src/xml/xmli18n-tmp.h:1434 src/xml/xmli18n-tmp.h:1437
-#: src/xml/xmli18n-tmp.h:1440 src/xml/xmli18n-tmp.h:1443
-#: src/xml/xmli18n-tmp.h:1446 src/xml/xmli18n-tmp.h:1449
-#: src/xml/xmli18n-tmp.h:1452 src/xml/xmli18n-tmp.h:1455
-#: src/xml/xmli18n-tmp.h:1458 src/xml/xmli18n-tmp.h:1461
-#: src/xml/xmli18n-tmp.h:1464 src/xml/xmli18n-tmp.h:1467
-#: src/xml/xmli18n-tmp.h:1470 src/xml/xmli18n-tmp.h:1473
-#: src/xml/xmli18n-tmp.h:1476 src/xml/xmli18n-tmp.h:1479
-#: src/xml/xmli18n-tmp.h:1482 src/xml/xmli18n-tmp.h:1485
-#: src/xml/xmli18n-tmp.h:1488 src/xml/xmli18n-tmp.h:1491
-#: src/xml/xmli18n-tmp.h:1494 src/xml/xmli18n-tmp.h:1497
-#: src/xml/xmli18n-tmp.h:1500 src/xml/xmli18n-tmp.h:1677
-#: src/xml/xmli18n-tmp.h:1680 src/xml/xmli18n-tmp.h:1683
-#: src/xml/xmli18n-tmp.h:1686 src/xml/xmli18n-tmp.h:1689
-#: src/xml/xmli18n-tmp.h:1692 src/xml/xmli18n-tmp.h:1695
-#: src/xml/xmli18n-tmp.h:1698 src/xml/xmli18n-tmp.h:1701
-#: src/xml/xmli18n-tmp.h:1704 src/xml/xmli18n-tmp.h:1707
-#: src/xml/xmli18n-tmp.h:1710 src/xml/xmli18n-tmp.h:1713
-#: src/xml/xmli18n-tmp.h:1716 src/xml/xmli18n-tmp.h:1719
-#: src/xml/xmli18n-tmp.h:1722 src/xml/xmli18n-tmp.h:1725
-#: src/xml/xmli18n-tmp.h:1728 src/xml/xmli18n-tmp.h:1731
-#: src/xml/xmli18n-tmp.h:1734 src/xml/xmli18n-tmp.h:1737
-#: src/xml/xmli18n-tmp.h:3335 src/xml/xmli18n-tmp.h:3503
-#: src/xml/xmli18n-tmp.h:3563
+#: src/xml/xmli18n-tmp.h:834 src/xml/xmli18n-tmp.h:837
+#: src/xml/xmli18n-tmp.h:840 src/xml/xmli18n-tmp.h:843
+#: src/xml/xmli18n-tmp.h:846 src/xml/xmli18n-tmp.h:849
+#: src/xml/xmli18n-tmp.h:852 src/xml/xmli18n-tmp.h:855
+#: src/xml/xmli18n-tmp.h:858 src/xml/xmli18n-tmp.h:861
+#: src/xml/xmli18n-tmp.h:864 src/xml/xmli18n-tmp.h:867
+#: src/xml/xmli18n-tmp.h:870 src/xml/xmli18n-tmp.h:873
+#: src/xml/xmli18n-tmp.h:876 src/xml/xmli18n-tmp.h:879
+#: src/xml/xmli18n-tmp.h:882 src/xml/xmli18n-tmp.h:885
+#: src/xml/xmli18n-tmp.h:888 src/xml/xmli18n-tmp.h:891
+#: src/xml/xmli18n-tmp.h:894 src/xml/xmli18n-tmp.h:1863
+#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1869
+#: src/xml/xmli18n-tmp.h:1872 src/xml/xmli18n-tmp.h:1875
+#: src/xml/xmli18n-tmp.h:1878 src/xml/xmli18n-tmp.h:1881
+#: src/xml/xmli18n-tmp.h:1884 src/xml/xmli18n-tmp.h:1887
+#: src/xml/xmli18n-tmp.h:1890 src/xml/xmli18n-tmp.h:1893
+#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1899
+#: src/xml/xmli18n-tmp.h:1902 src/xml/xmli18n-tmp.h:1905
+#: src/xml/xmli18n-tmp.h:1908 src/xml/xmli18n-tmp.h:1911
+#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1917
+#: src/xml/xmli18n-tmp.h:1920 src/xml/xmli18n-tmp.h:1923
+#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1929
+#: src/xml/xmli18n-tmp.h:1932 src/xml/xmli18n-tmp.h:1935
+#: src/xml/xmli18n-tmp.h:1938 src/xml/xmli18n-tmp.h:1941
+#: src/xml/xmli18n-tmp.h:1944 src/xml/xmli18n-tmp.h:1947
+#: src/xml/xmli18n-tmp.h:1950 src/xml/xmli18n-tmp.h:1953
+#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1959
+#: src/xml/xmli18n-tmp.h:1962 src/xml/xmli18n-tmp.h:1965
+#: src/xml/xmli18n-tmp.h:1968 src/xml/xmli18n-tmp.h:1971
+#: src/xml/xmli18n-tmp.h:1974 src/xml/xmli18n-tmp.h:1977
+#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1983
+#: src/xml/xmli18n-tmp.h:1986 src/xml/xmli18n-tmp.h:2201
+#: src/xml/xmli18n-tmp.h:2204 src/xml/xmli18n-tmp.h:2207
+#: src/xml/xmli18n-tmp.h:2210 src/xml/xmli18n-tmp.h:2213
+#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2219
+#: src/xml/xmli18n-tmp.h:2222 src/xml/xmli18n-tmp.h:2225
+#: src/xml/xmli18n-tmp.h:2228 src/xml/xmli18n-tmp.h:2231
+#: src/xml/xmli18n-tmp.h:2234 src/xml/xmli18n-tmp.h:2237
+#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2243
+#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2249
+#: src/xml/xmli18n-tmp.h:2252 src/xml/xmli18n-tmp.h:2255
+#: src/xml/xmli18n-tmp.h:2258 src/xml/xmli18n-tmp.h:2261
+#: src/xml/xmli18n-tmp.h:4376 src/xml/xmli18n-tmp.h:5343
+#: src/xml/xmli18n-tmp.h:5645
 msgid "UltraChrome Photo Black"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:694 src/xml/xmli18n-tmp.h:697
-#: src/xml/xmli18n-tmp.h:700 src/xml/xmli18n-tmp.h:703
-#: src/xml/xmli18n-tmp.h:706 src/xml/xmli18n-tmp.h:709
-#: src/xml/xmli18n-tmp.h:712 src/xml/xmli18n-tmp.h:715
-#: src/xml/xmli18n-tmp.h:718 src/xml/xmli18n-tmp.h:721
-#: src/xml/xmli18n-tmp.h:724 src/xml/xmli18n-tmp.h:727
-#: src/xml/xmli18n-tmp.h:730 src/xml/xmli18n-tmp.h:733
-#: src/xml/xmli18n-tmp.h:736 src/xml/xmli18n-tmp.h:739
-#: src/xml/xmli18n-tmp.h:742 src/xml/xmli18n-tmp.h:745
-#: src/xml/xmli18n-tmp.h:748 src/xml/xmli18n-tmp.h:751
-#: src/xml/xmli18n-tmp.h:754 src/xml/xmli18n-tmp.h:1378
-#: src/xml/xmli18n-tmp.h:1381 src/xml/xmli18n-tmp.h:1384
-#: src/xml/xmli18n-tmp.h:1387 src/xml/xmli18n-tmp.h:1390
-#: src/xml/xmli18n-tmp.h:1393 src/xml/xmli18n-tmp.h:1396
-#: src/xml/xmli18n-tmp.h:1399 src/xml/xmli18n-tmp.h:1402
-#: src/xml/xmli18n-tmp.h:1405 src/xml/xmli18n-tmp.h:1408
-#: src/xml/xmli18n-tmp.h:1411 src/xml/xmli18n-tmp.h:1414
-#: src/xml/xmli18n-tmp.h:1417 src/xml/xmli18n-tmp.h:1420
-#: src/xml/xmli18n-tmp.h:1423 src/xml/xmli18n-tmp.h:1426
-#: src/xml/xmli18n-tmp.h:1429 src/xml/xmli18n-tmp.h:1432
-#: src/xml/xmli18n-tmp.h:1435 src/xml/xmli18n-tmp.h:1438
-#: src/xml/xmli18n-tmp.h:1441 src/xml/xmli18n-tmp.h:1444
-#: src/xml/xmli18n-tmp.h:1447 src/xml/xmli18n-tmp.h:1450
-#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1456
-#: src/xml/xmli18n-tmp.h:1459 src/xml/xmli18n-tmp.h:1462
-#: src/xml/xmli18n-tmp.h:1465 src/xml/xmli18n-tmp.h:1468
-#: src/xml/xmli18n-tmp.h:1471 src/xml/xmli18n-tmp.h:1474
-#: src/xml/xmli18n-tmp.h:1477 src/xml/xmli18n-tmp.h:1480
-#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1486
-#: src/xml/xmli18n-tmp.h:1489 src/xml/xmli18n-tmp.h:1492
-#: src/xml/xmli18n-tmp.h:1495 src/xml/xmli18n-tmp.h:1498
-#: src/xml/xmli18n-tmp.h:1501 src/xml/xmli18n-tmp.h:1678
-#: src/xml/xmli18n-tmp.h:1681 src/xml/xmli18n-tmp.h:1684
-#: src/xml/xmli18n-tmp.h:1687 src/xml/xmli18n-tmp.h:1690
-#: src/xml/xmli18n-tmp.h:1693 src/xml/xmli18n-tmp.h:1696
-#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1702
-#: src/xml/xmli18n-tmp.h:1705 src/xml/xmli18n-tmp.h:1708
-#: src/xml/xmli18n-tmp.h:1711 src/xml/xmli18n-tmp.h:1714
-#: src/xml/xmli18n-tmp.h:1717 src/xml/xmli18n-tmp.h:1720
-#: src/xml/xmli18n-tmp.h:1723 src/xml/xmli18n-tmp.h:1726
-#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1732
-#: src/xml/xmli18n-tmp.h:1735 src/xml/xmli18n-tmp.h:1738
-#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3517
-#: src/xml/xmli18n-tmp.h:3577
+#: src/xml/xmli18n-tmp.h:835 src/xml/xmli18n-tmp.h:838
+#: src/xml/xmli18n-tmp.h:841 src/xml/xmli18n-tmp.h:844
+#: src/xml/xmli18n-tmp.h:847 src/xml/xmli18n-tmp.h:850
+#: src/xml/xmli18n-tmp.h:853 src/xml/xmli18n-tmp.h:856
+#: src/xml/xmli18n-tmp.h:859 src/xml/xmli18n-tmp.h:862
+#: src/xml/xmli18n-tmp.h:865 src/xml/xmli18n-tmp.h:868
+#: src/xml/xmli18n-tmp.h:871 src/xml/xmli18n-tmp.h:874
+#: src/xml/xmli18n-tmp.h:877 src/xml/xmli18n-tmp.h:880
+#: src/xml/xmli18n-tmp.h:883 src/xml/xmli18n-tmp.h:886
+#: src/xml/xmli18n-tmp.h:889 src/xml/xmli18n-tmp.h:892
+#: src/xml/xmli18n-tmp.h:895 src/xml/xmli18n-tmp.h:1864
+#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1870
+#: src/xml/xmli18n-tmp.h:1873 src/xml/xmli18n-tmp.h:1876
+#: src/xml/xmli18n-tmp.h:1879 src/xml/xmli18n-tmp.h:1882
+#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1888
+#: src/xml/xmli18n-tmp.h:1891 src/xml/xmli18n-tmp.h:1894
+#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1900
+#: src/xml/xmli18n-tmp.h:1903 src/xml/xmli18n-tmp.h:1906
+#: src/xml/xmli18n-tmp.h:1909 src/xml/xmli18n-tmp.h:1912
+#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1918
+#: src/xml/xmli18n-tmp.h:1921 src/xml/xmli18n-tmp.h:1924
+#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1930
+#: src/xml/xmli18n-tmp.h:1933 src/xml/xmli18n-tmp.h:1936
+#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1942
+#: src/xml/xmli18n-tmp.h:1945 src/xml/xmli18n-tmp.h:1948
+#: src/xml/xmli18n-tmp.h:1951 src/xml/xmli18n-tmp.h:1954
+#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1960
+#: src/xml/xmli18n-tmp.h:1963 src/xml/xmli18n-tmp.h:1966
+#: src/xml/xmli18n-tmp.h:1969 src/xml/xmli18n-tmp.h:1972
+#: src/xml/xmli18n-tmp.h:1975 src/xml/xmli18n-tmp.h:1978
+#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1984
+#: src/xml/xmli18n-tmp.h:1987 src/xml/xmli18n-tmp.h:2202
+#: src/xml/xmli18n-tmp.h:2205 src/xml/xmli18n-tmp.h:2208
+#: src/xml/xmli18n-tmp.h:2211 src/xml/xmli18n-tmp.h:2214
+#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2220
+#: src/xml/xmli18n-tmp.h:2223 src/xml/xmli18n-tmp.h:2226
+#: src/xml/xmli18n-tmp.h:2229 src/xml/xmli18n-tmp.h:2232
+#: src/xml/xmli18n-tmp.h:2235 src/xml/xmli18n-tmp.h:2238
+#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2244
+#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2250
+#: src/xml/xmli18n-tmp.h:2253 src/xml/xmli18n-tmp.h:2256
+#: src/xml/xmli18n-tmp.h:2259 src/xml/xmli18n-tmp.h:2262
+#: src/xml/xmli18n-tmp.h:4445 src/xml/xmli18n-tmp.h:5412
+#: src/xml/xmli18n-tmp.h:5714
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1815 src/xml/xmli18n-tmp.h:1826
-#: src/xml/xmli18n-tmp.h:1839 src/xml/xmli18n-tmp.h:1852
-#: src/xml/xmli18n-tmp.h:1907 src/xml/xmli18n-tmp.h:1923
-#: src/xml/xmli18n-tmp.h:1939 src/xml/xmli18n-tmp.h:1952
-#: src/xml/xmli18n-tmp.h:1965 src/xml/xmli18n-tmp.h:2054
-#: src/xml/xmli18n-tmp.h:2081 src/xml/xmli18n-tmp.h:2146
-#: src/xml/xmli18n-tmp.h:2189 src/xml/xmli18n-tmp.h:2202
-#: src/xml/xmli18n-tmp.h:2215 src/xml/xmli18n-tmp.h:2228
-#: src/xml/xmli18n-tmp.h:2335 src/xml/xmli18n-tmp.h:2348
-#: src/xml/xmli18n-tmp.h:2361 src/xml/xmli18n-tmp.h:2407
-#: src/xml/xmli18n-tmp.h:2527 src/xml/xmli18n-tmp.h:2899
-#: src/xml/xmli18n-tmp.h:2916 src/xml/xmli18n-tmp.h:3142
+#: src/xml/xmli18n-tmp.h:1054 src/xml/xmli18n-tmp.h:1059
+#: src/xml/xmli18n-tmp.h:1064 src/xml/xmli18n-tmp.h:1069
+#: src/xml/xmli18n-tmp.h:1074 src/xml/xmli18n-tmp.h:1079
+#: src/xml/xmli18n-tmp.h:1084 src/xml/xmli18n-tmp.h:1089
+#: src/xml/xmli18n-tmp.h:1094 src/xml/xmli18n-tmp.h:1099
+#: src/xml/xmli18n-tmp.h:1104 src/xml/xmli18n-tmp.h:1109
+#: src/xml/xmli18n-tmp.h:1114 src/xml/xmli18n-tmp.h:1119
+#: src/xml/xmli18n-tmp.h:1124 src/xml/xmli18n-tmp.h:1129
+#: src/xml/xmli18n-tmp.h:1134 src/xml/xmli18n-tmp.h:1139
+#: src/xml/xmli18n-tmp.h:1144 src/xml/xmli18n-tmp.h:1149
+#: src/xml/xmli18n-tmp.h:1154 src/xml/xmli18n-tmp.h:1159
+#: src/xml/xmli18n-tmp.h:1164 src/xml/xmli18n-tmp.h:1169
+#: src/xml/xmli18n-tmp.h:1174 src/xml/xmli18n-tmp.h:1179
+#: src/xml/xmli18n-tmp.h:1184 src/xml/xmli18n-tmp.h:1189
+#: src/xml/xmli18n-tmp.h:1194 src/xml/xmli18n-tmp.h:1199
+#: src/xml/xmli18n-tmp.h:1204 src/xml/xmli18n-tmp.h:1209
+#: src/xml/xmli18n-tmp.h:1214 src/xml/xmli18n-tmp.h:1219
+#: src/xml/xmli18n-tmp.h:1224 src/xml/xmli18n-tmp.h:1229
+#: src/xml/xmli18n-tmp.h:1234 src/xml/xmli18n-tmp.h:1239
+#: src/xml/xmli18n-tmp.h:1244 src/xml/xmli18n-tmp.h:1249
+#: src/xml/xmli18n-tmp.h:1254 src/xml/xmli18n-tmp.h:1259
+#: src/xml/xmli18n-tmp.h:1264 src/xml/xmli18n-tmp.h:1269
+#: src/xml/xmli18n-tmp.h:1274 src/xml/xmli18n-tmp.h:1279
+#: src/xml/xmli18n-tmp.h:1284 src/xml/xmli18n-tmp.h:1289
+#: src/xml/xmli18n-tmp.h:1294 src/xml/xmli18n-tmp.h:1299
+#: src/xml/xmli18n-tmp.h:1304 src/xml/xmli18n-tmp.h:1309
+#: src/xml/xmli18n-tmp.h:1314 src/xml/xmli18n-tmp.h:1319
+#: src/xml/xmli18n-tmp.h:1324 src/xml/xmli18n-tmp.h:1329
+#: src/xml/xmli18n-tmp.h:1334 src/xml/xmli18n-tmp.h:1339
+#: src/xml/xmli18n-tmp.h:1340 src/xml/xmli18n-tmp.h:1345
+#: src/xml/xmli18n-tmp.h:1346 src/xml/xmli18n-tmp.h:1351
+#: src/xml/xmli18n-tmp.h:1352 src/xml/xmli18n-tmp.h:1357
+#: src/xml/xmli18n-tmp.h:1358 src/xml/xmli18n-tmp.h:1363
+#: src/xml/xmli18n-tmp.h:1364 src/xml/xmli18n-tmp.h:1369
+#: src/xml/xmli18n-tmp.h:1370 src/xml/xmli18n-tmp.h:1375
+#: src/xml/xmli18n-tmp.h:1376 src/xml/xmli18n-tmp.h:1381
+#: src/xml/xmli18n-tmp.h:1382 src/xml/xmli18n-tmp.h:1387
+#: src/xml/xmli18n-tmp.h:1388 src/xml/xmli18n-tmp.h:1393
+#: src/xml/xmli18n-tmp.h:1394 src/xml/xmli18n-tmp.h:1399
+#: src/xml/xmli18n-tmp.h:1400 src/xml/xmli18n-tmp.h:1405
+#: src/xml/xmli18n-tmp.h:1406 src/xml/xmli18n-tmp.h:1411
+#: src/xml/xmli18n-tmp.h:1412 src/xml/xmli18n-tmp.h:1417
+#: src/xml/xmli18n-tmp.h:1418 src/xml/xmli18n-tmp.h:1423
+#: src/xml/xmli18n-tmp.h:1424 src/xml/xmli18n-tmp.h:1429
+#: src/xml/xmli18n-tmp.h:1430 src/xml/xmli18n-tmp.h:1435
+#: src/xml/xmli18n-tmp.h:1436 src/xml/xmli18n-tmp.h:1441
+#: src/xml/xmli18n-tmp.h:1442 src/xml/xmli18n-tmp.h:1447
+#: src/xml/xmli18n-tmp.h:1448 src/xml/xmli18n-tmp.h:1634
+#: src/xml/xmli18n-tmp.h:1639 src/xml/xmli18n-tmp.h:1644
+#: src/xml/xmli18n-tmp.h:1649 src/xml/xmli18n-tmp.h:1654
+#: src/xml/xmli18n-tmp.h:1659 src/xml/xmli18n-tmp.h:1664
+#: src/xml/xmli18n-tmp.h:1669 src/xml/xmli18n-tmp.h:1674
+#: src/xml/xmli18n-tmp.h:1679 src/xml/xmli18n-tmp.h:1684
+#: src/xml/xmli18n-tmp.h:1689 src/xml/xmli18n-tmp.h:1694
+#: src/xml/xmli18n-tmp.h:1699 src/xml/xmli18n-tmp.h:1704
+#: src/xml/xmli18n-tmp.h:1709 src/xml/xmli18n-tmp.h:1714
+#: src/xml/xmli18n-tmp.h:1719 src/xml/xmli18n-tmp.h:1724
+#: src/xml/xmli18n-tmp.h:1729 src/xml/xmli18n-tmp.h:1734
+#: src/xml/xmli18n-tmp.h:1739 src/xml/xmli18n-tmp.h:1744
+#: src/xml/xmli18n-tmp.h:1749 src/xml/xmli18n-tmp.h:1754
+#: src/xml/xmli18n-tmp.h:1759 src/xml/xmli18n-tmp.h:1764
+#: src/xml/xmli18n-tmp.h:1769 src/xml/xmli18n-tmp.h:1774
+#: src/xml/xmli18n-tmp.h:1779 src/xml/xmli18n-tmp.h:1784
+#: src/xml/xmli18n-tmp.h:1789 src/xml/xmli18n-tmp.h:1794
+#: src/xml/xmli18n-tmp.h:1799 src/xml/xmli18n-tmp.h:1804
+#: src/xml/xmli18n-tmp.h:1809 src/xml/xmli18n-tmp.h:1814
+#: src/xml/xmli18n-tmp.h:1819
+msgid "MIS Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:1453 src/xml/xmli18n-tmp.h:1458
+#: src/xml/xmli18n-tmp.h:1463 src/xml/xmli18n-tmp.h:1468
+#: src/xml/xmli18n-tmp.h:1473 src/xml/xmli18n-tmp.h:1478
+#: src/xml/xmli18n-tmp.h:1483 src/xml/xmli18n-tmp.h:1488
+#: src/xml/xmli18n-tmp.h:1493 src/xml/xmli18n-tmp.h:1498
+#: src/xml/xmli18n-tmp.h:1503 src/xml/xmli18n-tmp.h:1508
+#: src/xml/xmli18n-tmp.h:1513 src/xml/xmli18n-tmp.h:1518
+#: src/xml/xmli18n-tmp.h:1523 src/xml/xmli18n-tmp.h:1528
+#: src/xml/xmli18n-tmp.h:1533 src/xml/xmli18n-tmp.h:1538
+#: src/xml/xmli18n-tmp.h:1543 src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:4858 src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:4992 src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:5289
+msgid "Hextone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:2339 src/xml/xmli18n-tmp.h:2350
+#: src/xml/xmli18n-tmp.h:2363 src/xml/xmli18n-tmp.h:2376
+#: src/xml/xmli18n-tmp.h:2431 src/xml/xmli18n-tmp.h:2447
+#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
+#: src/xml/xmli18n-tmp.h:2489 src/xml/xmli18n-tmp.h:2578
+#: src/xml/xmli18n-tmp.h:2605 src/xml/xmli18n-tmp.h:2670
+#: src/xml/xmli18n-tmp.h:2713 src/xml/xmli18n-tmp.h:2726
+#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2752
+#: src/xml/xmli18n-tmp.h:2859 src/xml/xmli18n-tmp.h:2872
+#: src/xml/xmli18n-tmp.h:2885 src/xml/xmli18n-tmp.h:2931
+#: src/xml/xmli18n-tmp.h:3051 src/xml/xmli18n-tmp.h:3422
+#: src/xml/xmli18n-tmp.h:3439 src/xml/xmli18n-tmp.h:3665
 msgid "360 x 90 DPI Fast Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1816 src/xml/xmli18n-tmp.h:1828
-#: src/xml/xmli18n-tmp.h:1841 src/xml/xmli18n-tmp.h:1853
-#: src/xml/xmli18n-tmp.h:1866 src/xml/xmli18n-tmp.h:1879
-#: src/xml/xmli18n-tmp.h:1892 src/xml/xmli18n-tmp.h:1908
-#: src/xml/xmli18n-tmp.h:1924 src/xml/xmli18n-tmp.h:1940
-#: src/xml/xmli18n-tmp.h:1953 src/xml/xmli18n-tmp.h:1966
-#: src/xml/xmli18n-tmp.h:1990 src/xml/xmli18n-tmp.h:2055
-#: src/xml/xmli18n-tmp.h:2082 src/xml/xmli18n-tmp.h:2133
-#: src/xml/xmli18n-tmp.h:2147 src/xml/xmli18n-tmp.h:2175
-#: src/xml/xmli18n-tmp.h:2190 src/xml/xmli18n-tmp.h:2203
-#: src/xml/xmli18n-tmp.h:2216 src/xml/xmli18n-tmp.h:2229
-#: src/xml/xmli18n-tmp.h:2265 src/xml/xmli18n-tmp.h:2336
-#: src/xml/xmli18n-tmp.h:2349 src/xml/xmli18n-tmp.h:2362
-#: src/xml/xmli18n-tmp.h:2408 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2340 src/xml/xmli18n-tmp.h:2352
+#: src/xml/xmli18n-tmp.h:2365 src/xml/xmli18n-tmp.h:2377
+#: src/xml/xmli18n-tmp.h:2390 src/xml/xmli18n-tmp.h:2403
+#: src/xml/xmli18n-tmp.h:2416 src/xml/xmli18n-tmp.h:2432
+#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2464
+#: src/xml/xmli18n-tmp.h:2477 src/xml/xmli18n-tmp.h:2490
+#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2579
+#: src/xml/xmli18n-tmp.h:2606 src/xml/xmli18n-tmp.h:2657
+#: src/xml/xmli18n-tmp.h:2671 src/xml/xmli18n-tmp.h:2699
+#: src/xml/xmli18n-tmp.h:2714 src/xml/xmli18n-tmp.h:2727
+#: src/xml/xmli18n-tmp.h:2740 src/xml/xmli18n-tmp.h:2753
+#: src/xml/xmli18n-tmp.h:2789 src/xml/xmli18n-tmp.h:2860
+#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2886
+#: src/xml/xmli18n-tmp.h:2932 src/xml/xmli18n-tmp.h:3052
 msgid "180 DPI Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1817 src/xml/xmli18n-tmp.h:1830
-#: src/xml/xmli18n-tmp.h:1843 src/xml/xmli18n-tmp.h:1854
-#: src/xml/xmli18n-tmp.h:1867 src/xml/xmli18n-tmp.h:1880
-#: src/xml/xmli18n-tmp.h:1893 src/xml/xmli18n-tmp.h:1909
-#: src/xml/xmli18n-tmp.h:1925 src/xml/xmli18n-tmp.h:1941
-#: src/xml/xmli18n-tmp.h:1954 src/xml/xmli18n-tmp.h:1967
-#: src/xml/xmli18n-tmp.h:1991 src/xml/xmli18n-tmp.h:2056
-#: src/xml/xmli18n-tmp.h:2083 src/xml/xmli18n-tmp.h:2134
-#: src/xml/xmli18n-tmp.h:2148 src/xml/xmli18n-tmp.h:2176
-#: src/xml/xmli18n-tmp.h:2191 src/xml/xmli18n-tmp.h:2204
-#: src/xml/xmli18n-tmp.h:2217 src/xml/xmli18n-tmp.h:2230
-#: src/xml/xmli18n-tmp.h:2266 src/xml/xmli18n-tmp.h:2337
-#: src/xml/xmli18n-tmp.h:2350 src/xml/xmli18n-tmp.h:2363
-#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2409
-#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2434
-#: src/xml/xmli18n-tmp.h:2447 src/xml/xmli18n-tmp.h:2459
-#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2529
-#: src/xml/xmli18n-tmp.h:2540 src/xml/xmli18n-tmp.h:2601
-#: src/xml/xmli18n-tmp.h:2659 src/xml/xmli18n-tmp.h:2703
-#: src/xml/xmli18n-tmp.h:2721 src/xml/xmli18n-tmp.h:2735
-#: src/xml/xmli18n-tmp.h:2750 src/xml/xmli18n-tmp.h:2768
-#: src/xml/xmli18n-tmp.h:2872 src/xml/xmli18n-tmp.h:2884
-#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2917
-#: src/xml/xmli18n-tmp.h:2961 src/xml/xmli18n-tmp.h:3007
-#: src/xml/xmli18n-tmp.h:3021 src/xml/xmli18n-tmp.h:3035
-#: src/xml/xmli18n-tmp.h:3049 src/xml/xmli18n-tmp.h:3126
-#: src/xml/xmli18n-tmp.h:3143
+#: src/xml/xmli18n-tmp.h:2341 src/xml/xmli18n-tmp.h:2354
+#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2391 src/xml/xmli18n-tmp.h:2404
+#: src/xml/xmli18n-tmp.h:2417 src/xml/xmli18n-tmp.h:2433
+#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2465
+#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2491
+#: src/xml/xmli18n-tmp.h:2515 src/xml/xmli18n-tmp.h:2580
+#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2658
+#: src/xml/xmli18n-tmp.h:2672 src/xml/xmli18n-tmp.h:2700
+#: src/xml/xmli18n-tmp.h:2715 src/xml/xmli18n-tmp.h:2728
+#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2754
+#: src/xml/xmli18n-tmp.h:2790 src/xml/xmli18n-tmp.h:2861
+#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2887
+#: src/xml/xmli18n-tmp.h:2919 src/xml/xmli18n-tmp.h:2933
+#: src/xml/xmli18n-tmp.h:2945 src/xml/xmli18n-tmp.h:2958
+#: src/xml/xmli18n-tmp.h:2971 src/xml/xmli18n-tmp.h:2983
+#: src/xml/xmli18n-tmp.h:3039 src/xml/xmli18n-tmp.h:3053
+#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3125
+#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3227
+#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3259
+#: src/xml/xmli18n-tmp.h:3274 src/xml/xmli18n-tmp.h:3292
+#: src/xml/xmli18n-tmp.h:3395 src/xml/xmli18n-tmp.h:3407
+#: src/xml/xmli18n-tmp.h:3423 src/xml/xmli18n-tmp.h:3440
+#: src/xml/xmli18n-tmp.h:3484 src/xml/xmli18n-tmp.h:3530
+#: src/xml/xmli18n-tmp.h:3544 src/xml/xmli18n-tmp.h:3558
+#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3649
+#: src/xml/xmli18n-tmp.h:3666 src/xml/xmli18n-tmp.h:3684
 msgid "360 x 180 DPI Draft"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1818 src/xml/xmli18n-tmp.h:1831
-#: src/xml/xmli18n-tmp.h:1844 src/xml/xmli18n-tmp.h:1855
-#: src/xml/xmli18n-tmp.h:1868 src/xml/xmli18n-tmp.h:1881
-#: src/xml/xmli18n-tmp.h:1894 src/xml/xmli18n-tmp.h:1910
-#: src/xml/xmli18n-tmp.h:1926 src/xml/xmli18n-tmp.h:1942
-#: src/xml/xmli18n-tmp.h:1955 src/xml/xmli18n-tmp.h:1968
-#: src/xml/xmli18n-tmp.h:2057 src/xml/xmli18n-tmp.h:2135
-#: src/xml/xmli18n-tmp.h:2338 src/xml/xmli18n-tmp.h:2410
+#: src/xml/xmli18n-tmp.h:2342 src/xml/xmli18n-tmp.h:2355
+#: src/xml/xmli18n-tmp.h:2368 src/xml/xmli18n-tmp.h:2379
+#: src/xml/xmli18n-tmp.h:2392 src/xml/xmli18n-tmp.h:2405
+#: src/xml/xmli18n-tmp.h:2418 src/xml/xmli18n-tmp.h:2434
+#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2466
+#: src/xml/xmli18n-tmp.h:2479 src/xml/xmli18n-tmp.h:2492
+#: src/xml/xmli18n-tmp.h:2581 src/xml/xmli18n-tmp.h:2659
+#: src/xml/xmli18n-tmp.h:2862 src/xml/xmli18n-tmp.h:2934
 msgid "360 DPI High Quality"
 msgstr "360 DPI 高�質"
 
-#: src/xml/xmli18n-tmp.h:1819 src/xml/xmli18n-tmp.h:1832
-#: src/xml/xmli18n-tmp.h:1845 src/xml/xmli18n-tmp.h:1856
-#: src/xml/xmli18n-tmp.h:1869 src/xml/xmli18n-tmp.h:1882
-#: src/xml/xmli18n-tmp.h:1895 src/xml/xmli18n-tmp.h:1911
-#: src/xml/xmli18n-tmp.h:1927 src/xml/xmli18n-tmp.h:1943
-#: src/xml/xmli18n-tmp.h:1956 src/xml/xmli18n-tmp.h:1969
-#: src/xml/xmli18n-tmp.h:1980 src/xml/xmli18n-tmp.h:1992
-#: src/xml/xmli18n-tmp.h:2006 src/xml/xmli18n-tmp.h:2020
-#: src/xml/xmli18n-tmp.h:2032 src/xml/xmli18n-tmp.h:2044
-#: src/xml/xmli18n-tmp.h:2058 src/xml/xmli18n-tmp.h:2069
-#: src/xml/xmli18n-tmp.h:2084 src/xml/xmli18n-tmp.h:2096
-#: src/xml/xmli18n-tmp.h:2109 src/xml/xmli18n-tmp.h:2123
-#: src/xml/xmli18n-tmp.h:2136 src/xml/xmli18n-tmp.h:2149
-#: src/xml/xmli18n-tmp.h:2163 src/xml/xmli18n-tmp.h:2177
-#: src/xml/xmli18n-tmp.h:2192 src/xml/xmli18n-tmp.h:2205
-#: src/xml/xmli18n-tmp.h:2218 src/xml/xmli18n-tmp.h:2231
-#: src/xml/xmli18n-tmp.h:2241 src/xml/xmli18n-tmp.h:2254
-#: src/xml/xmli18n-tmp.h:2267 src/xml/xmli18n-tmp.h:2282
-#: src/xml/xmli18n-tmp.h:2297 src/xml/xmli18n-tmp.h:2312
-#: src/xml/xmli18n-tmp.h:2325 src/xml/xmli18n-tmp.h:2339
-#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
-#: src/xml/xmli18n-tmp.h:2374 src/xml/xmli18n-tmp.h:2385
-#: src/xml/xmli18n-tmp.h:2396 src/xml/xmli18n-tmp.h:2411
-#: src/xml/xmli18n-tmp.h:2422 src/xml/xmli18n-tmp.h:2435
-#: src/xml/xmli18n-tmp.h:2448 src/xml/xmli18n-tmp.h:2460
-#: src/xml/xmli18n-tmp.h:2473 src/xml/xmli18n-tmp.h:2488
-#: src/xml/xmli18n-tmp.h:2501 src/xml/xmli18n-tmp.h:2516
-#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2541
-#: src/xml/xmli18n-tmp.h:2554 src/xml/xmli18n-tmp.h:2591
-#: src/xml/xmli18n-tmp.h:2602 src/xml/xmli18n-tmp.h:2615
-#: src/xml/xmli18n-tmp.h:2630 src/xml/xmli18n-tmp.h:2645
-#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2675
-#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2704
-#: src/xml/xmli18n-tmp.h:2722 src/xml/xmli18n-tmp.h:2736
-#: src/xml/xmli18n-tmp.h:2751 src/xml/xmli18n-tmp.h:2769
-#: src/xml/xmli18n-tmp.h:2784 src/xml/xmli18n-tmp.h:2808
-#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2833
-#: src/xml/xmli18n-tmp.h:2847 src/xml/xmli18n-tmp.h:2861
-#: src/xml/xmli18n-tmp.h:2873 src/xml/xmli18n-tmp.h:2885
-#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2918
-#: src/xml/xmli18n-tmp.h:2935 src/xml/xmli18n-tmp.h:2950
-#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2987
-#: src/xml/xmli18n-tmp.h:3008 src/xml/xmli18n-tmp.h:3022
-#: src/xml/xmli18n-tmp.h:3036 src/xml/xmli18n-tmp.h:3050
-#: src/xml/xmli18n-tmp.h:3064 src/xml/xmli18n-tmp.h:3081
-#: src/xml/xmli18n-tmp.h:3098 src/xml/xmli18n-tmp.h:3113
-#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:2343 src/xml/xmli18n-tmp.h:2356
+#: src/xml/xmli18n-tmp.h:2369 src/xml/xmli18n-tmp.h:2380
+#: src/xml/xmli18n-tmp.h:2393 src/xml/xmli18n-tmp.h:2406
+#: src/xml/xmli18n-tmp.h:2419 src/xml/xmli18n-tmp.h:2435
+#: src/xml/xmli18n-tmp.h:2451 src/xml/xmli18n-tmp.h:2467
+#: src/xml/xmli18n-tmp.h:2480 src/xml/xmli18n-tmp.h:2493
+#: src/xml/xmli18n-tmp.h:2504 src/xml/xmli18n-tmp.h:2516
+#: src/xml/xmli18n-tmp.h:2530 src/xml/xmli18n-tmp.h:2544
+#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
+#: src/xml/xmli18n-tmp.h:2582 src/xml/xmli18n-tmp.h:2593
+#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2620
+#: src/xml/xmli18n-tmp.h:2633 src/xml/xmli18n-tmp.h:2647
+#: src/xml/xmli18n-tmp.h:2660 src/xml/xmli18n-tmp.h:2673
+#: src/xml/xmli18n-tmp.h:2687 src/xml/xmli18n-tmp.h:2701
+#: src/xml/xmli18n-tmp.h:2716 src/xml/xmli18n-tmp.h:2729
+#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2755
+#: src/xml/xmli18n-tmp.h:2765 src/xml/xmli18n-tmp.h:2778
+#: src/xml/xmli18n-tmp.h:2791 src/xml/xmli18n-tmp.h:2806
+#: src/xml/xmli18n-tmp.h:2821 src/xml/xmli18n-tmp.h:2836
+#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
+#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2888
+#: src/xml/xmli18n-tmp.h:2898 src/xml/xmli18n-tmp.h:2909
+#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2935
+#: src/xml/xmli18n-tmp.h:2946 src/xml/xmli18n-tmp.h:2959
+#: src/xml/xmli18n-tmp.h:2972 src/xml/xmli18n-tmp.h:2984
+#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3012
+#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3040
+#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3065
+#: src/xml/xmli18n-tmp.h:3078 src/xml/xmli18n-tmp.h:3115
+#: src/xml/xmli18n-tmp.h:3126 src/xml/xmli18n-tmp.h:3139
+#: src/xml/xmli18n-tmp.h:3154 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3184 src/xml/xmli18n-tmp.h:3199
+#: src/xml/xmli18n-tmp.h:3212 src/xml/xmli18n-tmp.h:3228
+#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3260
+#: src/xml/xmli18n-tmp.h:3275 src/xml/xmli18n-tmp.h:3293
+#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3332
+#: src/xml/xmli18n-tmp.h:3345 src/xml/xmli18n-tmp.h:3357
+#: src/xml/xmli18n-tmp.h:3369 src/xml/xmli18n-tmp.h:3384
+#: src/xml/xmli18n-tmp.h:3396 src/xml/xmli18n-tmp.h:3408
+#: src/xml/xmli18n-tmp.h:3424 src/xml/xmli18n-tmp.h:3441
+#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3473
+#: src/xml/xmli18n-tmp.h:3485 src/xml/xmli18n-tmp.h:3510
+#: src/xml/xmli18n-tmp.h:3531 src/xml/xmli18n-tmp.h:3545
+#: src/xml/xmli18n-tmp.h:3559 src/xml/xmli18n-tmp.h:3573
+#: src/xml/xmli18n-tmp.h:3587 src/xml/xmli18n-tmp.h:3604
+#: src/xml/xmli18n-tmp.h:3621 src/xml/xmli18n-tmp.h:3636
+#: src/xml/xmli18n-tmp.h:3650 src/xml/xmli18n-tmp.h:3667
+#: src/xml/xmli18n-tmp.h:3685
 msgid "360 DPI"
 msgstr "360 DPI"
 
-#: src/xml/xmli18n-tmp.h:1820 src/xml/xmli18n-tmp.h:1833
-#: src/xml/xmli18n-tmp.h:1846 src/xml/xmli18n-tmp.h:1857
-#: src/xml/xmli18n-tmp.h:1870 src/xml/xmli18n-tmp.h:1883
-#: src/xml/xmli18n-tmp.h:1896 src/xml/xmli18n-tmp.h:1912
-#: src/xml/xmli18n-tmp.h:1928 src/xml/xmli18n-tmp.h:1944
-#: src/xml/xmli18n-tmp.h:1957 src/xml/xmli18n-tmp.h:1970
-#: src/xml/xmli18n-tmp.h:1981 src/xml/xmli18n-tmp.h:1993
-#: src/xml/xmli18n-tmp.h:2007 src/xml/xmli18n-tmp.h:2021
-#: src/xml/xmli18n-tmp.h:2033 src/xml/xmli18n-tmp.h:2045
-#: src/xml/xmli18n-tmp.h:2059 src/xml/xmli18n-tmp.h:2070
-#: src/xml/xmli18n-tmp.h:2085 src/xml/xmli18n-tmp.h:2097
-#: src/xml/xmli18n-tmp.h:2110 src/xml/xmli18n-tmp.h:2124
-#: src/xml/xmli18n-tmp.h:2137 src/xml/xmli18n-tmp.h:2150
-#: src/xml/xmli18n-tmp.h:2164 src/xml/xmli18n-tmp.h:2178
-#: src/xml/xmli18n-tmp.h:2193 src/xml/xmli18n-tmp.h:2206
-#: src/xml/xmli18n-tmp.h:2219 src/xml/xmli18n-tmp.h:2232
-#: src/xml/xmli18n-tmp.h:2242 src/xml/xmli18n-tmp.h:2255
-#: src/xml/xmli18n-tmp.h:2268 src/xml/xmli18n-tmp.h:2283
-#: src/xml/xmli18n-tmp.h:2298 src/xml/xmli18n-tmp.h:2313
-#: src/xml/xmli18n-tmp.h:2326 src/xml/xmli18n-tmp.h:2340
-#: src/xml/xmli18n-tmp.h:2352 src/xml/xmli18n-tmp.h:2365
-#: src/xml/xmli18n-tmp.h:2375 src/xml/xmli18n-tmp.h:2386
-#: src/xml/xmli18n-tmp.h:2397 src/xml/xmli18n-tmp.h:2412
-#: src/xml/xmli18n-tmp.h:2423 src/xml/xmli18n-tmp.h:2436
-#: src/xml/xmli18n-tmp.h:2449 src/xml/xmli18n-tmp.h:2461
-#: src/xml/xmli18n-tmp.h:2474 src/xml/xmli18n-tmp.h:2489
-#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2517
-#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2542
-#: src/xml/xmli18n-tmp.h:2555 src/xml/xmli18n-tmp.h:2567
-#: src/xml/xmli18n-tmp.h:2579 src/xml/xmli18n-tmp.h:2592
-#: src/xml/xmli18n-tmp.h:2603 src/xml/xmli18n-tmp.h:2616
-#: src/xml/xmli18n-tmp.h:2631 src/xml/xmli18n-tmp.h:2646
-#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2676
-#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2705
-#: src/xml/xmli18n-tmp.h:2723 src/xml/xmli18n-tmp.h:2737
-#: src/xml/xmli18n-tmp.h:2752 src/xml/xmli18n-tmp.h:2770
-#: src/xml/xmli18n-tmp.h:2785 src/xml/xmli18n-tmp.h:2809
-#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2834
-#: src/xml/xmli18n-tmp.h:2848 src/xml/xmli18n-tmp.h:2862
-#: src/xml/xmli18n-tmp.h:2874 src/xml/xmli18n-tmp.h:2886
-#: src/xml/xmli18n-tmp.h:2902 src/xml/xmli18n-tmp.h:2919
-#: src/xml/xmli18n-tmp.h:2936 src/xml/xmli18n-tmp.h:2951
-#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2988
-#: src/xml/xmli18n-tmp.h:3009 src/xml/xmli18n-tmp.h:3023
-#: src/xml/xmli18n-tmp.h:3037 src/xml/xmli18n-tmp.h:3051
-#: src/xml/xmli18n-tmp.h:3066 src/xml/xmli18n-tmp.h:3083
-#: src/xml/xmli18n-tmp.h:3099 src/xml/xmli18n-tmp.h:3114
-#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:2344 src/xml/xmli18n-tmp.h:2357
+#: src/xml/xmli18n-tmp.h:2370 src/xml/xmli18n-tmp.h:2381
+#: src/xml/xmli18n-tmp.h:2394 src/xml/xmli18n-tmp.h:2407
+#: src/xml/xmli18n-tmp.h:2420 src/xml/xmli18n-tmp.h:2436
+#: src/xml/xmli18n-tmp.h:2452 src/xml/xmli18n-tmp.h:2468
+#: src/xml/xmli18n-tmp.h:2481 src/xml/xmli18n-tmp.h:2494
+#: src/xml/xmli18n-tmp.h:2505 src/xml/xmli18n-tmp.h:2517
+#: src/xml/xmli18n-tmp.h:2531 src/xml/xmli18n-tmp.h:2545
+#: src/xml/xmli18n-tmp.h:2557 src/xml/xmli18n-tmp.h:2569
+#: src/xml/xmli18n-tmp.h:2583 src/xml/xmli18n-tmp.h:2594
+#: src/xml/xmli18n-tmp.h:2609 src/xml/xmli18n-tmp.h:2621
+#: src/xml/xmli18n-tmp.h:2634 src/xml/xmli18n-tmp.h:2648
+#: src/xml/xmli18n-tmp.h:2661 src/xml/xmli18n-tmp.h:2674
+#: src/xml/xmli18n-tmp.h:2688 src/xml/xmli18n-tmp.h:2702
+#: src/xml/xmli18n-tmp.h:2717 src/xml/xmli18n-tmp.h:2730
+#: src/xml/xmli18n-tmp.h:2743 src/xml/xmli18n-tmp.h:2756
+#: src/xml/xmli18n-tmp.h:2766 src/xml/xmli18n-tmp.h:2779
+#: src/xml/xmli18n-tmp.h:2792 src/xml/xmli18n-tmp.h:2807
+#: src/xml/xmli18n-tmp.h:2822 src/xml/xmli18n-tmp.h:2837
+#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
+#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2899 src/xml/xmli18n-tmp.h:2910
+#: src/xml/xmli18n-tmp.h:2921 src/xml/xmli18n-tmp.h:2936
+#: src/xml/xmli18n-tmp.h:2947 src/xml/xmli18n-tmp.h:2960
+#: src/xml/xmli18n-tmp.h:2973 src/xml/xmli18n-tmp.h:2985
+#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3013
+#: src/xml/xmli18n-tmp.h:3026 src/xml/xmli18n-tmp.h:3041
+#: src/xml/xmli18n-tmp.h:3055 src/xml/xmli18n-tmp.h:3066
+#: src/xml/xmli18n-tmp.h:3079 src/xml/xmli18n-tmp.h:3091
+#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3116
+#: src/xml/xmli18n-tmp.h:3127 src/xml/xmli18n-tmp.h:3140
+#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3170
+#: src/xml/xmli18n-tmp.h:3185 src/xml/xmli18n-tmp.h:3200
+#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3229
+#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3261
+#: src/xml/xmli18n-tmp.h:3276 src/xml/xmli18n-tmp.h:3294
+#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3333
+#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3358
+#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3385
+#: src/xml/xmli18n-tmp.h:3397 src/xml/xmli18n-tmp.h:3409
+#: src/xml/xmli18n-tmp.h:3425 src/xml/xmli18n-tmp.h:3442
+#: src/xml/xmli18n-tmp.h:3459 src/xml/xmli18n-tmp.h:3474
+#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3511
+#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:3560 src/xml/xmli18n-tmp.h:3574
+#: src/xml/xmli18n-tmp.h:3589 src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3622 src/xml/xmli18n-tmp.h:3637
+#: src/xml/xmli18n-tmp.h:3651 src/xml/xmli18n-tmp.h:3668
+#: src/xml/xmli18n-tmp.h:3686
 msgid "720 x 360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:1821 src/xml/xmli18n-tmp.h:1834
-#: src/xml/xmli18n-tmp.h:1847 src/xml/xmli18n-tmp.h:1858
-#: src/xml/xmli18n-tmp.h:1871 src/xml/xmli18n-tmp.h:1884
-#: src/xml/xmli18n-tmp.h:1897 src/xml/xmli18n-tmp.h:1913
-#: src/xml/xmli18n-tmp.h:1929 src/xml/xmli18n-tmp.h:1945
-#: src/xml/xmli18n-tmp.h:1958 src/xml/xmli18n-tmp.h:1971
-#: src/xml/xmli18n-tmp.h:1982 src/xml/xmli18n-tmp.h:1994
-#: src/xml/xmli18n-tmp.h:2008 src/xml/xmli18n-tmp.h:2022
-#: src/xml/xmli18n-tmp.h:2034 src/xml/xmli18n-tmp.h:2046
-#: src/xml/xmli18n-tmp.h:2060 src/xml/xmli18n-tmp.h:2071
-#: src/xml/xmli18n-tmp.h:2086 src/xml/xmli18n-tmp.h:2098
-#: src/xml/xmli18n-tmp.h:2111 src/xml/xmli18n-tmp.h:2125
-#: src/xml/xmli18n-tmp.h:2138 src/xml/xmli18n-tmp.h:2151
-#: src/xml/xmli18n-tmp.h:2165 src/xml/xmli18n-tmp.h:2179
-#: src/xml/xmli18n-tmp.h:2194 src/xml/xmli18n-tmp.h:2207
-#: src/xml/xmli18n-tmp.h:2220 src/xml/xmli18n-tmp.h:2233
-#: src/xml/xmli18n-tmp.h:2243 src/xml/xmli18n-tmp.h:2256
-#: src/xml/xmli18n-tmp.h:2269 src/xml/xmli18n-tmp.h:2284
-#: src/xml/xmli18n-tmp.h:2299 src/xml/xmli18n-tmp.h:2314
-#: src/xml/xmli18n-tmp.h:2327 src/xml/xmli18n-tmp.h:2341
-#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
-#: src/xml/xmli18n-tmp.h:2376 src/xml/xmli18n-tmp.h:2387
-#: src/xml/xmli18n-tmp.h:2398 src/xml/xmli18n-tmp.h:2413
-#: src/xml/xmli18n-tmp.h:2424 src/xml/xmli18n-tmp.h:2437
-#: src/xml/xmli18n-tmp.h:2450 src/xml/xmli18n-tmp.h:2462
-#: src/xml/xmli18n-tmp.h:2475 src/xml/xmli18n-tmp.h:2490
-#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2518
-#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2543
-#: src/xml/xmli18n-tmp.h:2556 src/xml/xmli18n-tmp.h:2568
-#: src/xml/xmli18n-tmp.h:2580 src/xml/xmli18n-tmp.h:2593
-#: src/xml/xmli18n-tmp.h:2604 src/xml/xmli18n-tmp.h:2617
-#: src/xml/xmli18n-tmp.h:2632 src/xml/xmli18n-tmp.h:2647
-#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2677
-#: src/xml/xmli18n-tmp.h:2690 src/xml/xmli18n-tmp.h:2706
-#: src/xml/xmli18n-tmp.h:2724 src/xml/xmli18n-tmp.h:2738
-#: src/xml/xmli18n-tmp.h:2753 src/xml/xmli18n-tmp.h:2771
-#: src/xml/xmli18n-tmp.h:2786 src/xml/xmli18n-tmp.h:2810
-#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2835
-#: src/xml/xmli18n-tmp.h:2849 src/xml/xmli18n-tmp.h:2863
-#: src/xml/xmli18n-tmp.h:2875 src/xml/xmli18n-tmp.h:2887
-#: src/xml/xmli18n-tmp.h:2903 src/xml/xmli18n-tmp.h:2921
-#: src/xml/xmli18n-tmp.h:2937 src/xml/xmli18n-tmp.h:2952
-#: src/xml/xmli18n-tmp.h:2966 src/xml/xmli18n-tmp.h:2990
-#: src/xml/xmli18n-tmp.h:3010 src/xml/xmli18n-tmp.h:3024
-#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3052
-#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3085
-#: src/xml/xmli18n-tmp.h:3100 src/xml/xmli18n-tmp.h:3115
-#: src/xml/xmli18n-tmp.h:3129 src/xml/xmli18n-tmp.h:3146
+#: src/xml/xmli18n-tmp.h:2345 src/xml/xmli18n-tmp.h:2358
+#: src/xml/xmli18n-tmp.h:2371 src/xml/xmli18n-tmp.h:2382
+#: src/xml/xmli18n-tmp.h:2395 src/xml/xmli18n-tmp.h:2408
+#: src/xml/xmli18n-tmp.h:2421 src/xml/xmli18n-tmp.h:2437
+#: src/xml/xmli18n-tmp.h:2453 src/xml/xmli18n-tmp.h:2469
+#: src/xml/xmli18n-tmp.h:2482 src/xml/xmli18n-tmp.h:2495
+#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2518
+#: src/xml/xmli18n-tmp.h:2532 src/xml/xmli18n-tmp.h:2546
+#: src/xml/xmli18n-tmp.h:2558 src/xml/xmli18n-tmp.h:2570
+#: src/xml/xmli18n-tmp.h:2584 src/xml/xmli18n-tmp.h:2595
+#: src/xml/xmli18n-tmp.h:2610 src/xml/xmli18n-tmp.h:2622
+#: src/xml/xmli18n-tmp.h:2635 src/xml/xmli18n-tmp.h:2649
+#: src/xml/xmli18n-tmp.h:2662 src/xml/xmli18n-tmp.h:2675
+#: src/xml/xmli18n-tmp.h:2689 src/xml/xmli18n-tmp.h:2703
+#: src/xml/xmli18n-tmp.h:2718 src/xml/xmli18n-tmp.h:2731
+#: src/xml/xmli18n-tmp.h:2744 src/xml/xmli18n-tmp.h:2757
+#: src/xml/xmli18n-tmp.h:2767 src/xml/xmli18n-tmp.h:2780
+#: src/xml/xmli18n-tmp.h:2793 src/xml/xmli18n-tmp.h:2808
+#: src/xml/xmli18n-tmp.h:2823 src/xml/xmli18n-tmp.h:2838
+#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2890
+#: src/xml/xmli18n-tmp.h:2900 src/xml/xmli18n-tmp.h:2911
+#: src/xml/xmli18n-tmp.h:2922 src/xml/xmli18n-tmp.h:2937
+#: src/xml/xmli18n-tmp.h:2948 src/xml/xmli18n-tmp.h:2961
+#: src/xml/xmli18n-tmp.h:2974 src/xml/xmli18n-tmp.h:2986
+#: src/xml/xmli18n-tmp.h:2999 src/xml/xmli18n-tmp.h:3014
+#: src/xml/xmli18n-tmp.h:3027 src/xml/xmli18n-tmp.h:3042
+#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3067
+#: src/xml/xmli18n-tmp.h:3080 src/xml/xmli18n-tmp.h:3092
+#: src/xml/xmli18n-tmp.h:3104 src/xml/xmli18n-tmp.h:3117
+#: src/xml/xmli18n-tmp.h:3128 src/xml/xmli18n-tmp.h:3141
+#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3171
+#: src/xml/xmli18n-tmp.h:3186 src/xml/xmli18n-tmp.h:3201
+#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3230
+#: src/xml/xmli18n-tmp.h:3248 src/xml/xmli18n-tmp.h:3262
+#: src/xml/xmli18n-tmp.h:3277 src/xml/xmli18n-tmp.h:3295
+#: src/xml/xmli18n-tmp.h:3310 src/xml/xmli18n-tmp.h:3334
+#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3359
+#: src/xml/xmli18n-tmp.h:3371 src/xml/xmli18n-tmp.h:3386
+#: src/xml/xmli18n-tmp.h:3398 src/xml/xmli18n-tmp.h:3410
+#: src/xml/xmli18n-tmp.h:3426 src/xml/xmli18n-tmp.h:3444
+#: src/xml/xmli18n-tmp.h:3460 src/xml/xmli18n-tmp.h:3475
+#: src/xml/xmli18n-tmp.h:3489 src/xml/xmli18n-tmp.h:3513
+#: src/xml/xmli18n-tmp.h:3533 src/xml/xmli18n-tmp.h:3547
+#: src/xml/xmli18n-tmp.h:3561 src/xml/xmli18n-tmp.h:3575
+#: src/xml/xmli18n-tmp.h:3591 src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3623 src/xml/xmli18n-tmp.h:3638
+#: src/xml/xmli18n-tmp.h:3652 src/xml/xmli18n-tmp.h:3669
+#: src/xml/xmli18n-tmp.h:3687
 msgid "720 DPI"
 msgstr "720 DPI"
 
-#: src/xml/xmli18n-tmp.h:1827 src/xml/xmli18n-tmp.h:1840
-#: src/xml/xmli18n-tmp.h:1978 src/xml/xmli18n-tmp.h:2004
-#: src/xml/xmli18n-tmp.h:2018 src/xml/xmli18n-tmp.h:2030
-#: src/xml/xmli18n-tmp.h:2042 src/xml/xmli18n-tmp.h:2067
-#: src/xml/xmli18n-tmp.h:2094 src/xml/xmli18n-tmp.h:2107
-#: src/xml/xmli18n-tmp.h:2121 src/xml/xmli18n-tmp.h:2161
-#: src/xml/xmli18n-tmp.h:2239 src/xml/xmli18n-tmp.h:2252
-#: src/xml/xmli18n-tmp.h:2280 src/xml/xmli18n-tmp.h:2295
-#: src/xml/xmli18n-tmp.h:2310 src/xml/xmli18n-tmp.h:2323
-#: src/xml/xmli18n-tmp.h:2372 src/xml/xmli18n-tmp.h:2383
-#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2486
-#: src/xml/xmli18n-tmp.h:2499 src/xml/xmli18n-tmp.h:2552
-#: src/xml/xmli18n-tmp.h:2589 src/xml/xmli18n-tmp.h:2613
-#: src/xml/xmli18n-tmp.h:2628 src/xml/xmli18n-tmp.h:2643
-#: src/xml/xmli18n-tmp.h:2673 src/xml/xmli18n-tmp.h:2686
-#: src/xml/xmli18n-tmp.h:2782 src/xml/xmli18n-tmp.h:2806
-#: src/xml/xmli18n-tmp.h:2819 src/xml/xmli18n-tmp.h:2831
-#: src/xml/xmli18n-tmp.h:2845 src/xml/xmli18n-tmp.h:2859
-#: src/xml/xmli18n-tmp.h:2933 src/xml/xmli18n-tmp.h:2948
-#: src/xml/xmli18n-tmp.h:3063 src/xml/xmli18n-tmp.h:3080
-#: src/xml/xmli18n-tmp.h:3097 src/xml/xmli18n-tmp.h:3111
+#: src/xml/xmli18n-tmp.h:2351 src/xml/xmli18n-tmp.h:2364
+#: src/xml/xmli18n-tmp.h:2502 src/xml/xmli18n-tmp.h:2528
+#: src/xml/xmli18n-tmp.h:2542 src/xml/xmli18n-tmp.h:2554
+#: src/xml/xmli18n-tmp.h:2566 src/xml/xmli18n-tmp.h:2591
+#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2631
+#: src/xml/xmli18n-tmp.h:2645 src/xml/xmli18n-tmp.h:2685
+#: src/xml/xmli18n-tmp.h:2763 src/xml/xmli18n-tmp.h:2776
+#: src/xml/xmli18n-tmp.h:2804 src/xml/xmli18n-tmp.h:2819
+#: src/xml/xmli18n-tmp.h:2834 src/xml/xmli18n-tmp.h:2847
+#: src/xml/xmli18n-tmp.h:2896 src/xml/xmli18n-tmp.h:2907
+#: src/xml/xmli18n-tmp.h:2995 src/xml/xmli18n-tmp.h:3010
+#: src/xml/xmli18n-tmp.h:3023 src/xml/xmli18n-tmp.h:3076
+#: src/xml/xmli18n-tmp.h:3113 src/xml/xmli18n-tmp.h:3137
+#: src/xml/xmli18n-tmp.h:3152 src/xml/xmli18n-tmp.h:3167
+#: src/xml/xmli18n-tmp.h:3197 src/xml/xmli18n-tmp.h:3210
+#: src/xml/xmli18n-tmp.h:3306 src/xml/xmli18n-tmp.h:3330
+#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3355
+#: src/xml/xmli18n-tmp.h:3367 src/xml/xmli18n-tmp.h:3382
+#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3471
+#: src/xml/xmli18n-tmp.h:3586 src/xml/xmli18n-tmp.h:3603
+#: src/xml/xmli18n-tmp.h:3620 src/xml/xmli18n-tmp.h:3634
 msgid "360 x 120 DPI Economy"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1829 src/xml/xmli18n-tmp.h:1842
-#: src/xml/xmli18n-tmp.h:1979 src/xml/xmli18n-tmp.h:2005
-#: src/xml/xmli18n-tmp.h:2019 src/xml/xmli18n-tmp.h:2031
-#: src/xml/xmli18n-tmp.h:2043 src/xml/xmli18n-tmp.h:2068
-#: src/xml/xmli18n-tmp.h:2095 src/xml/xmli18n-tmp.h:2108
-#: src/xml/xmli18n-tmp.h:2122 src/xml/xmli18n-tmp.h:2162
-#: src/xml/xmli18n-tmp.h:2240 src/xml/xmli18n-tmp.h:2253
-#: src/xml/xmli18n-tmp.h:2281 src/xml/xmli18n-tmp.h:2296
-#: src/xml/xmli18n-tmp.h:2311 src/xml/xmli18n-tmp.h:2324
-#: src/xml/xmli18n-tmp.h:2373 src/xml/xmli18n-tmp.h:2384
-#: src/xml/xmli18n-tmp.h:2472 src/xml/xmli18n-tmp.h:2487
-#: src/xml/xmli18n-tmp.h:2500 src/xml/xmli18n-tmp.h:2553
-#: src/xml/xmli18n-tmp.h:2590 src/xml/xmli18n-tmp.h:2614
-#: src/xml/xmli18n-tmp.h:2629 src/xml/xmli18n-tmp.h:2644
-#: src/xml/xmli18n-tmp.h:2674 src/xml/xmli18n-tmp.h:2687
-#: src/xml/xmli18n-tmp.h:2783 src/xml/xmli18n-tmp.h:2807
-#: src/xml/xmli18n-tmp.h:2820 src/xml/xmli18n-tmp.h:2832
-#: src/xml/xmli18n-tmp.h:2846 src/xml/xmli18n-tmp.h:2860
-#: src/xml/xmli18n-tmp.h:2934 src/xml/xmli18n-tmp.h:2949
-#: src/xml/xmli18n-tmp.h:3112
+#: src/xml/xmli18n-tmp.h:2353 src/xml/xmli18n-tmp.h:2366
+#: src/xml/xmli18n-tmp.h:2503 src/xml/xmli18n-tmp.h:2529
+#: src/xml/xmli18n-tmp.h:2543 src/xml/xmli18n-tmp.h:2555
+#: src/xml/xmli18n-tmp.h:2567 src/xml/xmli18n-tmp.h:2592
+#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2632
+#: src/xml/xmli18n-tmp.h:2646 src/xml/xmli18n-tmp.h:2686
+#: src/xml/xmli18n-tmp.h:2764 src/xml/xmli18n-tmp.h:2777
+#: src/xml/xmli18n-tmp.h:2805 src/xml/xmli18n-tmp.h:2820
+#: src/xml/xmli18n-tmp.h:2835 src/xml/xmli18n-tmp.h:2848
+#: src/xml/xmli18n-tmp.h:2897 src/xml/xmli18n-tmp.h:2908
+#: src/xml/xmli18n-tmp.h:2996 src/xml/xmli18n-tmp.h:3011
+#: src/xml/xmli18n-tmp.h:3024 src/xml/xmli18n-tmp.h:3077
+#: src/xml/xmli18n-tmp.h:3114 src/xml/xmli18n-tmp.h:3138
+#: src/xml/xmli18n-tmp.h:3153 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3198 src/xml/xmli18n-tmp.h:3211
+#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3331
+#: src/xml/xmli18n-tmp.h:3344 src/xml/xmli18n-tmp.h:3356
+#: src/xml/xmli18n-tmp.h:3368 src/xml/xmli18n-tmp.h:3383
+#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3472
+#: src/xml/xmli18n-tmp.h:3635
 msgid "360 x 240 DPI Draft"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1859 src/xml/xmli18n-tmp.h:1872
-#: src/xml/xmli18n-tmp.h:1885 src/xml/xmli18n-tmp.h:1898
-#: src/xml/xmli18n-tmp.h:1914 src/xml/xmli18n-tmp.h:1930
-#: src/xml/xmli18n-tmp.h:1946 src/xml/xmli18n-tmp.h:1959
-#: src/xml/xmli18n-tmp.h:1983 src/xml/xmli18n-tmp.h:1995
-#: src/xml/xmli18n-tmp.h:2009 src/xml/xmli18n-tmp.h:2023
-#: src/xml/xmli18n-tmp.h:2035 src/xml/xmli18n-tmp.h:2047
-#: src/xml/xmli18n-tmp.h:2072 src/xml/xmli18n-tmp.h:2087
-#: src/xml/xmli18n-tmp.h:2099 src/xml/xmli18n-tmp.h:2112
-#: src/xml/xmli18n-tmp.h:2126 src/xml/xmli18n-tmp.h:2139
-#: src/xml/xmli18n-tmp.h:2152 src/xml/xmli18n-tmp.h:2166
-#: src/xml/xmli18n-tmp.h:2180 src/xml/xmli18n-tmp.h:2328
-#: src/xml/xmli18n-tmp.h:2377 src/xml/xmli18n-tmp.h:2388
-#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2557
-#: src/xml/xmli18n-tmp.h:2594 src/xml/xmli18n-tmp.h:2922
-#: src/xml/xmli18n-tmp.h:2967 src/xml/xmli18n-tmp.h:2991
-#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3086
+#: src/xml/xmli18n-tmp.h:2383 src/xml/xmli18n-tmp.h:2396
+#: src/xml/xmli18n-tmp.h:2409 src/xml/xmli18n-tmp.h:2422
+#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2454
+#: src/xml/xmli18n-tmp.h:2470 src/xml/xmli18n-tmp.h:2483
+#: src/xml/xmli18n-tmp.h:2507 src/xml/xmli18n-tmp.h:2519
+#: src/xml/xmli18n-tmp.h:2533 src/xml/xmli18n-tmp.h:2547
+#: src/xml/xmli18n-tmp.h:2559 src/xml/xmli18n-tmp.h:2571
+#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2611
+#: src/xml/xmli18n-tmp.h:2623 src/xml/xmli18n-tmp.h:2636
+#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2663
+#: src/xml/xmli18n-tmp.h:2676 src/xml/xmli18n-tmp.h:2690
+#: src/xml/xmli18n-tmp.h:2704 src/xml/xmli18n-tmp.h:2852
+#: src/xml/xmli18n-tmp.h:2901 src/xml/xmli18n-tmp.h:2912
+#: src/xml/xmli18n-tmp.h:3057 src/xml/xmli18n-tmp.h:3081
+#: src/xml/xmli18n-tmp.h:3118 src/xml/xmli18n-tmp.h:3445
+#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3514
+#: src/xml/xmli18n-tmp.h:3592 src/xml/xmli18n-tmp.h:3609
 msgid "720 DPI High Quality"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:1860 src/xml/xmli18n-tmp.h:1873
-#: src/xml/xmli18n-tmp.h:1886 src/xml/xmli18n-tmp.h:1899
-#: src/xml/xmli18n-tmp.h:1915 src/xml/xmli18n-tmp.h:1931
-#: src/xml/xmli18n-tmp.h:1972 src/xml/xmli18n-tmp.h:1984
-#: src/xml/xmli18n-tmp.h:1996 src/xml/xmli18n-tmp.h:2010
-#: src/xml/xmli18n-tmp.h:2024 src/xml/xmli18n-tmp.h:2036
-#: src/xml/xmli18n-tmp.h:2048 src/xml/xmli18n-tmp.h:2061
-#: src/xml/xmli18n-tmp.h:2073 src/xml/xmli18n-tmp.h:2088
-#: src/xml/xmli18n-tmp.h:2113 src/xml/xmli18n-tmp.h:2127
-#: src/xml/xmli18n-tmp.h:2140 src/xml/xmli18n-tmp.h:2153
-#: src/xml/xmli18n-tmp.h:2167 src/xml/xmli18n-tmp.h:2181
-#: src/xml/xmli18n-tmp.h:2195 src/xml/xmli18n-tmp.h:2208
-#: src/xml/xmli18n-tmp.h:2221 src/xml/xmli18n-tmp.h:2234
-#: src/xml/xmli18n-tmp.h:2244 src/xml/xmli18n-tmp.h:2257
-#: src/xml/xmli18n-tmp.h:2270 src/xml/xmli18n-tmp.h:2285
-#: src/xml/xmli18n-tmp.h:2300 src/xml/xmli18n-tmp.h:2315
-#: src/xml/xmli18n-tmp.h:2329 src/xml/xmli18n-tmp.h:2354
-#: src/xml/xmli18n-tmp.h:2367 src/xml/xmli18n-tmp.h:2389
-#: src/xml/xmli18n-tmp.h:2399 src/xml/xmli18n-tmp.h:2425
-#: src/xml/xmli18n-tmp.h:2438 src/xml/xmli18n-tmp.h:2451
-#: src/xml/xmli18n-tmp.h:2463 src/xml/xmli18n-tmp.h:2476
-#: src/xml/xmli18n-tmp.h:2491 src/xml/xmli18n-tmp.h:2504
-#: src/xml/xmli18n-tmp.h:2519 src/xml/xmli18n-tmp.h:2534
-#: src/xml/xmli18n-tmp.h:2544 src/xml/xmli18n-tmp.h:2558
-#: src/xml/xmli18n-tmp.h:2569 src/xml/xmli18n-tmp.h:2581
-#: src/xml/xmli18n-tmp.h:2595 src/xml/xmli18n-tmp.h:2605
-#: src/xml/xmli18n-tmp.h:2618 src/xml/xmli18n-tmp.h:2633
-#: src/xml/xmli18n-tmp.h:2648 src/xml/xmli18n-tmp.h:2663
-#: src/xml/xmli18n-tmp.h:2678 src/xml/xmli18n-tmp.h:2691
-#: src/xml/xmli18n-tmp.h:2707 src/xml/xmli18n-tmp.h:2725
-#: src/xml/xmli18n-tmp.h:2739 src/xml/xmli18n-tmp.h:2754
-#: src/xml/xmli18n-tmp.h:2772 src/xml/xmli18n-tmp.h:2787
-#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2811
-#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2836
-#: src/xml/xmli18n-tmp.h:2850 src/xml/xmli18n-tmp.h:2864
-#: src/xml/xmli18n-tmp.h:2876 src/xml/xmli18n-tmp.h:2888
-#: src/xml/xmli18n-tmp.h:2904 src/xml/xmli18n-tmp.h:2923
-#: src/xml/xmli18n-tmp.h:2938 src/xml/xmli18n-tmp.h:2953
-#: src/xml/xmli18n-tmp.h:2968 src/xml/xmli18n-tmp.h:2978
-#: src/xml/xmli18n-tmp.h:2992 src/xml/xmli18n-tmp.h:3011
-#: src/xml/xmli18n-tmp.h:3025 src/xml/xmli18n-tmp.h:3039
-#: src/xml/xmli18n-tmp.h:3053 src/xml/xmli18n-tmp.h:3070
-#: src/xml/xmli18n-tmp.h:3087 src/xml/xmli18n-tmp.h:3101
-#: src/xml/xmli18n-tmp.h:3116 src/xml/xmli18n-tmp.h:3130
-#: src/xml/xmli18n-tmp.h:3147
+#: src/xml/xmli18n-tmp.h:2384 src/xml/xmli18n-tmp.h:2397
+#: src/xml/xmli18n-tmp.h:2410 src/xml/xmli18n-tmp.h:2423
+#: src/xml/xmli18n-tmp.h:2439 src/xml/xmli18n-tmp.h:2455
+#: src/xml/xmli18n-tmp.h:2496 src/xml/xmli18n-tmp.h:2508
+#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2534
+#: src/xml/xmli18n-tmp.h:2548 src/xml/xmli18n-tmp.h:2560
+#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2585
+#: src/xml/xmli18n-tmp.h:2597 src/xml/xmli18n-tmp.h:2612
+#: src/xml/xmli18n-tmp.h:2637 src/xml/xmli18n-tmp.h:2651
+#: src/xml/xmli18n-tmp.h:2664 src/xml/xmli18n-tmp.h:2677
+#: src/xml/xmli18n-tmp.h:2691 src/xml/xmli18n-tmp.h:2705
+#: src/xml/xmli18n-tmp.h:2719 src/xml/xmli18n-tmp.h:2732
+#: src/xml/xmli18n-tmp.h:2745 src/xml/xmli18n-tmp.h:2758
+#: src/xml/xmli18n-tmp.h:2768 src/xml/xmli18n-tmp.h:2781
+#: src/xml/xmli18n-tmp.h:2794 src/xml/xmli18n-tmp.h:2809
+#: src/xml/xmli18n-tmp.h:2824 src/xml/xmli18n-tmp.h:2839
+#: src/xml/xmli18n-tmp.h:2853 src/xml/xmli18n-tmp.h:2878
+#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2913
+#: src/xml/xmli18n-tmp.h:2923 src/xml/xmli18n-tmp.h:2949
+#: src/xml/xmli18n-tmp.h:2962 src/xml/xmli18n-tmp.h:2975
+#: src/xml/xmli18n-tmp.h:2987 src/xml/xmli18n-tmp.h:3000
+#: src/xml/xmli18n-tmp.h:3015 src/xml/xmli18n-tmp.h:3028
+#: src/xml/xmli18n-tmp.h:3043 src/xml/xmli18n-tmp.h:3058
+#: src/xml/xmli18n-tmp.h:3068 src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3093 src/xml/xmli18n-tmp.h:3105
+#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3129
+#: src/xml/xmli18n-tmp.h:3142 src/xml/xmli18n-tmp.h:3157
+#: src/xml/xmli18n-tmp.h:3172 src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3215
+#: src/xml/xmli18n-tmp.h:3231 src/xml/xmli18n-tmp.h:3249
+#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3278
+#: src/xml/xmli18n-tmp.h:3296 src/xml/xmli18n-tmp.h:3311
+#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3335
+#: src/xml/xmli18n-tmp.h:3348 src/xml/xmli18n-tmp.h:3360
+#: src/xml/xmli18n-tmp.h:3372 src/xml/xmli18n-tmp.h:3387
+#: src/xml/xmli18n-tmp.h:3399 src/xml/xmli18n-tmp.h:3411
+#: src/xml/xmli18n-tmp.h:3427 src/xml/xmli18n-tmp.h:3446
+#: src/xml/xmli18n-tmp.h:3461 src/xml/xmli18n-tmp.h:3476
+#: src/xml/xmli18n-tmp.h:3491 src/xml/xmli18n-tmp.h:3501
+#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3534
+#: src/xml/xmli18n-tmp.h:3548 src/xml/xmli18n-tmp.h:3562
+#: src/xml/xmli18n-tmp.h:3576 src/xml/xmli18n-tmp.h:3593
+#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:3639 src/xml/xmli18n-tmp.h:3653
+#: src/xml/xmli18n-tmp.h:3670 src/xml/xmli18n-tmp.h:3688
 msgid "1440 x 720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:1861 src/xml/xmli18n-tmp.h:1874
-#: src/xml/xmli18n-tmp.h:1887 src/xml/xmli18n-tmp.h:1900
-#: src/xml/xmli18n-tmp.h:1916 src/xml/xmli18n-tmp.h:1932
-#: src/xml/xmli18n-tmp.h:1973 src/xml/xmli18n-tmp.h:1985
-#: src/xml/xmli18n-tmp.h:1997 src/xml/xmli18n-tmp.h:2011
-#: src/xml/xmli18n-tmp.h:2025 src/xml/xmli18n-tmp.h:2037
-#: src/xml/xmli18n-tmp.h:2049 src/xml/xmli18n-tmp.h:2062
-#: src/xml/xmli18n-tmp.h:2074 src/xml/xmli18n-tmp.h:2089
-#: src/xml/xmli18n-tmp.h:2114 src/xml/xmli18n-tmp.h:2128
-#: src/xml/xmli18n-tmp.h:2141 src/xml/xmli18n-tmp.h:2154
-#: src/xml/xmli18n-tmp.h:2168 src/xml/xmli18n-tmp.h:2182
-#: src/xml/xmli18n-tmp.h:2245 src/xml/xmli18n-tmp.h:2258
-#: src/xml/xmli18n-tmp.h:2271 src/xml/xmli18n-tmp.h:2286
-#: src/xml/xmli18n-tmp.h:2301 src/xml/xmli18n-tmp.h:2316
-#: src/xml/xmli18n-tmp.h:2330 src/xml/xmli18n-tmp.h:2390
-#: src/xml/xmli18n-tmp.h:2535 src/xml/xmli18n-tmp.h:2559
-#: src/xml/xmli18n-tmp.h:2596 src/xml/xmli18n-tmp.h:2634
-#: src/xml/xmli18n-tmp.h:2865
+#: src/xml/xmli18n-tmp.h:2385 src/xml/xmli18n-tmp.h:2398
+#: src/xml/xmli18n-tmp.h:2411 src/xml/xmli18n-tmp.h:2424
+#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2456
+#: src/xml/xmli18n-tmp.h:2497 src/xml/xmli18n-tmp.h:2509
+#: src/xml/xmli18n-tmp.h:2521 src/xml/xmli18n-tmp.h:2535
+#: src/xml/xmli18n-tmp.h:2549 src/xml/xmli18n-tmp.h:2561
+#: src/xml/xmli18n-tmp.h:2573 src/xml/xmli18n-tmp.h:2586
+#: src/xml/xmli18n-tmp.h:2598 src/xml/xmli18n-tmp.h:2613
+#: src/xml/xmli18n-tmp.h:2638 src/xml/xmli18n-tmp.h:2652
+#: src/xml/xmli18n-tmp.h:2665 src/xml/xmli18n-tmp.h:2678
+#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2706
+#: src/xml/xmli18n-tmp.h:2769 src/xml/xmli18n-tmp.h:2782
+#: src/xml/xmli18n-tmp.h:2795 src/xml/xmli18n-tmp.h:2810
+#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2840
+#: src/xml/xmli18n-tmp.h:2854 src/xml/xmli18n-tmp.h:2914
+#: src/xml/xmli18n-tmp.h:3059 src/xml/xmli18n-tmp.h:3083
+#: src/xml/xmli18n-tmp.h:3120 src/xml/xmli18n-tmp.h:3158
+#: src/xml/xmli18n-tmp.h:3388
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 720 DPI 最高�質"
 
-#: src/xml/xmli18n-tmp.h:1947 src/xml/xmli18n-tmp.h:1960
-#: src/xml/xmli18n-tmp.h:2100 src/xml/xmli18n-tmp.h:2378
+#: src/xml/xmli18n-tmp.h:2471 src/xml/xmli18n-tmp.h:2484
+#: src/xml/xmli18n-tmp.h:2624 src/xml/xmli18n-tmp.h:2902
 msgid "720 DPI Highest Quality"
 msgstr "720 DPI 最高�質"
 
-#: src/xml/xmli18n-tmp.h:2246 src/xml/xmli18n-tmp.h:2259
-#: src/xml/xmli18n-tmp.h:2272 src/xml/xmli18n-tmp.h:2287
-#: src/xml/xmli18n-tmp.h:2302 src/xml/xmli18n-tmp.h:2317
-#: src/xml/xmli18n-tmp.h:2400 src/xml/xmli18n-tmp.h:2477
-#: src/xml/xmli18n-tmp.h:2492 src/xml/xmli18n-tmp.h:2505
-#: src/xml/xmli18n-tmp.h:2545 src/xml/xmli18n-tmp.h:2606
-#: src/xml/xmli18n-tmp.h:2619 src/xml/xmli18n-tmp.h:2635
-#: src/xml/xmli18n-tmp.h:2692 src/xml/xmli18n-tmp.h:2740
-#: src/xml/xmli18n-tmp.h:2788 src/xml/xmli18n-tmp.h:2866
-#: src/xml/xmli18n-tmp.h:2877 src/xml/xmli18n-tmp.h:2889
+#: src/xml/xmli18n-tmp.h:2770 src/xml/xmli18n-tmp.h:2783
+#: src/xml/xmli18n-tmp.h:2796 src/xml/xmli18n-tmp.h:2811
+#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2841
+#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:3001
+#: src/xml/xmli18n-tmp.h:3016 src/xml/xmli18n-tmp.h:3029
+#: src/xml/xmli18n-tmp.h:3069 src/xml/xmli18n-tmp.h:3130
+#: src/xml/xmli18n-tmp.h:3143 src/xml/xmli18n-tmp.h:3159
+#: src/xml/xmli18n-tmp.h:3216 src/xml/xmli18n-tmp.h:3264
+#: src/xml/xmli18n-tmp.h:3312 src/xml/xmli18n-tmp.h:3389
+#: src/xml/xmli18n-tmp.h:3400 src/xml/xmli18n-tmp.h:3412
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2247 src/xml/xmli18n-tmp.h:2260
-#: src/xml/xmli18n-tmp.h:2273 src/xml/xmli18n-tmp.h:2288
-#: src/xml/xmli18n-tmp.h:2303 src/xml/xmli18n-tmp.h:2318
-#: src/xml/xmli18n-tmp.h:2636 src/xml/xmli18n-tmp.h:2867
+#: src/xml/xmli18n-tmp.h:2771 src/xml/xmli18n-tmp.h:2784
+#: src/xml/xmli18n-tmp.h:2797 src/xml/xmli18n-tmp.h:2812
+#: src/xml/xmli18n-tmp.h:2827 src/xml/xmli18n-tmp.h:2842
+#: src/xml/xmli18n-tmp.h:3160 src/xml/xmli18n-tmp.h:3390
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 x 720 DPI 最高�質"
 
-#: src/xml/xmli18n-tmp.h:2401 src/xml/xmli18n-tmp.h:2439
-#: src/xml/xmli18n-tmp.h:2478 src/xml/xmli18n-tmp.h:2493
-#: src/xml/xmli18n-tmp.h:2506 src/xml/xmli18n-tmp.h:2546
-#: src/xml/xmli18n-tmp.h:2570 src/xml/xmli18n-tmp.h:2582
-#: src/xml/xmli18n-tmp.h:2607 src/xml/xmli18n-tmp.h:2620
-#: src/xml/xmli18n-tmp.h:2649 src/xml/xmli18n-tmp.h:2664
-#: src/xml/xmli18n-tmp.h:2679 src/xml/xmli18n-tmp.h:2693
-#: src/xml/xmli18n-tmp.h:2708 src/xml/xmli18n-tmp.h:2726
-#: src/xml/xmli18n-tmp.h:2741 src/xml/xmli18n-tmp.h:2755
-#: src/xml/xmli18n-tmp.h:2773 src/xml/xmli18n-tmp.h:2789
-#: src/xml/xmli18n-tmp.h:2799 src/xml/xmli18n-tmp.h:2812
-#: src/xml/xmli18n-tmp.h:2851 src/xml/xmli18n-tmp.h:2878
-#: src/xml/xmli18n-tmp.h:2890 src/xml/xmli18n-tmp.h:2905
-#: src/xml/xmli18n-tmp.h:2924 src/xml/xmli18n-tmp.h:2939
-#: src/xml/xmli18n-tmp.h:2954 src/xml/xmli18n-tmp.h:2969
-#: src/xml/xmli18n-tmp.h:2980 src/xml/xmli18n-tmp.h:2994
-#: src/xml/xmli18n-tmp.h:3054 src/xml/xmli18n-tmp.h:3071
-#: src/xml/xmli18n-tmp.h:3088 src/xml/xmli18n-tmp.h:3102
-#: src/xml/xmli18n-tmp.h:3117 src/xml/xmli18n-tmp.h:3131
-#: src/xml/xmli18n-tmp.h:3148
+#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2963
+#: src/xml/xmli18n-tmp.h:3002 src/xml/xmli18n-tmp.h:3017
+#: src/xml/xmli18n-tmp.h:3030 src/xml/xmli18n-tmp.h:3070
+#: src/xml/xmli18n-tmp.h:3094 src/xml/xmli18n-tmp.h:3106
+#: src/xml/xmli18n-tmp.h:3131 src/xml/xmli18n-tmp.h:3144
+#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3217
+#: src/xml/xmli18n-tmp.h:3232 src/xml/xmli18n-tmp.h:3250
+#: src/xml/xmli18n-tmp.h:3265 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3297 src/xml/xmli18n-tmp.h:3313
+#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
+#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3401
+#: src/xml/xmli18n-tmp.h:3413 src/xml/xmli18n-tmp.h:3428
+#: src/xml/xmli18n-tmp.h:3447 src/xml/xmli18n-tmp.h:3462
+#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3492
+#: src/xml/xmli18n-tmp.h:3503 src/xml/xmli18n-tmp.h:3517
+#: src/xml/xmli18n-tmp.h:3577 src/xml/xmli18n-tmp.h:3594
+#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:3640 src/xml/xmli18n-tmp.h:3654
+#: src/xml/xmli18n-tmp.h:3671 src/xml/xmli18n-tmp.h:3689
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2402 src/xml/xmli18n-tmp.h:2426
-#: src/xml/xmli18n-tmp.h:2440 src/xml/xmli18n-tmp.h:2452
-#: src/xml/xmli18n-tmp.h:2464 src/xml/xmli18n-tmp.h:2479
-#: src/xml/xmli18n-tmp.h:2494 src/xml/xmli18n-tmp.h:2507
-#: src/xml/xmli18n-tmp.h:2520 src/xml/xmli18n-tmp.h:2547
-#: src/xml/xmli18n-tmp.h:2571 src/xml/xmli18n-tmp.h:2583
-#: src/xml/xmli18n-tmp.h:2608 src/xml/xmli18n-tmp.h:2621
-#: src/xml/xmli18n-tmp.h:2650 src/xml/xmli18n-tmp.h:2665
-#: src/xml/xmli18n-tmp.h:2680 src/xml/xmli18n-tmp.h:2694
-#: src/xml/xmli18n-tmp.h:2709 src/xml/xmli18n-tmp.h:2727
-#: src/xml/xmli18n-tmp.h:2742 src/xml/xmli18n-tmp.h:2756
-#: src/xml/xmli18n-tmp.h:2774 src/xml/xmli18n-tmp.h:2790
-#: src/xml/xmli18n-tmp.h:2800 src/xml/xmli18n-tmp.h:2813
-#: src/xml/xmli18n-tmp.h:2825 src/xml/xmli18n-tmp.h:2837
-#: src/xml/xmli18n-tmp.h:2852 src/xml/xmli18n-tmp.h:2879
-#: src/xml/xmli18n-tmp.h:2891 src/xml/xmli18n-tmp.h:2906
-#: src/xml/xmli18n-tmp.h:2925 src/xml/xmli18n-tmp.h:2940
-#: src/xml/xmli18n-tmp.h:2955 src/xml/xmli18n-tmp.h:2970
-#: src/xml/xmli18n-tmp.h:2981 src/xml/xmli18n-tmp.h:2995
-#: src/xml/xmli18n-tmp.h:3012 src/xml/xmli18n-tmp.h:3026
-#: src/xml/xmli18n-tmp.h:3040 src/xml/xmli18n-tmp.h:3055
-#: src/xml/xmli18n-tmp.h:3072 src/xml/xmli18n-tmp.h:3089
-#: src/xml/xmli18n-tmp.h:3103 src/xml/xmli18n-tmp.h:3118
-#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3149
+#: src/xml/xmli18n-tmp.h:2926 src/xml/xmli18n-tmp.h:2950
+#: src/xml/xmli18n-tmp.h:2964 src/xml/xmli18n-tmp.h:2976
+#: src/xml/xmli18n-tmp.h:2988 src/xml/xmli18n-tmp.h:3003
+#: src/xml/xmli18n-tmp.h:3018 src/xml/xmli18n-tmp.h:3031
+#: src/xml/xmli18n-tmp.h:3044 src/xml/xmli18n-tmp.h:3071
+#: src/xml/xmli18n-tmp.h:3095 src/xml/xmli18n-tmp.h:3107
+#: src/xml/xmli18n-tmp.h:3132 src/xml/xmli18n-tmp.h:3145
+#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3204 src/xml/xmli18n-tmp.h:3218
+#: src/xml/xmli18n-tmp.h:3233 src/xml/xmli18n-tmp.h:3251
+#: src/xml/xmli18n-tmp.h:3266 src/xml/xmli18n-tmp.h:3280
+#: src/xml/xmli18n-tmp.h:3298 src/xml/xmli18n-tmp.h:3314
+#: src/xml/xmli18n-tmp.h:3324 src/xml/xmli18n-tmp.h:3337
+#: src/xml/xmli18n-tmp.h:3349 src/xml/xmli18n-tmp.h:3361
+#: src/xml/xmli18n-tmp.h:3374 src/xml/xmli18n-tmp.h:3402
+#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3429
+#: src/xml/xmli18n-tmp.h:3448 src/xml/xmli18n-tmp.h:3463
+#: src/xml/xmli18n-tmp.h:3478 src/xml/xmli18n-tmp.h:3493
+#: src/xml/xmli18n-tmp.h:3504 src/xml/xmli18n-tmp.h:3518
+#: src/xml/xmli18n-tmp.h:3535 src/xml/xmli18n-tmp.h:3549
+#: src/xml/xmli18n-tmp.h:3563 src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3612
+#: src/xml/xmli18n-tmp.h:3626 src/xml/xmli18n-tmp.h:3641
+#: src/xml/xmli18n-tmp.h:3655 src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:3690
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2514 src/xml/xmli18n-tmp.h:2566
+#: src/xml/xmli18n-tmp.h:3038 src/xml/xmli18n-tmp.h:3090
+#: src/xml/xmli18n-tmp.h:4313 src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:4374
 msgid "Dark Yellow"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:2572 src/xml/xmli18n-tmp.h:2584
-#: src/xml/xmli18n-tmp.h:2667 src/xml/xmli18n-tmp.h:2711
-#: src/xml/xmli18n-tmp.h:2729 src/xml/xmli18n-tmp.h:2743
-#: src/xml/xmli18n-tmp.h:2758 src/xml/xmli18n-tmp.h:2776
-#: src/xml/xmli18n-tmp.h:2892 src/xml/xmli18n-tmp.h:2908
-#: src/xml/xmli18n-tmp.h:2927 src/xml/xmli18n-tmp.h:2972
-#: src/xml/xmli18n-tmp.h:2997 src/xml/xmli18n-tmp.h:3057
-#: src/xml/xmli18n-tmp.h:3074 src/xml/xmli18n-tmp.h:3091
-#: src/xml/xmli18n-tmp.h:3105 src/xml/xmli18n-tmp.h:3134
-#: src/xml/xmli18n-tmp.h:3151
+#: src/xml/xmli18n-tmp.h:3096 src/xml/xmli18n-tmp.h:3108
+#: src/xml/xmli18n-tmp.h:3191 src/xml/xmli18n-tmp.h:3235
+#: src/xml/xmli18n-tmp.h:3253 src/xml/xmli18n-tmp.h:3267
+#: src/xml/xmli18n-tmp.h:3282 src/xml/xmli18n-tmp.h:3300
+#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3431
+#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3495
+#: src/xml/xmli18n-tmp.h:3520 src/xml/xmli18n-tmp.h:3580
+#: src/xml/xmli18n-tmp.h:3597 src/xml/xmli18n-tmp.h:3614
+#: src/xml/xmli18n-tmp.h:3628 src/xml/xmli18n-tmp.h:3657
+#: src/xml/xmli18n-tmp.h:3674 src/xml/xmli18n-tmp.h:3692
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/xml/xmli18n-tmp.h:2666 src/xml/xmli18n-tmp.h:2681
-#: src/xml/xmli18n-tmp.h:2710 src/xml/xmli18n-tmp.h:2728
-#: src/xml/xmli18n-tmp.h:2757 src/xml/xmli18n-tmp.h:2775
-#: src/xml/xmli18n-tmp.h:2801 src/xml/xmli18n-tmp.h:2814
-#: src/xml/xmli18n-tmp.h:2826 src/xml/xmli18n-tmp.h:2838
-#: src/xml/xmli18n-tmp.h:2907 src/xml/xmli18n-tmp.h:2926
-#: src/xml/xmli18n-tmp.h:2941 src/xml/xmli18n-tmp.h:2971
-#: src/xml/xmli18n-tmp.h:2982 src/xml/xmli18n-tmp.h:2996
-#: src/xml/xmli18n-tmp.h:3056 src/xml/xmli18n-tmp.h:3073
-#: src/xml/xmli18n-tmp.h:3090 src/xml/xmli18n-tmp.h:3104
-#: src/xml/xmli18n-tmp.h:3119 src/xml/xmli18n-tmp.h:3133
-#: src/xml/xmli18n-tmp.h:3150
+#: src/xml/xmli18n-tmp.h:3190 src/xml/xmli18n-tmp.h:3205
+#: src/xml/xmli18n-tmp.h:3234 src/xml/xmli18n-tmp.h:3252
+#: src/xml/xmli18n-tmp.h:3281 src/xml/xmli18n-tmp.h:3299
+#: src/xml/xmli18n-tmp.h:3325 src/xml/xmli18n-tmp.h:3338
+#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3362
+#: src/xml/xmli18n-tmp.h:3375 src/xml/xmli18n-tmp.h:3430
+#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3464
+#: src/xml/xmli18n-tmp.h:3494 src/xml/xmli18n-tmp.h:3505
+#: src/xml/xmli18n-tmp.h:3519 src/xml/xmli18n-tmp.h:3579
+#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3613
+#: src/xml/xmli18n-tmp.h:3627 src/xml/xmli18n-tmp.h:3642
+#: src/xml/xmli18n-tmp.h:3656 src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:3691
 #, fuzzy
 msgid "5760 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/xml/xmli18n-tmp.h:2668 src/xml/xmli18n-tmp.h:2712
-#: src/xml/xmli18n-tmp.h:2730 src/xml/xmli18n-tmp.h:2759
-#: src/xml/xmli18n-tmp.h:2777 src/xml/xmli18n-tmp.h:2909
-#: src/xml/xmli18n-tmp.h:2928 src/xml/xmli18n-tmp.h:2973
-#: src/xml/xmli18n-tmp.h:2998 src/xml/xmli18n-tmp.h:3058
-#: src/xml/xmli18n-tmp.h:3075 src/xml/xmli18n-tmp.h:3092
-#: src/xml/xmli18n-tmp.h:3106 src/xml/xmli18n-tmp.h:3135
-#: src/xml/xmli18n-tmp.h:3152
+#: src/xml/xmli18n-tmp.h:3192 src/xml/xmli18n-tmp.h:3236
+#: src/xml/xmli18n-tmp.h:3254 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:3301 src/xml/xmli18n-tmp.h:3432
+#: src/xml/xmli18n-tmp.h:3451 src/xml/xmli18n-tmp.h:3496
+#: src/xml/xmli18n-tmp.h:3521 src/xml/xmli18n-tmp.h:3581
+#: src/xml/xmli18n-tmp.h:3598 src/xml/xmli18n-tmp.h:3615
+#: src/xml/xmli18n-tmp.h:3629 src/xml/xmli18n-tmp.h:3658
+#: src/xml/xmli18n-tmp.h:3675 src/xml/xmli18n-tmp.h:3693
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/xml/xmli18n-tmp.h:2798 src/xml/xmli18n-tmp.h:2979
+#: src/xml/xmli18n-tmp.h:3322 src/xml/xmli18n-tmp.h:3502
 #, fuzzy
 msgid "1440 x 720 DPI Transposed"
 msgstr "1440 x 720 DPI"
 
-#: src/xml/xmli18n-tmp.h:2920 src/xml/xmli18n-tmp.h:2965
-#: src/xml/xmli18n-tmp.h:2989 src/xml/xmli18n-tmp.h:3067
-#: src/xml/xmli18n-tmp.h:3084
+#: src/xml/xmli18n-tmp.h:3443 src/xml/xmli18n-tmp.h:3488
+#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:3607
 #, fuzzy
 msgid "720 x 360 DPI Enhanced"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:2956
+#: src/xml/xmli18n-tmp.h:3479
 #, fuzzy
 msgid "Black 1"
 msgstr "黑"
 
-#: src/xml/xmli18n-tmp.h:2957
+#: src/xml/xmli18n-tmp.h:3480
 #, fuzzy
 msgid "Black 2"
 msgstr "黑"
 
-#: src/xml/xmli18n-tmp.h:2963 src/xml/xmli18n-tmp.h:3065
-#: src/xml/xmli18n-tmp.h:3082
+#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3605
 #, fuzzy
 msgid "360 DPI Enhanced"
 msgstr "720 x 360 DPI"
 
-#: src/xml/xmli18n-tmp.h:2993
+#: src/xml/xmli18n-tmp.h:3516
 #, fuzzy
 msgid "1440 x 720 DPI High Quality"
 msgstr "1440 x 720 DPI 最高�質"
 
-#: src/xml/xmli18n-tmp.h:3153
-msgid "Lower Front Tray"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:3677
+#, fuzzy
+msgid "Vivid Light Magenta"
+msgstr "洋紅色平衡"
 
-#: src/xml/xmli18n-tmp.h:3154
-msgid "Upper Front Tray"
+#: src/xml/xmli18n-tmp.h:3682
+#, fuzzy
+msgid "Vivid Magenta"
+msgstr "æ´‹ç´…"
+
+#: src/xml/xmli18n-tmp.h:3694
+msgid "Main Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3155 src/xml/xmli18n-tmp.h:3160
-#: src/xml/xmli18n-tmp.h:3165 src/xml/xmli18n-tmp.h:3176
-#: src/xml/xmli18n-tmp.h:3183 src/xml/xmli18n-tmp.h:3186
+#: src/xml/xmli18n-tmp.h:3695
+#, fuzzy
+msgid "Photo Tray"
+msgstr "相片"
+
+#: src/xml/xmli18n-tmp.h:3696 src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:3706 src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:3725 src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:3732
 msgid "Print to CD"
 msgstr "列�至光碟"
 
-#: src/xml/xmli18n-tmp.h:3156 src/xml/xmli18n-tmp.h:3181
-#: src/xml/xmli18n-tmp.h:3184
+#: src/xml/xmli18n-tmp.h:3697 src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:3730
 msgid "Rear Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3157 src/xml/xmli18n-tmp.h:3182
-#: src/xml/xmli18n-tmp.h:3185
+#: src/xml/xmli18n-tmp.h:3698 src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:3731
 msgid "Front Tray"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3159 src/xml/xmli18n-tmp.h:3164
+#: src/xml/xmli18n-tmp.h:3700 src/xml/xmli18n-tmp.h:3705
 msgid "Manual Feed"
 msgstr "人手�紙"
 
-#: src/xml/xmli18n-tmp.h:3161 src/xml/xmli18n-tmp.h:3168
+#: src/xml/xmli18n-tmp.h:3702 src/xml/xmli18n-tmp.h:3709
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3162 src/xml/xmli18n-tmp.h:3169
+#: src/xml/xmli18n-tmp.h:3703 src/xml/xmli18n-tmp.h:3710
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3166 src/xml/xmli18n-tmp.h:3171
-#: src/xml/xmli18n-tmp.h:3175 src/xml/xmli18n-tmp.h:3180
-#: src/xml/xmli18n-tmp.h:3193
+#: src/xml/xmli18n-tmp.h:3707 src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:3716 src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:3726 src/xml/xmli18n-tmp.h:3739
 msgid "Roll Feed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3173 src/xml/xmli18n-tmp.h:3178
+#: src/xml/xmli18n-tmp.h:3714 src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:3723
 #, fuzzy
 msgid "Manual Sheet Guide"
 msgstr "人手�紙"
 
-#: src/xml/xmli18n-tmp.h:3174 src/xml/xmli18n-tmp.h:3179
+#: src/xml/xmli18n-tmp.h:3715 src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:3724
 #, fuzzy
 msgid "Manual Feed (Front)"
 msgstr "人手�紙"
 
-#: src/xml/xmli18n-tmp.h:3187
+#: src/xml/xmli18n-tmp.h:3733
 #, fuzzy
 msgid "Photo Board"
 msgstr "相紙"
 
-#: src/xml/xmli18n-tmp.h:3188
+#: src/xml/xmli18n-tmp.h:3734
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3189
+#: src/xml/xmli18n-tmp.h:3735
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3190
+#: src/xml/xmli18n-tmp.h:3736
 msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3191
+#: src/xml/xmli18n-tmp.h:3737
 msgid "Manual Selection"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3199 src/xml/xmli18n-tmp.h:3207
-#: src/xml/xmli18n-tmp.h:3213 src/xml/xmli18n-tmp.h:3219
-#: src/xml/xmli18n-tmp.h:3227 src/xml/xmli18n-tmp.h:3235
-#: src/xml/xmli18n-tmp.h:3245 src/xml/xmli18n-tmp.h:3257
-#: src/xml/xmli18n-tmp.h:3269 src/xml/xmli18n-tmp.h:3278
-#: src/xml/xmli18n-tmp.h:3290 src/xml/xmli18n-tmp.h:3297
-#: src/xml/xmli18n-tmp.h:3307 src/xml/xmli18n-tmp.h:3317
-#: src/xml/xmli18n-tmp.h:3329 src/xml/xmli18n-tmp.h:3342
-#: src/xml/xmli18n-tmp.h:3356 src/xml/xmli18n-tmp.h:3382
-#: src/xml/xmli18n-tmp.h:3390 src/xml/xmli18n-tmp.h:3402
-#: src/xml/xmli18n-tmp.h:3414 src/xml/xmli18n-tmp.h:3426
-#: src/xml/xmli18n-tmp.h:3436 src/xml/xmli18n-tmp.h:3446
-#: src/xml/xmli18n-tmp.h:3456 src/xml/xmli18n-tmp.h:3474
-#: src/xml/xmli18n-tmp.h:3486 src/xml/xmli18n-tmp.h:3498
-#: src/xml/xmli18n-tmp.h:3510 src/xml/xmli18n-tmp.h:3524
-#: src/xml/xmli18n-tmp.h:3550 src/xml/xmli18n-tmp.h:3558
-#: src/xml/xmli18n-tmp.h:3570 src/xml/xmli18n-tmp.h:3584
-#: src/xml/xmli18n-tmp.h:3594 src/xml/xmli18n-tmp.h:3600
-#: src/xml/xmli18n-tmp.h:3606
+#: src/xml/xmli18n-tmp.h:3763 src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:3818 src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:3872 src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:3951 src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:4067 src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:4172 src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:4236 src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:4344 src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:4479 src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:4754 src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:4888 src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:5009 src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:5102 src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:5252 src/xml/xmli18n-tmp.h:5319
+#: src/xml/xmli18n-tmp.h:5377 src/xml/xmli18n-tmp.h:5446
+#: src/xml/xmli18n-tmp.h:5589 src/xml/xmli18n-tmp.h:5622
+#: src/xml/xmli18n-tmp.h:5679 src/xml/xmli18n-tmp.h:5748
+#: src/xml/xmli18n-tmp.h:5793 src/xml/xmli18n-tmp.h:5814
+#: src/xml/xmli18n-tmp.h:5835
 msgid "One Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3200 src/xml/xmli18n-tmp.h:3208
-#: src/xml/xmli18n-tmp.h:3214 src/xml/xmli18n-tmp.h:3220
-#: src/xml/xmli18n-tmp.h:3228 src/xml/xmli18n-tmp.h:3236
-#: src/xml/xmli18n-tmp.h:3246 src/xml/xmli18n-tmp.h:3259
-#: src/xml/xmli18n-tmp.h:3270 src/xml/xmli18n-tmp.h:3280
-#: src/xml/xmli18n-tmp.h:3291 src/xml/xmli18n-tmp.h:3298
-#: src/xml/xmli18n-tmp.h:3308 src/xml/xmli18n-tmp.h:3318
-#: src/xml/xmli18n-tmp.h:3330 src/xml/xmli18n-tmp.h:3344
-#: src/xml/xmli18n-tmp.h:3358 src/xml/xmli18n-tmp.h:3383
-#: src/xml/xmli18n-tmp.h:3391 src/xml/xmli18n-tmp.h:3403
-#: src/xml/xmli18n-tmp.h:3415 src/xml/xmli18n-tmp.h:3427
-#: src/xml/xmli18n-tmp.h:3437 src/xml/xmli18n-tmp.h:3447
-#: src/xml/xmli18n-tmp.h:3457 src/xml/xmli18n-tmp.h:3475
-#: src/xml/xmli18n-tmp.h:3487 src/xml/xmli18n-tmp.h:3499
-#: src/xml/xmli18n-tmp.h:3512 src/xml/xmli18n-tmp.h:3526
-#: src/xml/xmli18n-tmp.h:3551 src/xml/xmli18n-tmp.h:3559
-#: src/xml/xmli18n-tmp.h:3572 src/xml/xmli18n-tmp.h:3586
-#: src/xml/xmli18n-tmp.h:3595 src/xml/xmli18n-tmp.h:3601
-#: src/xml/xmli18n-tmp.h:3607
+#: src/xml/xmli18n-tmp.h:3765 src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:3820 src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:3874 src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:3953 src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:4069 src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:4174 src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:4238 src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:4346 src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:4484 src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:4756 src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:4890 src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:5011 src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:5104 src/xml/xmli18n-tmp.h:5187
+#: src/xml/xmli18n-tmp.h:5254 src/xml/xmli18n-tmp.h:5321
+#: src/xml/xmli18n-tmp.h:5382 src/xml/xmli18n-tmp.h:5451
+#: src/xml/xmli18n-tmp.h:5591 src/xml/xmli18n-tmp.h:5624
+#: src/xml/xmli18n-tmp.h:5684 src/xml/xmli18n-tmp.h:5753
+#: src/xml/xmli18n-tmp.h:5795 src/xml/xmli18n-tmp.h:5816
+#: src/xml/xmli18n-tmp.h:5837
 msgid "Three Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3201 src/xml/xmli18n-tmp.h:3209
-#: src/xml/xmli18n-tmp.h:3215 src/xml/xmli18n-tmp.h:3221
-#: src/xml/xmli18n-tmp.h:3229 src/xml/xmli18n-tmp.h:3237
-#: src/xml/xmli18n-tmp.h:3247 src/xml/xmli18n-tmp.h:3271
-#: src/xml/xmli18n-tmp.h:3292 src/xml/xmli18n-tmp.h:3299
-#: src/xml/xmli18n-tmp.h:3309 src/xml/xmli18n-tmp.h:3319
-#: src/xml/xmli18n-tmp.h:3331 src/xml/xmli18n-tmp.h:3345
-#: src/xml/xmli18n-tmp.h:3359 src/xml/xmli18n-tmp.h:3384
-#: src/xml/xmli18n-tmp.h:3392 src/xml/xmli18n-tmp.h:3404
-#: src/xml/xmli18n-tmp.h:3416 src/xml/xmli18n-tmp.h:3428
-#: src/xml/xmli18n-tmp.h:3438 src/xml/xmli18n-tmp.h:3448
-#: src/xml/xmli18n-tmp.h:3458 src/xml/xmli18n-tmp.h:3463
-#: src/xml/xmli18n-tmp.h:3468 src/xml/xmli18n-tmp.h:3476
-#: src/xml/xmli18n-tmp.h:3488 src/xml/xmli18n-tmp.h:3500
-#: src/xml/xmli18n-tmp.h:3513 src/xml/xmli18n-tmp.h:3527
-#: src/xml/xmli18n-tmp.h:3552 src/xml/xmli18n-tmp.h:3560
-#: src/xml/xmli18n-tmp.h:3573 src/xml/xmli18n-tmp.h:3587
-#: src/xml/xmli18n-tmp.h:3596 src/xml/xmli18n-tmp.h:3602
-#: src/xml/xmli18n-tmp.h:3608
+#: src/xml/xmli18n-tmp.h:3769 src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:3824 src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:3878 src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:3957 src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:4178 src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:4242 src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:4350 src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:4488 src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:4760 src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:4894 src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:5015 src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:5108 src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:5157 src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:5258 src/xml/xmli18n-tmp.h:5325
+#: src/xml/xmli18n-tmp.h:5386 src/xml/xmli18n-tmp.h:5455
+#: src/xml/xmli18n-tmp.h:5595 src/xml/xmli18n-tmp.h:5628
+#: src/xml/xmli18n-tmp.h:5688 src/xml/xmli18n-tmp.h:5757
+#: src/xml/xmli18n-tmp.h:5799 src/xml/xmli18n-tmp.h:5820
+#: src/xml/xmli18n-tmp.h:5841
 msgid "Four Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3202 src/xml/xmli18n-tmp.h:3248
-#: src/xml/xmli18n-tmp.h:3320 src/xml/xmli18n-tmp.h:3332
-#: src/xml/xmli18n-tmp.h:3346 src/xml/xmli18n-tmp.h:3360
-#: src/xml/xmli18n-tmp.h:3393 src/xml/xmli18n-tmp.h:3405
-#: src/xml/xmli18n-tmp.h:3417 src/xml/xmli18n-tmp.h:3429
-#: src/xml/xmli18n-tmp.h:3449 src/xml/xmli18n-tmp.h:3459
-#: src/xml/xmli18n-tmp.h:3477 src/xml/xmli18n-tmp.h:3489
-#: src/xml/xmli18n-tmp.h:3501 src/xml/xmli18n-tmp.h:3514
-#: src/xml/xmli18n-tmp.h:3528 src/xml/xmli18n-tmp.h:3574
-#: src/xml/xmli18n-tmp.h:3588
+#: src/xml/xmli18n-tmp.h:3774 src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:4293 src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:4424 src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:4765 src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:4899 src/xml/xmli18n-tmp.h:4966
+#: src/xml/xmli18n-tmp.h:5066 src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:5196 src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:5330 src/xml/xmli18n-tmp.h:5391
+#: src/xml/xmli18n-tmp.h:5460 src/xml/xmli18n-tmp.h:5693
+#: src/xml/xmli18n-tmp.h:5762
 msgid "Five Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3203 src/xml/xmli18n-tmp.h:3249
-#: src/xml/xmli18n-tmp.h:3272 src/xml/xmli18n-tmp.h:3293
-#: src/xml/xmli18n-tmp.h:3321 src/xml/xmli18n-tmp.h:3333
-#: src/xml/xmli18n-tmp.h:3347 src/xml/xmli18n-tmp.h:3361
-#: src/xml/xmli18n-tmp.h:3394 src/xml/xmli18n-tmp.h:3406
-#: src/xml/xmli18n-tmp.h:3418 src/xml/xmli18n-tmp.h:3430
-#: src/xml/xmli18n-tmp.h:3450 src/xml/xmli18n-tmp.h:3460
-#: src/xml/xmli18n-tmp.h:3467 src/xml/xmli18n-tmp.h:3478
-#: src/xml/xmli18n-tmp.h:3490 src/xml/xmli18n-tmp.h:3502
-#: src/xml/xmli18n-tmp.h:3515 src/xml/xmli18n-tmp.h:3529
-#: src/xml/xmli18n-tmp.h:3575 src/xml/xmli18n-tmp.h:3589
+#: src/xml/xmli18n-tmp.h:3780 src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:4078 src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:4299 src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:4430 src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:4771 src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:4905 src/xml/xmli18n-tmp.h:4972
+#: src/xml/xmli18n-tmp.h:5072 src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:5150 src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:5269 src/xml/xmli18n-tmp.h:5336
+#: src/xml/xmli18n-tmp.h:5397 src/xml/xmli18n-tmp.h:5466
+#: src/xml/xmli18n-tmp.h:5699 src/xml/xmli18n-tmp.h:5768
 msgid "Six Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3258 src/xml/xmli18n-tmp.h:3279
+#: src/xml/xmli18n-tmp.h:3853 src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:3886 src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:3919 src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:4214 src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:4250 src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:4781 src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:4795 src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:4854 src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:4915 src/xml/xmli18n-tmp.h:4921
+#: src/xml/xmli18n-tmp.h:4929 src/xml/xmli18n-tmp.h:4982
+#: src/xml/xmli18n-tmp.h:4988 src/xml/xmli18n-tmp.h:4996
+#: src/xml/xmli18n-tmp.h:5023 src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:5212 src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:5226 src/xml/xmli18n-tmp.h:5279
+#: src/xml/xmli18n-tmp.h:5285 src/xml/xmli18n-tmp.h:5293
+#: src/xml/xmli18n-tmp.h:5603 src/xml/xmli18n-tmp.h:5609
+#: src/xml/xmli18n-tmp.h:5636 src/xml/xmli18n-tmp.h:5642
+#, fuzzy
+msgid "Gray 3"
+msgstr "�階"
+
+#: src/xml/xmli18n-tmp.h:3854 src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:3887 src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:3920 src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:4215 src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:4251 src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:4782 src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:4796 src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:4855 src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:4916 src/xml/xmli18n-tmp.h:4922
+#: src/xml/xmli18n-tmp.h:4930 src/xml/xmli18n-tmp.h:4983
+#: src/xml/xmli18n-tmp.h:4989 src/xml/xmli18n-tmp.h:4997
+#: src/xml/xmli18n-tmp.h:5024 src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:5213 src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:5227 src/xml/xmli18n-tmp.h:5280
+#: src/xml/xmli18n-tmp.h:5286 src/xml/xmli18n-tmp.h:5294
+#: src/xml/xmli18n-tmp.h:5604 src/xml/xmli18n-tmp.h:5610
+#: src/xml/xmli18n-tmp.h:5637 src/xml/xmli18n-tmp.h:5643
+#, fuzzy
+msgid "Gray 2"
+msgstr "�階"
+
+#: src/xml/xmli18n-tmp.h:3855 src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:3888 src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:3921 src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:4216 src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:4252 src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:4783 src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:4797 src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:4856 src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:4917 src/xml/xmli18n-tmp.h:4923
+#: src/xml/xmli18n-tmp.h:4931 src/xml/xmli18n-tmp.h:4984
+#: src/xml/xmli18n-tmp.h:4990 src/xml/xmli18n-tmp.h:4998
+#: src/xml/xmli18n-tmp.h:5025 src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:5214 src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:5228 src/xml/xmli18n-tmp.h:5281
+#: src/xml/xmli18n-tmp.h:5287 src/xml/xmli18n-tmp.h:5295
+#: src/xml/xmli18n-tmp.h:5605 src/xml/xmli18n-tmp.h:5611
+#: src/xml/xmli18n-tmp.h:5638 src/xml/xmli18n-tmp.h:5644
+#, fuzzy
+msgid "Gray 1"
+msgstr "�階"
+
+#: src/xml/xmli18n-tmp.h:3856 src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:3922 src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:4253 src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:4851 src/xml/xmli18n-tmp.h:4918
+#: src/xml/xmli18n-tmp.h:4985 src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:5215 src/xml/xmli18n-tmp.h:5282
+#: src/xml/xmli18n-tmp.h:5606 src/xml/xmli18n-tmp.h:5639
+msgid "MIS Quadtone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4009 src/xml/xmli18n-tmp.h:4114
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3260 src/xml/xmli18n-tmp.h:3281
+#: src/xml/xmli18n-tmp.h:4016 src/xml/xmli18n-tmp.h:4121
 msgid "Three Color Raw Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3261 src/xml/xmli18n-tmp.h:3282
+#: src/xml/xmli18n-tmp.h:4021 src/xml/xmli18n-tmp.h:4126
 msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3262 src/xml/xmli18n-tmp.h:3283
+#: src/xml/xmli18n-tmp.h:4027 src/xml/xmli18n-tmp.h:4132
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3263 src/xml/xmli18n-tmp.h:3284
+#: src/xml/xmli18n-tmp.h:4035 src/xml/xmli18n-tmp.h:4140
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3303
+#: src/xml/xmli18n-tmp.h:4141
+#, fuzzy
+msgid "MatteBlack"
+msgstr "黑"
+
+#: src/xml/xmli18n-tmp.h:4224
 #, fuzzy
 msgid "Default Black"
 msgstr "�設"
 
-#: src/xml/xmli18n-tmp.h:3323 src/xml/xmli18n-tmp.h:3336
-#: src/xml/xmli18n-tmp.h:3350 src/xml/xmli18n-tmp.h:3365
-#: src/xml/xmli18n-tmp.h:3373 src/xml/xmli18n-tmp.h:3504
-#: src/xml/xmli18n-tmp.h:3518 src/xml/xmli18n-tmp.h:3533
-#: src/xml/xmli18n-tmp.h:3541 src/xml/xmli18n-tmp.h:3564
-#: src/xml/xmli18n-tmp.h:3578
+#: src/xml/xmli18n-tmp.h:4307 src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:4446 src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:4573 src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:4671 src/xml/xmli18n-tmp.h:5344
+#: src/xml/xmli18n-tmp.h:5413 src/xml/xmli18n-tmp.h:5491
+#: src/xml/xmli18n-tmp.h:5540 src/xml/xmli18n-tmp.h:5646
+#: src/xml/xmli18n-tmp.h:5715
 msgid "Seven Color Photo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3324
+#: src/xml/xmli18n-tmp.h:4315
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3334 src/xml/xmli18n-tmp.h:3348
-#: src/xml/xmli18n-tmp.h:3362 src/xml/xmli18n-tmp.h:3516
-#: src/xml/xmli18n-tmp.h:3530 src/xml/xmli18n-tmp.h:3576
-#: src/xml/xmli18n-tmp.h:3590
+#: src/xml/xmli18n-tmp.h:4368 src/xml/xmli18n-tmp.h:4437
+#: src/xml/xmli18n-tmp.h:4506 src/xml/xmli18n-tmp.h:5404
+#: src/xml/xmli18n-tmp.h:5473 src/xml/xmli18n-tmp.h:5706
+#: src/xml/xmli18n-tmp.h:5775
 msgid "Seven Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3341 src/xml/xmli18n-tmp.h:3355
-#: src/xml/xmli18n-tmp.h:3509 src/xml/xmli18n-tmp.h:3523
-#: src/xml/xmli18n-tmp.h:3569 src/xml/xmli18n-tmp.h:3583
+#: src/xml/xmli18n-tmp.h:4407 src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:5374 src/xml/xmli18n-tmp.h:5443
+#: src/xml/xmli18n-tmp.h:5676 src/xml/xmli18n-tmp.h:5745
 msgid "Two Level Grayscale"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3343 src/xml/xmli18n-tmp.h:3357
-#: src/xml/xmli18n-tmp.h:3511 src/xml/xmli18n-tmp.h:3525
-#: src/xml/xmli18n-tmp.h:3571 src/xml/xmli18n-tmp.h:3585
+#: src/xml/xmli18n-tmp.h:4412 src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:5379 src/xml/xmli18n-tmp.h:5448
+#: src/xml/xmli18n-tmp.h:5681 src/xml/xmli18n-tmp.h:5750
 msgid "Two Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3364 src/xml/xmli18n-tmp.h:3372
-#: src/xml/xmli18n-tmp.h:3532 src/xml/xmli18n-tmp.h:3540
+#: src/xml/xmli18n-tmp.h:4515 src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:4613 src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:5482 src/xml/xmli18n-tmp.h:5531
 msgid "Eight Color Photo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3370 src/xml/xmli18n-tmp.h:3378
-#: src/xml/xmli18n-tmp.h:3538 src/xml/xmli18n-tmp.h:3546
+#: src/xml/xmli18n-tmp.h:4554 src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:4652 src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:5521 src/xml/xmli18n-tmp.h:5570
 msgid "Eight Color Raw"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3462 src/xml/xmli18n-tmp.h:3466
+#: src/xml/xmli18n-tmp.h:4790 src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:4924 src/xml/xmli18n-tmp.h:4991
+#: src/xml/xmli18n-tmp.h:5221 src/xml/xmli18n-tmp.h:5288
+msgid "MIS Six Tone"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:4793 src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:4927 src/xml/xmli18n-tmp.h:4994
+#: src/xml/xmli18n-tmp.h:5224 src/xml/xmli18n-tmp.h:5291
+#, fuzzy
+msgid "Gray 5"
+msgstr "�階"
+
+#: src/xml/xmli18n-tmp.h:4794 src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:4928 src/xml/xmli18n-tmp.h:4995
+#: src/xml/xmli18n-tmp.h:5225 src/xml/xmli18n-tmp.h:5292
+#, fuzzy
+msgid "Gray 4"
+msgstr "�階"
+
+#: src/xml/xmli18n-tmp.h:5127 src/xml/xmli18n-tmp.h:5145
 msgid "Four Color Photo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3610 src/xml/xmli18n-tmp.h:3615
-#: src/xml/xmli18n-tmp.h:3621
+#: src/xml/xmli18n-tmp.h:5847 src/xml/xmli18n-tmp.h:5852
+#: src/xml/xmli18n-tmp.h:5858
 msgid "Interleave"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3611 src/xml/xmli18n-tmp.h:3616
-#: src/xml/xmli18n-tmp.h:3622
+#: src/xml/xmli18n-tmp.h:5848 src/xml/xmli18n-tmp.h:5853
+#: src/xml/xmli18n-tmp.h:5859
 msgid "Full Overlap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3612 src/xml/xmli18n-tmp.h:3617
-#: src/xml/xmli18n-tmp.h:3623
+#: src/xml/xmli18n-tmp.h:5849 src/xml/xmli18n-tmp.h:5854
+#: src/xml/xmli18n-tmp.h:5860
 msgid "Four Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3613 src/xml/xmli18n-tmp.h:3618
-#: src/xml/xmli18n-tmp.h:3624
+#: src/xml/xmli18n-tmp.h:5850 src/xml/xmli18n-tmp.h:5855
+#: src/xml/xmli18n-tmp.h:5861
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3619 src/xml/xmli18n-tmp.h:3625
+#: src/xml/xmli18n-tmp.h:5856 src/xml/xmli18n-tmp.h:5862
 msgid "Interleave 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3626
+#: src/xml/xmli18n-tmp.h:5863
 msgid "Eight Pass"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3628
+#: src/xml/xmli18n-tmp.h:5865
 msgid "On"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3672
+#: src/xml/xmli18n-tmp.h:5909
 msgid "Legal"
 msgstr "Legal"
 
-#: src/xml/xmli18n-tmp.h:3673
+#: src/xml/xmli18n-tmp.h:5910
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: src/xml/xmli18n-tmp.h:3674
+#: src/xml/xmli18n-tmp.h:5911
 msgid "Executive"
 msgstr "Executive"
 
-#: src/xml/xmli18n-tmp.h:3679
+#: src/xml/xmli18n-tmp.h:5916
 msgid "3x5"
 msgstr "3x5"
 
-#: src/xml/xmli18n-tmp.h:3680
+#: src/xml/xmli18n-tmp.h:5917
 msgid "3 1/2 x5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3681
+#: src/xml/xmli18n-tmp.h:5918
 msgid "4x6"
 msgstr "4x6"
 
-#: src/xml/xmli18n-tmp.h:3682
+#: src/xml/xmli18n-tmp.h:5919
 #, fuzzy
 msgid "Epson 4x6 Photo Paper (tear-off borders)"
 msgstr "Epson 4x6 相紙"
 
-#: src/xml/xmli18n-tmp.h:3683
+#: src/xml/xmli18n-tmp.h:5920
+#, fuzzy
+msgid "Epson L Photo Paper (tear-off borders)"
+msgstr "Epson 4x6 相紙"
+
+#: src/xml/xmli18n-tmp.h:5921
 msgid "5x7"
 msgstr "5x7"
 
-#: src/xml/xmli18n-tmp.h:3684
+#: src/xml/xmli18n-tmp.h:5922
 msgid "5x8"
 msgstr "5x8"
 
-#: src/xml/xmli18n-tmp.h:3685
+#: src/xml/xmli18n-tmp.h:5923
 msgid "6x8"
 msgstr "6x8"
 
-#: src/xml/xmli18n-tmp.h:3686
+#: src/xml/xmli18n-tmp.h:5924
 msgid "8x10"
 msgstr "8x10"
 
-#: src/xml/xmli18n-tmp.h:3688
+#: src/xml/xmli18n-tmp.h:5926
 msgid "12x18"
 msgstr "12x18"
 
-#: src/xml/xmli18n-tmp.h:3689
+#: src/xml/xmli18n-tmp.h:5927
 msgid "Super B 13x19"
 msgstr "Super B 13x19"
 
-#: src/xml/xmli18n-tmp.h:3690
+#: src/xml/xmli18n-tmp.h:5928
 msgid "Engineering C 17x22"
 msgstr "Engineering C 17x22"
 
-#: src/xml/xmli18n-tmp.h:3691
+#: src/xml/xmli18n-tmp.h:5929
 msgid "8x12"
 msgstr "8x12"
 
-#: src/xml/xmli18n-tmp.h:3692
+#: src/xml/xmli18n-tmp.h:5930
 msgid "11x14"
 msgstr "11x14"
 
-#: src/xml/xmli18n-tmp.h:3693
+#: src/xml/xmli18n-tmp.h:5931
 msgid "16x20"
 msgstr "16x20"
 
-#: src/xml/xmli18n-tmp.h:3694
+#: src/xml/xmli18n-tmp.h:5932
 msgid "16x24"
 msgstr "16x24"
 
-#: src/xml/xmli18n-tmp.h:3695
+#: src/xml/xmli18n-tmp.h:5933
 msgid "20x24"
 msgstr "20x24"
 
-#: src/xml/xmli18n-tmp.h:3696
+#: src/xml/xmli18n-tmp.h:5934
 msgid "20x30"
 msgstr "20x30"
 
-#: src/xml/xmli18n-tmp.h:3697
+#: src/xml/xmli18n-tmp.h:5935
 msgid "22x30"
 msgstr "22x30"
 
-#: src/xml/xmli18n-tmp.h:3698
+#: src/xml/xmli18n-tmp.h:5936
 msgid "24x30"
 msgstr "24x30"
 
-#: src/xml/xmli18n-tmp.h:3699
+#: src/xml/xmli18n-tmp.h:5937
 msgid "Super A1 24x36"
 msgstr "Super A1 24x36"
 
-#: src/xml/xmli18n-tmp.h:3700
+#: src/xml/xmli18n-tmp.h:5938
 msgid "30x40"
 msgstr "30x40"
 
-#: src/xml/xmli18n-tmp.h:3701
+#: src/xml/xmli18n-tmp.h:5939
 msgid "4A"
 msgstr "4A"
 
-#: src/xml/xmli18n-tmp.h:3702
+#: src/xml/xmli18n-tmp.h:5940
 msgid "2A"
 msgstr "2A"
 
-#: src/xml/xmli18n-tmp.h:3703
+#: src/xml/xmli18n-tmp.h:5941
 msgid "Super A0"
 msgstr "Super A0"
 
-#: src/xml/xmli18n-tmp.h:3704
+#: src/xml/xmli18n-tmp.h:5942
 msgid "A0"
 msgstr "A0"
 
-#: src/xml/xmli18n-tmp.h:3705
+#: src/xml/xmli18n-tmp.h:5943
 msgid "A1"
 msgstr "A1"
 
-#: src/xml/xmli18n-tmp.h:3706
+#: src/xml/xmli18n-tmp.h:5944
 msgid "A2"
 msgstr "A2"
 
-#: src/xml/xmli18n-tmp.h:3707
+#: src/xml/xmli18n-tmp.h:5945
 msgid "A3"
 msgstr "A3"
 
-#: src/xml/xmli18n-tmp.h:3709
+#: src/xml/xmli18n-tmp.h:5947
 msgid "A5"
 msgstr "A5"
 
-#: src/xml/xmli18n-tmp.h:3710
+#: src/xml/xmli18n-tmp.h:5948
 msgid "A6"
 msgstr "A6"
 
-#: src/xml/xmli18n-tmp.h:3711
+#: src/xml/xmli18n-tmp.h:5949
 msgid "A7"
 msgstr "A7"
 
-#: src/xml/xmli18n-tmp.h:3712
+#: src/xml/xmli18n-tmp.h:5950
 msgid "A8"
 msgstr "A8"
 
-#: src/xml/xmli18n-tmp.h:3713
+#: src/xml/xmli18n-tmp.h:5951
 msgid "A9"
 msgstr "A9"
 
-#: src/xml/xmli18n-tmp.h:3714
+#: src/xml/xmli18n-tmp.h:5952
 msgid "A10"
 msgstr "A10"
 
-#: src/xml/xmli18n-tmp.h:3715
+#: src/xml/xmli18n-tmp.h:5953
 msgid "RA0"
 msgstr "RA0"
 
-#: src/xml/xmli18n-tmp.h:3716
+#: src/xml/xmli18n-tmp.h:5954
 msgid "RA1"
 msgstr "RA1"
 
-#: src/xml/xmli18n-tmp.h:3717
+#: src/xml/xmli18n-tmp.h:5955
 msgid "RA2"
 msgstr "RA2"
 
-#: src/xml/xmli18n-tmp.h:3718
+#: src/xml/xmli18n-tmp.h:5956
 msgid "RA3"
 msgstr "RA3"
 
-#: src/xml/xmli18n-tmp.h:3719
+#: src/xml/xmli18n-tmp.h:5957
 msgid "RA4"
 msgstr "RA4"
 
-#: src/xml/xmli18n-tmp.h:3720
+#: src/xml/xmli18n-tmp.h:5958
 msgid "SRA0"
 msgstr "SRA0"
 
-#: src/xml/xmli18n-tmp.h:3721
+#: src/xml/xmli18n-tmp.h:5959
 msgid "SRA1"
 msgstr "SRA1"
 
-#: src/xml/xmli18n-tmp.h:3722
+#: src/xml/xmli18n-tmp.h:5960
 msgid "SRA2"
 msgstr "SRA2"
 
-#: src/xml/xmli18n-tmp.h:3723
+#: src/xml/xmli18n-tmp.h:5961
 msgid "SRA3"
 msgstr "SRA3"
 
-#: src/xml/xmli18n-tmp.h:3724
+#: src/xml/xmli18n-tmp.h:5962
 msgid "SRA4"
 msgstr "SRA4"
 
-#: src/xml/xmli18n-tmp.h:3725
+#: src/xml/xmli18n-tmp.h:5963
 msgid "4B ISO"
 msgstr "4B ISO"
 
-#: src/xml/xmli18n-tmp.h:3726
+#: src/xml/xmli18n-tmp.h:5964
 msgid "2B ISO"
 msgstr "2B ISO"
 
-#: src/xml/xmli18n-tmp.h:3727
+#: src/xml/xmli18n-tmp.h:5965
 msgid "B0 ISO"
 msgstr "B0 ISO"
 
-#: src/xml/xmli18n-tmp.h:3728
+#: src/xml/xmli18n-tmp.h:5966
 msgid "B1 ISO"
 msgstr "B1 ISO"
 
-#: src/xml/xmli18n-tmp.h:3729
+#: src/xml/xmli18n-tmp.h:5967
 msgid "B2 ISO"
 msgstr "B2 ISO"
 
-#: src/xml/xmli18n-tmp.h:3730
+#: src/xml/xmli18n-tmp.h:5968
 msgid "B3 ISO"
 msgstr "B3 ISO"
 
-#: src/xml/xmli18n-tmp.h:3731
+#: src/xml/xmli18n-tmp.h:5969
 msgid "B4 ISO"
 msgstr "B4 ISO"
 
-#: src/xml/xmli18n-tmp.h:3732
+#: src/xml/xmli18n-tmp.h:5970
 msgid "B5 ISO"
 msgstr "B5 ISO"
 
-#: src/xml/xmli18n-tmp.h:3733
+#: src/xml/xmli18n-tmp.h:5971
 msgid "B6 ISO"
 msgstr "B6 ISO"
 
-#: src/xml/xmli18n-tmp.h:3734
+#: src/xml/xmli18n-tmp.h:5972
 msgid "B7 ISO"
 msgstr "B7 ISO"
 
-#: src/xml/xmli18n-tmp.h:3735
+#: src/xml/xmli18n-tmp.h:5973
 msgid "B8 ISO"
 msgstr "B8 ISO"
 
-#: src/xml/xmli18n-tmp.h:3736
+#: src/xml/xmli18n-tmp.h:5974
 msgid "B9 ISO"
 msgstr "B9 ISO"
 
-#: src/xml/xmli18n-tmp.h:3737
+#: src/xml/xmli18n-tmp.h:5975
 msgid "B10 ISO"
 msgstr "B10 ISO"
 
-#: src/xml/xmli18n-tmp.h:3738
+#: src/xml/xmli18n-tmp.h:5976
 msgid "Super B0 JIS"
 msgstr "Super B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3739
+#: src/xml/xmli18n-tmp.h:5977
 msgid "B0 JIS"
 msgstr "B0 JIS"
 
-#: src/xml/xmli18n-tmp.h:3740
+#: src/xml/xmli18n-tmp.h:5978
 msgid "B1 JIS"
 msgstr "B1 JIS"
 
-#: src/xml/xmli18n-tmp.h:3741
+#: src/xml/xmli18n-tmp.h:5979
 msgid "B2 JIS"
 msgstr "B2 JIS"
 
-#: src/xml/xmli18n-tmp.h:3742
+#: src/xml/xmli18n-tmp.h:5980
 msgid "B3 JIS"
 msgstr "B3 JIS"
 
-#: src/xml/xmli18n-tmp.h:3743
+#: src/xml/xmli18n-tmp.h:5981
 msgid "B4 JIS"
 msgstr "B4 JIS"
 
-#: src/xml/xmli18n-tmp.h:3744
+#: src/xml/xmli18n-tmp.h:5982
 msgid "B5 JIS"
 msgstr "B5 JIS"
 
-#: src/xml/xmli18n-tmp.h:3745
+#: src/xml/xmli18n-tmp.h:5983
 msgid "B6 JIS"
 msgstr "B6 JIS"
 
-#: src/xml/xmli18n-tmp.h:3746
+#: src/xml/xmli18n-tmp.h:5984
 msgid "B7 JIS"
 msgstr "B7 JIS"
 
-#: src/xml/xmli18n-tmp.h:3747
+#: src/xml/xmli18n-tmp.h:5985
 msgid "B8 JIS"
 msgstr "B8 JIS"
 
-#: src/xml/xmli18n-tmp.h:3748
+#: src/xml/xmli18n-tmp.h:5986
 msgid "B9 JIS"
 msgstr "B9 JIS"
 
-#: src/xml/xmli18n-tmp.h:3749
+#: src/xml/xmli18n-tmp.h:5987
 msgid "B10 JIS"
 msgstr "B10 JIS"
 
-#: src/xml/xmli18n-tmp.h:3750
+#: src/xml/xmli18n-tmp.h:5988
 msgid "C0"
 msgstr "C0"
 
-#: src/xml/xmli18n-tmp.h:3751
+#: src/xml/xmli18n-tmp.h:5989
 #, fuzzy
 msgid "C0 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:3752
+#: src/xml/xmli18n-tmp.h:5990
 msgid "C1"
 msgstr "C1"
 
-#: src/xml/xmli18n-tmp.h:3753
+#: src/xml/xmli18n-tmp.h:5991
 #, fuzzy
 msgid "C1 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:3754
+#: src/xml/xmli18n-tmp.h:5992
 msgid "C2"
 msgstr "C2"
 
-#: src/xml/xmli18n-tmp.h:3755
+#: src/xml/xmli18n-tmp.h:5993
 #, fuzzy
 msgid "C2 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:3756
+#: src/xml/xmli18n-tmp.h:5994
 msgid "C3"
 msgstr "C3"
 
-#: src/xml/xmli18n-tmp.h:3757
+#: src/xml/xmli18n-tmp.h:5995
 #, fuzzy
 msgid "C3 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:3758
+#: src/xml/xmli18n-tmp.h:5996
 msgid "C4"
 msgstr "C4"
 
-#: src/xml/xmli18n-tmp.h:3759
+#: src/xml/xmli18n-tmp.h:5997
 #, fuzzy
 msgid "C4 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:3760
+#: src/xml/xmli18n-tmp.h:5998
 msgid "C5"
 msgstr "C5"
 
-#: src/xml/xmli18n-tmp.h:3761
+#: src/xml/xmli18n-tmp.h:5999
 #, fuzzy
 msgid "C5 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:3762
+#: src/xml/xmli18n-tmp.h:6000
 msgid "B6-C4"
 msgstr "B6-C4"
 
-#: src/xml/xmli18n-tmp.h:3763
+#: src/xml/xmli18n-tmp.h:6001
 #, fuzzy
 msgid "B6-C4 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:3764
+#: src/xml/xmli18n-tmp.h:6002
 msgid "C6"
 msgstr "C6"
 
-#: src/xml/xmli18n-tmp.h:3765
+#: src/xml/xmli18n-tmp.h:6003
 #, fuzzy
 msgid "C6 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:3766
+#: src/xml/xmli18n-tmp.h:6004
 msgid "DL"
 msgstr "DL"
 
-#: src/xml/xmli18n-tmp.h:3767
+#: src/xml/xmli18n-tmp.h:6005
 #, fuzzy
 msgid "DL landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:3768
+#: src/xml/xmli18n-tmp.h:6006
 msgid "C7-6"
 msgstr "C7-6"
 
-#: src/xml/xmli18n-tmp.h:3769
+#: src/xml/xmli18n-tmp.h:6007
 #, fuzzy
 msgid "C7-6 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:3770
+#: src/xml/xmli18n-tmp.h:6008
 msgid "C7"
 msgstr "C7"
 
-#: src/xml/xmli18n-tmp.h:3771
+#: src/xml/xmli18n-tmp.h:6009
 #, fuzzy
 msgid "C7 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:3772
+#: src/xml/xmli18n-tmp.h:6010
 msgid "C8"
 msgstr "C8"
 
-#: src/xml/xmli18n-tmp.h:3773
+#: src/xml/xmli18n-tmp.h:6011
 #, fuzzy
 msgid "C8 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:3774
+#: src/xml/xmli18n-tmp.h:6012
 msgid "C9"
 msgstr "C9"
 
-#: src/xml/xmli18n-tmp.h:3775
+#: src/xml/xmli18n-tmp.h:6013
 #, fuzzy
 msgid "C9 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:3776
+#: src/xml/xmli18n-tmp.h:6014
 msgid "C10"
 msgstr "C10"
 
-#: src/xml/xmli18n-tmp.h:3777
+#: src/xml/xmli18n-tmp.h:6015
 #, fuzzy
 msgid "C10 landscape"
 msgstr "橫�"
 
-#: src/xml/xmli18n-tmp.h:3778
+#: src/xml/xmli18n-tmp.h:6016
 msgid "ArchA"
 msgstr "ArchA"
 
-#: src/xml/xmli18n-tmp.h:3779
+#: src/xml/xmli18n-tmp.h:6017
 msgid "ArchA transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3780
+#: src/xml/xmli18n-tmp.h:6018
 msgid "ArchB"
 msgstr "ArchB"
 
-#: src/xml/xmli18n-tmp.h:3781
+#: src/xml/xmli18n-tmp.h:6019
 msgid "ArchB transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3782
+#: src/xml/xmli18n-tmp.h:6020
 msgid "ArchC"
 msgstr "ArchC"
 
-#: src/xml/xmli18n-tmp.h:3783
+#: src/xml/xmli18n-tmp.h:6021
 msgid "ArchC transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3784
+#: src/xml/xmli18n-tmp.h:6022
 msgid "ArchD"
 msgstr "ArchD"
 
-#: src/xml/xmli18n-tmp.h:3785
+#: src/xml/xmli18n-tmp.h:6023
 msgid "ArchD transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3786
+#: src/xml/xmli18n-tmp.h:6024
 msgid "ArchE"
 msgstr "ArchE"
 
-#: src/xml/xmli18n-tmp.h:3787
+#: src/xml/xmli18n-tmp.h:6025
 msgid "ArchE transposed"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3788
+#: src/xml/xmli18n-tmp.h:6026
 msgid "American foolscap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3789
+#: src/xml/xmli18n-tmp.h:6027
 msgid "European foolscap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3790
+#: src/xml/xmli18n-tmp.h:6028
 msgid "Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3791
+#: src/xml/xmli18n-tmp.h:6029
 msgid "Large Crown Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3792
+#: src/xml/xmli18n-tmp.h:6030
 msgid "Demy Quarto"
 msgstr "Demy Quarto"
 
-#: src/xml/xmli18n-tmp.h:3793
+#: src/xml/xmli18n-tmp.h:6031
 msgid "Royal Quarto"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3794
+#: src/xml/xmli18n-tmp.h:6032
 msgid "Crown Octavo"
 msgstr "Crown Octavo"
 
-#: src/xml/xmli18n-tmp.h:3795
+#: src/xml/xmli18n-tmp.h:6033
 msgid "Large Crown Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3796
+#: src/xml/xmli18n-tmp.h:6034
 msgid "Demy Octavo"
 msgstr "Demy Octavo"
 
-#: src/xml/xmli18n-tmp.h:3797
+#: src/xml/xmli18n-tmp.h:6035
 msgid "Royal Octavo"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3798
+#: src/xml/xmli18n-tmp.h:6036
 msgid "Small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3799
+#: src/xml/xmli18n-tmp.h:6037
 msgid "Penguin small paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3800
+#: src/xml/xmli18n-tmp.h:6038
 msgid "Penguin large paperback"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3801
+#: src/xml/xmli18n-tmp.h:6039
 msgid "10cm x 15cm"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3802
+#: src/xml/xmli18n-tmp.h:6040
 msgid "Hagaki Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3803
+#: src/xml/xmli18n-tmp.h:6041
 msgid "Oufuku Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3804
+#: src/xml/xmli18n-tmp.h:6042
 msgid "Japanese long envelope #3"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3805
+#: src/xml/xmli18n-tmp.h:6043
 msgid "Japanese long envelope #3 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3806
+#: src/xml/xmli18n-tmp.h:6044
 msgid "Japanese long envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3807
+#: src/xml/xmli18n-tmp.h:6045
 msgid "Japanese long envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3808
+#: src/xml/xmli18n-tmp.h:6046
 msgid "Japanese Kaku envelope #4"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3809
+#: src/xml/xmli18n-tmp.h:6047
 msgid "Japanese Kaku envelope #4 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3810
+#: src/xml/xmli18n-tmp.h:6048
 msgid "Commercial 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3811
+#: src/xml/xmli18n-tmp.h:6049
 msgid "Commercial 10 landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3812
+#: src/xml/xmli18n-tmp.h:6050
 msgid "A2 Invitation"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3813
+#: src/xml/xmli18n-tmp.h:6051
 msgid "Monarch Envelope"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3814
+#: src/xml/xmli18n-tmp.h:6052
 msgid "Monarch Envelope landscape"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3815
+#: src/xml/xmli18n-tmp.h:6053
 msgid "4x5 3/8"
 msgstr "4x5 3/8"
 
-#: src/xml/xmli18n-tmp.h:3816
+#: src/xml/xmli18n-tmp.h:6054
 msgid "4x7"
 msgstr "4x7"
 
-#: src/xml/xmli18n-tmp.h:3817
+#: src/xml/xmli18n-tmp.h:6055
 msgid "CP_L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3818
+#: src/xml/xmli18n-tmp.h:6056
 msgid "Card"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3819
+#: src/xml/xmli18n-tmp.h:6057
 msgid "Wide Postcard"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3820
+#: src/xml/xmli18n-tmp.h:6058
 msgid "Chilean Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3821
+#: src/xml/xmli18n-tmp.h:6059
 msgid "Chilean Double Letter"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3822
+#: src/xml/xmli18n-tmp.h:6060
 msgid "Chilean Double Office"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3824
+#: src/xml/xmli18n-tmp.h:6062
 msgid "89 mm Roll Paper"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3825
+#: src/xml/xmli18n-tmp.h:6063
 msgid "4 Inch Roll Paper"
 msgstr "4 �滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:3826
+#: src/xml/xmli18n-tmp.h:6064
 msgid "5 Inch Roll Paper"
 msgstr "5 �滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:3827
+#: src/xml/xmli18n-tmp.h:6065
 msgid "210 mm Roll Paper"
 msgstr "210 毫米滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:3828
+#: src/xml/xmli18n-tmp.h:6066
 msgid "13 Inch Roll Paper"
 msgstr "13 �滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:3829
+#: src/xml/xmli18n-tmp.h:6067
 #, fuzzy
 msgid "17 Inch Roll Paper"
 msgstr "13 �滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:3830
+#: src/xml/xmli18n-tmp.h:6068
 msgid "22 Inch Roll Paper"
 msgstr "22 �滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:3831
+#: src/xml/xmli18n-tmp.h:6069
 msgid "24 Inch Roll Paper"
 msgstr "24 �滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:3832
+#: src/xml/xmli18n-tmp.h:6070
 msgid "36 Inch Roll Paper"
 msgstr "36 �滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:3833
+#: src/xml/xmli18n-tmp.h:6071
 msgid "44 Inch Roll Paper"
 msgstr "44 �滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:3834
+#: src/xml/xmli18n-tmp.h:6072
 #, fuzzy
 msgid "60 Inch Roll Paper"
 msgstr "36 �滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:3835
+#: src/xml/xmli18n-tmp.h:6073
 #, fuzzy
 msgid "64 Inch Roll Paper"
 msgstr "4 �滾筒紙"
 
-#: src/xml/xmli18n-tmp.h:3836
+#: src/xml/xmli18n-tmp.h:6074
 msgid "PostScript Level 1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3837
+#: src/xml/xmli18n-tmp.h:6075
 msgid "PostScript Level 2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3838
+#: src/xml/xmli18n-tmp.h:6076
 #, fuzzy
 msgid "Canon BJ-30"
 msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:3839
+#: src/xml/xmli18n-tmp.h:6077
 #, fuzzy
 msgid "Canon BJC-50"
 msgstr "Canon BJC 50"
 
-#: src/xml/xmli18n-tmp.h:3840
+#: src/xml/xmli18n-tmp.h:6078
 #, fuzzy
 msgid "Canon BJC-55"
 msgstr "Canon BJC 55"
 
-#: src/xml/xmli18n-tmp.h:3841
+#: src/xml/xmli18n-tmp.h:6079
 #, fuzzy
 msgid "Canon BJC-80"
 msgstr "Canon BJC 80"
 
-#: src/xml/xmli18n-tmp.h:3842
+#: src/xml/xmli18n-tmp.h:6080
 #, fuzzy
 msgid "Canon BJC-85"
 msgstr "Canon BJC 85"
 
-#: src/xml/xmli18n-tmp.h:3843
+#: src/xml/xmli18n-tmp.h:6081
 #, fuzzy
 msgid "Canon BJC-210"
 msgstr "Canon BJC 210"
 
-#: src/xml/xmli18n-tmp.h:3844
+#: src/xml/xmli18n-tmp.h:6082
 #, fuzzy
 msgid "Canon BJC-240"
 msgstr "Canon BJC 240"
 
-#: src/xml/xmli18n-tmp.h:3845
+#: src/xml/xmli18n-tmp.h:6083
 #, fuzzy
 msgid "Canon BJC-250"
 msgstr "Canon BJC 250"
 
-#: src/xml/xmli18n-tmp.h:3846
+#: src/xml/xmli18n-tmp.h:6084
 #, fuzzy
 msgid "Canon BJC-1000"
 msgstr "Canon BJC 1000"
 
-#: src/xml/xmli18n-tmp.h:3847
+#: src/xml/xmli18n-tmp.h:6085
 #, fuzzy
 msgid "Canon BJC-2000"
 msgstr "Canon BJC 2000"
 
-#: src/xml/xmli18n-tmp.h:3848
+#: src/xml/xmli18n-tmp.h:6086
 #, fuzzy
 msgid "Canon BJC-2010"
 msgstr "Canon BJC 210"
 
-#: src/xml/xmli18n-tmp.h:3849
+#: src/xml/xmli18n-tmp.h:6087
 #, fuzzy
 msgid "Canon BJC-2100"
 msgstr "Canon BJC 210"
 
-#: src/xml/xmli18n-tmp.h:3850
+#: src/xml/xmli18n-tmp.h:6088
 #, fuzzy
 msgid "Canon BJC-2110"
 msgstr "Canon BJC 210"
 
-#: src/xml/xmli18n-tmp.h:3851
+#: src/xml/xmli18n-tmp.h:6089
 #, fuzzy
 msgid "Canon BJC-3000"
 msgstr "Canon BJC 3000"
 
-#: src/xml/xmli18n-tmp.h:3852
+#: src/xml/xmli18n-tmp.h:6090
 #, fuzzy
 msgid "Canon BJC-4000"
 msgstr "Canon BJC 1000"
 
-#: src/xml/xmli18n-tmp.h:3853
+#: src/xml/xmli18n-tmp.h:6091
 #, fuzzy
 msgid "Canon BJC-4300"
 msgstr "Canon BJC 4300"
 
-#: src/xml/xmli18n-tmp.h:3854
+#: src/xml/xmli18n-tmp.h:6092
 #, fuzzy
 msgid "Canon BJC-4400"
 msgstr "Canon BJC 4300"
 
-#: src/xml/xmli18n-tmp.h:3855
+#: src/xml/xmli18n-tmp.h:6093
 #, fuzzy
 msgid "Canon BJC-5100"
 msgstr "Canon BJC 1000"
 
-#: src/xml/xmli18n-tmp.h:3856
+#: src/xml/xmli18n-tmp.h:6094
 #, fuzzy
 msgid "Canon BJC-5500"
 msgstr "Canon BJC 6500"
 
-#: src/xml/xmli18n-tmp.h:3857
+#: src/xml/xmli18n-tmp.h:6095
 #, fuzzy
 msgid "Canon BJC-6000"
 msgstr "Canon BJC 6000"
 
-#: src/xml/xmli18n-tmp.h:3858
+#: src/xml/xmli18n-tmp.h:6096
 #, fuzzy
 msgid "Canon BJC-6100"
 msgstr "Canon BJC 6100"
 
-#: src/xml/xmli18n-tmp.h:3859
+#: src/xml/xmli18n-tmp.h:6097
 #, fuzzy
 msgid "Canon BJC-6200"
 msgstr "Canon BJC 6200"
 
-#: src/xml/xmli18n-tmp.h:3860
+#: src/xml/xmli18n-tmp.h:6098
 #, fuzzy
 msgid "Canon BJC-6500"
 msgstr "Canon BJC 6500"
 
-#: src/xml/xmli18n-tmp.h:3861
+#: src/xml/xmli18n-tmp.h:6099
 #, fuzzy
 msgid "Canon BJC-7000"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:3862
+#: src/xml/xmli18n-tmp.h:6100
 #, fuzzy
 msgid "Canon BJC-7100"
 msgstr "Canon BJC 7100"
 
-#: src/xml/xmli18n-tmp.h:3863
+#: src/xml/xmli18n-tmp.h:6101
 #, fuzzy
 msgid "Canon BJC-8200"
 msgstr "Canon BJC 8200"
 
-#: src/xml/xmli18n-tmp.h:3864
+#: src/xml/xmli18n-tmp.h:6102
 #, fuzzy
 msgid "Canon BJC-8500"
 msgstr "Canon BJC 6500"
 
-#: src/xml/xmli18n-tmp.h:3865
+#: src/xml/xmli18n-tmp.h:6103
 #, fuzzy
 msgid "Canon S100"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:3866
+#: src/xml/xmli18n-tmp.h:6104
 #, fuzzy
 msgid "Canon S200"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:3867
+#: src/xml/xmli18n-tmp.h:6105
 #, fuzzy
 msgid "Canon S300"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:3868
+#: src/xml/xmli18n-tmp.h:6106
 msgid "Canon S400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:3869
+#: src/xml/xmli18n-tmp.h:6107
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:3870
+#: src/xml/xmli18n-tmp.h:6108
 #, fuzzy
 msgid "Canon S500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:3871
+#: src/xml/xmli18n-tmp.h:6109
 #, fuzzy
 msgid "Canon S600"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:3872
+#: src/xml/xmli18n-tmp.h:6110
 #, fuzzy
 msgid "Canon S630"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:3873
+#: src/xml/xmli18n-tmp.h:6111
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:3874
+#: src/xml/xmli18n-tmp.h:6112
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:3875
+#: src/xml/xmli18n-tmp.h:6113
 #, fuzzy
 msgid "Canon PIXMA iP2000"
 msgstr "Canon BJC 2000"
 
-#: src/xml/xmli18n-tmp.h:3876
+#: src/xml/xmli18n-tmp.h:6114
 #, fuzzy
 msgid "Canon PIXMA iP3000"
 msgstr "Canon BJC 3000"
 
-#: src/xml/xmli18n-tmp.h:3877
+#: src/xml/xmli18n-tmp.h:6115
 #, fuzzy
 msgid "Canon PIXMA iP3100"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:3878
+#: src/xml/xmli18n-tmp.h:6116
 #, fuzzy
 msgid "Canon PIXMA iP4000"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:3879
+#: src/xml/xmli18n-tmp.h:6117
 #, fuzzy
 msgid "Canon PIXMA iP4100"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:3880
+#: src/xml/xmli18n-tmp.h:6118
 #, fuzzy
 msgid "Canon PIXMA iP4200"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:3881
+#: src/xml/xmli18n-tmp.h:6119
 #, fuzzy
 msgid "Canon PIXMA iP4300"
 msgstr "Canon BJC 4300"
 
-#: src/xml/xmli18n-tmp.h:3882
+#: src/xml/xmli18n-tmp.h:6120
 #, fuzzy
 msgid "Canon PIXMA iP4500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:3883
+#: src/xml/xmli18n-tmp.h:6121
 #, fuzzy
 msgid "Canon PIXMA iP4600"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:3884
+#: src/xml/xmli18n-tmp.h:6122
 #, fuzzy
 msgid "Canon PIXMA iP5000"
 msgstr "Canon BJC 1000"
 
-#: src/xml/xmli18n-tmp.h:3885
+#: src/xml/xmli18n-tmp.h:6123
 #, fuzzy
 msgid "Canon PIXMA iP5200"
 msgstr "Canon BJC 2000"
 
-#: src/xml/xmli18n-tmp.h:3886
+#: src/xml/xmli18n-tmp.h:6124
 #, fuzzy
 msgid "Canon PIXMA iP5300"
 msgstr "Canon BJC 3000"
 
-#: src/xml/xmli18n-tmp.h:3887
+#: src/xml/xmli18n-tmp.h:6125
 #, fuzzy
 msgid "Canon PIXMA iP6000D"
 msgstr "Canon BJC 6000"
 
-#: src/xml/xmli18n-tmp.h:3888
+#: src/xml/xmli18n-tmp.h:6126
 #, fuzzy
 msgid "Canon PIXMA iP6700"
 msgstr "Canon BJC 6000"
 
-#: src/xml/xmli18n-tmp.h:3889
+#: src/xml/xmli18n-tmp.h:6127
 #, fuzzy
 msgid "Canon PIXMA iP8500"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:3890
+#: src/xml/xmli18n-tmp.h:6128
+#, fuzzy
+msgid "Canon PIXMA iX4000"
+msgstr "Canon S400"
+
+#: src/xml/xmli18n-tmp.h:6129
 #, fuzzy
 msgid "Canon PIXMA iX5000"
 msgstr "Canon BJC 1000"
 
-#: src/xml/xmli18n-tmp.h:3891
+#: src/xml/xmli18n-tmp.h:6130
 #, fuzzy
 msgid "Canon PIXMA Pro9500"
 msgstr "Canon BJC 6500"
 
-#: src/xml/xmli18n-tmp.h:3892
+#: src/xml/xmli18n-tmp.h:6131
 #, fuzzy
 msgid "Canon PIXMA MP150"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:3893
+#: src/xml/xmli18n-tmp.h:6132
 #, fuzzy
 msgid "Canon PIXMA MP160"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:3894
+#: src/xml/xmli18n-tmp.h:6133
 #, fuzzy
 msgid "Canon PIXMA MP170"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:3895
+#: src/xml/xmli18n-tmp.h:6134
 #, fuzzy
 msgid "Canon PIXMA MP180"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:3896
+#: src/xml/xmli18n-tmp.h:6135
 #, fuzzy
 msgid "Canon PIXMA MP220"
 msgstr "Canon CP220"
 
-#: src/xml/xmli18n-tmp.h:3897
+#: src/xml/xmli18n-tmp.h:6136
 #, fuzzy
 msgid "Canon PIXMA MP500"
 msgstr "Canon BJC 6500"
 
-#: src/xml/xmli18n-tmp.h:3898
+#: src/xml/xmli18n-tmp.h:6137
 #, fuzzy
 msgid "Canon PIXMA MP520"
 msgstr "Canon CP220"
 
-#: src/xml/xmli18n-tmp.h:3899
+#: src/xml/xmli18n-tmp.h:6138
 #, fuzzy
 msgid "Canon PIXMA MP610"
 msgstr "Canon BJC 6100"
 
-#: src/xml/xmli18n-tmp.h:3900
+#: src/xml/xmli18n-tmp.h:6139
 #, fuzzy
 msgid "Canon PIXMA MP700"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:3901
+#: src/xml/xmli18n-tmp.h:6140
 #, fuzzy
 msgid "Canon PIXMA MP710"
 msgstr "Canon BJC 7100"
 
-#: src/xml/xmli18n-tmp.h:3902
+#: src/xml/xmli18n-tmp.h:6141
 #, fuzzy
 msgid "Canon PIXMA MP730"
 msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:3903
+#: src/xml/xmli18n-tmp.h:6142
 #, fuzzy
 msgid "Canon PIXMA MP740"
 msgstr "Canon BJC 240"
 
-#: src/xml/xmli18n-tmp.h:3904
+#: src/xml/xmli18n-tmp.h:6143
 #, fuzzy
 msgid "Canon PIXMA MP750"
 msgstr "Canon BJC 50"
 
-#: src/xml/xmli18n-tmp.h:3905
+#: src/xml/xmli18n-tmp.h:6144
 msgid "Canon PIXMA MP760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3906
+#: src/xml/xmli18n-tmp.h:6145
 msgid "Canon PIXMA MP770"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3907
+#: src/xml/xmli18n-tmp.h:6146
 #, fuzzy
 msgid "Canon PIXMA MP780"
 msgstr "Canon BJC 80"
 
-#: src/xml/xmli18n-tmp.h:3908
+#: src/xml/xmli18n-tmp.h:6147
 msgid "Canon PIXMA MP790"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:3909
+#: src/xml/xmli18n-tmp.h:6148
 #, fuzzy
 msgid "Canon PIXMA MP830"
 msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:3910
+#: src/xml/xmli18n-tmp.h:6149
 #, fuzzy
 msgid "Canon PIXUS iP3100"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:3911
+#: src/xml/xmli18n-tmp.h:6150
 #, fuzzy
 msgid "Canon PIXUS iP4100"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:3912
+#: src/xml/xmli18n-tmp.h:6151
 #, fuzzy
 msgid "Canon i80"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:3913
+#: src/xml/xmli18n-tmp.h:6152
 #, fuzzy
 msgid "Canon i560"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:3914
+#: src/xml/xmli18n-tmp.h:6153
 #, fuzzy
 msgid "Canon i850"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:3915
+#: src/xml/xmli18n-tmp.h:6154
 #, fuzzy
 msgid "Canon i860"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:3916
+#: src/xml/xmli18n-tmp.h:6155
 #, fuzzy
 msgid "Canon i865"
 msgstr "Canon BJC 85"
 
-#: src/xml/xmli18n-tmp.h:3917
+#: src/xml/xmli18n-tmp.h:6156
 #, fuzzy
 msgid "Epson Artisan 700"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:3918
+#: src/xml/xmli18n-tmp.h:6157
 #, fuzzy
 msgid "Epson Artisan 800"
 msgstr "EPSON Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3919
+#: src/xml/xmli18n-tmp.h:6158
 #, fuzzy
 msgid "Epson B-300"
 msgstr "EPSON PM-3000C"
 
-#: src/xml/xmli18n-tmp.h:3920
+#: src/xml/xmli18n-tmp.h:6159
 #, fuzzy
 msgid "Epson B-308"
 msgstr "EPSON PM-3000C"
 
-#: src/xml/xmli18n-tmp.h:3921
+#: src/xml/xmli18n-tmp.h:6160
 #, fuzzy
 msgid "Epson B-500DN"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:3922
+#: src/xml/xmli18n-tmp.h:6161
 #, fuzzy
 msgid "Epson B-508DN"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:3923
+#: src/xml/xmli18n-tmp.h:6162
 #, fuzzy
 msgid "Epson Stylus C20"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:3924
+#: src/xml/xmli18n-tmp.h:6163
 #, fuzzy
 msgid "Epson Stylus C20SX"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:3925
+#: src/xml/xmli18n-tmp.h:6164
 #, fuzzy
 msgid "Epson Stylus C20UX"
 msgstr "EPSON Stylus C20UX"
 
-#: src/xml/xmli18n-tmp.h:3926
+#: src/xml/xmli18n-tmp.h:6165
 #, fuzzy
 msgid "Epson Stylus C40"
 msgstr "EPSON Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:3927
+#: src/xml/xmli18n-tmp.h:6166
 #, fuzzy
 msgid "Epson Stylus C40SX"
 msgstr "EPSON Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:3928
+#: src/xml/xmli18n-tmp.h:6167
 #, fuzzy
 msgid "Epson Stylus C40UX"
 msgstr "EPSON Stylus C40UX"
 
-#: src/xml/xmli18n-tmp.h:3929
+#: src/xml/xmli18n-tmp.h:6168
 #, fuzzy
 msgid "Epson Stylus C41"
 msgstr "EPSON Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:3930
+#: src/xml/xmli18n-tmp.h:6169
 #, fuzzy
 msgid "Epson Stylus C41SX"
 msgstr "EPSON Stylus C41SX"
 
-#: src/xml/xmli18n-tmp.h:3931
+#: src/xml/xmli18n-tmp.h:6170
 #, fuzzy
 msgid "Epson Stylus C41UX"
 msgstr "EPSON Stylus C41UX"
 
-#: src/xml/xmli18n-tmp.h:3932
+#: src/xml/xmli18n-tmp.h:6171
 #, fuzzy
 msgid "Epson Stylus C42"
 msgstr "EPSON Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:3933
+#: src/xml/xmli18n-tmp.h:6172
 #, fuzzy
 msgid "Epson Stylus C42SX"
 msgstr "EPSON Stylus C42SX"
 
-#: src/xml/xmli18n-tmp.h:3934
+#: src/xml/xmli18n-tmp.h:6173
 #, fuzzy
 msgid "Epson Stylus C42UX"
 msgstr "EPSON Stylus C42UX"
 
-#: src/xml/xmli18n-tmp.h:3935
+#: src/xml/xmli18n-tmp.h:6174
 #, fuzzy
 msgid "Epson Stylus C43"
 msgstr "EPSON Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:3936
+#: src/xml/xmli18n-tmp.h:6175
 #, fuzzy
 msgid "Epson Stylus C43SX"
 msgstr "EPSON Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:3937
+#: src/xml/xmli18n-tmp.h:6176
 #, fuzzy
 msgid "Epson Stylus C43UX"
 msgstr "EPSON Stylus C43UX"
 
-#: src/xml/xmli18n-tmp.h:3938
+#: src/xml/xmli18n-tmp.h:6177
 #, fuzzy
 msgid "Epson Stylus C44"
 msgstr "EPSON Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:3939
+#: src/xml/xmli18n-tmp.h:6178
 #, fuzzy
 msgid "Epson Stylus C44SX"
 msgstr "EPSON Stylus C44SX"
 
-#: src/xml/xmli18n-tmp.h:3940
+#: src/xml/xmli18n-tmp.h:6179
 #, fuzzy
 msgid "Epson Stylus C44UX"
 msgstr "EPSON Stylus C44UX"
 
-#: src/xml/xmli18n-tmp.h:3941
+#: src/xml/xmli18n-tmp.h:6180
 #, fuzzy
 msgid "Epson Stylus C45"
 msgstr "EPSON Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:3942
+#: src/xml/xmli18n-tmp.h:6181
 #, fuzzy
 msgid "Epson Stylus C46"
 msgstr "EPSON Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:3943
+#: src/xml/xmli18n-tmp.h:6182
 #, fuzzy
 msgid "Epson Stylus C48"
 msgstr "EPSON Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:3944
+#: src/xml/xmli18n-tmp.h:6183
 #, fuzzy
 msgid "Epson Stylus C50"
 msgstr "EPSON Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:3945
+#: src/xml/xmli18n-tmp.h:6184
 #, fuzzy
 msgid "Epson Stylus C60"
 msgstr "EPSON Stylus C60"
 
-#: src/xml/xmli18n-tmp.h:3946
+#: src/xml/xmli18n-tmp.h:6185
 #, fuzzy
 msgid "Epson Stylus C61"
 msgstr "EPSON Stylus C61"
 
-#: src/xml/xmli18n-tmp.h:3947
+#: src/xml/xmli18n-tmp.h:6186
 #, fuzzy
 msgid "Epson Stylus C62"
 msgstr "EPSON Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:3948
+#: src/xml/xmli18n-tmp.h:6187
 #, fuzzy
 msgid "Epson Stylus C63"
 msgstr "EPSON Stylus C63"
 
-#: src/xml/xmli18n-tmp.h:3949
+#: src/xml/xmli18n-tmp.h:6188
 #, fuzzy
 msgid "Epson Stylus C64"
 msgstr "EPSON Stylus C64"
 
-#: src/xml/xmli18n-tmp.h:3950
+#: src/xml/xmli18n-tmp.h:6189
 #, fuzzy
 msgid "Epson Stylus C65"
 msgstr "EPSON Stylus C65"
 
-#: src/xml/xmli18n-tmp.h:3951
+#: src/xml/xmli18n-tmp.h:6190
 #, fuzzy
 msgid "Epson Stylus C66"
 msgstr "EPSON Stylus C66"
 
-#: src/xml/xmli18n-tmp.h:3952
+#: src/xml/xmli18n-tmp.h:6191
 #, fuzzy
 msgid "Epson Stylus C68"
 msgstr "EPSON Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:3953
+#: src/xml/xmli18n-tmp.h:6192
 #, fuzzy
 msgid "Epson Stylus C70"
 msgstr "EPSON Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3954
+#: src/xml/xmli18n-tmp.h:6193
 #, fuzzy
 msgid "Epson Stylus C79"
 msgstr "EPSON Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3955
+#: src/xml/xmli18n-tmp.h:6194
 #, fuzzy
 msgid "Epson Stylus C80"
 msgstr "EPSON Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3956
+#: src/xml/xmli18n-tmp.h:6195
 #, fuzzy
 msgid "Epson Stylus C82"
 msgstr "EPSON Stylus C82"
 
-#: src/xml/xmli18n-tmp.h:3957
+#: src/xml/xmli18n-tmp.h:6196
 #, fuzzy
 msgid "Epson Stylus C83"
 msgstr "EPSON Stylus C83"
 
-#: src/xml/xmli18n-tmp.h:3958
+#: src/xml/xmli18n-tmp.h:6197
 #, fuzzy
 msgid "Epson Stylus C84"
 msgstr "EPSON Stylus C84"
 
-#: src/xml/xmli18n-tmp.h:3959
+#: src/xml/xmli18n-tmp.h:6198
 #, fuzzy
 msgid "Epson Stylus C85"
 msgstr "EPSON Stylus C85"
 
-#: src/xml/xmli18n-tmp.h:3960
+#: src/xml/xmli18n-tmp.h:6199
 #, fuzzy
 msgid "Epson Stylus C86"
 msgstr "EPSON Stylus C86"
 
-#: src/xml/xmli18n-tmp.h:3961
+#: src/xml/xmli18n-tmp.h:6200
 #, fuzzy
 msgid "Epson Stylus C87"
 msgstr "EPSON Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:3962
+#: src/xml/xmli18n-tmp.h:6201
 #, fuzzy
 msgid "Epson Stylus C88"
 msgstr "EPSON Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:3963
+#: src/xml/xmli18n-tmp.h:6202
 #, fuzzy
 msgid "Epson Stylus C110"
 msgstr "EPSON Stylus C50"
 
-#: src/xml/xmli18n-tmp.h:3964
+#: src/xml/xmli18n-tmp.h:6203
 #, fuzzy
 msgid "Epson Stylus C120"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:3965
+#: src/xml/xmli18n-tmp.h:6204
 #, fuzzy
 msgid "Epson Stylus Color"
 msgstr "EPSON Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3966
+#: src/xml/xmli18n-tmp.h:6205
 #, fuzzy
 msgid "Epson Stylus Color I"
 msgstr "EPSON Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3967
+#: src/xml/xmli18n-tmp.h:6206
 #, fuzzy
 msgid "Epson Stylus Color II"
 msgstr "EPSON Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3968
+#: src/xml/xmli18n-tmp.h:6207
 #, fuzzy
 msgid "Epson Stylus Color IIs"
 msgstr "EPSON Stylus Color"
 
-#: src/xml/xmli18n-tmp.h:3969
+#: src/xml/xmli18n-tmp.h:6208
 #, fuzzy
 msgid "Epson Stylus Color PRO"
 msgstr "EPSON Stylus Color Pro"
 
-#: src/xml/xmli18n-tmp.h:3970
+#: src/xml/xmli18n-tmp.h:6209
 #, fuzzy
 msgid "Epson Stylus Pro XL"
 msgstr "EPSON Stylus Color Pro XL"
 
-#: src/xml/xmli18n-tmp.h:3971
+#: src/xml/xmli18n-tmp.h:6210
 #, fuzzy
 msgid "Epson Stylus Color 400"
 msgstr "EPSON Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:3972
+#: src/xml/xmli18n-tmp.h:6211
 #, fuzzy
 msgid "Epson Stylus Color 440"
 msgstr "EPSON Stylus Color 440"
 
-#: src/xml/xmli18n-tmp.h:3973
+#: src/xml/xmli18n-tmp.h:6212
 #, fuzzy
 msgid "Epson Stylus Color 460"
 msgstr "EPSON Stylus Color 460"
 
-#: src/xml/xmli18n-tmp.h:3974
+#: src/xml/xmli18n-tmp.h:6213
 #, fuzzy
 msgid "Epson Stylus Color 480"
 msgstr "EPSON Stylus Color 480"
 
-#: src/xml/xmli18n-tmp.h:3975
+#: src/xml/xmli18n-tmp.h:6214
 #, fuzzy
 msgid "Epson Stylus Color 500"
 msgstr "EPSON Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:3976
+#: src/xml/xmli18n-tmp.h:6215
 #, fuzzy
 msgid "Epson Stylus Color 580"
 msgstr "EPSON Stylus Color 580"
 
-#: src/xml/xmli18n-tmp.h:3977
+#: src/xml/xmli18n-tmp.h:6216
 #, fuzzy
 msgid "Epson Stylus Color 600"
 msgstr "EPSON Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:3978
+#: src/xml/xmli18n-tmp.h:6217
 #, fuzzy
 msgid "Epson Stylus Color 640"
 msgstr "EPSON Stylus Color 640"
 
-#: src/xml/xmli18n-tmp.h:3979
+#: src/xml/xmli18n-tmp.h:6218
 #, fuzzy
 msgid "Epson Stylus Color 660"
 msgstr "EPSON Stylus Color 660"
 
-#: src/xml/xmli18n-tmp.h:3980
+#: src/xml/xmli18n-tmp.h:6219
 #, fuzzy
 msgid "Epson Stylus Color 670"
 msgstr "EPSON Stylus Color 670"
 
-#: src/xml/xmli18n-tmp.h:3981
+#: src/xml/xmli18n-tmp.h:6220
 #, fuzzy
 msgid "Epson Stylus Color 680"
 msgstr "EPSON Stylus Color 680"
 
-#: src/xml/xmli18n-tmp.h:3982
+#: src/xml/xmli18n-tmp.h:6221
 #, fuzzy
 msgid "Epson Stylus Color 740"
 msgstr "EPSON Stylus Color 740"
 
-#: src/xml/xmli18n-tmp.h:3983
+#: src/xml/xmli18n-tmp.h:6222
 #, fuzzy
 msgid "Epson Stylus Color 760"
 msgstr "EPSON Stylus Color 760"
 
-#: src/xml/xmli18n-tmp.h:3984
+#: src/xml/xmli18n-tmp.h:6223
 #, fuzzy
 msgid "Epson Stylus Color 777"
 msgstr "EPSON Stylus Color 777"
 
-#: src/xml/xmli18n-tmp.h:3985
+#: src/xml/xmli18n-tmp.h:6224
 #, fuzzy
 msgid "Epson Stylus Color 800"
 msgstr "EPSON Stylus Color 800"
 
-#: src/xml/xmli18n-tmp.h:3986
+#: src/xml/xmli18n-tmp.h:6225
 #, fuzzy
 msgid "Epson Stylus Color 850"
 msgstr "EPSON Stylus Color 850"
 
-#: src/xml/xmli18n-tmp.h:3987
+#: src/xml/xmli18n-tmp.h:6226
 #, fuzzy
 msgid "Epson Stylus Color 860"
 msgstr "EPSON Stylus Color 860"
 
-#: src/xml/xmli18n-tmp.h:3988
+#: src/xml/xmli18n-tmp.h:6227
 #, fuzzy
 msgid "Epson Stylus Color 880"
 msgstr "EPSON Stylus Color 880"
 
-#: src/xml/xmli18n-tmp.h:3989
+#: src/xml/xmli18n-tmp.h:6228
 #, fuzzy
 msgid "Epson Stylus Color 8 3"
 msgstr "EPSON Stylus Color 83"
 
-#: src/xml/xmli18n-tmp.h:3990
+#: src/xml/xmli18n-tmp.h:6229
 #, fuzzy
 msgid "Epson Stylus Color 900"
 msgstr "EPSON Stylus Color 900"
 
-#: src/xml/xmli18n-tmp.h:3991
+#: src/xml/xmli18n-tmp.h:6230
 #, fuzzy
 msgid "Epson Stylus Color 980"
 msgstr "EPSON Stylus Color 980"
 
-#: src/xml/xmli18n-tmp.h:3992
+#: src/xml/xmli18n-tmp.h:6231
 #, fuzzy
 msgid "Epson Stylus Color 1160"
 msgstr "EPSON Stylus Color 1160"
 
-#: src/xml/xmli18n-tmp.h:3993
+#: src/xml/xmli18n-tmp.h:6232
 #, fuzzy
 msgid "Epson Stylus Color 1500"
 msgstr "EPSON Stylus Color 1500"
 
-#: src/xml/xmli18n-tmp.h:3994
+#: src/xml/xmli18n-tmp.h:6233
 #, fuzzy
 msgid "Epson Stylus Color 1520"
 msgstr "EPSON Stylus Color 1520"
 
-#: src/xml/xmli18n-tmp.h:3995
+#: src/xml/xmli18n-tmp.h:6234
 #, fuzzy
 msgid "Epson Stylus Color 3000"
 msgstr "EPSON Stylus Color 3000"
 
-#: src/xml/xmli18n-tmp.h:3996
+#: src/xml/xmli18n-tmp.h:6235
 #, fuzzy
 msgid "Epson Stylus Office B30"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:3997
+#: src/xml/xmli18n-tmp.h:6236
 #, fuzzy
 msgid "Epson Stylus Office B33"
 msgstr "EPSON Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:3998
+#: src/xml/xmli18n-tmp.h:6237
 #, fuzzy
 msgid "Epson Stylus Office B40W"
 msgstr "EPSON Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:3999
+#: src/xml/xmli18n-tmp.h:6238
 #, fuzzy
 msgid "Epson Stylus Office T30"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:4000
+#: src/xml/xmli18n-tmp.h:6239
 #, fuzzy
 msgid "Epson Stylus Office T33"
 msgstr "EPSON Stylus C43SX"
 
-#: src/xml/xmli18n-tmp.h:4001
+#: src/xml/xmli18n-tmp.h:6240
 #, fuzzy
 msgid "Epson Stylus Office T40W"
 msgstr "EPSON Stylus C40SX"
 
-#: src/xml/xmli18n-tmp.h:4002
+#: src/xml/xmli18n-tmp.h:6241
 #, fuzzy
 msgid "Epson Stylus Office BX300F"
 msgstr "EPSON Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4003
+#: src/xml/xmli18n-tmp.h:6242
 #, fuzzy
 msgid "Epson Stylus Office BX600FW"
 msgstr "EPSON Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4004
+#: src/xml/xmli18n-tmp.h:6243
 #, fuzzy
 msgid "Epson Stylus Office SX600FW"
 msgstr "EPSON Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4005
+#: src/xml/xmli18n-tmp.h:6244
 #, fuzzy
-msgid "Epson Stylus Offixe TX300F"
+msgid "Epson Stylus Office TX300F"
 msgstr "EPSON Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4006
+#: src/xml/xmli18n-tmp.h:6245
 #, fuzzy
 msgid "Epson Stylus Office TX600FW"
 msgstr "EPSON Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4007
+#: src/xml/xmli18n-tmp.h:6246
 #, fuzzy
 msgid "Epson Stylus Photo"
 msgstr "EPSON Stylus Photo"
 
-#: src/xml/xmli18n-tmp.h:4008
+#: src/xml/xmli18n-tmp.h:6247
 #, fuzzy
 msgid "Epson Stylus Photo 700"
 msgstr "EPSON Stylus Photo 700"
 
-#: src/xml/xmli18n-tmp.h:4009
+#: src/xml/xmli18n-tmp.h:6248
 #, fuzzy
 msgid "Epson Stylus Photo EX"
 msgstr "EPSON Stylus Photo EX"
 
-#: src/xml/xmli18n-tmp.h:4010
+#: src/xml/xmli18n-tmp.h:6249
 #, fuzzy
 msgid "Epson Stylus Photo EX3"
 msgstr "EPSON Stylus Photo EX3"
 
-#: src/xml/xmli18n-tmp.h:4011
+#: src/xml/xmli18n-tmp.h:6250
 #, fuzzy
 msgid "Epson Stylus Photo 720"
 msgstr "EPSON Stylus Photo 720"
 
-#: src/xml/xmli18n-tmp.h:4012
+#: src/xml/xmli18n-tmp.h:6251
 #, fuzzy
 msgid "Epson Stylus Photo 750"
 msgstr "EPSON Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4013
+#: src/xml/xmli18n-tmp.h:6252
 #, fuzzy
 msgid "Epson Stylus Photo 780"
 msgstr "EPSON Stylus Photo 780"
 
-#: src/xml/xmli18n-tmp.h:4014
+#: src/xml/xmli18n-tmp.h:6253
 #, fuzzy
 msgid "Epson Stylus Photo 785"
 msgstr "EPSON Stylus Photo 750"
 
-#: src/xml/xmli18n-tmp.h:4015
+#: src/xml/xmli18n-tmp.h:6254
 #, fuzzy
 msgid "Epson Stylus Photo 790"
 msgstr "EPSON Stylus Photo 790"
 
-#: src/xml/xmli18n-tmp.h:4016
+#: src/xml/xmli18n-tmp.h:6255
 #, fuzzy
 msgid "Epson Stylus Photo 810"
 msgstr "EPSON Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4017
+#: src/xml/xmli18n-tmp.h:6256
 #, fuzzy
 msgid "Epson Stylus Photo 820"
 msgstr "EPSON Stylus Photo 820"
 
-#: src/xml/xmli18n-tmp.h:4018
+#: src/xml/xmli18n-tmp.h:6257
 #, fuzzy
 msgid "Epson Stylus Photo 825"
 msgstr "EPSON Stylus Photo 825"
 
-#: src/xml/xmli18n-tmp.h:4019
+#: src/xml/xmli18n-tmp.h:6258
 #, fuzzy
 msgid "Epson Stylus Photo 830"
 msgstr "EPSON Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:4020
+#: src/xml/xmli18n-tmp.h:6259
 #, fuzzy
 msgid "Epson Stylus Photo 830U"
 msgstr "EPSON Stylus Photo 830"
 
-#: src/xml/xmli18n-tmp.h:4021
+#: src/xml/xmli18n-tmp.h:6260
 #, fuzzy
 msgid "Epson Stylus Photo 870"
 msgstr "EPSON Stylus Photo 870"
 
-#: src/xml/xmli18n-tmp.h:4022
+#: src/xml/xmli18n-tmp.h:6261
 #, fuzzy
 msgid "Epson Stylus Photo 875"
 msgstr "EPSON Stylus Photo 875"
 
-#: src/xml/xmli18n-tmp.h:4023
+#: src/xml/xmli18n-tmp.h:6262
 #, fuzzy
 msgid "Epson Stylus Photo 890"
 msgstr "EPSON Stylus Photo 890"
 
-#: src/xml/xmli18n-tmp.h:4024
+#: src/xml/xmli18n-tmp.h:6263
 #, fuzzy
 msgid "Epson Stylus Photo 895"
 msgstr "EPSON Stylus Photo 895"
 
-#: src/xml/xmli18n-tmp.h:4025
+#: src/xml/xmli18n-tmp.h:6264
 #, fuzzy
 msgid "Epson Stylus Photo 900"
 msgstr "EPSON Stylus Photo 900"
 
-#: src/xml/xmli18n-tmp.h:4026
+#: src/xml/xmli18n-tmp.h:6265
 #, fuzzy
 msgid "Epson Stylus Photo 915"
 msgstr "EPSON Stylus Photo 915"
 
-#: src/xml/xmli18n-tmp.h:4027
+#: src/xml/xmli18n-tmp.h:6266
 #, fuzzy
 msgid "Epson Stylus Photo 925"
 msgstr "EPSON Stylus Photo 925"
 
-#: src/xml/xmli18n-tmp.h:4028
+#: src/xml/xmli18n-tmp.h:6267
 #, fuzzy
 msgid "Epson Stylus Photo 935"
 msgstr "EPSON Stylus Photo 935"
 
-#: src/xml/xmli18n-tmp.h:4029
+#: src/xml/xmli18n-tmp.h:6268
 #, fuzzy
 msgid "Epson Stylus Photo 950"
 msgstr "EPSON Stylus Photo 950"
 
-#: src/xml/xmli18n-tmp.h:4030
+#: src/xml/xmli18n-tmp.h:6269
 #, fuzzy
 msgid "Epson Stylus Photo 960"
 msgstr "EPSON Stylus Photo 960"
 
-#: src/xml/xmli18n-tmp.h:4031
+#: src/xml/xmli18n-tmp.h:6270
 #, fuzzy
 msgid "Epson Stylus Photo 1200"
 msgstr "EPSON Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4032
+#: src/xml/xmli18n-tmp.h:6271
 #, fuzzy
 msgid "Epson Stylus Photo 1270"
 msgstr "EPSON Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4033
+#: src/xml/xmli18n-tmp.h:6272
 #, fuzzy
 msgid "Epson Stylus Photo 1280"
 msgstr "EPSON Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4034
+#: src/xml/xmli18n-tmp.h:6273
 #, fuzzy
 msgid "Epson Stylus Photo 1290"
 msgstr "EPSON Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4035
+#: src/xml/xmli18n-tmp.h:6274
 #, fuzzy
 msgid "Epson Stylus Photo 1400"
 msgstr "EPSON Stylus Photo 1200"
 
-#: src/xml/xmli18n-tmp.h:4036
+#: src/xml/xmli18n-tmp.h:6275
 #, fuzzy
 msgid "Epson Stylus Photo 1410"
 msgstr "EPSON Stylus Photo 810"
 
-#: src/xml/xmli18n-tmp.h:4037
+#: src/xml/xmli18n-tmp.h:6276
 #, fuzzy
 msgid "Epson Stylus Photo 2000P"
 msgstr "EPSON Stylus Photo 2000P"
 
-#: src/xml/xmli18n-tmp.h:4038
+#: src/xml/xmli18n-tmp.h:6277
 #, fuzzy
 msgid "Epson Stylus Photo 2100"
 msgstr "EPSON Stylus Photo 2100"
 
-#: src/xml/xmli18n-tmp.h:4039
+#: src/xml/xmli18n-tmp.h:6278
 #, fuzzy
 msgid "Epson Stylus Photo 2200"
 msgstr "EPSON Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:4040
+#: src/xml/xmli18n-tmp.h:6279
 #, fuzzy
 msgid "Epson Stylus Photo R200"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:4041
+#: src/xml/xmli18n-tmp.h:6280
 #, fuzzy
 msgid "Epson Stylus Photo R210"
 msgstr "EPSON Stylus Photo R210"
 
-#: src/xml/xmli18n-tmp.h:4042
+#: src/xml/xmli18n-tmp.h:6281
 #, fuzzy
 msgid "Epson Stylus Photo R220"
 msgstr "EPSON Stylus Photo 2200"
 
-#: src/xml/xmli18n-tmp.h:4043
+#: src/xml/xmli18n-tmp.h:6282
 #, fuzzy
 msgid "Epson Stylus Photo R230"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:4044
+#: src/xml/xmli18n-tmp.h:6283
 #, fuzzy
 msgid "Epson Stylus Photo R240"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:4045
+#: src/xml/xmli18n-tmp.h:6284
 #, fuzzy
 msgid "Epson Stylus Photo R245"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4046
+#: src/xml/xmli18n-tmp.h:6285
 #, fuzzy
 msgid "Epson Stylus Photo R260"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:4047
+#: src/xml/xmli18n-tmp.h:6286
 #, fuzzy
 msgid "Epson Stylus Photo R265"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4048
+#: src/xml/xmli18n-tmp.h:6287
 #, fuzzy
 msgid "Epson Stylus Photo R270"
 msgstr "EPSON Stylus Photo 1270"
 
-#: src/xml/xmli18n-tmp.h:4049
+#: src/xml/xmli18n-tmp.h:6288
 #, fuzzy
 msgid "Epson Stylus Photo R280"
 msgstr "EPSON Stylus Photo 1280"
 
-#: src/xml/xmli18n-tmp.h:4050
+#: src/xml/xmli18n-tmp.h:6289
 #, fuzzy
 msgid "Epson Stylus Photo R285"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4051
+#: src/xml/xmli18n-tmp.h:6290
 #, fuzzy
 msgid "Epson Stylus Photo R290"
 msgstr "EPSON Stylus Photo 1290"
 
-#: src/xml/xmli18n-tmp.h:4052
+#: src/xml/xmli18n-tmp.h:6291
 #, fuzzy
 msgid "Epson Stylus Photo R300"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:4053
+#: src/xml/xmli18n-tmp.h:6292
 #, fuzzy
 msgid "Epson Stylus Photo R310"
 msgstr "EPSON Stylus Photo R310"
 
-#: src/xml/xmli18n-tmp.h:4054
+#: src/xml/xmli18n-tmp.h:6293
 #, fuzzy
 msgid "Epson Stylus Photo R320"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:4055
+#: src/xml/xmli18n-tmp.h:6294
 #, fuzzy
 msgid "Epson Stylus Photo R340"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:4056
+#: src/xml/xmli18n-tmp.h:6295
 #, fuzzy
 msgid "Epson Stylus Photo R350"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:4057
+#: src/xml/xmli18n-tmp.h:6296
 #, fuzzy
 msgid "Epson Stylus Photo R360"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:4058
+#: src/xml/xmli18n-tmp.h:6297
 #, fuzzy
 msgid "Epson Stylus Photo R380"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:4059
+#: src/xml/xmli18n-tmp.h:6298
 #, fuzzy
 msgid "Epson Stylus Photo R390"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/xml/xmli18n-tmp.h:4060
+#: src/xml/xmli18n-tmp.h:6299
 #, fuzzy
 msgid "Epson Stylus Photo R800"
 msgstr "EPSON Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:4061
+#: src/xml/xmli18n-tmp.h:6300
 #, fuzzy
 msgid "Epson Stylus Photo R1800"
 msgstr "EPSON Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:4062
+#: src/xml/xmli18n-tmp.h:6301
 #, fuzzy
 msgid "Epson Stylus Photo R1900"
 msgstr "EPSON Stylus Photo R1800"
 
-#: src/xml/xmli18n-tmp.h:4063
+#: src/xml/xmli18n-tmp.h:6302
 #, fuzzy
 msgid "Epson Stylus Photo R2400"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/xml/xmli18n-tmp.h:4064
+#: src/xml/xmli18n-tmp.h:6303
+#, fuzzy
+msgid "Epson Stylus Photo R2880"
+msgstr "EPSON Stylus Photo 1280"
+
+#: src/xml/xmli18n-tmp.h:6304
 #, fuzzy
 msgid "Epson Stylus Photo RX400"
 msgstr "EPSON Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:4065
+#: src/xml/xmli18n-tmp.h:6305
 #, fuzzy
 msgid "Epson Stylus Photo RX420"
 msgstr "EPSON Stylus Photo RX420"
 
-#: src/xml/xmli18n-tmp.h:4066
+#: src/xml/xmli18n-tmp.h:6306
 #, fuzzy
 msgid "Epson Stylus Photo RX425"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4067
+#: src/xml/xmli18n-tmp.h:6307
 #, fuzzy
 msgid "Epson Stylus Photo RX430"
 msgstr "EPSON Stylus Photo RX430"
 
-#: src/xml/xmli18n-tmp.h:4068
+#: src/xml/xmli18n-tmp.h:6308
 #, fuzzy
 msgid "Epson Stylus Photo RX500"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4069
+#: src/xml/xmli18n-tmp.h:6309
 #, fuzzy
 msgid "Epson Stylus Photo RX510"
 msgstr "EPSON Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:4070
+#: src/xml/xmli18n-tmp.h:6310
 #, fuzzy
 msgid "Epson Stylus Photo RX560"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4071
+#: src/xml/xmli18n-tmp.h:6311
 #, fuzzy
 msgid "Epson Stylus Photo RX580"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4072
+#: src/xml/xmli18n-tmp.h:6312
 #, fuzzy
 msgid "Epson Stylus Photo RX585"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4073
+#: src/xml/xmli18n-tmp.h:6313
 #, fuzzy
 msgid "Epson Stylus Photo RX590"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4074
+#: src/xml/xmli18n-tmp.h:6314
 #, fuzzy
 msgid "Epson Stylus Photo RX595"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4075
+#: src/xml/xmli18n-tmp.h:6315
 #, fuzzy
 msgid "Epson Stylus Photo RX600"
 msgstr "EPSON Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:4076
+#: src/xml/xmli18n-tmp.h:6316
 #, fuzzy
 msgid "Epson Stylus Photo RX610"
 msgstr "EPSON Stylus Photo RX510"
 
-#: src/xml/xmli18n-tmp.h:4077
+#: src/xml/xmli18n-tmp.h:6317
 #, fuzzy
 msgid "Epson Stylus Photo RX620"
 msgstr "EPSON Stylus Photo RX620"
 
-#: src/xml/xmli18n-tmp.h:4078
+#: src/xml/xmli18n-tmp.h:6318
 #, fuzzy
 msgid "Epson Stylus Photo RX630"
 msgstr "EPSON Stylus Photo RX630"
 
-#: src/xml/xmli18n-tmp.h:4079
+#: src/xml/xmli18n-tmp.h:6319
 #, fuzzy
 msgid "Epson Stylus Photo RX640"
 msgstr "EPSON Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:4080
+#: src/xml/xmli18n-tmp.h:6320
 #, fuzzy
 msgid "Epson Stylus Photo RX680"
 msgstr "EPSON Stylus Photo RX600"
 
-#: src/xml/xmli18n-tmp.h:4081
+#: src/xml/xmli18n-tmp.h:6321
 #, fuzzy
 msgid "Epson Stylus Photo RX685"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/xml/xmli18n-tmp.h:4082
+#: src/xml/xmli18n-tmp.h:6322
 #, fuzzy
 msgid "Epson Stylus Photo RX690"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/xml/xmli18n-tmp.h:4083
+#: src/xml/xmli18n-tmp.h:6323
 #, fuzzy
 msgid "Epson Stylus Photo RX700"
 msgstr "EPSON Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:4084
+#: src/xml/xmli18n-tmp.h:6324
 #, fuzzy
 msgid "Epson Stylus Photo TX700W"
 msgstr "EPSON Stylus Photo RX400"
 
-#: src/xml/xmli18n-tmp.h:4085
+#: src/xml/xmli18n-tmp.h:6325
 #, fuzzy
-msgid "Epson Stylus Photo TX800W"
+msgid "Epson Stylus Photo TX800FW"
 msgstr "EPSON Stylus Photo R800"
 
-#: src/xml/xmli18n-tmp.h:4086
+#: src/xml/xmli18n-tmp.h:6326
 #, fuzzy
 msgid "Epson Stylus Pro 5000"
 msgstr "EPSON Stylus Pro 5000"
 
-#: src/xml/xmli18n-tmp.h:4087
+#: src/xml/xmli18n-tmp.h:6327
 #, fuzzy
 msgid "Epson Stylus Pro 5500"
 msgstr "EPSON Stylus Pro 5500"
 
-#: src/xml/xmli18n-tmp.h:4088
+#: src/xml/xmli18n-tmp.h:6328
 #, fuzzy
 msgid "Epson Stylus Pro 7000"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4089
+#: src/xml/xmli18n-tmp.h:6329
 #, fuzzy
 msgid "Epson Stylus Pro 7500"
 msgstr "EPSON Stylus Pro 7500"
 
-#: src/xml/xmli18n-tmp.h:4090
+#: src/xml/xmli18n-tmp.h:6330
 #, fuzzy
 msgid "Epson Stylus Pro 7600"
 msgstr "EPSON Stylus Pro 7600"
 
-#: src/xml/xmli18n-tmp.h:4091
+#: src/xml/xmli18n-tmp.h:6331
 #, fuzzy
 msgid "Epson Stylus Pro 7800"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4092
+#: src/xml/xmli18n-tmp.h:6332
 #, fuzzy
 msgid "Epson Stylus Pro 7880"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4093
+#: src/xml/xmli18n-tmp.h:6333
 #, fuzzy
 msgid "Epson Stylus Pro 9000"
 msgstr "EPSON Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4094
+#: src/xml/xmli18n-tmp.h:6334
 #, fuzzy
 msgid "Epson Stylus Pro 9500"
 msgstr "EPSON Stylus Pro 9500"
 
-#: src/xml/xmli18n-tmp.h:4095
+#: src/xml/xmli18n-tmp.h:6335
 #, fuzzy
 msgid "Epson Stylus Pro 9600"
 msgstr "EPSON Stylus Pro 9600"
 
-#: src/xml/xmli18n-tmp.h:4096
+#: src/xml/xmli18n-tmp.h:6336
 #, fuzzy
 msgid "Epson Stylus Pro 9800"
 msgstr "EPSON Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4097
+#: src/xml/xmli18n-tmp.h:6337
 #, fuzzy
 msgid "Epson Stylus Pro 9880"
 msgstr "EPSON Stylus Pro 9000"
 
-#: src/xml/xmli18n-tmp.h:4098
+#: src/xml/xmli18n-tmp.h:6338
 #, fuzzy
 msgid "Epson Stylus Pro 10000"
 msgstr "EPSON Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4099
+#: src/xml/xmli18n-tmp.h:6339
 #, fuzzy
 msgid "Epson Stylus Pro 11880"
 msgstr "EPSON Stylus Pro 10000"
 
-#: src/xml/xmli18n-tmp.h:4100
+#: src/xml/xmli18n-tmp.h:6340
 #, fuzzy
 msgid "Epson Stylus Scan 2000"
 msgstr "EPSON Stylus Scan 2000"
 
-#: src/xml/xmli18n-tmp.h:4101
+#: src/xml/xmli18n-tmp.h:6341
 #, fuzzy
 msgid "Epson Stylus Scan 2500"
 msgstr "EPSON Stylus Scan 2500"
 
-#: src/xml/xmli18n-tmp.h:4102
+#: src/xml/xmli18n-tmp.h:6342
 #, fuzzy
 msgid "Epson Stylus CX1500"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4103
+#: src/xml/xmli18n-tmp.h:6343
 #, fuzzy
 msgid "Epson Stylus CX3100"
 msgstr "EPSON Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4104
+#: src/xml/xmli18n-tmp.h:6344
 #, fuzzy
 msgid "Epson Stylus CX3200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4105
+#: src/xml/xmli18n-tmp.h:6345
 #, fuzzy
 msgid "Epson Stylus CX3500"
 msgstr "EPSON Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:4106
+#: src/xml/xmli18n-tmp.h:6346
 #, fuzzy
 msgid "Epson Stylus CX3600"
 msgstr "EPSON Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4107
+#: src/xml/xmli18n-tmp.h:6347
 #, fuzzy
 msgid "Epson Stylus CX3650"
 msgstr "EPSON Stylus CX3650"
 
-#: src/xml/xmli18n-tmp.h:4108
+#: src/xml/xmli18n-tmp.h:6348
 #, fuzzy
 msgid "Epson Stylus CX3700"
 msgstr "EPSON Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4109
+#: src/xml/xmli18n-tmp.h:6349
 #, fuzzy
 msgid "Epson Stylus CX3800"
 msgstr "EPSON Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4110
+#: src/xml/xmli18n-tmp.h:6350
 #, fuzzy
 msgid "Epson Stylus CX3805"
 msgstr "EPSON Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:4111
+#: src/xml/xmli18n-tmp.h:6351
 #, fuzzy
 msgid "Epson Stylus CX3810"
 msgstr "EPSON Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4112
+#: src/xml/xmli18n-tmp.h:6352
 #, fuzzy
 msgid "Epson Stylus CX4100"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4113
+#: src/xml/xmli18n-tmp.h:6353
 #, fuzzy
 msgid "Epson Stylus CX4200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4114
+#: src/xml/xmli18n-tmp.h:6354
 #, fuzzy
 msgid "Epson Stylus CX4400"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:4115
+#: src/xml/xmli18n-tmp.h:6355
 #, fuzzy
 msgid "Epson Stylus CX4500"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4116
+#: src/xml/xmli18n-tmp.h:6356
 #, fuzzy
 msgid "Epson Stylus CX4600"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:4117
+#: src/xml/xmli18n-tmp.h:6357
 #, fuzzy
 msgid "Epson Stylus CX4700"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:4118
+#: src/xml/xmli18n-tmp.h:6358
 #, fuzzy
 msgid "Epson Stylus CX4800"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:4119
+#: src/xml/xmli18n-tmp.h:6359
 #, fuzzy
 msgid "Epson Stylus CX4900"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:4120
+#: src/xml/xmli18n-tmp.h:6360
 #, fuzzy
 msgid "Epson Stylus CX5000"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4121
+#: src/xml/xmli18n-tmp.h:6361
 #, fuzzy
 msgid "Epson Stylus CX5000F"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4122
+#: src/xml/xmli18n-tmp.h:6362
 #, fuzzy
 msgid "Epson Stylus CX5100"
 msgstr "EPSON Stylus CX5100"
 
-#: src/xml/xmli18n-tmp.h:4123
+#: src/xml/xmli18n-tmp.h:6363
 #, fuzzy
 msgid "Epson Stylus CX5200"
 msgstr "EPSON Stylus CX5200"
 
-#: src/xml/xmli18n-tmp.h:4124
+#: src/xml/xmli18n-tmp.h:6364
 #, fuzzy
 msgid "Epson Stylus CX5300"
 msgstr "EPSON Stylus CX5300"
 
-#: src/xml/xmli18n-tmp.h:4125
+#: src/xml/xmli18n-tmp.h:6365
 #, fuzzy
 msgid "Epson Stylus CX5400"
 msgstr "EPSON Stylus CX5400"
 
-#: src/xml/xmli18n-tmp.h:4126
+#: src/xml/xmli18n-tmp.h:6366
 #, fuzzy
 msgid "Epson Stylus CX5500"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4127
+#: src/xml/xmli18n-tmp.h:6367
 #, fuzzy
 msgid "Epson Stylus CX5600"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4128
+#: src/xml/xmli18n-tmp.h:6368
 #, fuzzy
 msgid "Epson Stylus CX5700"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4129
+#: src/xml/xmli18n-tmp.h:6369
 #, fuzzy
 msgid "Epson Stylus CX5800"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4130
+#: src/xml/xmli18n-tmp.h:6370
 #, fuzzy
 msgid "Epson Stylus CX6000"
 msgstr "EPSON Stylus CX3600"
 
-#: src/xml/xmli18n-tmp.h:4131
+#: src/xml/xmli18n-tmp.h:6371
 #, fuzzy
 msgid "Epson Stylus CX6300"
 msgstr "EPSON Stylus CX6300"
 
-#: src/xml/xmli18n-tmp.h:4132
+#: src/xml/xmli18n-tmp.h:6372
 #, fuzzy
 msgid "Epson Stylus CX6400"
 msgstr "EPSON Stylus CX6400"
 
-#: src/xml/xmli18n-tmp.h:4133
+#: src/xml/xmli18n-tmp.h:6373
 #, fuzzy
 msgid "Epson Stylus CX6500"
 msgstr "EPSON Stylus CX6500"
 
-#: src/xml/xmli18n-tmp.h:4134
+#: src/xml/xmli18n-tmp.h:6374
 #, fuzzy
 msgid "Epson Stylus CX6600"
 msgstr "EPSON Stylus CX6600"
 
-#: src/xml/xmli18n-tmp.h:4135
+#: src/xml/xmli18n-tmp.h:6375
 #, fuzzy
 msgid "Epson Stylus CX7000F"
 msgstr "EPSON Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4136
+#: src/xml/xmli18n-tmp.h:6376
 #, fuzzy
 msgid "Epson Stylus CX7400"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:4137
+#: src/xml/xmli18n-tmp.h:6377
 #, fuzzy
 msgid "Epson Stylus CX7700"
 msgstr "EPSON Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4138
+#: src/xml/xmli18n-tmp.h:6378
 #, fuzzy
 msgid "Epson Stylus CX7800"
 msgstr "EPSON Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:4139
+#: src/xml/xmli18n-tmp.h:6379
 #, fuzzy
 msgid "Epson Stylus CX8300"
 msgstr "EPSON Stylus CX8300"
 
-#: src/xml/xmli18n-tmp.h:4140
+#: src/xml/xmli18n-tmp.h:6380
 #, fuzzy
 msgid "Epson Stylus CX8400"
 msgstr "EPSON Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:4141
+#: src/xml/xmli18n-tmp.h:6381
 #, fuzzy
 msgid "Epson Stylus CX9300F"
 msgstr "EPSON Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4142
+#: src/xml/xmli18n-tmp.h:6382
 #, fuzzy
 msgid "Epson Stylus CX9400"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:4143
+#: src/xml/xmli18n-tmp.h:6383
 #, fuzzy
 msgid "Epson Stylus CX9400F"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:4144
+#: src/xml/xmli18n-tmp.h:6384
 #, fuzzy
 msgid "Epson Stylus CX9475F"
 msgstr "EPSON Stylus C45"
 
-#: src/xml/xmli18n-tmp.h:4145
+#: src/xml/xmli18n-tmp.h:6385
 #, fuzzy
 msgid "Epson Stylus D68"
 msgstr "EPSON Stylus C46"
 
-#: src/xml/xmli18n-tmp.h:4146
+#: src/xml/xmli18n-tmp.h:6386
 #, fuzzy
 msgid "Epson Stylus D88"
 msgstr "EPSON Stylus C80"
 
-#: src/xml/xmli18n-tmp.h:4147
+#: src/xml/xmli18n-tmp.h:6387
 #, fuzzy
 msgid "Epson Stylus D92"
 msgstr "EPSON Stylus C62"
 
-#: src/xml/xmli18n-tmp.h:4148
+#: src/xml/xmli18n-tmp.h:6388
 #, fuzzy
 msgid "Epson Stylus D120"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:4149
+#: src/xml/xmli18n-tmp.h:6389
 #, fuzzy
 msgid "Epson Stylus DX3800"
 msgstr "EPSON Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4150
+#: src/xml/xmli18n-tmp.h:6390
 #, fuzzy
 msgid "Epson Stylus DX3850"
 msgstr "EPSON Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:4151
+#: src/xml/xmli18n-tmp.h:6391
+#, fuzzy
+msgid "Epson Stylus DX4000"
+msgstr "EPSON Stylus CX4600"
+
+#: src/xml/xmli18n-tmp.h:6392
 #, fuzzy
 msgid "Epson Stylus DX4050"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:4152
+#: src/xml/xmli18n-tmp.h:6393
 #, fuzzy
 msgid "Epson Stylus DX4200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4153
+#: src/xml/xmli18n-tmp.h:6394
 #, fuzzy
 msgid "Epson Stylus DX4250"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4154
+#: src/xml/xmli18n-tmp.h:6395
 #, fuzzy
 msgid "Epson Stylus DX4400"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:4155
+#: src/xml/xmli18n-tmp.h:6396
 #, fuzzy
 msgid "Epson Stylus DX4450"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4156
+#: src/xml/xmli18n-tmp.h:6397
 #, fuzzy
 msgid "Epson Stylus DX4800"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:4157
+#: src/xml/xmli18n-tmp.h:6398
 #, fuzzy
 msgid "Epson Stylus DX4850"
 msgstr "EPSON Stylus CX3500"
 
-#: src/xml/xmli18n-tmp.h:4158
+#: src/xml/xmli18n-tmp.h:6399
 #, fuzzy
 msgid "Epson Stylus DX7000F"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/xml/xmli18n-tmp.h:4159
+#: src/xml/xmli18n-tmp.h:6400
 #, fuzzy
 msgid "Epson Stylus DX7400"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:4160
+#: src/xml/xmli18n-tmp.h:6401
 #, fuzzy
 msgid "Epson Stylus DX7450"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4161
+#: src/xml/xmli18n-tmp.h:6402
 #, fuzzy
 msgid "Epson Stylus DX8400"
 msgstr "EPSON Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:4162
+#: src/xml/xmli18n-tmp.h:6403
 #, fuzzy
 msgid "Epson Stylus DX8450"
 msgstr "EPSON Stylus CX8400"
 
-#: src/xml/xmli18n-tmp.h:4163
+#: src/xml/xmli18n-tmp.h:6404
 #, fuzzy
 msgid "Epson Stylus DX9400F"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:4164
+#: src/xml/xmli18n-tmp.h:6405
 #, fuzzy
 msgid "Epson Stylus NX100"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4165
+#: src/xml/xmli18n-tmp.h:6406
 #, fuzzy
 msgid "Epson Stylus NX105"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4166
+#: src/xml/xmli18n-tmp.h:6407
 #, fuzzy
 msgid "Epson Stylus NX200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4167
+#: src/xml/xmli18n-tmp.h:6408
 #, fuzzy
 msgid "Epson Stylus NX300"
 msgstr "EPSON Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4168
+#: src/xml/xmli18n-tmp.h:6409
 #, fuzzy
 msgid "Epson Stylus NX400"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4169
+#: src/xml/xmli18n-tmp.h:6410
 #, fuzzy
-msgid "Epson Stylus PX700FW"
+msgid "Epson Stylus PX700W"
 msgstr "EPSON Stylus C70"
 
-#: src/xml/xmli18n-tmp.h:4170
+#: src/xml/xmli18n-tmp.h:6411
 #, fuzzy
 msgid "Epson Stylus PX800FW"
 msgstr "EPSON Stylus CX3100"
 
-#: src/xml/xmli18n-tmp.h:4171
+#: src/xml/xmli18n-tmp.h:6412
 #, fuzzy
 msgid "Epson Stylus S20"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:4172
+#: src/xml/xmli18n-tmp.h:6413
 #, fuzzy
 msgid "Epson Stylus SX100"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4173
+#: src/xml/xmli18n-tmp.h:6414
 #, fuzzy
 msgid "Epson Stylus SX105"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4174
+#: src/xml/xmli18n-tmp.h:6415
 #, fuzzy
 msgid "Epson Stylus SX200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4175
+#: src/xml/xmli18n-tmp.h:6416
 #, fuzzy
 msgid "Epson Stylus SX205"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:4176
+#: src/xml/xmli18n-tmp.h:6417
 #, fuzzy
 msgid "Epson Stylus SX400"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4177
+#: src/xml/xmli18n-tmp.h:6418
 #, fuzzy
 msgid "Epson Stylus SX405"
 msgstr "EPSON Stylus CX4600"
 
-#: src/xml/xmli18n-tmp.h:4178
+#: src/xml/xmli18n-tmp.h:6419
 #, fuzzy
 msgid "Epson Stylus T20"
 msgstr "EPSON Stylus C20SX"
 
-#: src/xml/xmli18n-tmp.h:4179
+#: src/xml/xmli18n-tmp.h:6420
 #, fuzzy
 msgid "Epson Stylus TX100"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4180
+#: src/xml/xmli18n-tmp.h:6421
 #, fuzzy
 msgid "Epson Stylus TX101"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4181
+#: src/xml/xmli18n-tmp.h:6422
 #, fuzzy
 msgid "Epson Stylus TX102"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4182
+#: src/xml/xmli18n-tmp.h:6423
 #, fuzzy
 msgid "Epson Stylus TX103"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4183
+#: src/xml/xmli18n-tmp.h:6424
 #, fuzzy
 msgid "Epson Stylus TX104"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4184
+#: src/xml/xmli18n-tmp.h:6425
 #, fuzzy
 msgid "Epson Stylus TX105"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4185
+#: src/xml/xmli18n-tmp.h:6426
 #, fuzzy
 msgid "Epson Stylus TX106"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4186
+#: src/xml/xmli18n-tmp.h:6427
 #, fuzzy
 msgid "Epson Stylus TX109"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4187
+#: src/xml/xmli18n-tmp.h:6428
 #, fuzzy
 msgid "Epson Stylus TX200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/xml/xmli18n-tmp.h:4188
+#: src/xml/xmli18n-tmp.h:6429
 #, fuzzy
 msgid "Epson Stylus TX400"
 msgstr "EPSON Stylus CX1500"
 
-#: src/xml/xmli18n-tmp.h:4189
+#: src/xml/xmli18n-tmp.h:6430
 msgid "Epson PictureMate"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4190
+#: src/xml/xmli18n-tmp.h:6431
 msgid "Epson PictureMate Dash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4191
+#: src/xml/xmli18n-tmp.h:6432
 msgid "Epson PictureMate Deluxe"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4192
+#: src/xml/xmli18n-tmp.h:6433
 msgid "Epson PictureMate Flash"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4193
+#: src/xml/xmli18n-tmp.h:6434
 msgid "Epson PictureMate Pal"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4194
+#: src/xml/xmli18n-tmp.h:6435
 msgid "Epson PictureMate Snap"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4195
+#: src/xml/xmli18n-tmp.h:6436
 msgid "Epson PictureMate 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4196
+#: src/xml/xmli18n-tmp.h:6437
 msgid "Epson PictureMate 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4197
+#: src/xml/xmli18n-tmp.h:6438
 msgid "Epson PictureMate 210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4198
+#: src/xml/xmli18n-tmp.h:6439
 msgid "Epson PictureMate 215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4199
+#: src/xml/xmli18n-tmp.h:6440
 msgid "Epson PictureMate 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4200
+#: src/xml/xmli18n-tmp.h:6441
 msgid "Epson PictureMate 250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4201
+#: src/xml/xmli18n-tmp.h:6442
 msgid "Epson PictureMate 260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4202
+#: src/xml/xmli18n-tmp.h:6443
 msgid "Epson PictureMate 270"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4203
+#: src/xml/xmli18n-tmp.h:6444
 msgid "Epson PictureMate 280"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4204
+#: src/xml/xmli18n-tmp.h:6445
 msgid "Epson PictureMate 290"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4205
+#: src/xml/xmli18n-tmp.h:6446
 msgid "Epson PictureMate 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4206
+#: src/xml/xmli18n-tmp.h:6447
 msgid "Epson PictureMate 2005"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4207
+#: src/xml/xmli18n-tmp.h:6448
 msgid "Epson WorkForce 30"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4208
+#: src/xml/xmli18n-tmp.h:6449
 #, fuzzy
 msgid "Epson WorkForce 40"
 msgstr "EPSON Stylus Color 400"
 
-#: src/xml/xmli18n-tmp.h:4209
+#: src/xml/xmli18n-tmp.h:6450
 #, fuzzy
 msgid "Epson WorkForce 500"
 msgstr "EPSON Stylus Color 500"
 
-#: src/xml/xmli18n-tmp.h:4210
+#: src/xml/xmli18n-tmp.h:6451
 #, fuzzy
 msgid "Epson WorkForce 600"
 msgstr "EPSON Stylus Color 600"
 
-#: src/xml/xmli18n-tmp.h:4211
+#: src/xml/xmli18n-tmp.h:6452
 #, fuzzy
 msgid "Epson CL 700"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:4212
+#: src/xml/xmli18n-tmp.h:6453
 msgid "Epson CL 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4213
+#: src/xml/xmli18n-tmp.h:6454
 msgid "Epson CL 760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4214
+#: src/xml/xmli18n-tmp.h:6455
 msgid "Epson E 100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4215
+#: src/xml/xmli18n-tmp.h:6456
 msgid "Epson E 150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4216
+#: src/xml/xmli18n-tmp.h:6457
 msgid "Epson E 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4217
+#: src/xml/xmli18n-tmp.h:6458
 msgid "Epson E 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4218
+#: src/xml/xmli18n-tmp.h:6459
 msgid "Epson E 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4219
+#: src/xml/xmli18n-tmp.h:6460
 msgid "Epson E 520"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4220
+#: src/xml/xmli18n-tmp.h:6461
 msgid "Epson E 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4221
+#: src/xml/xmli18n-tmp.h:6462
 msgid "Epson E 720"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4222
+#: src/xml/xmli18n-tmp.h:6463
 #, fuzzy
 msgid "Epson EM 900C"
 msgstr "EPSON EM-900C"
 
-#: src/xml/xmli18n-tmp.h:4223
+#: src/xml/xmli18n-tmp.h:6464
 #, fuzzy
 msgid "Epson EM 930C"
 msgstr "EPSON EM-930C"
 
-#: src/xml/xmli18n-tmp.h:4224
+#: src/xml/xmli18n-tmp.h:6465
 #, fuzzy
 msgid "Epson EP 801A"
 msgstr "EPSON PX-G900"
 
-#: src/xml/xmli18n-tmp.h:4225
+#: src/xml/xmli18n-tmp.h:6466
 #, fuzzy
 msgid "Epson EP 901A"
 msgstr "EPSON PX-G900"
 
-#: src/xml/xmli18n-tmp.h:4226
+#: src/xml/xmli18n-tmp.h:6467
 #, fuzzy
 msgid "Epson EP 901F"
 msgstr "EPSON PX-V600"
 
-#: src/xml/xmli18n-tmp.h:4227
+#: src/xml/xmli18n-tmp.h:6468
 #, fuzzy
 msgid "Epson MC 2000"
 msgstr "Canon BJC 2000"
 
-#: src/xml/xmli18n-tmp.h:4228
+#: src/xml/xmli18n-tmp.h:6469
 #, fuzzy
 msgid "Epson MC 5000"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:4229
+#: src/xml/xmli18n-tmp.h:6470
 #, fuzzy
 msgid "Epson MC 7000"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:4230
+#: src/xml/xmli18n-tmp.h:6471
 #, fuzzy
 msgid "Epson MC 9000"
 msgstr "EPSON MC-9000"
 
-#: src/xml/xmli18n-tmp.h:4231
+#: src/xml/xmli18n-tmp.h:6472
 #, fuzzy
 msgid "Epson MC 10000"
 msgstr "Canon BJC 1000"
 
-#: src/xml/xmli18n-tmp.h:4232
+#: src/xml/xmli18n-tmp.h:6473
 #, fuzzy
 msgid "Epson ME 300"
 msgstr "EPSON PM-3000C"
 
-#: src/xml/xmli18n-tmp.h:4233
+#: src/xml/xmli18n-tmp.h:6474
 #, fuzzy
 msgid "Epson ME Office 70"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:4234
+#: src/xml/xmli18n-tmp.h:6475
 #, fuzzy
 msgid "Epson ME Office 80W"
 msgstr "EPSON PM-780C"
 
-#: src/xml/xmli18n-tmp.h:4235
+#: src/xml/xmli18n-tmp.h:6476
 #, fuzzy
 msgid "Epson ME Office 360"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:4236
+#: src/xml/xmli18n-tmp.h:6477
 #, fuzzy
 msgid "Epson ME Office 700FW"
 msgstr "Canon BJC 7000"
 
-#: src/xml/xmli18n-tmp.h:4237
+#: src/xml/xmli18n-tmp.h:6478
 #, fuzzy
 msgid "Epson MJ 930C"
 msgstr "EPSON MJ-930C"
 
-#: src/xml/xmli18n-tmp.h:4238
+#: src/xml/xmli18n-tmp.h:6479
 #, fuzzy
 msgid "Epson MJ 5100C"
 msgstr "EPSON MJ-5100C"
 
-#: src/xml/xmli18n-tmp.h:4239
+#: src/xml/xmli18n-tmp.h:6480
 #, fuzzy
 msgid "Epson MJ 6000C"
 msgstr "Canon BJC 6000"
 
-#: src/xml/xmli18n-tmp.h:4240
+#: src/xml/xmli18n-tmp.h:6481
 #, fuzzy
 msgid "Epson MJ 8000C"
 msgstr "EPSON MJ-8000C"
 
-#: src/xml/xmli18n-tmp.h:4241
+#: src/xml/xmli18n-tmp.h:6482
 msgid "Epson PM 670C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4242
+#: src/xml/xmli18n-tmp.h:6483
 #, fuzzy
 msgid "Epson PM 700C"
 msgstr "EPSON PM-700C"
 
-#: src/xml/xmli18n-tmp.h:4243
+#: src/xml/xmli18n-tmp.h:6484
 #, fuzzy
 msgid "Epson PM 730C"
 msgstr "EPSON PM-730C"
 
-#: src/xml/xmli18n-tmp.h:4244
+#: src/xml/xmli18n-tmp.h:6485
 #, fuzzy
 msgid "Epson PM 740C"
 msgstr "EPSON PM-740C"
 
-#: src/xml/xmli18n-tmp.h:4245
+#: src/xml/xmli18n-tmp.h:6486
 #, fuzzy
 msgid "Epson PM 750C"
 msgstr "EPSON PM-750C"
 
-#: src/xml/xmli18n-tmp.h:4246
+#: src/xml/xmli18n-tmp.h:6487
 #, fuzzy
 msgid "Epson PM 760C"
 msgstr "EPSON PM-760C"
 
-#: src/xml/xmli18n-tmp.h:4247
+#: src/xml/xmli18n-tmp.h:6488
 #, fuzzy
 msgid "Epson PM 770C"
 msgstr "EPSON PM-770C"
 
-#: src/xml/xmli18n-tmp.h:4248
+#: src/xml/xmli18n-tmp.h:6489
 #, fuzzy
 msgid "Epson PM 780C"
 msgstr "EPSON PM-780C"
 
-#: src/xml/xmli18n-tmp.h:4249
+#: src/xml/xmli18n-tmp.h:6490
 #, fuzzy
 msgid "Epson PM 790PT"
 msgstr "EPSON PM-790PT"
 
-#: src/xml/xmli18n-tmp.h:4250
+#: src/xml/xmli18n-tmp.h:6491
 #, fuzzy
 msgid "Epson PM 800C"
 msgstr "EPSON PM-800C"
 
-#: src/xml/xmli18n-tmp.h:4251
+#: src/xml/xmli18n-tmp.h:6492
 #, fuzzy
 msgid "Epson PM 850PT"
 msgstr "EPSON PM-850PT"
 
-#: src/xml/xmli18n-tmp.h:4252
+#: src/xml/xmli18n-tmp.h:6493
 #, fuzzy
 msgid "Epson PM 870C"
 msgstr "EPSON PM-870C"
 
-#: src/xml/xmli18n-tmp.h:4253
+#: src/xml/xmli18n-tmp.h:6494
 #, fuzzy
 msgid "Epson PM 880C"
 msgstr "EPSON PM-880C"
 
-#: src/xml/xmli18n-tmp.h:4254
+#: src/xml/xmli18n-tmp.h:6495
 #, fuzzy
 msgid "Epson PM 930C"
 msgstr "EPSON PM-930C"
 
-#: src/xml/xmli18n-tmp.h:4255
+#: src/xml/xmli18n-tmp.h:6496
 #, fuzzy
 msgid "Epson PM 940C"
 msgstr "EPSON PM-940C"
 
-#: src/xml/xmli18n-tmp.h:4256
+#: src/xml/xmli18n-tmp.h:6497
 #, fuzzy
 msgid "Epson PM 950C"
 msgstr "EPSON PM-950C"
 
-#: src/xml/xmli18n-tmp.h:4257
+#: src/xml/xmli18n-tmp.h:6498
 #, fuzzy
 msgid "Epson PM 970C"
 msgstr "EPSON PM-970C"
 
-#: src/xml/xmli18n-tmp.h:4258
+#: src/xml/xmli18n-tmp.h:6499
 #, fuzzy
 msgid "Epson PM 980C"
 msgstr "EPSON PM-980C"
 
-#: src/xml/xmli18n-tmp.h:4259
+#: src/xml/xmli18n-tmp.h:6500
 #, fuzzy
 msgid "Epson PM 2000C"
 msgstr "EPSON PM-2000C"
 
-#: src/xml/xmli18n-tmp.h:4260
+#: src/xml/xmli18n-tmp.h:6501
 #, fuzzy
 msgid "Epson PM 2200C"
 msgstr "EPSON PM-2200C"
 
-#: src/xml/xmli18n-tmp.h:4261
+#: src/xml/xmli18n-tmp.h:6502
 #, fuzzy
 msgid "Epson PM 3000C"
 msgstr "EPSON PM-3000C"
 
-#: src/xml/xmli18n-tmp.h:4262
+#: src/xml/xmli18n-tmp.h:6503
 #, fuzzy
 msgid "Epson PM 3300C"
 msgstr "EPSON PM-3300C"
 
-#: src/xml/xmli18n-tmp.h:4263
+#: src/xml/xmli18n-tmp.h:6504
 #, fuzzy
 msgid "Epson PM 3500C"
 msgstr "EPSON PM-3500C"
 
-#: src/xml/xmli18n-tmp.h:4264
+#: src/xml/xmli18n-tmp.h:6505
 #, fuzzy
 msgid "Epson PM 3700C"
 msgstr "EPSON PM-3700C"
 
-#: src/xml/xmli18n-tmp.h:4265
+#: src/xml/xmli18n-tmp.h:6506
 #, fuzzy
 msgid "Epson PM 4000PX"
 msgstr "EPSON PM-4000PX"
 
-#: src/xml/xmli18n-tmp.h:4266
+#: src/xml/xmli18n-tmp.h:6507
 #, fuzzy
 msgid "Epson PM 5000C"
 msgstr "EPSON PM-5000C"
 
-#: src/xml/xmli18n-tmp.h:4267
+#: src/xml/xmli18n-tmp.h:6508
 #, fuzzy
 msgid "Epson PM 7000C"
 msgstr "EPSON PM-7000C"
 
-#: src/xml/xmli18n-tmp.h:4268
+#: src/xml/xmli18n-tmp.h:6509
 #, fuzzy
 msgid "Epson PM 9000C"
 msgstr "EPSON PM-9000C"
 
-#: src/xml/xmli18n-tmp.h:4269
+#: src/xml/xmli18n-tmp.h:6510
 #, fuzzy
 msgid "Epson PM 10000"
 msgstr "EPSON PM-10000"
 
-#: src/xml/xmli18n-tmp.h:4270
+#: src/xml/xmli18n-tmp.h:6511
 msgid "Epson PM A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4271
+#: src/xml/xmli18n-tmp.h:6512
 msgid "Epson PM A750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4272
+#: src/xml/xmli18n-tmp.h:6513
 msgid "Epson PM A820"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4273
+#: src/xml/xmli18n-tmp.h:6514
 msgid "Epson PM A890"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4274
+#: src/xml/xmli18n-tmp.h:6515
 msgid "Epson PM A900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4275
+#: src/xml/xmli18n-tmp.h:6516
 #, fuzzy
 msgid "Epson PM A940"
 msgstr "EPSON PM-940C"
 
-#: src/xml/xmli18n-tmp.h:4276
+#: src/xml/xmli18n-tmp.h:6517
 msgid "Epson PM A950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4277
+#: src/xml/xmli18n-tmp.h:6518
 msgid "Epson PM D600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4278
+#: src/xml/xmli18n-tmp.h:6519
 #, fuzzy
 msgid "Epson PM D750"
 msgstr "EPSON PM-D750"
 
-#: src/xml/xmli18n-tmp.h:4279
+#: src/xml/xmli18n-tmp.h:6520
 #, fuzzy
 msgid "Epson PM D770"
 msgstr "EPSON PM-D770"
 
-#: src/xml/xmli18n-tmp.h:4280
+#: src/xml/xmli18n-tmp.h:6521
 msgid "Epson PM D800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4281
+#: src/xml/xmli18n-tmp.h:6522
 msgid "Epson PM D870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4282
+#: src/xml/xmli18n-tmp.h:6523
 #, fuzzy
 msgid "Epson PM D1000"
 msgstr "EPSON PM-D1000"
 
-#: src/xml/xmli18n-tmp.h:4283
+#: src/xml/xmli18n-tmp.h:6524
 #, fuzzy
 msgid "Epson PM G700"
 msgstr "EPSON PM-G700"
 
-#: src/xml/xmli18n-tmp.h:4284
+#: src/xml/xmli18n-tmp.h:6525
 #, fuzzy
 msgid "Epson PM G720"
 msgstr "EPSON PM-G720"
 
-#: src/xml/xmli18n-tmp.h:4285
+#: src/xml/xmli18n-tmp.h:6526
 msgid "Epson PM G730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4286
+#: src/xml/xmli18n-tmp.h:6527
 #, fuzzy
 msgid "Epson PM G800"
 msgstr "EPSON PM-G800"
 
-#: src/xml/xmli18n-tmp.h:4287
+#: src/xml/xmli18n-tmp.h:6528
 #, fuzzy
 msgid "Epson PM G820"
 msgstr "EPSON PM-G820"
 
-#: src/xml/xmli18n-tmp.h:4288
+#: src/xml/xmli18n-tmp.h:6529
 msgid "Epson PM G850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4289
+#: src/xml/xmli18n-tmp.h:6530
 #, fuzzy
 msgid "Epson PM T960"
 msgstr "EPSON PM-760C"
 
-#: src/xml/xmli18n-tmp.h:4290
+#: src/xml/xmli18n-tmp.h:6531
 msgid "Epson PM G4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4291
+#: src/xml/xmli18n-tmp.h:6532
 msgid "Epson PX A650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4292
+#: src/xml/xmli18n-tmp.h:6533
 #, fuzzy
 msgid "Epson Offirio PX B300"
 msgstr "EPSON PX-G900"
 
-#: src/xml/xmli18n-tmp.h:4293
+#: src/xml/xmli18n-tmp.h:6534
 #, fuzzy
 msgid "Epson Offirio PX B500"
 msgstr "EPSON PX-V500"
 
-#: src/xml/xmli18n-tmp.h:4294
+#: src/xml/xmli18n-tmp.h:6535
 #, fuzzy
 msgid "Epson PX 101"
 msgstr "EPSON PX-G900"
 
-#: src/xml/xmli18n-tmp.h:4295
+#: src/xml/xmli18n-tmp.h:6536
 #, fuzzy
 msgid "Epson PX 201"
 msgstr "EPSON PX-G920"
 
-#: src/xml/xmli18n-tmp.h:4296
+#: src/xml/xmli18n-tmp.h:6537
 #, fuzzy
 msgid "Epson PX 401A"
 msgstr "EPSON PX-G900"
 
-#: src/xml/xmli18n-tmp.h:4297
+#: src/xml/xmli18n-tmp.h:6538
 #, fuzzy
 msgid "Epson PX 601F"
 msgstr "EPSON PX-V600"
 
-#: src/xml/xmli18n-tmp.h:4298
+#: src/xml/xmli18n-tmp.h:6539
 #, fuzzy
 msgid "Epson PX G900"
 msgstr "EPSON PX-G900"
 
-#: src/xml/xmli18n-tmp.h:4299
+#: src/xml/xmli18n-tmp.h:6540
 #, fuzzy
 msgid "Epson PX G920"
 msgstr "EPSON PX-G920"
 
-#: src/xml/xmli18n-tmp.h:4300
+#: src/xml/xmli18n-tmp.h:6541
 #, fuzzy
 msgid "Epson PX G5000"
 msgstr "EPSON PX-G5000"
 
-#: src/xml/xmli18n-tmp.h:4301
+#: src/xml/xmli18n-tmp.h:6542
 #, fuzzy
 msgid "Epson PX G5300"
 msgstr "EPSON PX-G5000"
 
-#: src/xml/xmli18n-tmp.h:4302
+#: src/xml/xmli18n-tmp.h:6543
 #, fuzzy
 msgid "Epson PX V500"
 msgstr "EPSON PX-V500"
 
-#: src/xml/xmli18n-tmp.h:4303
+#: src/xml/xmli18n-tmp.h:6544
 #, fuzzy
 msgid "Epson PX V600"
 msgstr "EPSON PX-V600"
 
-#: src/xml/xmli18n-tmp.h:4304
+#: src/xml/xmli18n-tmp.h:6545
 msgid "Epson PX V630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4305
+#: src/xml/xmli18n-tmp.h:6546
 msgid "Epson PX V780"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4306
+#: src/xml/xmli18n-tmp.h:6547
 msgid "Epson PX 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4307
+#: src/xml/xmli18n-tmp.h:6548
+#, fuzzy
+msgid "Epson PX G5600"
+msgstr "EPSON PX-G5000"
+
+#: src/xml/xmli18n-tmp.h:6549
 #, fuzzy
 msgid "Epson PX 7000"
 msgstr "EPSON PX-7000"
 
-#: src/xml/xmli18n-tmp.h:4308
+#: src/xml/xmli18n-tmp.h:6550
 #, fuzzy
 msgid "Epson PX 9000"
 msgstr "EPSON PX-9000"
 
-#: src/xml/xmli18n-tmp.h:4309
+#: src/xml/xmli18n-tmp.h:6551
 msgid "Apollo P-2100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4310
+#: src/xml/xmli18n-tmp.h:6552
 msgid "Apollo P-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4311
+#: src/xml/xmli18n-tmp.h:6553
 msgid "Apollo P-2200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4312
+#: src/xml/xmli18n-tmp.h:6554
 msgid "Apollo P-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4313
+#: src/xml/xmli18n-tmp.h:6555
 msgid "Apollo P-2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4314
+#: src/xml/xmli18n-tmp.h:6556
 msgid "Apollo P-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4315
+#: src/xml/xmli18n-tmp.h:6557
 msgid "Apollo P-2600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4316
+#: src/xml/xmli18n-tmp.h:6558
 msgid "Apollo P-2650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4317
+#: src/xml/xmli18n-tmp.h:6559
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/xml/xmli18n-tmp.h:4318
+#: src/xml/xmli18n-tmp.h:6560
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/xml/xmli18n-tmp.h:4319
+#: src/xml/xmli18n-tmp.h:6561
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/xml/xmli18n-tmp.h:4320
+#: src/xml/xmli18n-tmp.h:6562
 msgid "Apple LaserWriter Select 360"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4321
+#: src/xml/xmli18n-tmp.h:6563
 msgid "Brother DCP-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4322
+#: src/xml/xmli18n-tmp.h:6564
 msgid "Brother DCP-8045D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4323
+#: src/xml/xmli18n-tmp.h:6565
 msgid "Brother HL-1040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4324
+#: src/xml/xmli18n-tmp.h:6566
 msgid "Brother HL-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4325
+#: src/xml/xmli18n-tmp.h:6567
 msgid "Brother HL-1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4326
+#: src/xml/xmli18n-tmp.h:6568
 msgid "Brother HL-1070"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4327
+#: src/xml/xmli18n-tmp.h:6569
 msgid "Brother HL-10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4328
+#: src/xml/xmli18n-tmp.h:6570
 msgid "Brother HL-10h"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4329
+#: src/xml/xmli18n-tmp.h:6571
 msgid "Brother HL-1240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4330
+#: src/xml/xmli18n-tmp.h:6572
 msgid "Brother HL-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4331
+#: src/xml/xmli18n-tmp.h:6573
 msgid "Brother HL-1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4332
+#: src/xml/xmli18n-tmp.h:6574
 msgid "Brother HL-1270N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4333
+#: src/xml/xmli18n-tmp.h:6575
 msgid "Brother HL-1430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4334
+#: src/xml/xmli18n-tmp.h:6576
 msgid "Brother HL-1440"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4335
+#: src/xml/xmli18n-tmp.h:6577
 msgid "Brother HL-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4336
+#: src/xml/xmli18n-tmp.h:6578
 msgid "Brother HL-1470N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4337
+#: src/xml/xmli18n-tmp.h:6579
 msgid "Brother HL-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4338
+#: src/xml/xmli18n-tmp.h:6580
 msgid "Brother HL-1660e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4339
+#: src/xml/xmli18n-tmp.h:6581
 msgid "Brother HL-1670N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4340
+#: src/xml/xmli18n-tmp.h:6582
 msgid "Brother HL-1850"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4341
+#: src/xml/xmli18n-tmp.h:6583
 msgid "Brother HL-1870N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4342
+#: src/xml/xmli18n-tmp.h:6584
 msgid "Brother HL-2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4343
+#: src/xml/xmli18n-tmp.h:6585
 msgid "Brother HL-2460"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4344
+#: src/xml/xmli18n-tmp.h:6586
 msgid "Brother HL-2460N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4345
+#: src/xml/xmli18n-tmp.h:6587
 msgid "Brother HL-4Ve"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4346
+#: src/xml/xmli18n-tmp.h:6588
 msgid "Brother HL-5030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4347
+#: src/xml/xmli18n-tmp.h:6589
 msgid "Brother HL-5040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4348
+#: src/xml/xmli18n-tmp.h:6590
 msgid "Brother HL-5050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4349
+#: src/xml/xmli18n-tmp.h:6591
 msgid "Brother HL-5070N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4350
+#: src/xml/xmli18n-tmp.h:6592
 msgid "Brother HL-5140"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4351
+#: src/xml/xmli18n-tmp.h:6593
 msgid "Brother HL-5150D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4352
+#: src/xml/xmli18n-tmp.h:6594
 msgid "Brother HL-5170DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4353
+#: src/xml/xmli18n-tmp.h:6595
 msgid "Brother HL-630"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4354
+#: src/xml/xmli18n-tmp.h:6596
 msgid "Brother HL-660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4355
+#: src/xml/xmli18n-tmp.h:6597
 msgid "Brother HL-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4356
+#: src/xml/xmli18n-tmp.h:6598
 msgid "Brother HL-7050N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4357
+#: src/xml/xmli18n-tmp.h:6599
 msgid "Brother HL-760"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4358
+#: src/xml/xmli18n-tmp.h:6600
 msgid "Brother HL-960"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4359
+#: src/xml/xmli18n-tmp.h:6601
 msgid "Brother MFC-6550MC"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4360
+#: src/xml/xmli18n-tmp.h:6602
 msgid "Brother MFC-8300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4361
+#: src/xml/xmli18n-tmp.h:6603
 msgid "Brother MFC-9500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4362
+#: src/xml/xmli18n-tmp.h:6604
 msgid "Brother MFC-9600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4363
+#: src/xml/xmli18n-tmp.h:6605
 #, fuzzy
 msgid "Canon GP 335"
 msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:4364
+#: src/xml/xmli18n-tmp.h:6606
 #, fuzzy
 msgid "Canon LBP-4sx"
 msgstr "Canon BJC 240"
 
-#: src/xml/xmli18n-tmp.h:4365
+#: src/xml/xmli18n-tmp.h:6607
 #, fuzzy
 msgid "Canon LBP-430"
 msgstr "Canon BJC 4300"
 
-#: src/xml/xmli18n-tmp.h:4366
+#: src/xml/xmli18n-tmp.h:6608
 #, fuzzy
 msgid "Canon LBP-1000"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:4367
+#: src/xml/xmli18n-tmp.h:6609
 #, fuzzy
 msgid "Canon LBP-1260"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:4368
+#: src/xml/xmli18n-tmp.h:6610
 #, fuzzy
 msgid "Canon LBP-1760"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:4369
+#: src/xml/xmli18n-tmp.h:6611
 msgid "Canon imageRunner 330s"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4370
+#: src/xml/xmli18n-tmp.h:6612
 msgid "Citizen ProJet II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4371
+#: src/xml/xmli18n-tmp.h:6613
 msgid "DEC 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4372
+#: src/xml/xmli18n-tmp.h:6614
 msgid "DEC LN17"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4373
+#: src/xml/xmli18n-tmp.h:6615
 msgid "Epson ActionLaser 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4374
+#: src/xml/xmli18n-tmp.h:6616
 msgid "Epson ActionLaser II"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4375
+#: src/xml/xmli18n-tmp.h:6617
 msgid "Epson AcuLaser C2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4376
+#: src/xml/xmli18n-tmp.h:6618
 msgid "Epson AcuLaser C2000PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4377
+#: src/xml/xmli18n-tmp.h:6619
 msgid "Epson AcuLaser C8500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4378
+#: src/xml/xmli18n-tmp.h:6620
 msgid "Epson AcuLaser C8500PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4379
+#: src/xml/xmli18n-tmp.h:6621
 msgid "Epson AcuLaser C8600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4380
+#: src/xml/xmli18n-tmp.h:6622
 msgid "Epson AcuLaser C8600PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4381
+#: src/xml/xmli18n-tmp.h:6623
 msgid "Epson EPL-5200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4382
+#: src/xml/xmli18n-tmp.h:6624
 msgid "Epson EPL-5200+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4383
+#: src/xml/xmli18n-tmp.h:6625
 msgid "Epson EPL-5700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4384
+#: src/xml/xmli18n-tmp.h:6626
 msgid "Epson EPL-5700PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4385
+#: src/xml/xmli18n-tmp.h:6627
 msgid "Epson EPL-5800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4386
+#: src/xml/xmli18n-tmp.h:6628
 msgid "Epson EPL-5800PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4387
+#: src/xml/xmli18n-tmp.h:6629
 msgid "Epson EPL-5900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4388
+#: src/xml/xmli18n-tmp.h:6630
 msgid "Epson EPL-5900PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4389
+#: src/xml/xmli18n-tmp.h:6631
 msgid "Epson EPL-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4390
+#: src/xml/xmli18n-tmp.h:6632
 msgid "Epson EPL-6100PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4391
+#: src/xml/xmli18n-tmp.h:6633
 msgid "Epson EPL-7100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4392
+#: src/xml/xmli18n-tmp.h:6634
 #, fuzzy
 msgid "Epson EPL-N2050"
 msgstr "EPSON PM-2000C"
 
-#: src/xml/xmli18n-tmp.h:4393
+#: src/xml/xmli18n-tmp.h:6635
 #, fuzzy
 msgid "Epson EPL-N2050+"
 msgstr "EPSON PM-2000C"
 
-#: src/xml/xmli18n-tmp.h:4394
+#: src/xml/xmli18n-tmp.h:6636
 #, fuzzy
 msgid "Epson EPL-N2050PS"
 msgstr "EPSON PM-850PT"
 
-#: src/xml/xmli18n-tmp.h:4395
+#: src/xml/xmli18n-tmp.h:6637
 #, fuzzy
 msgid "Epson EPL-N2050PS+"
 msgstr "EPSON PM-850PT"
 
-#: src/xml/xmli18n-tmp.h:4396
+#: src/xml/xmli18n-tmp.h:6638
 #, fuzzy
 msgid "Epson EPL-N2120"
 msgstr "EPSON PM-2200C"
 
-#: src/xml/xmli18n-tmp.h:4397
+#: src/xml/xmli18n-tmp.h:6639
 #, fuzzy
 msgid "Epson EPL-N2500"
 msgstr "EPSON PX-V500"
 
-#: src/xml/xmli18n-tmp.h:4398
+#: src/xml/xmli18n-tmp.h:6640
 #, fuzzy
 msgid "Epson EPL-N2500PS"
 msgstr "EPSON PX-V500"
 
-#: src/xml/xmli18n-tmp.h:4399
+#: src/xml/xmli18n-tmp.h:6641
 #, fuzzy
 msgid "Epson EPL-N2750"
 msgstr "EPSON PM-750C"
 
-#: src/xml/xmli18n-tmp.h:4400
+#: src/xml/xmli18n-tmp.h:6642
 #, fuzzy
 msgid "Epson EPL-N2750PS"
 msgstr "EPSON PM-750C"
 
-#: src/xml/xmli18n-tmp.h:4401
+#: src/xml/xmli18n-tmp.h:6643
 msgid "Fujitsu PrintPartner 10V"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4402
+#: src/xml/xmli18n-tmp.h:6644
 msgid "Fujitsu PrintPartner 16DV"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4403
+#: src/xml/xmli18n-tmp.h:6645
 msgid "Fujitsu PrintPartner 20W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4404
+#: src/xml/xmli18n-tmp.h:6646
 msgid "Fujitsu PrintPartner 8000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4405
+#: src/xml/xmli18n-tmp.h:6647
 #, fuzzy
 msgid "Generic PCL 4 Printer"
 msgstr "定義新的�表機"
 
-#: src/xml/xmli18n-tmp.h:4406
+#: src/xml/xmli18n-tmp.h:6648
 #, fuzzy
 msgid "Generic PCL 4 LF Printer"
 msgstr "定義新的�表機"
 
-#: src/xml/xmli18n-tmp.h:4407
+#: src/xml/xmli18n-tmp.h:6649
 #, fuzzy
 msgid "Generic PCL 5 Printer"
 msgstr "定義新的�表機"
 
-#: src/xml/xmli18n-tmp.h:4408
+#: src/xml/xmli18n-tmp.h:6650
 #, fuzzy
 msgid "Generic PCL 5 LF Printer"
 msgstr "定義新的�表機"
 
-#: src/xml/xmli18n-tmp.h:4409
+#: src/xml/xmli18n-tmp.h:6651
 #, fuzzy
 msgid "Generic PCL 5c Printer"
 msgstr "定義新的�表機"
 
-#: src/xml/xmli18n-tmp.h:4410
+#: src/xml/xmli18n-tmp.h:6652
 #, fuzzy
 msgid "Generic PCL 5c LF Printer"
 msgstr "定義新的�表機"
 
-#: src/xml/xmli18n-tmp.h:4411
+#: src/xml/xmli18n-tmp.h:6653
 #, fuzzy
 msgid "Generic PCL 5e Printer"
 msgstr "定義新的�表機"
 
-#: src/xml/xmli18n-tmp.h:4412
+#: src/xml/xmli18n-tmp.h:6654
 #, fuzzy
 msgid "Generic PCL 5e LF Printer"
 msgstr "定義新的�表機"
 
-#: src/xml/xmli18n-tmp.h:4413
+#: src/xml/xmli18n-tmp.h:6655
 msgid "Generic PCL 6/PCL XL Printer"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4414
+#: src/xml/xmli18n-tmp.h:6656
 #, fuzzy
 msgid "Generic PCL 6/PCL XL LF Printer"
 msgstr "定義新的�表機"
 
-#: src/xml/xmli18n-tmp.h:4415
+#: src/xml/xmli18n-tmp.h:6657
 msgid "Gestetner 10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4416
+#: src/xml/xmli18n-tmp.h:6658
 msgid "Gestetner 2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4417
+#: src/xml/xmli18n-tmp.h:6659
 msgid "Gestetner 2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4418
+#: src/xml/xmli18n-tmp.h:6660
 msgid "Gestetner 3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4419
+#: src/xml/xmli18n-tmp.h:6661
 msgid "Gestetner 3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4420
-msgid "Gestetner 3532"
+#: src/xml/xmli18n-tmp.h:6662
+msgid "Gestetner 3532/4235g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4421
-msgid "Gestetner 4235g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4422
+#: src/xml/xmli18n-tmp.h:6663
 msgid "Gestetner 4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4423
-msgid "Gestetner 4532"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4424
-msgid "Gestetner 4245g"
+#: src/xml/xmli18n-tmp.h:6664
+msgid "Gestetner 4532/4245g"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4425
+#: src/xml/xmli18n-tmp.h:6665
 msgid "Gestetner 6002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4426
+#: src/xml/xmli18n-tmp.h:6666
 msgid "Gestetner 7502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4427
+#: src/xml/xmli18n-tmp.h:6667
 msgid "Gestetner 9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4428
+#: src/xml/xmli18n-tmp.h:6668
 msgid "Gestetner DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4429
+#: src/xml/xmli18n-tmp.h:6669
 msgid "Gestetner DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4430
+#: src/xml/xmli18n-tmp.h:6670
 msgid "Gestetner DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4431
+#: src/xml/xmli18n-tmp.h:6671
 msgid "Gestetner DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4432
+#: src/xml/xmli18n-tmp.h:6672
 msgid "Gestetner DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4433
+#: src/xml/xmli18n-tmp.h:6673
 msgid "Gestetner DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4434
+#: src/xml/xmli18n-tmp.h:6674
 msgid "Gestetner DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4435
+#: src/xml/xmli18n-tmp.h:6675
 msgid "Gestetner DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4436
+#: src/xml/xmli18n-tmp.h:6676
 msgid "Gestetner DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4437
-msgid "Gestetner DSm635"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4438
-msgid "Gestetner DSm635G"
+#: src/xml/xmli18n-tmp.h:6677
+msgid "Gestetner DSm635/635G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4439
-msgid "Gestetner DSm645"
+#: src/xml/xmli18n-tmp.h:6678
+msgid "Gestetner DSm645/645G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4440
-msgid "Gestetner DS645G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4441
+#: src/xml/xmli18n-tmp.h:6679
 msgid "Gestetner DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4442
+#: src/xml/xmli18n-tmp.h:6680
 msgid "Gestetner DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4443
+#: src/xml/xmli18n-tmp.h:6681
 msgid "Gestetner DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4444
+#: src/xml/xmli18n-tmp.h:6682
 msgid "Gestetner DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4445
+#: src/xml/xmli18n-tmp.h:6683
 msgid "Gestetner DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4446
-msgid "Gestetner DSm735"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4447
-msgid "Gestetner DSm735G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4448
-msgid "Gestetner DSm745"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4449
-msgid "Gestetner DSm745G"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4450
-msgid "Gestetner MP1100"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4451
-msgid "Gestetner DSm7110"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4452
-msgid "Gestetner MP1350"
+#: src/xml/xmli18n-tmp.h:6684
+msgid "Gestetner DSm735/735G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4453
-msgid "Gestetner DSm7135"
+#: src/xml/xmli18n-tmp.h:6685
+msgid "Gestetner DSm745/745G"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4454
-msgid "Gestetner MP1600"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4455
-msgid "Gestetner DSm716"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4456
-msgid "Gestetner MP2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4457
-msgid "Gestetner DSm721d"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4458
-msgid "Gestetner MP2500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4459
-msgid "Gestetner DSm625"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4460
-msgid "Gestetner MP3500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4461
-msgid "Gestetner DSm735e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4462
-msgid "Gestetner MP4500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4463
-msgid "Gestetner DSm745e"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6686
+#, fuzzy
+msgid "Gestetner MP1100/DSm7110"
+msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:4464
-msgid "Gestetner MP5500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6687
+#, fuzzy
+msgid "Gestetner MP1350/DSm7135"
+msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:4465
-msgid "Gestetner DSm755"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6688
+#, fuzzy
+msgid "Gestetner MP1600/DSm716"
+msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:4466
-msgid "Gestetner MP6500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6689
+#, fuzzy
+msgid "Gestetner MP2000/DSm721d"
+msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:4467
-msgid "Gestetner DSm765"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6690
+#, fuzzy
+msgid "Gestetner MP2500/DSm625"
+msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:4468
-msgid "Gestetner MP7500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6691
+#, fuzzy
+msgid "Gestetner MP3500/DSm735e"
+msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:4469
-msgid "Gestetner DSm775"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6692
+#, fuzzy
+msgid "Gestetner MP4500/DSm745e"
+msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:4470
-msgid "Gestetner MP9000"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6693
+#, fuzzy
+msgid "Gestetner MP5500/DSm755"
+msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:4471
-msgid "Gestetner DSm790"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6694
+#, fuzzy
+msgid "Gestetner MP6500/DSm765"
+msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:4472
-msgid "Gestetner MP 161"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6695
+#, fuzzy
+msgid "Gestetner MP7500/DSm775"
+msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:4473
-msgid "Gestetner DSm416"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6696
+#, fuzzy
+msgid "Gestetner MP9000/DSm790"
+msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:4474
-msgid "Gestetner MP 2510"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6697
+#, fuzzy
+msgid "Gestetner MP 161/DSm416"
+msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:4475
-msgid "Gestetner DSm725e"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6698
+#, fuzzy
+msgid "Gestetner MP 2510/DSm725e"
+msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:4476
+#: src/xml/xmli18n-tmp.h:6699
 msgid "Gestetner MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4477
+#: src/xml/xmli18n-tmp.h:6700
 msgid "Gestetner MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4478
-msgid "Gestetner MP 3010"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4479
-msgid "Gestetner DSm730e"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:6701
+#, fuzzy
+msgid "Gestetner MP 3010/DSm730e"
+msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:4480
+#: src/xml/xmli18n-tmp.h:6702
 msgid "Gestetner MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4481
+#: src/xml/xmli18n-tmp.h:6703
 msgid "Gestetner MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4482
+#: src/xml/xmli18n-tmp.h:6704
 msgid "Gestetner MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4483
+#: src/xml/xmli18n-tmp.h:6705
 msgid "Gestetner MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4484
+#: src/xml/xmli18n-tmp.h:6706
 #, fuzzy
 msgid "Gestetner MP 5000"
 msgstr "EPSON MC-5000"
 
-#: src/xml/xmli18n-tmp.h:4485
+#: src/xml/xmli18n-tmp.h:6707
 msgid "Gestetner MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4486
+#: src/xml/xmli18n-tmp.h:6708
 #, fuzzy
 msgid "HP Business Inkjet 2200"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:4487
+#: src/xml/xmli18n-tmp.h:6709
 #, fuzzy
 msgid "HP Business Inkjet 2230"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:4488
+#: src/xml/xmli18n-tmp.h:6710
 #, fuzzy
 msgid "HP Business Inkjet 2250"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:4489
+#: src/xml/xmli18n-tmp.h:6711
 msgid "HP Business Inkjet 2250TN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4490
+#: src/xml/xmli18n-tmp.h:6712
 #, fuzzy
 msgid "HP Business Inkjet 2280"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:4491
+#: src/xml/xmli18n-tmp.h:6713
 msgid "HP Color Inkjet Printer CP1160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4492
+#: src/xml/xmli18n-tmp.h:6714
 msgid "HP Color Inkjet Printer CP1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4493
+#: src/xml/xmli18n-tmp.h:6715
 #, fuzzy
 msgid "HP Color LaserJet 2500"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4494
+#: src/xml/xmli18n-tmp.h:6716
 #, fuzzy
 msgid "HP Color LaserJet 4500"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4495
+#: src/xml/xmli18n-tmp.h:6717
 #, fuzzy
 msgid "HP Color LaserJet 4550"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4496
+#: src/xml/xmli18n-tmp.h:6718
 #, fuzzy
 msgid "HP Color LaserJet 4600"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4497
+#: src/xml/xmli18n-tmp.h:6719
 #, fuzzy
 msgid "HP Color LaserJet 5"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4498
+#: src/xml/xmli18n-tmp.h:6720
 #, fuzzy
 msgid "HP Color LaserJet 5000"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4499
+#: src/xml/xmli18n-tmp.h:6721
 #, fuzzy
 msgid "HP Color LaserJet 5500"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4500
+#: src/xml/xmli18n-tmp.h:6722
 #, fuzzy
 msgid "HP Color LaserJet 8550GN"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4501
+#: src/xml/xmli18n-tmp.h:6723
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:4502
+#: src/xml/xmli18n-tmp.h:6724
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:4503
+#: src/xml/xmli18n-tmp.h:6725
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/xml/xmli18n-tmp.h:4504
+#: src/xml/xmli18n-tmp.h:6726
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/xml/xmli18n-tmp.h:4505
+#: src/xml/xmli18n-tmp.h:6727
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:4506
+#: src/xml/xmli18n-tmp.h:6728
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/xml/xmli18n-tmp.h:4507
+#: src/xml/xmli18n-tmp.h:6729
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:4508
+#: src/xml/xmli18n-tmp.h:6730
 #, fuzzy
 msgid "HP DesignJet 750C Plus"
 msgstr "HP DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:4509
+#: src/xml/xmli18n-tmp.h:6731
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/xml/xmli18n-tmp.h:4510
+#: src/xml/xmli18n-tmp.h:6732
 #, fuzzy
 msgid "HP DesignJet 2500CP"
 msgstr "HP DesignJet 2500C"
 
-#: src/xml/xmli18n-tmp.h:4511
+#: src/xml/xmli18n-tmp.h:6733
 #, fuzzy
 msgid "HP DesignJet 3500CP"
 msgstr "HP DesignJet 3500C"
 
-#: src/xml/xmli18n-tmp.h:4512
+#: src/xml/xmli18n-tmp.h:6734
 #, fuzzy
 msgid "HP DesignJet ColorPro CAD"
 msgstr "HP DesignJet 455CA"
 
-#: src/xml/xmli18n-tmp.h:4513
+#: src/xml/xmli18n-tmp.h:6735
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/xml/xmli18n-tmp.h:4514
+#: src/xml/xmli18n-tmp.h:6736
 #, fuzzy
 msgid "HP DeskJet 420C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:4515
+#: src/xml/xmli18n-tmp.h:6737
 #, fuzzy
 msgid "HP DeskJet 450"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:4516
+#: src/xml/xmli18n-tmp.h:6738
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:4517
+#: src/xml/xmli18n-tmp.h:6739
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:4518
+#: src/xml/xmli18n-tmp.h:6740
 #, fuzzy
 msgid "HP DeskJet 505J Plus"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:4519
+#: src/xml/xmli18n-tmp.h:6741
 #, fuzzy
 msgid "HP DeskJet 510"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:4520
+#: src/xml/xmli18n-tmp.h:6742
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:4521
+#: src/xml/xmli18n-tmp.h:6743
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:4522
+#: src/xml/xmli18n-tmp.h:6744
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:4523
+#: src/xml/xmli18n-tmp.h:6745
 #, fuzzy
 msgid "HP DeskJet 5550"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:4524
+#: src/xml/xmli18n-tmp.h:6746
 #, fuzzy
 msgid "HP DeskJet 5551"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:4525
+#: src/xml/xmli18n-tmp.h:6747
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4526
+#: src/xml/xmli18n-tmp.h:6748
 #, fuzzy
 msgid "HP DeskJet 600"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:4527
+#: src/xml/xmli18n-tmp.h:6749
 #, fuzzy
 msgid "HP DeskJet 600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:4528
+#: src/xml/xmli18n-tmp.h:6750
 #, fuzzy
 msgid "HP DeskJet 610C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4529
+#: src/xml/xmli18n-tmp.h:6751
 #, fuzzy
 msgid "HP DeskJet 610CL"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4530
+#: src/xml/xmli18n-tmp.h:6752
 #, fuzzy
 msgid "HP DeskJet 6122"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:4531
+#: src/xml/xmli18n-tmp.h:6753
 #, fuzzy
 msgid "HP DeskJet 6127"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:4532
+#: src/xml/xmli18n-tmp.h:6754
 #, fuzzy
 msgid "HP DeskJet 612C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:4533
+#: src/xml/xmli18n-tmp.h:6755
 #, fuzzy
 msgid "HP DeskJet 640C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:4534
+#: src/xml/xmli18n-tmp.h:6756
 #, fuzzy
 msgid "HP DeskJet 648C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:4535
+#: src/xml/xmli18n-tmp.h:6757
 #, fuzzy
 msgid "HP DeskJet 660C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4536
+#: src/xml/xmli18n-tmp.h:6758
 #, fuzzy
 msgid "HP DeskJet 670C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4537
+#: src/xml/xmli18n-tmp.h:6759
 #, fuzzy
 msgid "HP DeskJet 670TV"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4538
+#: src/xml/xmli18n-tmp.h:6760
 #, fuzzy
 msgid "HP DeskJet 672C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4539
+#: src/xml/xmli18n-tmp.h:6761
 #, fuzzy
 msgid "HP DeskJet 680C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4540
+#: src/xml/xmli18n-tmp.h:6762
 #, fuzzy
 msgid "HP DeskJet 682C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:4541
+#: src/xml/xmli18n-tmp.h:6763
 #, fuzzy
 msgid "HP DeskJet 690C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4542
+#: src/xml/xmli18n-tmp.h:6764
 #, fuzzy
 msgid "HP DeskJet 692C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4543
+#: src/xml/xmli18n-tmp.h:6765
 #, fuzzy
 msgid "HP DeskJet 693C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4544
+#: src/xml/xmli18n-tmp.h:6766
 #, fuzzy
 msgid "HP DeskJet 694C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:4545
+#: src/xml/xmli18n-tmp.h:6767
 #, fuzzy
 msgid "HP DeskJet 695C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:4546
+#: src/xml/xmli18n-tmp.h:6768
 #, fuzzy
 msgid "HP DeskJet 697C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4547
+#: src/xml/xmli18n-tmp.h:6769
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:4548
+#: src/xml/xmli18n-tmp.h:6770
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:4549
+#: src/xml/xmli18n-tmp.h:6771
 #, fuzzy
 msgid "HP DeskJet 815C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:4550
+#: src/xml/xmli18n-tmp.h:6772
 #, fuzzy
 msgid "HP DeskJet 816C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:4551
+#: src/xml/xmli18n-tmp.h:6773
 #, fuzzy
 msgid "HP DeskJet 825C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:4552
+#: src/xml/xmli18n-tmp.h:6774
 #, fuzzy
 msgid "HP DeskJet 830C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:4553
+#: src/xml/xmli18n-tmp.h:6775
 #, fuzzy
 msgid "HP DeskJet 832C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:4554
+#: src/xml/xmli18n-tmp.h:6776
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:4555
+#: src/xml/xmli18n-tmp.h:6777
 #, fuzzy
 msgid "HP DeskJet 841C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:4556
+#: src/xml/xmli18n-tmp.h:6778
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/xml/xmli18n-tmp.h:4557
+#: src/xml/xmli18n-tmp.h:6779
 #, fuzzy
 msgid "HP DeskJet 843C"
 msgstr "HP DeskJet 840C"
 
-#: src/xml/xmli18n-tmp.h:4558
+#: src/xml/xmli18n-tmp.h:6780
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:4559
+#: src/xml/xmli18n-tmp.h:6781
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/xml/xmli18n-tmp.h:4560
+#: src/xml/xmli18n-tmp.h:6782
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/xml/xmli18n-tmp.h:4561
+#: src/xml/xmli18n-tmp.h:6783
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:4562
+#: src/xml/xmli18n-tmp.h:6784
 #, fuzzy
 msgid "HP DeskJet 880C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:4563
+#: src/xml/xmli18n-tmp.h:6785
 #, fuzzy
 msgid "HP DeskJet 882C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:4564
+#: src/xml/xmli18n-tmp.h:6786
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:4565
+#: src/xml/xmli18n-tmp.h:6787
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:4566
+#: src/xml/xmli18n-tmp.h:6788
 #, fuzzy
 msgid "HP DeskJet 916C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:4567
+#: src/xml/xmli18n-tmp.h:6789
 #, fuzzy
 msgid "HP DeskJet 920C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:4568
+#: src/xml/xmli18n-tmp.h:6790
 #, fuzzy
 msgid "HP DeskJet 9300"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:4569
+#: src/xml/xmli18n-tmp.h:6791
 #, fuzzy
 msgid "HP DeskJet 930C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:4570
+#: src/xml/xmli18n-tmp.h:6792
 #, fuzzy
 msgid "HP DeskJet 932C"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:4571
+#: src/xml/xmli18n-tmp.h:6793
 #, fuzzy
 msgid "HP DeskJet 933C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:4572
+#: src/xml/xmli18n-tmp.h:6794
 #, fuzzy
 msgid "HP DeskJet 934C"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:4573
+#: src/xml/xmli18n-tmp.h:6795
 #, fuzzy
 msgid "HP DeskJet 935C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:4574
+#: src/xml/xmli18n-tmp.h:6796
 #, fuzzy
 msgid "HP DeskJet 940C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:4575
+#: src/xml/xmli18n-tmp.h:6797
 #, fuzzy
 msgid "HP DeskJet 948C"
 msgstr "HP DeskJet 540C"
 
-#: src/xml/xmli18n-tmp.h:4576
+#: src/xml/xmli18n-tmp.h:6798
 #, fuzzy
 msgid "HP DeskJet 950C"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:4577
+#: src/xml/xmli18n-tmp.h:6799
 #, fuzzy
 msgid "HP DeskJet 952C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:4578
+#: src/xml/xmli18n-tmp.h:6800
 #, fuzzy
 msgid "HP DeskJet 955C"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:4579
+#: src/xml/xmli18n-tmp.h:6801
 #, fuzzy
 msgid "HP DeskJet 957C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:4580
+#: src/xml/xmli18n-tmp.h:6802
 #, fuzzy
 msgid "HP DeskJet 959C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:4581
+#: src/xml/xmli18n-tmp.h:6803
 #, fuzzy
 msgid "HP DeskJet 960C"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4582
+#: src/xml/xmli18n-tmp.h:6804
 #, fuzzy
 msgid "HP DeskJet 970C"
 msgstr "HP DeskJet 870C"
 
-#: src/xml/xmli18n-tmp.h:4583
+#: src/xml/xmli18n-tmp.h:6805
 #, fuzzy
 msgid "HP DeskJet 975C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:4584
+#: src/xml/xmli18n-tmp.h:6806
 #, fuzzy
 msgid "HP DeskJet 980C"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:4585
+#: src/xml/xmli18n-tmp.h:6807
 #, fuzzy
 msgid "HP DeskJet 990C"
 msgstr "HP DeskJet 890C"
 
-#: src/xml/xmli18n-tmp.h:4586
+#: src/xml/xmli18n-tmp.h:6808
 #, fuzzy
 msgid "HP DeskJet 995C"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:4587
+#: src/xml/xmli18n-tmp.h:6809
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:4588
+#: src/xml/xmli18n-tmp.h:6810
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:4589
+#: src/xml/xmli18n-tmp.h:6811
 #, fuzzy
 msgid "HP DeskJet 1125C"
 msgstr "HP DeskJet 1120C"
 
-#: src/xml/xmli18n-tmp.h:4590
+#: src/xml/xmli18n-tmp.h:6812
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:4591
+#: src/xml/xmli18n-tmp.h:6813
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/xml/xmli18n-tmp.h:4592
+#: src/xml/xmli18n-tmp.h:6814
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:4593
+#: src/xml/xmli18n-tmp.h:6815
 #, fuzzy
 msgid "HP DeskJet 1600CM"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:4594
+#: src/xml/xmli18n-tmp.h:6816
 #, fuzzy
 msgid "HP DeskJet 2000"
 msgstr "HP DeskJet 1200C"
 
-#: src/xml/xmli18n-tmp.h:4595
+#: src/xml/xmli18n-tmp.h:6817
 #, fuzzy
 msgid "HP DeskJet 2500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:4596
+#: src/xml/xmli18n-tmp.h:6818
 #, fuzzy
 msgid "HP DeskJet 2500CM"
 msgstr "HP DeskJet 500C"
 
-#: src/xml/xmli18n-tmp.h:4597
+#: src/xml/xmli18n-tmp.h:6819
 #, fuzzy
 msgid "HP DeskJet 340C"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:4598
+#: src/xml/xmli18n-tmp.h:6820
 #, fuzzy
 msgid "HP DeskJet 3810"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:4599
+#: src/xml/xmli18n-tmp.h:6821
 #, fuzzy
 msgid "HP DeskJet 3816"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:4600
+#: src/xml/xmli18n-tmp.h:6822
 #, fuzzy
 msgid "HP DeskJet 3820"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:4601
+#: src/xml/xmli18n-tmp.h:6823
 #, fuzzy
 msgid "HP DeskJet 3822"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:4602
+#: src/xml/xmli18n-tmp.h:6824
 #, fuzzy
 msgid "HP LaserJet 2"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4603
+#: src/xml/xmli18n-tmp.h:6825
 #, fuzzy
 msgid "HP LaserJet 2D"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4604
+#: src/xml/xmli18n-tmp.h:6826
 #, fuzzy
 msgid "HP LaserJet 2P Plus"
 msgstr "HP LaserJet IIP 系列"
 
-#: src/xml/xmli18n-tmp.h:4605
+#: src/xml/xmli18n-tmp.h:6827
 #, fuzzy
 msgid "HP LaserJet 2P"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4606
+#: src/xml/xmli18n-tmp.h:6828
 #, fuzzy
 msgid "HP LaserJet 3"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4607
+#: src/xml/xmli18n-tmp.h:6829
 #, fuzzy
 msgid "HP LaserJet 3D"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4608
+#: src/xml/xmli18n-tmp.h:6830
 #, fuzzy
 msgid "HP LaserJet 3P w/ PCL5"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4609
+#: src/xml/xmli18n-tmp.h:6831
 #, fuzzy
 msgid "HP LaserJet 3P w/PS"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:4610
+#: src/xml/xmli18n-tmp.h:6832
 #, fuzzy
 msgid "HP LaserJet 4 Plus"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4611
+#: src/xml/xmli18n-tmp.h:6833
 #, fuzzy
 msgid "HP LaserJet 4"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4612
+#: src/xml/xmli18n-tmp.h:6834
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4613
+#: src/xml/xmli18n-tmp.h:6835
 #, fuzzy
 msgid "HP LaserJet 4M"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4614
+#: src/xml/xmli18n-tmp.h:6836
 #, fuzzy
 msgid "HP LaserJet 4ML"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4615
+#: src/xml/xmli18n-tmp.h:6837
 #, fuzzy
 msgid "HP LaserJet 4P"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4616
+#: src/xml/xmli18n-tmp.h:6838
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/xml/xmli18n-tmp.h:4617
+#: src/xml/xmli18n-tmp.h:6839
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/xml/xmli18n-tmp.h:4618
+#: src/xml/xmli18n-tmp.h:6840
 #, fuzzy
 msgid "HP LaserJet 5"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4619
+#: src/xml/xmli18n-tmp.h:6841
 #, fuzzy
 msgid "HP LaserJet 5L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4620
+#: src/xml/xmli18n-tmp.h:6842
 #, fuzzy
 msgid "HP LaserJet 5M"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4621
+#: src/xml/xmli18n-tmp.h:6843
 #, fuzzy
 msgid "HP LaserJet 5MP"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4622
+#: src/xml/xmli18n-tmp.h:6844
 #, fuzzy
 msgid "HP LaserJet 5P"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4623
+#: src/xml/xmli18n-tmp.h:6845
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4624
+#: src/xml/xmli18n-tmp.h:6846
 #, fuzzy
 msgid "HP LaserJet 6"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4625
+#: src/xml/xmli18n-tmp.h:6847
 #, fuzzy
 msgid "HP LaserJet 6L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4626
+#: src/xml/xmli18n-tmp.h:6848
 #, fuzzy
 msgid "HP LaserJet 6MP"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4627
+#: src/xml/xmli18n-tmp.h:6849
 #, fuzzy
 msgid "HP LaserJet 6P"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4628
+#: src/xml/xmli18n-tmp.h:6850
 #, fuzzy
 msgid "HP LaserJet 1010"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4629
+#: src/xml/xmli18n-tmp.h:6851
 #, fuzzy
 msgid "HP LaserJet 1012"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4630
+#: src/xml/xmli18n-tmp.h:6852
 #, fuzzy
 msgid "HP LaserJet 1015"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4631
+#: src/xml/xmli18n-tmp.h:6853
 #, fuzzy
 msgid "HP LaserJet 1022"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4632
+#: src/xml/xmli18n-tmp.h:6854
 #, fuzzy
 msgid "HP LaserJet 1100"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4633
+#: src/xml/xmli18n-tmp.h:6855
 #, fuzzy
 msgid "HP LaserJet 1100A"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4634
+#: src/xml/xmli18n-tmp.h:6856
 #, fuzzy
 msgid "HP LaserJet 1150"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4635
+#: src/xml/xmli18n-tmp.h:6857
 #, fuzzy
 msgid "HP LaserJet 1160"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4636
+#: src/xml/xmli18n-tmp.h:6858
 #, fuzzy
 msgid "HP LaserJet 1200"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4637
+#: src/xml/xmli18n-tmp.h:6859
 #, fuzzy
 msgid "HP LaserJet 1220"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4638
+#: src/xml/xmli18n-tmp.h:6860
 #, fuzzy
 msgid "HP LaserJet 1300"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4639
+#: src/xml/xmli18n-tmp.h:6861
 #, fuzzy
 msgid "HP LaserJet 1320"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4640
+#: src/xml/xmli18n-tmp.h:6862
 #, fuzzy
 msgid "HP LaserJet 2100"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4641
+#: src/xml/xmli18n-tmp.h:6863
 #, fuzzy
 msgid "HP LaserJet 2100M"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4642
+#: src/xml/xmli18n-tmp.h:6864
 #, fuzzy
 msgid "HP LaserJet 2200"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4643
+#: src/xml/xmli18n-tmp.h:6865
 #, fuzzy
 msgid "HP LaserJet 2300"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4644
+#: src/xml/xmli18n-tmp.h:6866
 #, fuzzy
 msgid "HP LaserJet 2410"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4645
+#: src/xml/xmli18n-tmp.h:6867
 #, fuzzy
 msgid "HP LaserJet 2420"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4646
+#: src/xml/xmli18n-tmp.h:6868
 #, fuzzy
 msgid "HP LaserJet 2430"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4647
+#: src/xml/xmli18n-tmp.h:6869
 #, fuzzy
 msgid "HP LaserJet 3015"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4648
+#: src/xml/xmli18n-tmp.h:6870
 #, fuzzy
 msgid "HP LaserJet 3020"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4649
+#: src/xml/xmli18n-tmp.h:6871
 #, fuzzy
 msgid "HP LaserJet 3030"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4650
+#: src/xml/xmli18n-tmp.h:6872
 #, fuzzy
 msgid "HP LaserJet 3050"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4651
+#: src/xml/xmli18n-tmp.h:6873
 #, fuzzy
 msgid "HP LaserJet 3052"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4652
+#: src/xml/xmli18n-tmp.h:6874
 #, fuzzy
 msgid "HP LaserJet 3055"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4653
+#: src/xml/xmli18n-tmp.h:6875
 #, fuzzy
 msgid "HP LaserJet 3200"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4654
+#: src/xml/xmli18n-tmp.h:6876
 #, fuzzy
 msgid "HP LaserJet 3200m"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4655
+#: src/xml/xmli18n-tmp.h:6877
 #, fuzzy
 msgid "HP LaserJet 3200se"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4656
+#: src/xml/xmli18n-tmp.h:6878
 #, fuzzy
 msgid "HP LaserJet 3300 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4657
+#: src/xml/xmli18n-tmp.h:6879
 #, fuzzy
 msgid "HP LaserJet 3310 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4658
+#: src/xml/xmli18n-tmp.h:6880
 #, fuzzy
 msgid "HP LaserJet 3320 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4659
+#: src/xml/xmli18n-tmp.h:6881
 #, fuzzy
 msgid "HP LaserJet 3320N MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4660
+#: src/xml/xmli18n-tmp.h:6882
 #, fuzzy
 msgid "HP LaserJet 3330 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4661
+#: src/xml/xmli18n-tmp.h:6883
 #, fuzzy
 msgid "HP LaserJet 3380"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4662
+#: src/xml/xmli18n-tmp.h:6884
 #, fuzzy
 msgid "HP LaserJet 3390"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4663
+#: src/xml/xmli18n-tmp.h:6885
 #, fuzzy
 msgid "HP LaserJet 3392"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4664
+#: src/xml/xmli18n-tmp.h:6886
 #, fuzzy
 msgid "HP LaserJet 4000"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4665
+#: src/xml/xmli18n-tmp.h:6887
 #, fuzzy
 msgid "HP LaserJet 4050"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4666
+#: src/xml/xmli18n-tmp.h:6888
 #, fuzzy
 msgid "HP LaserJet 4100"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4667
+#: src/xml/xmli18n-tmp.h:6889
 #, fuzzy
 msgid "HP LaserJet 4200"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4668
+#: src/xml/xmli18n-tmp.h:6890
 #, fuzzy
 msgid "HP LaserJet 4240"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4669
+#: src/xml/xmli18n-tmp.h:6891
 #, fuzzy
 msgid "HP LaserJet 4250"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4670
+#: src/xml/xmli18n-tmp.h:6892
 #, fuzzy
 msgid "HP LaserJet 4300"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4671
+#: src/xml/xmli18n-tmp.h:6893
 #, fuzzy
 msgid "HP LaserJet 4345 mfp"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4672
+#: src/xml/xmli18n-tmp.h:6894
 #, fuzzy
 msgid "HP LaserJet 4350"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4673
+#: src/xml/xmli18n-tmp.h:6895
 #, fuzzy
 msgid "HP LaserJet 5000"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4674
+#: src/xml/xmli18n-tmp.h:6896
 #, fuzzy
 msgid "HP LaserJet 5100"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4675
+#: src/xml/xmli18n-tmp.h:6897
 #, fuzzy
 msgid "HP LaserJet 5200"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4676
+#: src/xml/xmli18n-tmp.h:6898
 #, fuzzy
 msgid "HP LaserJet 5200L"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4677
+#: src/xml/xmli18n-tmp.h:6899
 #, fuzzy
 msgid "HP LaserJet 8000"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4678
+#: src/xml/xmli18n-tmp.h:6900
 #, fuzzy
 msgid "HP LaserJet 8100"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4679
+#: src/xml/xmli18n-tmp.h:6901
 #, fuzzy
 msgid "HP LaserJet 8150"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4680
+#: src/xml/xmli18n-tmp.h:6902
 #, fuzzy
 msgid "HP LaserJet 9000"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4681
+#: src/xml/xmli18n-tmp.h:6903
 #, fuzzy
 msgid "HP LaserJet 9040"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4682
+#: src/xml/xmli18n-tmp.h:6904
 #, fuzzy
 msgid "HP LaserJet 9040 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4683
+#: src/xml/xmli18n-tmp.h:6905
 #, fuzzy
 msgid "HP LaserJet 9050"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4684
+#: src/xml/xmli18n-tmp.h:6906
 #, fuzzy
 msgid "HP LaserJet 9050 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4685
+#: src/xml/xmli18n-tmp.h:6907
 #, fuzzy
 msgid "HP LaserJet M3027 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4686
+#: src/xml/xmli18n-tmp.h:6908
 #, fuzzy
 msgid "HP LaserJet M3035 MFP"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4687
+#: src/xml/xmli18n-tmp.h:6909
 #, fuzzy
 msgid "HP LaserJet M4345 MFP"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4688
+#: src/xml/xmli18n-tmp.h:6910
 #, fuzzy
 msgid "HP LaserJet M5025 MFP"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4689
+#: src/xml/xmli18n-tmp.h:6911
 #, fuzzy
 msgid "HP LaserJet M5035 MFP"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4690
+#: src/xml/xmli18n-tmp.h:6912
 #, fuzzy
 msgid "HP LaserJet P2010"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4691
+#: src/xml/xmli18n-tmp.h:6913
 #, fuzzy
 msgid "HP LaserJet P2015"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4692
+#: src/xml/xmli18n-tmp.h:6914
 #, fuzzy
 msgid "HP LaserJet P3004"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4693
+#: src/xml/xmli18n-tmp.h:6915
 #, fuzzy
 msgid "HP LaserJet P3005"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4694
+#: src/xml/xmli18n-tmp.h:6916
 msgid "HP Mopier 240"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4695
+#: src/xml/xmli18n-tmp.h:6917
 msgid "HP Mopier 320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4696
+#: src/xml/xmli18n-tmp.h:6918
 #, fuzzy
 msgid "HP OfficeJet 300"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:4697
+#: src/xml/xmli18n-tmp.h:6919
 #, fuzzy
 msgid "HP OfficeJet 330"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:4698
+#: src/xml/xmli18n-tmp.h:6920
 #, fuzzy
 msgid "HP OfficeJet 350"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:4699
+#: src/xml/xmli18n-tmp.h:6921
 #, fuzzy
 msgid "HP OfficeJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:4700
+#: src/xml/xmli18n-tmp.h:6922
 #, fuzzy
 msgid "HP OfficeJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:4701
+#: src/xml/xmli18n-tmp.h:6923
 #, fuzzy
 msgid "HP OfficeJet 570"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:4702
+#: src/xml/xmli18n-tmp.h:6924
 #, fuzzy
 msgid "HP OfficeJet 580"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:4703
+#: src/xml/xmli18n-tmp.h:6925
 #, fuzzy
 msgid "HP OfficeJet 590"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:4704
+#: src/xml/xmli18n-tmp.h:6926
 #, fuzzy
 msgid "HP OfficeJet 600"
 msgstr "HP DeskJet 1600C"
 
-#: src/xml/xmli18n-tmp.h:4705
+#: src/xml/xmli18n-tmp.h:6927
 #, fuzzy
 msgid "HP OfficeJet 610"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4706
+#: src/xml/xmli18n-tmp.h:6928
 #, fuzzy
 msgid "HP OfficeJet 625"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:4707
+#: src/xml/xmli18n-tmp.h:6929
 #, fuzzy
 msgid "HP OfficeJet 630"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:4708
+#: src/xml/xmli18n-tmp.h:6930
 #, fuzzy
 msgid "HP OfficeJet 635"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:4709
+#: src/xml/xmli18n-tmp.h:6931
 #, fuzzy
 msgid "HP OfficeJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/xml/xmli18n-tmp.h:4710
+#: src/xml/xmli18n-tmp.h:6932
 #, fuzzy
 msgid "HP OfficeJet 710"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:4711
+#: src/xml/xmli18n-tmp.h:6933
 #, fuzzy
 msgid "HP OfficeJet 720"
 msgstr "HP DeskJet 520"
 
-#: src/xml/xmli18n-tmp.h:4712
+#: src/xml/xmli18n-tmp.h:6934
 #, fuzzy
 msgid "HP OfficeJet 725"
 msgstr "HP DesignJet 250C"
 
-#: src/xml/xmli18n-tmp.h:4713
+#: src/xml/xmli18n-tmp.h:6935
 #, fuzzy
 msgid "HP OfficeJet 5105"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:4714
+#: src/xml/xmli18n-tmp.h:6936
 #, fuzzy
 msgid "HP OfficeJet 5110"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:4715
+#: src/xml/xmli18n-tmp.h:6937
 #, fuzzy
 msgid "HP OfficeJet 5110xi"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:4716
+#: src/xml/xmli18n-tmp.h:6938
 #, fuzzy
 msgid "HP OfficeJet 6105"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4717
+#: src/xml/xmli18n-tmp.h:6939
 #, fuzzy
 msgid "HP OfficeJet 6110"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:4718
+#: src/xml/xmli18n-tmp.h:6940
 #, fuzzy
 msgid "HP OfficeJet 7110"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:4719
+#: src/xml/xmli18n-tmp.h:6941
 #, fuzzy
 msgid "HP OfficeJet 7130"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:4720
+#: src/xml/xmli18n-tmp.h:6942
 #, fuzzy
 msgid "HP OfficeJet 7140"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:4721
+#: src/xml/xmli18n-tmp.h:6943
 #, fuzzy
 msgid "HP OfficeJet D125"
 msgstr "HP DeskJet 812C"
 
-#: src/xml/xmli18n-tmp.h:4722
+#: src/xml/xmli18n-tmp.h:6944
 msgid "HP OfficeJet D135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4723
+#: src/xml/xmli18n-tmp.h:6945
 #, fuzzy
 msgid "HP OfficeJet D145"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:4724
+#: src/xml/xmli18n-tmp.h:6946
 #, fuzzy
 msgid "HP OfficeJet D155"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:4725
+#: src/xml/xmli18n-tmp.h:6947
 #, fuzzy
 msgid "HP OfficeJet G55"
 msgstr "HP DeskJet 550C"
 
-#: src/xml/xmli18n-tmp.h:4726
+#: src/xml/xmli18n-tmp.h:6948
 #, fuzzy
 msgid "HP OfficeJet G85"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:4727
+#: src/xml/xmli18n-tmp.h:6949
 #, fuzzy
 msgid "HP OfficeJet G95"
 msgstr "HP DeskJet 895C"
 
-#: src/xml/xmli18n-tmp.h:4728
+#: src/xml/xmli18n-tmp.h:6950
 #, fuzzy
 msgid "HP OfficeJet K60"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4729
+#: src/xml/xmli18n-tmp.h:6951
 #, fuzzy
 msgid "HP OfficeJet K60xi"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4730
+#: src/xml/xmli18n-tmp.h:6952
 #, fuzzy
 msgid "HP OfficeJet K80"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:4731
+#: src/xml/xmli18n-tmp.h:6953
 #, fuzzy
 msgid "HP OfficeJet K80xi"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:4732
+#: src/xml/xmli18n-tmp.h:6954
 #, fuzzy
 msgid "HP OfficeJet LX"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4733
+#: src/xml/xmli18n-tmp.h:6955
 #, fuzzy
 msgid "HP OfficeJet Pro 1150C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:4734
+#: src/xml/xmli18n-tmp.h:6956
 #, fuzzy
 msgid "HP OfficeJet Pro 1170C"
 msgstr "HP DeskJet 1100C"
 
-#: src/xml/xmli18n-tmp.h:4735
+#: src/xml/xmli18n-tmp.h:6957
 msgid "HP OfficeJet Pro 1175C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4736
+#: src/xml/xmli18n-tmp.h:6958
 #, fuzzy
 msgid "HP OfficeJet R40"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:4737
+#: src/xml/xmli18n-tmp.h:6959
 #, fuzzy
 msgid "HP OfficeJet R45"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:4738
+#: src/xml/xmli18n-tmp.h:6960
 #, fuzzy
 msgid "HP OfficeJet R60"
 msgstr "HP DeskJet 560C"
 
-#: src/xml/xmli18n-tmp.h:4739
+#: src/xml/xmli18n-tmp.h:6961
 #, fuzzy
 msgid "HP OfficeJet R65"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:4740
+#: src/xml/xmli18n-tmp.h:6962
 #, fuzzy
 msgid "HP OfficeJet R80"
 msgstr "HP DeskJet 810C"
 
-#: src/xml/xmli18n-tmp.h:4741
+#: src/xml/xmli18n-tmp.h:6963
 #, fuzzy
 msgid "HP OfficeJet T45"
 msgstr "HP DeskJet 845C"
 
-#: src/xml/xmli18n-tmp.h:4742
+#: src/xml/xmli18n-tmp.h:6964
 #, fuzzy
 msgid "HP OfficeJet T65"
 msgstr "HP DeskJet 500"
 
-#: src/xml/xmli18n-tmp.h:4743
+#: src/xml/xmli18n-tmp.h:6965
 #, fuzzy
 msgid "HP OfficeJet V40"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:4744
+#: src/xml/xmli18n-tmp.h:6966
 #, fuzzy
 msgid "HP OfficeJet V40xi"
 msgstr "HP DeskJet 340"
 
-#: src/xml/xmli18n-tmp.h:4745
+#: src/xml/xmli18n-tmp.h:6967
 msgid "HP OfficeJet"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4746
+#: src/xml/xmli18n-tmp.h:6968
 msgid "HP PSC 370"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4747
+#: src/xml/xmli18n-tmp.h:6969
 msgid "HP PSC 380"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4748
+#: src/xml/xmli18n-tmp.h:6970
 msgid "HP PSC 500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4749
+#: src/xml/xmli18n-tmp.h:6971
 msgid "HP PSC 750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4750
+#: src/xml/xmli18n-tmp.h:6972
 msgid "HP PSC 950"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4751
+#: src/xml/xmli18n-tmp.h:6973
 msgid "HP PSC 950xi"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4752
+#: src/xml/xmli18n-tmp.h:6974
 #, fuzzy
 msgid "HP PSC 2110"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:4753
+#: src/xml/xmli18n-tmp.h:6975
 msgid "HP PSC 2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4754
+#: src/xml/xmli18n-tmp.h:6976
 msgid "HP PSC 2210"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4755
+#: src/xml/xmli18n-tmp.h:6977
 #, fuzzy
 msgid "HP PhotoSmart 7150"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:4756
+#: src/xml/xmli18n-tmp.h:6978
 #, fuzzy
 msgid "HP PhotoSmart 7345"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:4757
+#: src/xml/xmli18n-tmp.h:6979
 #, fuzzy
 msgid "HP PhotoSmart 7350"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:4758
+#: src/xml/xmli18n-tmp.h:6980
 #, fuzzy
 msgid "HP PhotoSmart 7550"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:4759
+#: src/xml/xmli18n-tmp.h:6981
 #, fuzzy
 msgid "HP PhotoSmart P100"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:4760
+#: src/xml/xmli18n-tmp.h:6982
 #, fuzzy
 msgid "HP PhotoSmart P130"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:4761
+#: src/xml/xmli18n-tmp.h:6983
 #, fuzzy
 msgid "HP PhotoSmart P230"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:4762
+#: src/xml/xmli18n-tmp.h:6984
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/xml/xmli18n-tmp.h:4763
+#: src/xml/xmli18n-tmp.h:6985
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:4764
+#: src/xml/xmli18n-tmp.h:6986
 #, fuzzy
 msgid "HP PhotoSmart P1115"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:4765
+#: src/xml/xmli18n-tmp.h:6987
 #, fuzzy
 msgid "HP PhotoSmart P1215"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:4766
+#: src/xml/xmli18n-tmp.h:6988
 #, fuzzy
 msgid "HP PhotoSmart P1218"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:4767
+#: src/xml/xmli18n-tmp.h:6989
 #, fuzzy
 msgid "HP PhotoSmart P1315"
 msgstr "HP PhotoSmart P1100"
 
-#: src/xml/xmli18n-tmp.h:4768
+#: src/xml/xmli18n-tmp.h:6990
 #, fuzzy
 msgid "HP e-printer e20"
 msgstr "HP DesignJet 230"
 
-#: src/xml/xmli18n-tmp.h:4769
+#: src/xml/xmli18n-tmp.h:6991
 msgid "IBM 4019"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4770
+#: src/xml/xmli18n-tmp.h:6992
 msgid "IBM 4029 030 LaserPrinter 10"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4771
+#: src/xml/xmli18n-tmp.h:6993
 msgid "IBM 4312"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4772
+#: src/xml/xmli18n-tmp.h:6994
 msgid "IBM Infoprint 12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4773
+#: src/xml/xmli18n-tmp.h:6995
 msgid "IBM Page Printer 3112"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4774
+#: src/xml/xmli18n-tmp.h:6996
 msgid "Infotec 4353 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4775
+#: src/xml/xmli18n-tmp.h:6997
 msgid "Infotec 4452 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4776
+#: src/xml/xmli18n-tmp.h:6998
 msgid "Infotec 4651 MF"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4777
+#: src/xml/xmli18n-tmp.h:6999
 msgid "Infotec IS2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4778
+#: src/xml/xmli18n-tmp.h:7000
 msgid "Infotec IS2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4779
+#: src/xml/xmli18n-tmp.h:7001
 msgid "Infotec IS2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4780
+#: src/xml/xmli18n-tmp.h:7002
 msgid "Infotec IS2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4781
+#: src/xml/xmli18n-tmp.h:7003
 msgid "Infotec IS2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4782
+#: src/xml/xmli18n-tmp.h:7004
 msgid "Infotec IS2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4783
+#: src/xml/xmli18n-tmp.h:7005
 msgid "Infotec IS2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4784
+#: src/xml/xmli18n-tmp.h:7006
 msgid "Infotec IS 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4785
+#: src/xml/xmli18n-tmp.h:7007
 msgid "Infotec IS 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4786
+#: src/xml/xmli18n-tmp.h:7008
 msgid "Infotec IS 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4787
+#: src/xml/xmli18n-tmp.h:7009
 msgid "Infotec IS 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4788
+#: src/xml/xmli18n-tmp.h:7010
 msgid "Infotec IS 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4789
+#: src/xml/xmli18n-tmp.h:7011
 msgid "Infotec IS 2122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4790
+#: src/xml/xmli18n-tmp.h:7012
 msgid "Infotec IS 2127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4791
+#: src/xml/xmli18n-tmp.h:7013
 msgid "Infotec IS 2132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4792
+#: src/xml/xmli18n-tmp.h:7014
 msgid "Infotec IS 2135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4793
+#: src/xml/xmli18n-tmp.h:7015
 msgid "Infotec IS 2145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4794
+#: src/xml/xmli18n-tmp.h:7016
 msgid "Infotec IS 2151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4795
+#: src/xml/xmli18n-tmp.h:7017
 msgid "Infotec IS 2160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4796
+#: src/xml/xmli18n-tmp.h:7018
 msgid "Infotec IS 2175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4797
+#: src/xml/xmli18n-tmp.h:7019
 msgid "Infotec IS 2215"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4798
+#: src/xml/xmli18n-tmp.h:7020
 msgid "Infotec IS 2216"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4799
+#: src/xml/xmli18n-tmp.h:7021
 msgid "Infotec IS 2220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4800
+#: src/xml/xmli18n-tmp.h:7022
 msgid "Infotec IS 2220D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4801
+#: src/xml/xmli18n-tmp.h:7023
 msgid "Infotec IS 2225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4802
+#: src/xml/xmli18n-tmp.h:7024
 msgid "Infotec IS 2230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4803
+#: src/xml/xmli18n-tmp.h:7025
 msgid "Infotec IS 2235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4804
+#: src/xml/xmli18n-tmp.h:7026
 msgid "Infotec IS 2245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4805
+#: src/xml/xmli18n-tmp.h:7027
 msgid "Infotec IS 2255"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4806
+#: src/xml/xmli18n-tmp.h:7028
 msgid "Infotec IS 2265"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4807
+#: src/xml/xmli18n-tmp.h:7029
 msgid "Infotec IS 2275"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4808
+#: src/xml/xmli18n-tmp.h:7030
 msgid "Infotec IS 2316"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4809
+#: src/xml/xmli18n-tmp.h:7031
 msgid "Infotec IS 2320"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4810
+#: src/xml/xmli18n-tmp.h:7032
 msgid "Infotec IS 2325"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4811
+#: src/xml/xmli18n-tmp.h:7033
 msgid "Infotec IS 2416"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4812
+#: src/xml/xmli18n-tmp.h:7034
 msgid "Infotec IS 2425"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4813
+#: src/xml/xmli18n-tmp.h:7035
 msgid "Infotec IS 2430"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4814
+#: src/xml/xmli18n-tmp.h:7036
 msgid "Infotec IS 2435"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4815
+#: src/xml/xmli18n-tmp.h:7037
 msgid "Infotec IS 2445"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4816
+#: src/xml/xmli18n-tmp.h:7038
 msgid "Infotec IS 3090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4817
+#: src/xml/xmli18n-tmp.h:7039
 msgid "Infotec IS 3110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4818
+#: src/xml/xmli18n-tmp.h:7040
 msgid "Infotec IS 3135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4819
+#: src/xml/xmli18n-tmp.h:7041
 msgid "Infotec MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4820
+#: src/xml/xmli18n-tmp.h:7042
 msgid "Infotec MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4821
+#: src/xml/xmli18n-tmp.h:7043
 msgid "Infotec MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4822
+#: src/xml/xmli18n-tmp.h:7044
 msgid "Infotec MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4823
+#: src/xml/xmli18n-tmp.h:7045
 msgid "Infotec MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4824
+#: src/xml/xmli18n-tmp.h:7046
 msgid "Infotec MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4825
+#: src/xml/xmli18n-tmp.h:7047
 msgid "Infotec MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4826
+#: src/xml/xmli18n-tmp.h:7048
 msgid "Infotec MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4827
+#: src/xml/xmli18n-tmp.h:7049
 msgid "Kyocera F-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4828
+#: src/xml/xmli18n-tmp.h:7050
 msgid "Kyocera FS-600 - KPDL-2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4829
+#: src/xml/xmli18n-tmp.h:7051
 msgid "Kyocera FS-600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4830
+#: src/xml/xmli18n-tmp.h:7052
 msgid "Kyocera FS-680"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4831
+#: src/xml/xmli18n-tmp.h:7053
 msgid "Kyocera FS-800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4832
+#: src/xml/xmli18n-tmp.h:7054
 msgid "Kyocera FS-1000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4833
+#: src/xml/xmli18n-tmp.h:7055
 msgid "Kyocera FS-1000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4834
+#: src/xml/xmli18n-tmp.h:7056
 msgid "Kyocera FS-1010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4835
+#: src/xml/xmli18n-tmp.h:7057
 msgid "Kyocera FS-1050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4836
+#: src/xml/xmli18n-tmp.h:7058
 msgid "Kyocera FS-1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4837
+#: src/xml/xmli18n-tmp.h:7059
 msgid "Kyocera FS-1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4838
+#: src/xml/xmli18n-tmp.h:7060
 msgid "Kyocera FS-1600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4839
+#: src/xml/xmli18n-tmp.h:7061
 msgid "Kyocera FS-1700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4840
+#: src/xml/xmli18n-tmp.h:7062
 msgid "Kyocera FS-1700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4841
+#: src/xml/xmli18n-tmp.h:7063
 msgid "Kyocera FS-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4842
+#: src/xml/xmli18n-tmp.h:7064
 msgid "Kyocera FS-1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4843
+#: src/xml/xmli18n-tmp.h:7065
 msgid "Kyocera FS-1800+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4844
+#: src/xml/xmli18n-tmp.h:7066
 msgid "Kyocera FS-1900"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4845
+#: src/xml/xmli18n-tmp.h:7067
 msgid "Kyocera FS-3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4846
+#: src/xml/xmli18n-tmp.h:7068
 msgid "Kyocera FS-3600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4847
+#: src/xml/xmli18n-tmp.h:7069
 msgid "Kyocera FS-3600+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4848
+#: src/xml/xmli18n-tmp.h:7070
 msgid "Kyocera FS-3700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4849
+#: src/xml/xmli18n-tmp.h:7071
 msgid "Kyocera FS-3700+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4850
+#: src/xml/xmli18n-tmp.h:7072
 msgid "Kyocera FS-3750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4851
+#: src/xml/xmli18n-tmp.h:7073
 msgid "Kyocera FS-3800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4852
+#: src/xml/xmli18n-tmp.h:7074
 msgid "Kyocera FS-5800C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4853
+#: src/xml/xmli18n-tmp.h:7075
 msgid "Kyocera FS-5900C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4854
+#: src/xml/xmli18n-tmp.h:7076
 msgid "Kyocera FS-6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4855
+#: src/xml/xmli18n-tmp.h:7077
 msgid "Kyocera FS-6500+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4856
+#: src/xml/xmli18n-tmp.h:7078
 msgid "Kyocera FS-6700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4857
+#: src/xml/xmli18n-tmp.h:7079
 msgid "Kyocera FS-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4858
+#: src/xml/xmli18n-tmp.h:7080
 msgid "Kyocera FS-7000+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4859
+#: src/xml/xmli18n-tmp.h:7081
 msgid "Kyocera FS-8000C"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4860
+#: src/xml/xmli18n-tmp.h:7082
 msgid "Kyocera FS-9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4861
+#: src/xml/xmli18n-tmp.h:7083
 msgid "Kyocera FS-9100DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4862
+#: src/xml/xmli18n-tmp.h:7084
 msgid "Kyocera FS-9500DN"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4863
+#: src/xml/xmli18n-tmp.h:7085
 msgid "Kyocera KM-1530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4864
+#: src/xml/xmli18n-tmp.h:7086
 msgid "Kyocera KM-1810"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4865
+#: src/xml/xmli18n-tmp.h:7087
 msgid "Kyocera KM-2030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4866
+#: src/xml/xmli18n-tmp.h:7088
 msgid "Kyocera KM-2530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4867
+#: src/xml/xmli18n-tmp.h:7089
 msgid "Kyocera KM-3530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4868
+#: src/xml/xmli18n-tmp.h:7090
 msgid "Kyocera KM-4230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4869
+#: src/xml/xmli18n-tmp.h:7091
 msgid "Kyocera KM-4530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4870
+#: src/xml/xmli18n-tmp.h:7092
 msgid "Kyocera KM-5230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4871
+#: src/xml/xmli18n-tmp.h:7093
 msgid "Kyocera KM-5530"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4872
+#: src/xml/xmli18n-tmp.h:7094
 msgid "Kyocera KM-6230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4873
+#: src/xml/xmli18n-tmp.h:7095
 msgid "Lanier 5622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4874
+#: src/xml/xmli18n-tmp.h:7096
 msgid "Lanier 5627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4875
+#: src/xml/xmli18n-tmp.h:7097
 msgid "Lanier 5632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4876
+#: src/xml/xmli18n-tmp.h:7098
 msgid "Lanier 5635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4877
+#: src/xml/xmli18n-tmp.h:7099
 msgid "Lanier 5645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4878
+#: src/xml/xmli18n-tmp.h:7100
 msgid "Lanier LD0105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4879
+#: src/xml/xmli18n-tmp.h:7101
 msgid "Lanier LD015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4880
+#: src/xml/xmli18n-tmp.h:7102
 msgid "Lanier LD035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4881
+#: src/xml/xmli18n-tmp.h:7103
 msgid "Lanier LD045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4882
+#: src/xml/xmli18n-tmp.h:7104
 msgid "Lanier LD060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4883
+#: src/xml/xmli18n-tmp.h:7105
 msgid "Lanier LD075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4884
+#: src/xml/xmli18n-tmp.h:7106
 msgid "Lanier LD090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4885
+#: src/xml/xmli18n-tmp.h:7107
 msgid "Lanier LD115"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4886
+#: src/xml/xmli18n-tmp.h:7108
 msgid "Lanier LD116"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4887
+#: src/xml/xmli18n-tmp.h:7109
 msgid "Lanier LD118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4888
+#: src/xml/xmli18n-tmp.h:7110
 msgid "Lanier LD118d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4889
+#: src/xml/xmli18n-tmp.h:7111
 msgid "Lanier LD120"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4890
+#: src/xml/xmli18n-tmp.h:7112
 msgid "Lanier LD120d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4891
+#: src/xml/xmli18n-tmp.h:7113
 msgid "Lanier LD122"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4892
+#: src/xml/xmli18n-tmp.h:7114
 msgid "Lanier LD127"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4893
+#: src/xml/xmli18n-tmp.h:7115
 msgid "Lanier LD132"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4894
+#: src/xml/xmli18n-tmp.h:7116
 msgid "Lanier LD135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4895
+#: src/xml/xmli18n-tmp.h:7117
 msgid "Lanier LD145"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4896
+#: src/xml/xmli18n-tmp.h:7118
 msgid "Lanier LD151"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4897
+#: src/xml/xmli18n-tmp.h:7119
 msgid "Lanier LD160"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4898
+#: src/xml/xmli18n-tmp.h:7120
 msgid "Lanier LD175"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4899
+#: src/xml/xmli18n-tmp.h:7121
 msgid "Lanier LD225"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4900
+#: src/xml/xmli18n-tmp.h:7122
 msgid "Lanier LD230"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4901
+#: src/xml/xmli18n-tmp.h:7123
 msgid "Lanier LD235"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4902
+#: src/xml/xmli18n-tmp.h:7124
 msgid "Lanier LD245"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4903
-msgid "Lanier MP 2500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4904
-msgid "Lanier LD125"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4905
+#: src/xml/xmli18n-tmp.h:7125
 #, fuzzy
-msgid "Lanier MP 1100"
-msgstr "HP LaserJet 4L"
+msgid "Lanier MP2500/LD125"
+msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4906
+#: src/xml/xmli18n-tmp.h:7126
 #, fuzzy
-msgid "Lanier LD1100"
+msgid "Lanier MP 1100/LD1100"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4907
-msgid "Lanier MP 1350"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4908
-msgid "Lanier LD1135"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4909
-msgid "Lanier MP 1600"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4910
-msgid "Lanier LD316"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4911
-msgid "Lanier MP 161"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4912
-msgid "Lanier LD016"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4913
-msgid "Lanier MP 2000"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4914
-msgid "Lanier LD320d"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4915
-msgid "Lanier MP 2510"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4916
-msgid "Lanier LD325"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4917
-msgid "Lanier MP 2550B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4918
-msgid "Lanier LD425B"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4919
-msgid "Lanier MP 2550"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4920
-msgid "Lanier LD425"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7127
+#, fuzzy
+msgid "Lanier MP 1350/LD1135"
+msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:4921
-msgid "Lanier MP 3010"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7128
+#, fuzzy
+msgid "Lanier MP 1600/LD316"
+msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4922
-msgid "Lanier LD330"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7129
+#, fuzzy
+msgid "Lanier MP 161/LD016"
+msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4923
-msgid "Lanier MP 3350B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7130
+#, fuzzy
+msgid "Lanier MP 2000/LD320d"
+msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4924
-msgid "Lanier LD433B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7131
+#, fuzzy
+msgid "Lanier MP 2510/LD325"
+msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4925
+#: src/xml/xmli18n-tmp.h:7132
 #, fuzzy
-msgid "Lanier MP 3350"
+msgid "Lanier MP 2550B/LD425B"
 msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:4926
-msgid "Lanier LD433"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7133
+#, fuzzy
+msgid "Lanier MP 2550/LD425"
+msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:4927
-msgid "Lanier MP 3500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7134
+#, fuzzy
+msgid "Lanier MP 3010/LD330"
+msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4928
-msgid "Lanier LD335"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7135
+#, fuzzy
+msgid "Lanier MP 3350B/LD433B"
+msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:4929
-msgid "Lanier MP 4000B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7136
+#, fuzzy
+msgid "Lanier MP 3350/LD433"
+msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:4930
-msgid "Lanier LD040B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7137
+#, fuzzy
+msgid "Lanier MP 3500/LD335"
+msgstr "Canon BJC 30"
 
-#: src/xml/xmli18n-tmp.h:4931
+#: src/xml/xmli18n-tmp.h:7138
 #, fuzzy
-msgid "Lanier MP 4000"
+msgid "Lanier MP 4000B/LD040B"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4932
-msgid "Lanier LD040"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4933
-msgid "Lanier MP 4500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4934
-msgid "Lanier LD345"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4935
-msgid "Lanier MP 5000B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7139
+#, fuzzy
+msgid "Lanier MP 4000/LD040"
+msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4936
-msgid "Lanier LD050B"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7140
+#, fuzzy
+msgid "Lanier MP 4500/LD345"
+msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4937
+#: src/xml/xmli18n-tmp.h:7141
 #, fuzzy
-msgid "Lanier MP 5000"
+msgid "Lanier MP 5000B/LD050B"
 msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4938
-msgid "Lanier LD050"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4939
-msgid "Lanier MP 5500"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4940
-msgid "Lanier LD255"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4941
-msgid "Lanier MP 6500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7142
+#, fuzzy
+msgid "Lanier MP 5000/LD050"
+msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4942
-msgid "Lanier LD265"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7143
+#, fuzzy
+msgid "Lanier MP 5500/LD255"
+msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4943
-msgid "Lanier MP 7500"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7144
+#, fuzzy
+msgid "Lanier MP 6500/LD265"
+msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4944
-msgid "Lanier LD275"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7145
+#, fuzzy
+msgid "Lanier MP 7500/LD275"
+msgstr "HP LaserJet 5Si"
 
-#: src/xml/xmli18n-tmp.h:4945
+#: src/xml/xmli18n-tmp.h:7146
 #, fuzzy
-msgid "Lanier MP 9000"
+msgid "Lanier MP 9000/LD190"
 msgstr "HP LaserJet 4L"
 
-#: src/xml/xmli18n-tmp.h:4946
-msgid "Lanier LD190"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4947
+#: src/xml/xmli18n-tmp.h:7147
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/xml/xmli18n-tmp.h:4948
+#: src/xml/xmli18n-tmp.h:7148
 #, fuzzy
 msgid "Lexmark Optra E"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:4949
+#: src/xml/xmli18n-tmp.h:7149
 msgid "Lexmark Optra E+"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4950
+#: src/xml/xmli18n-tmp.h:7150
 #, fuzzy
 msgid "Lexmark Optra E220"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:4951
+#: src/xml/xmli18n-tmp.h:7151
 #, fuzzy
 msgid "Lexmark Optra E321"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:4952
+#: src/xml/xmli18n-tmp.h:7152
 #, fuzzy
 msgid "Lexmark Optra E323"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:4953
+#: src/xml/xmli18n-tmp.h:7153
 msgid "Lexmark Valuewriter 300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4954
+#: src/xml/xmli18n-tmp.h:7154
 msgid "Minolta PagePro 6"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4955
+#: src/xml/xmli18n-tmp.h:7155
 msgid "Minolta PagePro 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4956
+#: src/xml/xmli18n-tmp.h:7156
 msgid "Minolta PagePro 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4957
+#: src/xml/xmli18n-tmp.h:7157
 msgid "Minolta PagePro 8"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4958
+#: src/xml/xmli18n-tmp.h:7158
 msgid "Minolta PagePro 8L"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4959
+#: src/xml/xmli18n-tmp.h:7159
 msgid "Minolta PagePro 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4960
+#: src/xml/xmli18n-tmp.h:7160
 msgid "NEC SuperScript 660i"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4961
+#: src/xml/xmli18n-tmp.h:7161
 msgid "NEC SuperScript 860"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4962
+#: src/xml/xmli18n-tmp.h:7162
 msgid "NEC SuperScript 870"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4963
+#: src/xml/xmli18n-tmp.h:7163
 msgid "NEC SuperScript 1260"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4964
+#: src/xml/xmli18n-tmp.h:7164
 msgid "NEC SuperScript 1400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4965
+#: src/xml/xmli18n-tmp.h:7165
 msgid "NEC SuperScript 1800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4966
-msgid "NRG 10515"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4967
-msgid "NRG 10518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4968
-msgid "NRG 10512"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4969
-msgid "NRG 2205"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4970
-msgid "NRG 2238"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4971
-msgid "NRG 2212"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4972
-msgid "NRG 2705"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4973
-msgid "NRG 2738"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4974
-msgid "NRG 2712"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4975
-msgid "NRG 3205"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4976
-msgid "NRG 3238"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4977
-msgid "NRG 3212"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4978
-msgid "NRG 3525"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4979
-msgid "NRG 3508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4980
-msgid "NRG 3502"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4981
-msgid "NRG 3545"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4982
-msgid "NRG 3518"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4983
-msgid "NRG 3532"
+#: src/xml/xmli18n-tmp.h:7166
+msgid "NRG 10515/10518/10512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4984
-msgid "NRG 4525"
+#: src/xml/xmli18n-tmp.h:7167
+msgid "NRG 2205/2238/2212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4985
-msgid "NRG 4508"
+#: src/xml/xmli18n-tmp.h:7168
+msgid "NRG 2705/2738/2712"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4986
-msgid "NRG 4502"
+#: src/xml/xmli18n-tmp.h:7169
+msgid "NRG 3205/3238/3212"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4987
-msgid "NRG 4545"
+#: src/xml/xmli18n-tmp.h:7170
+msgid "NRG 3525/3508/3502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4988
-msgid "NRG 4518"
+#: src/xml/xmli18n-tmp.h:7171
+msgid "NRG 3545/3518/3532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4989
-msgid "NRG 4532"
+#: src/xml/xmli18n-tmp.h:7172
+msgid "NRG 4525/4508/4502"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4990
-msgid "NRG 6002"
+#: src/xml/xmli18n-tmp.h:7173
+msgid "NRG 4545/4518/4532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4991
-msgid "NRG 6005"
+#: src/xml/xmli18n-tmp.h:7174
+msgid "NRG 6002/6005/6008"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4992
-msgid "NRG 6008"
+#: src/xml/xmli18n-tmp.h:7175
+msgid "NRG 7502/7505/7508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4993
-msgid "NRG 7502"
+#: src/xml/xmli18n-tmp.h:7176
+msgid "NRG 9005/9008/9002"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:4994
-msgid "NRG 7505"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4995
-msgid "NRG 7508"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4996
-msgid "NRG 9005"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4997
-msgid "NRG 9008"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4998
-msgid "NRG 9002"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:4999
+#: src/xml/xmli18n-tmp.h:7177
 msgid "NRG DSm415"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5000
+#: src/xml/xmli18n-tmp.h:7178
 msgid "NRG DSm615"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5001
+#: src/xml/xmli18n-tmp.h:7179
 msgid "NRG DSm616"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5002
+#: src/xml/xmli18n-tmp.h:7180
 msgid "NRG DSm618"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5003
+#: src/xml/xmli18n-tmp.h:7181
 msgid "NRG DSm618d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5004
+#: src/xml/xmli18n-tmp.h:7182
 msgid "NRG DSm620"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5005
+#: src/xml/xmli18n-tmp.h:7183
 msgid "NRG DSm620d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5006
+#: src/xml/xmli18n-tmp.h:7184
 msgid "NRG DSm622"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5007
+#: src/xml/xmli18n-tmp.h:7185
 msgid "NRG DSm627"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5008
+#: src/xml/xmli18n-tmp.h:7186
 msgid "NRG DSm632"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5009
+#: src/xml/xmli18n-tmp.h:7187
 msgid "NRG DSm635"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5010
+#: src/xml/xmli18n-tmp.h:7188
 msgid "NRG DSm645"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5011
+#: src/xml/xmli18n-tmp.h:7189
 msgid "NRG DSm651"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5012
+#: src/xml/xmli18n-tmp.h:7190
 msgid "NRG DSm660"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5013
+#: src/xml/xmli18n-tmp.h:7191
 msgid "NRG DSm675"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5014
+#: src/xml/xmli18n-tmp.h:7192
 msgid "NRG DSm725"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5015
+#: src/xml/xmli18n-tmp.h:7193
 msgid "NRG DSm730"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5016
+#: src/xml/xmli18n-tmp.h:7194
 msgid "NRG DSm735"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5017
+#: src/xml/xmli18n-tmp.h:7195
 msgid "NRG DSm745"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5018
+#: src/xml/xmli18n-tmp.h:7196
 msgid "NRG MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5019
+#: src/xml/xmli18n-tmp.h:7197
 msgid "NRG MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5020
+#: src/xml/xmli18n-tmp.h:7198
 msgid "NRG MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5021
+#: src/xml/xmli18n-tmp.h:7199
 msgid "NRG MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5022
+#: src/xml/xmli18n-tmp.h:7200
 msgid "NRG MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5023
+#: src/xml/xmli18n-tmp.h:7201
 msgid "NRG MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5024
+#: src/xml/xmli18n-tmp.h:7202
 msgid "NRG MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5025
+#: src/xml/xmli18n-tmp.h:7203
 msgid "NRG MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5026
+#: src/xml/xmli18n-tmp.h:7204
 msgid "NRG MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5027
+#: src/xml/xmli18n-tmp.h:7205
 msgid "NRG MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5028
+#: src/xml/xmli18n-tmp.h:7206
 msgid "NRG MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5029
+#: src/xml/xmli18n-tmp.h:7207
 msgid "NRG MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5030
+#: src/xml/xmli18n-tmp.h:7208
 msgid "NRG MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5031
+#: src/xml/xmli18n-tmp.h:7209
 msgid "NRG MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5032
+#: src/xml/xmli18n-tmp.h:7210
 msgid "NRG MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5033
+#: src/xml/xmli18n-tmp.h:7211
 msgid "NRG MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5034
+#: src/xml/xmli18n-tmp.h:7212
 msgid "NRG MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5035
+#: src/xml/xmli18n-tmp.h:7213
 msgid "NRG MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5036
+#: src/xml/xmli18n-tmp.h:7214
 msgid "NRG MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5037
+#: src/xml/xmli18n-tmp.h:7215
 msgid "NRG MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5038
+#: src/xml/xmli18n-tmp.h:7216
 msgid "NRG MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5039
+#: src/xml/xmli18n-tmp.h:7217
 msgid "NRG MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5040
+#: src/xml/xmli18n-tmp.h:7218
 msgid "Oki OL400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5041
+#: src/xml/xmli18n-tmp.h:7219
 msgid "Oki OL400e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5042
+#: src/xml/xmli18n-tmp.h:7220
 msgid "Oki OL400ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5043
+#: src/xml/xmli18n-tmp.h:7221
 msgid "Oki OL410e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5044
+#: src/xml/xmli18n-tmp.h:7222
 msgid "Oki OL600e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5045
+#: src/xml/xmli18n-tmp.h:7223
 msgid "Oki OL610e/S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5046
+#: src/xml/xmli18n-tmp.h:7224
 msgid "Oki OL800"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5047
+#: src/xml/xmli18n-tmp.h:7225
 msgid "Oki OL810ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5048
+#: src/xml/xmli18n-tmp.h:7226
 msgid "Oki Okipage 6e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5049
+#: src/xml/xmli18n-tmp.h:7227
 msgid "Oki Okipage 6ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5050
+#: src/xml/xmli18n-tmp.h:7228
 msgid "Oki Okipage 8p"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5051
+#: src/xml/xmli18n-tmp.h:7229
 msgid "Oki Okipage 10e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5052
+#: src/xml/xmli18n-tmp.h:7230
 msgid "Oki Okipage 10ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5053
+#: src/xml/xmli18n-tmp.h:7231
 msgid "Oki Okipage 14ex"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5054
+#: src/xml/xmli18n-tmp.h:7232
 #, fuzzy
 msgid "Oki Super 6e"
 msgstr "Super A0"
 
-#: src/xml/xmli18n-tmp.h:5055
+#: src/xml/xmli18n-tmp.h:7233
 msgid "Olivetti JP350S"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5056
+#: src/xml/xmli18n-tmp.h:7234
 msgid "Olivetti PG 306"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5057
+#: src/xml/xmli18n-tmp.h:7235
 msgid "PCPI 1030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5058
+#: src/xml/xmli18n-tmp.h:7236
 msgid "Panasonic KX-P4410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5059
+#: src/xml/xmli18n-tmp.h:7237
 msgid "Panasonic KX-P4450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5060
+#: src/xml/xmli18n-tmp.h:7238
 msgid "Panasonic KX-P6150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5061
+#: src/xml/xmli18n-tmp.h:7239
 msgid "Panasonic KX-P6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5062
+#: src/xml/xmli18n-tmp.h:7240
 msgid "Raven LP-410"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5063
+#: src/xml/xmli18n-tmp.h:7241
 msgid "Ricoh Aficio 1022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5064
+#: src/xml/xmli18n-tmp.h:7242
 msgid "Ricoh Aficio 1027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5065
+#: src/xml/xmli18n-tmp.h:7243
 msgid "Ricoh Aficio 1032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5066
+#: src/xml/xmli18n-tmp.h:7244
 msgid "Ricoh Aficio 1035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5067
+#: src/xml/xmli18n-tmp.h:7245
 msgid "Ricoh Aficio 1045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5068
+#: src/xml/xmli18n-tmp.h:7246
 msgid "Ricoh Aficio 1060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5069
+#: src/xml/xmli18n-tmp.h:7247
 msgid "Ricoh Aficio 1075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5070
+#: src/xml/xmli18n-tmp.h:7248
 msgid "Ricoh Aficio 1515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5071
+#: src/xml/xmli18n-tmp.h:7249
 msgid "Ricoh Aficio 2015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5072
+#: src/xml/xmli18n-tmp.h:7250
 msgid "Ricoh Aficio 2016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5073
+#: src/xml/xmli18n-tmp.h:7251
 msgid "Ricoh Aficio 2018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5074
+#: src/xml/xmli18n-tmp.h:7252
 msgid "Ricoh Aficio 2018D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5075
+#: src/xml/xmli18n-tmp.h:7253
 msgid "Ricoh Aficio 2020"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5076
+#: src/xml/xmli18n-tmp.h:7254
 msgid "Ricoh Aficio 2020D"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5077
+#: src/xml/xmli18n-tmp.h:7255
 msgid "Ricoh Aficio 2022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5078
+#: src/xml/xmli18n-tmp.h:7256
 msgid "Ricoh Aficio 2027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5079
+#: src/xml/xmli18n-tmp.h:7257
 msgid "Ricoh Aficio 2032"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5080
+#: src/xml/xmli18n-tmp.h:7258
 msgid "Ricoh Aficio 2035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5081
+#: src/xml/xmli18n-tmp.h:7259
 msgid "Ricoh Aficio 2035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5082
+#: src/xml/xmli18n-tmp.h:7260
 msgid "Ricoh Aficio 2045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5083
+#: src/xml/xmli18n-tmp.h:7261
 msgid "Ricoh Aficio 2045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5084
+#: src/xml/xmli18n-tmp.h:7262
 msgid "Ricoh Aficio 2051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5085
+#: src/xml/xmli18n-tmp.h:7263
 msgid "Ricoh Aficio 2060"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5086
+#: src/xml/xmli18n-tmp.h:7264
 msgid "Ricoh Aficio 2075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5087
+#: src/xml/xmli18n-tmp.h:7265
 msgid "Ricoh Aficio 2090"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5088
+#: src/xml/xmli18n-tmp.h:7266
 msgid "Ricoh Aficio 2105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5089
+#: src/xml/xmli18n-tmp.h:7267
 msgid "Ricoh Aficio 220"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5090
+#: src/xml/xmli18n-tmp.h:7268
 msgid "Ricoh Aficio 3025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5091
+#: src/xml/xmli18n-tmp.h:7269
 msgid "Ricoh Aficio 3030"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5092
+#: src/xml/xmli18n-tmp.h:7270
 msgid "Ricoh Aficio 3035"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5093
+#: src/xml/xmli18n-tmp.h:7271
 msgid "Ricoh Aficio 3045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5094
+#: src/xml/xmli18n-tmp.h:7272
 msgid "Ricoh Aficio 401"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5095
+#: src/xml/xmli18n-tmp.h:7273
 msgid "Ricoh Aficio 700"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5096
+#: src/xml/xmli18n-tmp.h:7274
 msgid "Ricoh Aficio MP 1100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5097
+#: src/xml/xmli18n-tmp.h:7275
 msgid "Ricoh Aficio MP 1350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5098
+#: src/xml/xmli18n-tmp.h:7276
 msgid "Ricoh Aficio MP 1600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5099
+#: src/xml/xmli18n-tmp.h:7277
 msgid "Ricoh Aficio MP 161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5100
+#: src/xml/xmli18n-tmp.h:7278
 msgid "Ricoh Aficio MP 2000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5101
+#: src/xml/xmli18n-tmp.h:7279
 msgid "Ricoh Aficio MP 2500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5102
+#: src/xml/xmli18n-tmp.h:7280
 msgid "Ricoh Aficio MP 2510"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5103
+#: src/xml/xmli18n-tmp.h:7281
 msgid "Ricoh Aficio MP 2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5104
+#: src/xml/xmli18n-tmp.h:7282
 msgid "Ricoh Aficio MP 2550B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5105
+#: src/xml/xmli18n-tmp.h:7283
 msgid "Ricoh Aficio MP 3010"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5106
+#: src/xml/xmli18n-tmp.h:7284
 msgid "Ricoh Aficio MP 3350"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5107
+#: src/xml/xmli18n-tmp.h:7285
 msgid "Ricoh Aficio MP 3350B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5108
+#: src/xml/xmli18n-tmp.h:7286
 msgid "Ricoh Aficio MP 3500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5109
+#: src/xml/xmli18n-tmp.h:7287
 msgid "Ricoh Aficio MP 4000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5110
+#: src/xml/xmli18n-tmp.h:7288
 msgid "Ricoh Aficio MP 4000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5111
+#: src/xml/xmli18n-tmp.h:7289
 msgid "Ricoh Aficio MP 4500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5112
+#: src/xml/xmli18n-tmp.h:7290
 msgid "Ricoh Aficio MP 5000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5113
+#: src/xml/xmli18n-tmp.h:7291
 msgid "Ricoh Aficio MP 5000B"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5114
+#: src/xml/xmli18n-tmp.h:7292
 msgid "Ricoh Aficio MP 5500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5115
+#: src/xml/xmli18n-tmp.h:7293
 msgid "Ricoh Aficio MP 6500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5116
+#: src/xml/xmli18n-tmp.h:7294
 msgid "Ricoh Aficio MP 7500"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5117
+#: src/xml/xmli18n-tmp.h:7295
 msgid "Ricoh Aficio MP 9000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5118
+#: src/xml/xmli18n-tmp.h:7296
 msgid "Samsung ML-85"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5119
+#: src/xml/xmli18n-tmp.h:7297
 msgid "Samsung ML-1250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5120
+#: src/xml/xmli18n-tmp.h:7298
 msgid "Samsung ML-1450"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5121
+#: src/xml/xmli18n-tmp.h:7299
 msgid "Samsung ML-1450PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5122
+#: src/xml/xmli18n-tmp.h:7300
 msgid "Samsung ML-1650"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5123
+#: src/xml/xmli18n-tmp.h:7301
 msgid "Samsung ML-1651N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5124
+#: src/xml/xmli18n-tmp.h:7302
 msgid "Samsung ML-1750"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5125
+#: src/xml/xmli18n-tmp.h:7303
 msgid "Samsung ML-2150"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5126
+#: src/xml/xmli18n-tmp.h:7304
 msgid "Samsung ML-2150PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5127
+#: src/xml/xmli18n-tmp.h:7305
 msgid "Samsung ML-2151N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5128
+#: src/xml/xmli18n-tmp.h:7306
 msgid "Samsung ML-2151NPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5129
+#: src/xml/xmli18n-tmp.h:7307
 msgid "Samsung ML-2152W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5130
+#: src/xml/xmli18n-tmp.h:7308
 msgid "Samsung ML-2152WPS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5131
+#: src/xml/xmli18n-tmp.h:7309
 msgid "Samsung ML-2250"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5132
+#: src/xml/xmli18n-tmp.h:7310
 msgid "Samsung ML-2550"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5133
+#: src/xml/xmli18n-tmp.h:7311
 msgid "Samsung ML-2551N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5134
+#: src/xml/xmli18n-tmp.h:7312
 msgid "Samsung ML-2552W"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5135
+#: src/xml/xmli18n-tmp.h:7313
 msgid "Samsung ML-4600"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5136
+#: src/xml/xmli18n-tmp.h:7314
 msgid "Samsung ML-5000a"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5137
+#: src/xml/xmli18n-tmp.h:7315
 msgid "Samsung ML-6000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5138
+#: src/xml/xmli18n-tmp.h:7316
 msgid "Samsung ML-6100"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5139
+#: src/xml/xmli18n-tmp.h:7317
 msgid "Samsung ML-7000"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5140
+#: src/xml/xmli18n-tmp.h:7318
 msgid "Samsung ML-7000N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5141
+#: src/xml/xmli18n-tmp.h:7319
 msgid "Samsung ML-7000P"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5142
+#: src/xml/xmli18n-tmp.h:7320
 msgid "Samsung ML-7050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5143
+#: src/xml/xmli18n-tmp.h:7321
 msgid "Samsung ML-7300"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5144
+#: src/xml/xmli18n-tmp.h:7322
 msgid "Samsung ML-7300N"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5145
+#: src/xml/xmli18n-tmp.h:7323
 msgid "Samsung QL-5100A"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5146
+#: src/xml/xmli18n-tmp.h:7324
 msgid "Samsung QL-6050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5147
+#: src/xml/xmli18n-tmp.h:7325
 msgid "Savin 2522"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5148
+#: src/xml/xmli18n-tmp.h:7326
 msgid "Savin 2527"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5149
+#: src/xml/xmli18n-tmp.h:7327
 msgid "Savin 2532"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5150
-msgid "Savin 2535"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5151
-msgid "Savin 2235"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5152
-msgid "Savin 2545"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7328
+#, fuzzy
+msgid "Savin 2535/2235"
+msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:5153
-msgid "Savin 2245"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7329
+#, fuzzy
+msgid "Savin 2545/2245"
+msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:5154
+#: src/xml/xmli18n-tmp.h:7330
 #, fuzzy
 msgid "Savin 2560"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:5155
+#: src/xml/xmli18n-tmp.h:7331
 msgid "Savin 2575"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5156
+#: src/xml/xmli18n-tmp.h:7332
 msgid "Savin 3515"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5157
+#: src/xml/xmli18n-tmp.h:7333
 msgid "Savin 40105"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5158
+#: src/xml/xmli18n-tmp.h:7334
 msgid "Savin 4015"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5159
+#: src/xml/xmli18n-tmp.h:7335
 msgid "Savin 4018"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5160
+#: src/xml/xmli18n-tmp.h:7336
 msgid "Savin 4018d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5161
+#: src/xml/xmli18n-tmp.h:7337
 msgid "Savin 4022"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5162
+#: src/xml/xmli18n-tmp.h:7338
 msgid "Savin 4027"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5163
-msgid "Savin 4035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5164
-msgid "Savin 4135g"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5165
-msgid "Savin 4035e"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5166
-msgid "Savin 4135eG"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5167
-msgid "Savin 4045"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7339
+#, fuzzy
+msgid "Savin 4035/4135g"
+msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:5168
-msgid "Savin 4145g"
+#: src/xml/xmli18n-tmp.h:7340
+msgid "Savin 4035e/4135eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5169
-msgid "Savin 4045e"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7341
+#, fuzzy
+msgid "Savin 4045/4145g"
+msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:5170
-msgid "Savin 4145eG"
+#: src/xml/xmli18n-tmp.h:7342
+msgid "Savin 4045e/4145eG"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5171
+#: src/xml/xmli18n-tmp.h:7343
 msgid "Savin 4051"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5172
+#: src/xml/xmli18n-tmp.h:7344
 #, fuzzy
 msgid "Savin 4060"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:5173
+#: src/xml/xmli18n-tmp.h:7345
 msgid "Savin 4075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5174
+#: src/xml/xmli18n-tmp.h:7346
 #, fuzzy
 msgid "Savin 4090"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:5175
+#: src/xml/xmli18n-tmp.h:7347
 msgid "Savin 7025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5176
+#: src/xml/xmli18n-tmp.h:7348
 msgid "Savin 8016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5177
+#: src/xml/xmli18n-tmp.h:7349
 #, fuzzy
 msgid "Savin 8020"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:5178
+#: src/xml/xmli18n-tmp.h:7350
 msgid "Savin 8020d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5179
+#: src/xml/xmli18n-tmp.h:7351
 msgid "Savin 8025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5180
+#: src/xml/xmli18n-tmp.h:7352
 msgid "Savin 8025e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5181
+#: src/xml/xmli18n-tmp.h:7353
 #, fuzzy
 msgid "Savin 8030"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:5182
+#: src/xml/xmli18n-tmp.h:7354
 msgid "Savin 8030e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5183
-msgid "Savin 8035"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5184
-msgid "Savin 8035g"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7355
+#, fuzzy
+msgid "Savin 8035/8035g"
+msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:5185
+#: src/xml/xmli18n-tmp.h:7356
 msgid "Savin 8035e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5186
-msgid "Savin 8045"
-msgstr ""
-
-#: src/xml/xmli18n-tmp.h:5187
-msgid "Savin 8045g"
-msgstr ""
+#: src/xml/xmli18n-tmp.h:7357
+#, fuzzy
+msgid "Savin 8045/8045g"
+msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:5188
+#: src/xml/xmli18n-tmp.h:7358
 msgid "Savin 8045e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5189
+#: src/xml/xmli18n-tmp.h:7359
 msgid "Savin 8055"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5190
+#: src/xml/xmli18n-tmp.h:7360
 #, fuzzy
 msgid "Savin 8065"
 msgstr "Canon BJC 85"
 
-#: src/xml/xmli18n-tmp.h:5191
+#: src/xml/xmli18n-tmp.h:7361
 msgid "Savin 8075"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5192
+#: src/xml/xmli18n-tmp.h:7362
 #, fuzzy
 msgid "Savin 8090"
 msgstr "Canon S800"
 
-#: src/xml/xmli18n-tmp.h:5193
+#: src/xml/xmli18n-tmp.h:7363
 msgid "Savin 8110"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5194
+#: src/xml/xmli18n-tmp.h:7364
 msgid "Savin 8135"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5195
+#: src/xml/xmli18n-tmp.h:7365
 msgid "Savin 816"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5196
+#: src/xml/xmli18n-tmp.h:7366
 msgid "Savin 9016"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5197
+#: src/xml/xmli18n-tmp.h:7367
 msgid "Savin 9021d"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5198
+#: src/xml/xmli18n-tmp.h:7368
 msgid "Savin 9025"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5199
+#: src/xml/xmli18n-tmp.h:7369
 msgid "Savin 9025b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5200
+#: src/xml/xmli18n-tmp.h:7370
 msgid "Savin 9033"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5201
+#: src/xml/xmli18n-tmp.h:7371
 msgid "Savin 9033b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5202
+#: src/xml/xmli18n-tmp.h:7372
 msgid "Savin 9040"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5203
+#: src/xml/xmli18n-tmp.h:7373
 msgid "Savin 9040b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5204
+#: src/xml/xmli18n-tmp.h:7374
 msgid "Savin 9050"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5205
+#: src/xml/xmli18n-tmp.h:7375
 msgid "Savin 9050b"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5206
+#: src/xml/xmli18n-tmp.h:7376
 msgid "Seiko SpeedJET 200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5207
+#: src/xml/xmli18n-tmp.h:7377
 msgid "Sharp AR-161"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5208
+#: src/xml/xmli18n-tmp.h:7378
 msgid "Sharp AR-M257"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5209
+#: src/xml/xmli18n-tmp.h:7379
 #, fuzzy
 msgid "Sony IJP-V100"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:5210
+#: src/xml/xmli18n-tmp.h:7380
 msgid "Star LS-04"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5211
+#: src/xml/xmli18n-tmp.h:7381
 #, fuzzy
 msgid "Star LaserPrinter 8"
 msgstr "設定�表機"
 
-#: src/xml/xmli18n-tmp.h:5212
+#: src/xml/xmli18n-tmp.h:7382
 msgid "Tally MT908"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5213
+#: src/xml/xmli18n-tmp.h:7383
 msgid "Xerox Able 1406"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5214
+#: src/xml/xmli18n-tmp.h:7384
 msgid "Xerox DocuPrint 4508"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5215
+#: src/xml/xmli18n-tmp.h:7385
 msgid "Xerox DocuPrint C20"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5216
+#: src/xml/xmli18n-tmp.h:7386
 msgid "Xerox DocuPrint N4512"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5217
+#: src/xml/xmli18n-tmp.h:7387
 msgid "Xerox DocuPrint N4512PS"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5218
+#: src/xml/xmli18n-tmp.h:7388
 msgid "Xerox DocuPrint P12"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5219
+#: src/xml/xmli18n-tmp.h:7389
 msgid "Xerox DocuPrint P1202"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5220
+#: src/xml/xmli18n-tmp.h:7390
 msgid "Xerox DocuPrint P8e"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5221
+#: src/xml/xmli18n-tmp.h:7391
 msgid "Xerox Document Centre 400"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5222
+#: src/xml/xmli18n-tmp.h:7392
 msgid "Xerox WorkCentre M118"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5223
+#: src/xml/xmli18n-tmp.h:7393
 msgid "Compaq IJ1200"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5224
+#: src/xml/xmli18n-tmp.h:7394
 #, fuzzy
 msgid "Lexmark X73"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:5225
+#: src/xml/xmli18n-tmp.h:7395
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/xml/xmli18n-tmp.h:5226
+#: src/xml/xmli18n-tmp.h:7396
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/xml/xmli18n-tmp.h:5227
+#: src/xml/xmli18n-tmp.h:7397
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/xml/xmli18n-tmp.h:5228
+#: src/xml/xmli18n-tmp.h:7398
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/xml/xmli18n-tmp.h:5229
+#: src/xml/xmli18n-tmp.h:7399
 #, fuzzy
 msgid "Olympus P-10"
 msgstr "Olympus P10"
 
-#: src/xml/xmli18n-tmp.h:5230
+#: src/xml/xmli18n-tmp.h:7400
 #, fuzzy
 msgid "Olympus P-11"
 msgstr "Olympus P10"
 
-#: src/xml/xmli18n-tmp.h:5231
+#: src/xml/xmli18n-tmp.h:7401
 #, fuzzy
 msgid "Olympus P-200"
 msgstr "Olympus P200"
 
-#: src/xml/xmli18n-tmp.h:5232
+#: src/xml/xmli18n-tmp.h:7402
 #, fuzzy
 msgid "Olympus P-300"
 msgstr "Olympus P300"
 
-#: src/xml/xmli18n-tmp.h:5233
+#: src/xml/xmli18n-tmp.h:7403
 #, fuzzy
 msgid "Olympus P-300E"
 msgstr "Olympus P300"
 
-#: src/xml/xmli18n-tmp.h:5234
+#: src/xml/xmli18n-tmp.h:7404
 #, fuzzy
 msgid "Olympus P-300U"
 msgstr "Olympus P300"
 
-#: src/xml/xmli18n-tmp.h:5235
+#: src/xml/xmli18n-tmp.h:7405
 #, fuzzy
 msgid "Olympus P-330E"
 msgstr "Olympus P300"
 
-#: src/xml/xmli18n-tmp.h:5236
+#: src/xml/xmli18n-tmp.h:7406
 #, fuzzy
 msgid "Olympus P-330NE"
 msgstr "Olympus P300"
 
-#: src/xml/xmli18n-tmp.h:5237
+#: src/xml/xmli18n-tmp.h:7407
 #, fuzzy
 msgid "Olympus P-400"
 msgstr "Olympus P400"
 
-#: src/xml/xmli18n-tmp.h:5238
+#: src/xml/xmli18n-tmp.h:7408
 #, fuzzy
 msgid "Olympus P-440"
 msgstr "Olympus P440"
 
-#: src/xml/xmli18n-tmp.h:5239
+#: src/xml/xmli18n-tmp.h:7409
 #, fuzzy
 msgid "Olympus P-S100"
 msgstr "Olympus P10"
 
-#: src/xml/xmli18n-tmp.h:5240
+#: src/xml/xmli18n-tmp.h:7410
 #, fuzzy
 msgid "Canon CP-10"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:5241
+#: src/xml/xmli18n-tmp.h:7411
 #, fuzzy
 msgid "Canon CP-100"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:5242
+#: src/xml/xmli18n-tmp.h:7412
 #, fuzzy
 msgid "Canon CP-200"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:5243
+#: src/xml/xmli18n-tmp.h:7413
 #, fuzzy
 msgid "Canon CP-220"
 msgstr "Canon CP220"
 
-#: src/xml/xmli18n-tmp.h:5244
+#: src/xml/xmli18n-tmp.h:7414
 #, fuzzy
 msgid "Canon CP-300"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:5245
+#: src/xml/xmli18n-tmp.h:7415
 #, fuzzy
 msgid "Canon CP-330"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:5246
+#: src/xml/xmli18n-tmp.h:7416
 #, fuzzy
 msgid "Canon SELPHY-CP-400"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:5247
+#: src/xml/xmli18n-tmp.h:7417
 #, fuzzy
 msgid "Canon SELPHY-CP-500"
 msgstr "Canon S4500"
 
-#: src/xml/xmli18n-tmp.h:5248
+#: src/xml/xmli18n-tmp.h:7418
 #, fuzzy
 msgid "Canon SELPHY-CP-510"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:5249
+#: src/xml/xmli18n-tmp.h:7419
+#, fuzzy
+msgid "Canon SELPHY-CP-520"
+msgstr "Canon S4500"
+
+#: src/xml/xmli18n-tmp.h:7420
 #, fuzzy
 msgid "Canon SELPHY-CP-600"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:5250
+#: src/xml/xmli18n-tmp.h:7421
 #, fuzzy
 msgid "Canon SELPHY-CP-710"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:5251
+#: src/xml/xmli18n-tmp.h:7422
 #, fuzzy
 msgid "Canon SELPHY-CP-720"
 msgstr "Canon CP220"
 
-#: src/xml/xmli18n-tmp.h:5252
+#: src/xml/xmli18n-tmp.h:7423
 #, fuzzy
 msgid "Canon SELPHY-CP-730"
 msgstr "Canon CP100"
 
-#: src/xml/xmli18n-tmp.h:5253
+#: src/xml/xmli18n-tmp.h:7424
 #, fuzzy
 msgid "Canon SELPHY-CP-740"
 msgstr "Canon S400"
 
-#: src/xml/xmli18n-tmp.h:5254
+#: src/xml/xmli18n-tmp.h:7425
 #, fuzzy
 msgid "Canon SELPHY-CP-750"
 msgstr "Canon S450"
 
-#: src/xml/xmli18n-tmp.h:5255
+#: src/xml/xmli18n-tmp.h:7426
 msgid "Canon SELPHY ES1"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5256
+#: src/xml/xmli18n-tmp.h:7427
 msgid "Canon SELPHY ES2"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5257
+#: src/xml/xmli18n-tmp.h:7428
 #, fuzzy
 msgid "Canon SELPHY ES20"
 msgstr "Canon CP220"
 
-#: src/xml/xmli18n-tmp.h:5258
+#: src/xml/xmli18n-tmp.h:7429
 msgid "Sony DPP-EX5"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5259
+#: src/xml/xmli18n-tmp.h:7430
 msgid "Sony DPP-EX7"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5260
+#: src/xml/xmli18n-tmp.h:7431
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:5261
+#: src/xml/xmli18n-tmp.h:7432
 #, fuzzy
 msgid "Sony UP-DR100"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:5262
+#: src/xml/xmli18n-tmp.h:7433
 #, fuzzy
 msgid "Sony UP-DR150"
 msgstr "Sony UP-DP10"
 
-#: src/xml/xmli18n-tmp.h:5263
+#: src/xml/xmli18n-tmp.h:7434
 #, fuzzy
 msgid "Fujifilm Printpix-CX-400"
 msgstr "Fujifilm Printpix CX-400"
 
-#: src/xml/xmli18n-tmp.h:5264
+#: src/xml/xmli18n-tmp.h:7435
 #, fuzzy
 msgid "Fujifilm Printpix-CX-550"
 msgstr "Fujifilm Printpix CX-550"
 
-#: src/xml/xmli18n-tmp.h:5265
+#: src/xml/xmli18n-tmp.h:7436
 #, fuzzy
 msgid "Fujifilm FinePix-NX-500"
 msgstr "Fujifilm Printpix CX-400"
 
-#: src/xml/xmli18n-tmp.h:5266
+#: src/xml/xmli18n-tmp.h:7437
 msgid "Kodak Easyshare-Printer-Dock"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5267
+#: src/xml/xmli18n-tmp.h:7438
 msgid "Shinko CHC-S9045"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5268
+#: src/xml/xmli18n-tmp.h:7439
+msgid "Dai Nippon Printing DS40"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7440
+msgid "Dai Nippon Printing DS80"
+msgstr ""
+
+#: src/xml/xmli18n-tmp.h:7441
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/xml/xmli18n-tmp.h:5269
+#: src/xml/xmli18n-tmp.h:7442
 msgid "RAW DATA 8 bit"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Epson Stylus Offixe TX300F"
+#~ msgstr "EPSON Stylus CX3100"
+
+#, fuzzy
+#~ msgid "Lanier LD1100"
+#~ msgstr "HP LaserJet 4L"
+
+#, fuzzy
 #~ msgid "Three Level Grayscale"
 #~ msgstr "�階"
 
diff --git a/samples/Makefile.in b/samples/Makefile.in
index 3c0fd16..8ba373f 100644
--- a/samples/Makefile.in
+++ b/samples/Makefile.in
@@ -44,11 +44,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -85,10 +88,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -98,16 +97,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -152,6 +150,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -163,6 +162,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -175,8 +175,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -210,8 +214,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -256,6 +259,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -268,6 +272,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index e78bcca..a722bf9 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -45,11 +45,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -77,10 +80,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -90,16 +89,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -144,6 +142,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -155,6 +154,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -167,8 +167,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -202,8 +206,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -248,6 +251,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -260,6 +264,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
diff --git a/scripts/autogen.sh b/scripts/autogen.sh
index f035c46..0b45f0b 100644
--- a/scripts/autogen.sh
+++ b/scripts/autogen.sh
@@ -16,7 +16,7 @@ else
   mkdir m4local
 fi
 
-libtoolv=`libtool --version | head -1 | sed 's,.*[        ]\([0-9][0-9]*\.[0-9][0-9]*\(\.[0-9][0-9]*\)*\)[a-z]*[   ].*,\1,'`
+libtoolv=`libtool --version | head -1 | sed 's,.*[      ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*[a-z]*\([   ]?.*\|\)$,\1,'`
 libtool_major=`echo $libtoolv | awk -F. '{print $1}'`
 libtool_minor=`echo $libtoolv | awk -F. '{print $2}'`
 libtool_point=`echo $libtoolv | awk -F. '{print $3}'`
@@ -370,7 +370,7 @@ do
   fi
 done
 
-conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
+conf_flags="--enable-maintainer-mode" #--enable-iso-c
 
 if test x$NOCONFIGURE = x; then
   echo Running $srcdir/configure $conf_flags "$@" ...
diff --git a/scripts/ltmain.sh b/scripts/ltmain.sh
index 27d498a..b36c4ad 100644..100755
--- a/scripts/ltmain.sh
+++ b/scripts/ltmain.sh
@@ -1,52 +1,83 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008  Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
+# Generated from ltmain.m4sh.
+
+# ltmain.sh (GNU libtool) 2.2.6
+# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool 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
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-basename="s,^.*/,,g"
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-# The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
+# Usage: $progname [OPTION]... [MODE-ARG]...
+#
+# Provide generalized library-building support services.
+#
+#     --config             show all configuration variables
+#     --debug              enable verbose shell tracing
+# -n, --dry-run            display commands without modifying any files
+#     --features           display basic configuration information and exit
+#     --mode=MODE          use operation mode MODE
+#     --preserve-dup-deps  don't remove duplicate dependency libraries
+#     --quiet, --silent    don't print informational messages
+#     --tag=TAG            use configuration variables from tag TAG
+# -v, --verbose            print informational messages (default)
+#     --version            print version information
+# -h, --help               print short or long help message
+#
+# MODE must be one of the following:
+#
+#       clean              remove files from the build directory
+#       compile            compile a source file into a libtool object
+#       execute            automatically set library path, then run a program
+#       finish             complete the installation of libtool libraries
+#       install            install libraries or executables
+#       link               create a library or an executable
+#       uninstall          remove libraries from an installed directory
+#
+# MODE-ARGS vary depending on the MODE.
+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
+#
+# When reporting a bug, please describe a test case to reproduce it and
+# include the following information:
+#
+#       host-triplet:	$host
+#       shell:		$SHELL
+#       compiler:		$LTCC
+#       compiler flags:		$LTCFLAGS
+#       linker:		$LD (gnu? $with_gnu_ld)
+#       $progname:		(GNU libtool) 2.2.6
+#       automake:		$automake_version
+#       autoconf:		$autoconf_version
+#
+# Report bugs to <bug-libtool@gnu.org>.
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.26
-TIMESTAMP=" (1.1220.2.492 2008/01/30 06:40:56)"
+VERSION=2.2.6
+TIMESTAMP=""
+package_revision=1.3012
 
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
@@ -60,104 +91,261 @@ fi
 BIN_SH=xpg4; export BIN_SH # for Tru64
 DUALCASE=1; export DUALCASE # for MKS sh
 
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  SP2NL='tr \040 \012'
-  NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  SP2NL='tr \100 \n'
-  NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-# NLS nuisances.
+# NLS nuisances: We save the old values to restore during execute mode.
 # Only set LANG and LC_ALL to C if already set.
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-lt_env=
+lt_user_locale=
+lt_safe_locale=
 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
 do
   eval "if test \"\${$lt_var+set}\" = set; then
-	  save_$lt_var=\$$lt_var
-	  lt_env=\"$lt_var=\$$lt_var \$lt_env\"
-	  $lt_var=C
+          save_$lt_var=\$$lt_var
+          $lt_var=C
 	  export $lt_var
+	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
+	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
 	fi"
 done
 
-if test -n "$lt_env"; then
-  lt_env="env $lt_env"
-fi
+$lt_unset CDPATH
+
+
+
+
+
+: ${CP="cp -f"}
+: ${ECHO="echo"}
+: ${EGREP="/usr/bin/grep -E"}
+: ${FGREP="/usr/bin/grep -F"}
+: ${GREP="/usr/bin/grep"}
+: ${LN_S="ln -s"}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SED="/opt/local/bin/gsed"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+: ${Xsed="$SED -e 1s/^X//"}
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
+
+exit_status=$EXIT_SUCCESS
 
 # Make sure IFS has a sensible default
 lt_nl='
 '
 IFS=" 	$lt_nl"
 
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$modename: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit $EXIT_FAILURE
-fi
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,"
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+  # Extract subdirectory from the argument.
+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+  if test "X$func_dirname_result" = "X${1}"; then
+    func_dirname_result="${3}"
+  else
+    func_dirname_result="$func_dirname_result${2}"
+  fi
+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+}
 
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-duplicate_deps=no
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
+# Generated shell functions inserted here.
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+# The name of this program:
+# In the unlikely event $progname began with a '-', it would play havoc with
+# func_echo (imagine progname=-n), so we prepend ./ in that case:
+func_dirname_and_basename "$progpath"
+progname=$func_basename_result
+case $progname in
+  -*) progname=./$progname ;;
+esac
+
+# Make sure we have an absolute path for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *[\\/]*)
+     progdir=$func_dirname_result
+     progdir=`cd "$progdir" && pwd`
+     progpath="$progdir/$progname"
+     ;;
+  *)
+     save_IFS="$IFS"
+     IFS=:
+     for progdir in $PATH; do
+       IFS="$save_IFS"
+       test -x "$progdir/$progname" && break
+     done
+     IFS="$save_IFS"
+     test -n "$progdir" || progdir=`pwd`
+     progpath="$progdir/$progname"
+     ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Re-`\' parameter expansions in output of double_quote_subst that were
+# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
+# in input to double_quote_subst, that '$' was protected from expansion.
+# Since each input `\' is now two `\'s, look for any number of runs of
+# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
+bs='\\'
+bs2='\\\\'
+bs4='\\\\\\\\'
+dollar='\$'
+sed_double_backslash="\
+  s/$bs4/&\\
+/g
+  s/^$bs2$dollar/$bs&/
+  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
+  s/\n//g"
+
+# Standard options:
+opt_dry_run=false
+opt_help=false
+opt_quiet=false
+opt_verbose=false
+opt_warning=:
+
+# func_echo arg...
+# Echo program name prefixed message, along with the current mode
+# name if it has been set yet.
+func_echo ()
+{
+    $ECHO "$progname${mode+: }$mode: $*"
+}
+
+# func_verbose arg...
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+    $opt_verbose && func_echo ${1+"$@"}
+
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
+}
+
+# func_error arg...
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+}
+
+# func_warning arg...
+# Echo program name prefixed warning message to standard error.
+func_warning ()
+{
+    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+
+    # bash bug again:
+    :
+}
+
+# func_fatal_error arg...
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+# func_fatal_help arg...
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    func_error ${1+"$@"}
+    func_fatal_error "$help"
+}
+help="Try \`$progname --help' for more information."  ## default
+
+
+# func_grep expression filename
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+    $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_mkdir_p directory-path
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+    my_directory_path="$1"
+    my_dir_list=
+
+    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+
+      # Protect directory names starting with `-'
+      case $my_directory_path in
+        -*) my_directory_path="./$my_directory_path" ;;
+      esac
+
+      # While some portion of DIR does not yet exist...
+      while test ! -d "$my_directory_path"; do
+        # ...make a list in topmost first order.  Use a colon delimited
+	# list incase some portion of path contains whitespace.
+        my_dir_list="$my_directory_path:$my_dir_list"
+
+        # If the last portion added has no slash in it, the list is done
+        case $my_directory_path in */*) ;; *) break ;; esac
+
+        # ...otherwise throw away the child directory and loop
+        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+      done
+      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+
+      save_mkdir_p_IFS="$IFS"; IFS=':'
+      for my_dir in $my_dir_list; do
+	IFS="$save_mkdir_p_IFS"
+        # mkdir can fail with a `File exist' error if two processes
+        # try to create one of the directories concurrently.  Don't
+        # stop in that case!
+        $MKDIR "$my_dir" 2>/dev/null || :
+      done
+      IFS="$save_mkdir_p_IFS"
+
+      # Bail out if we (or some other process) failed to create a directory.
+      test -d "$my_directory_path" || \
+        func_fatal_error "Failed to create \`$1'"
+    fi
+}
 
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
 
 # func_mktempdir [string]
 # Make a temporary directory that won't clash with other running
@@ -167,7 +355,7 @@ func_mktempdir ()
 {
     my_template="${TMPDIR-/tmp}/${1-$progname}"
 
-    if test "$run" = ":"; then
+    if test "$opt_dry_run" = ":"; then
       # Return a directory name, but don't create it in dry-run mode
       my_tmpdir="${my_template}-$$"
     else
@@ -176,486 +364,743 @@ func_mktempdir ()
       my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
 
       if test ! -d "$my_tmpdir"; then
-	# Failing that, at least try and use $RANDOM to avoid a race
-	my_tmpdir="${my_template}-${RANDOM-0}$$"
+        # Failing that, at least try and use $RANDOM to avoid a race
+        my_tmpdir="${my_template}-${RANDOM-0}$$"
 
-	save_mktempdir_umask=`umask`
-	umask 0077
-	$mkdir "$my_tmpdir"
-	umask $save_mktempdir_umask
+        save_mktempdir_umask=`umask`
+        umask 0077
+        $MKDIR "$my_tmpdir"
+        umask $save_mktempdir_umask
       fi
 
       # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || {
-        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
-	exit $EXIT_FAILURE
-      }
+      test -d "$my_tmpdir" || \
+        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
     fi
 
-    $echo "X$my_tmpdir" | $Xsed
+    $ECHO "X$my_tmpdir" | $Xsed
 }
 
 
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid ()
+# func_quote_for_eval arg
+# Aesthetically quote ARG to be evaled later.
+# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
+# is double-quoted, suitable for a subsequent eval, whereas
+# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
+# which are still active within double quotes backslashified.
+func_quote_for_eval ()
 {
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 | \
-	$SED -n -e '1,100{
-		/ I /{
-			s,.*,import,
-			p
-			q
-			}
-		}'`
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
+    case $1 in
+      *[\\\`\"\$]*)
+	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
+      *)
+        func_quote_for_eval_unquoted_result="$1" ;;
+    esac
+
+    case $func_quote_for_eval_unquoted_result in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting, command substitution and and variable
+      # expansion for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+        ;;
+      *)
+        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
     esac
-    ;;
-  esac
-  $echo $win32_libid_type
 }
 
 
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
+# func_quote_for_expand arg
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
 {
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	case $arg in
-	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	CC_quoted="$CC_quoted $arg"
-      done
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
+    case $1 in
+      *[\\\`\"]*)
+	my_arg=`$ECHO "X$1" | $Xsed \
+	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
       *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	    # Double-quote args containing other shell metacharacters.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    CC_quoted="$CC_quoted $arg"
-	  done
-	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit $EXIT_FAILURE
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
+        my_arg="$1" ;;
+    esac
+
+    case $my_arg in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting and command substitution for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        my_arg="\"$my_arg\""
+        ;;
+    esac
+
+    func_quote_for_expand_result="$my_arg"
 }
 
 
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
+# func_show_eval cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
 {
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
 
-    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
-    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
-      exit $EXIT_FAILURE
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$my_cmd"
+      my_status=$?
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
+      fi
     fi
 }
 
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
+
+# func_show_eval_locale cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.  Use the saved locale for evaluation.
+func_show_eval_locale ()
 {
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-    my_status=""
-
-    $show "${rm}r $my_gentop"
-    $run ${rm}r "$my_gentop"
-    $show "$mkdir $my_gentop"
-    $run $mkdir "$my_gentop"
-    my_status=$?
-    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
-      exit $my_status
-    fi
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
 
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-	*" $my_xlib_u "*)
-	  extracted_serial=`expr $extracted_serial + 1`
-	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
-	*) break ;;
-	esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
 
-      $show "${rm}r $my_xdir"
-      $run ${rm}r "$my_xdir"
-      $show "$mkdir $my_xdir"
-      $run $mkdir "$my_xdir"
-      exit_status=$?
-      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
-	exit $exit_status
+    if ${opt_dry_run-false}; then :; else
+      eval "$lt_user_locale
+	    $my_cmd"
+      my_status=$?
+      eval "$lt_safe_locale"
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
       fi
-      case $host in
-      *-darwin*)
-	$show "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	if test -z "$run"; then
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
-	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-	  if test -n "$darwin_arches"; then 
-	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-	      cd "$darwin_curdir"
-	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-	    done # $darwin_arches
-      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-	      lipo -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    ${rm}r unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd "$darwin_orig_dir"
- 	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	fi # $run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-        ;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-    done
-    func_extract_archives_result="$my_oldobjs"
+    fi
 }
-# End of Shell function definitions
-#####################################
 
-# Darwin sucks
-eval std_shrext=\"$shrext_cmds\"
 
-disable_libs=no
 
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
-  arg="$1"
+
+
+# func_version
+# Echo version message to standard output and exit.
+func_version ()
+{
+    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+        s/^# //
+	s/^# *$//
+        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
+        p
+     }' < "$progpath"
+     exit $?
+}
+
+# func_usage
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+    $SED -n '/^# Usage:/,/# -h/ {
+        s/^# //
+	s/^# *$//
+	s/\$progname/'$progname'/
+	p
+    }' < "$progpath"
+    $ECHO
+    $ECHO "run \`$progname --help | more' for full usage"
+    exit $?
+}
+
+# func_help
+# Echo long help message to standard output and exit.
+func_help ()
+{
+    $SED -n '/^# Usage:/,/# Report bugs to/ {
+        s/^# //
+	s/^# *$//
+	s*\$progname*'$progname'*
+	s*\$host*'"$host"'*
+	s*\$SHELL*'"$SHELL"'*
+	s*\$LTCC*'"$LTCC"'*
+	s*\$LTCFLAGS*'"$LTCFLAGS"'*
+	s*\$LD*'"$LD"'*
+	s/\$with_gnu_ld/'"$with_gnu_ld"'/
+	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	p
+     }' < "$progpath"
+    exit $?
+}
+
+# func_missing_arg argname
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+    func_error "missing argument for $1"
+    exit_cmd=exit
+}
+
+exit_cmd=:
+
+
+
+
+
+# Check that we have a working $ECHO.
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
   shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
+  # Yippee, $ECHO works!
+  :
+else
+  # Restart under the correct shell, and then maybe $ECHO will work.
+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+fi
 
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit $EXIT_SUCCESS
+fi
 
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
-      ;;
-    tag)
-      tagname="$arg"
-      preserve_args="${preserve_args}=$arg"
-
-      # Check whether tagname contains only valid characters
-      case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit $EXIT_FAILURE
-	;;
-      esac
+magic="%%%MAGIC variable%%%"
+magic_exe="%%%MAGIC EXE variable%%%"
 
-      case $tagname in
-      CC)
-	# Don't test for the "default" C tag, as we know, it's there, but
-	# not specially marked.
-	;;
-      *)
-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
-	  taglist="$taglist $tagname"
-	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
-	else
-	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
-	fi
-	;;
-      esac
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
+# Global variables.
+# $mode is unset
+nonopt=
+execute_dlfiles=
+preserve_args=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
-    prev=
-    prevopt=
-    continue
-  fi
+opt_dry_run=false
+opt_duplicate_deps=false
+opt_silent=false
+opt_debug=:
 
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+# func_fatal_configuration arg...
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+    func_error ${1+"$@"}
+    func_error "See the $PACKAGE documentation for more information."
+    func_fatal_error "Fatal configuration error."
+}
 
-  --version)
-    echo "\
-$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
 
-Copyright (C) 2008  Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit $?
-    ;;
+# func_config
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+    re_begincf='^# ### BEGIN LIBTOOL'
+    re_endcf='^# ### END LIBTOOL'
+
+    # Default configuration.
+    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
 
-  --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
     # Now print the configurations for the tags.
     for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
     done
-    exit $?
-    ;;
-
-  --debug)
-    $echo "$progname: enabling shell trace mode"
-    set -x
-    preserve_args="$preserve_args $arg"
-    ;;
 
-  --dry-run | -n)
-    run=:
-    ;;
+    exit $?
+}
 
-  --features)
-    $echo "host: $host"
+# func_features
+# Display the features supported by this script.
+func_features ()
+{
+    $ECHO "host: $host"
     if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
+      $ECHO "enable shared libraries"
     else
-      $echo "disable shared libraries"
+      $ECHO "disable shared libraries"
     fi
     if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
+      $ECHO "enable static libraries"
     else
-      $echo "disable static libraries"
+      $ECHO "disable static libraries"
     fi
+
     exit $?
-    ;;
+}
 
-  --finish) mode="finish" ;;
+# func_enable_tag tagname
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+  # Global variable:
+  tagname="$1"
 
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
+  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+  sed_extractcf="/$re_begincf/,/$re_endcf/p"
 
-  --preserve-dup-deps) duplicate_deps="yes" ;;
+  # Validate tagname.
+  case $tagname in
+    *[!-_A-Za-z0-9,/]*)
+      func_fatal_error "invalid tag name: $tagname"
+      ;;
+  esac
 
-  --quiet | --silent)
-    show=:
-    preserve_args="$preserve_args $arg"
-    ;;
+  # Don't test for the "default" C tag, as we know it's
+  # there but not specially marked.
+  case $tagname in
+    CC) ;;
+    *)
+      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	taglist="$taglist $tagname"
+
+	# Evaluate the configuration.  Be careful to quote the path
+	# and the sed script, to avoid splitting on whitespace, but
+	# also don't use non-portable quotes within backquotes within
+	# quotes we have to do it in 2 steps:
+	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	eval "$extractedcf"
+      else
+	func_error "ignoring unknown tag $tagname"
+      fi
+      ;;
+  esac
+}
+
+# Parse options once, thoroughly.  This comes as soon as possible in
+# the script to make things like `libtool --version' happen quickly.
+{
 
-  --tag)
-    prevopt="--tag"
-    prev=tag
-    preserve_args="$preserve_args --tag"
+  # Shorthand for --mode=foo, only valid as the first argument
+  case $1 in
+  clean|clea|cle|cl)
+    shift; set dummy --mode clean ${1+"$@"}; shift
     ;;
-  --tag=*)
-    set tag "$optarg" ${1+"$@"}
-    shift
-    prev=tag
-    preserve_args="$preserve_args --tag"
+  compile|compil|compi|comp|com|co|c)
+    shift; set dummy --mode compile ${1+"$@"}; shift
     ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
+  execute|execut|execu|exec|exe|ex|e)
+    shift; set dummy --mode execute ${1+"$@"}; shift
     ;;
-
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
+  finish|finis|fini|fin|fi|f)
+    shift; set dummy --mode finish ${1+"$@"}; shift
     ;;
-
-  *)
-    nonopt="$arg"
-    break
+  install|instal|insta|inst|ins|in|i)
+    shift; set dummy --mode install ${1+"$@"}; shift
+    ;;
+  link|lin|li|l)
+    shift; set dummy --mode link ${1+"$@"}; shift
+    ;;
+  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+    shift; set dummy --mode uninstall ${1+"$@"}; shift
     ;;
   esac
-done
 
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-fi
+  # Parse non-mode specific arguments:
+  while test "$#" -gt 0; do
+    opt="$1"
+    shift
 
-case $disable_libs in
-no) 
-  ;;
-shared)
-  build_libtool_libs=no
-  build_old_libs=yes
-  ;;
-static)
-  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-  ;;
-esac
+    case $opt in
+      --config)		func_config					;;
 
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
+      --debug)		preserve_args="$preserve_args $opt"
+			func_echo "enabling shell trace mode"
+			opt_debug='set -x'
+			$opt_debug
+			;;
 
-if test -z "$show_help"; then
+      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+			execute_dlfiles="$execute_dlfiles $1"
+			shift
+			;;
 
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
-    case $nonopt in
-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-      mode=link
-      for arg
-      do
-	case $arg in
-	-c)
-	   mode=compile
-	   break
-	   ;;
-	esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
+      --dry-run | -n)	opt_dry_run=:					;;
+      --features)       func_features					;;
+      --finish)		mode="finish"					;;
+
+      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+			case $1 in
+			  # Valid mode arguments:
+			  clean)	;;
+			  compile)	;;
+			  execute)	;;
+			  finish)	;;
+			  install)	;;
+			  link)		;;
+			  relink)	;;
+			  uninstall)	;;
+
+			  # Catch anything else as an error
+			  *) func_error "invalid argument for $opt"
+			     exit_cmd=exit
+			     break
+			     ;;
+		        esac
+
+			mode="$1"
+			shift
+			;;
+
+      --preserve-dup-deps)
+			opt_duplicate_deps=:				;;
+
+      --quiet|--silent)	preserve_args="$preserve_args $opt"
+			opt_silent=:
+			;;
+
+      --verbose| -v)	preserve_args="$preserve_args $opt"
+			opt_silent=false
+			;;
+
+      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+			preserve_args="$preserve_args $opt $1"
+			func_enable_tag "$1"	# tagname is set here
+			shift
+			;;
+
+      # Separate optargs to long options:
+      -dlopen=*|--mode=*|--tag=*)
+			func_opt_split "$opt"
+			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
+			shift
+			;;
+
+      -\?|-h)		func_usage					;;
+      --help)		opt_help=:					;;
+      --version)	func_version					;;
+
+      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
+
+      *)		nonopt="$opt"
+			break
+			;;
+    esac
+  done
+
+
+  case $host in
+    *cygwin* | *mingw* | *pw32* | *cegcc*)
+      # don't eliminate duplications in $postdeps and $predeps
+      opt_duplicate_compiler_generated_deps=:
       ;;
     *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
+      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
+      ;;
+  esac
 
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-	if test -n "$nonopt"; then
-	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-	else
-	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-	fi
+  # Having warned about all mis-specified options, bail out if
+  # anything was wrong.
+  $exit_cmd $EXIT_FAILURE
+}
+
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+  if test "$package_revision" != "$macro_revision"; then
+    if test "$VERSION" != "$macro_version"; then
+      if test -z "$macro_version"; then
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
       fi
-      ;;
-    esac
+    else
+      cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+    fi
+
+    exit $EXIT_MISMATCH
+  fi
+}
+
+
+## ----------- ##
+##    Main.    ##
+## ----------- ##
+
+$opt_help || {
+  # Sanity checks first:
+  func_check_version_match
+
+  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+    func_fatal_configuration "not configured to build any kind of library"
   fi
 
+  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+
+
+  # Darwin sucks
+  eval std_shrext=\"$shrext_cmds\"
+
+
   # Only execute mode is allowed to have -dlopen flags.
   if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
+    func_error "unrecognized option \`-dlopen'"
+    $ECHO "$help" 1>&2
     exit $EXIT_FAILURE
   fi
 
   # Change the help message to a mode-specific one.
   generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
+  help="Try \`$progname --help --mode=$mode' for more information."
+}
+
+
+# func_lalib_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+    test -f "$1" &&
+      $SED -e 4q "$1" 2>/dev/null \
+        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs.  To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway.  Works if `file' does not exist.
+func_lalib_unsafe_p ()
+{
+    lalib_p=no
+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+	for lalib_p_l in 1 2 3 4
+	do
+	    read lalib_p_line
+	    case "$lalib_p_line" in
+		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+	    esac
+	done
+	exec 0<&5 5<&-
+    fi
+    test "$lalib_p" = yes
+}
+
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+    func_lalib_p "$1"
+}
+
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+    func_ltwrapper_exec_suffix=
+    case $1 in
+    *.exe) ;;
+    *) func_ltwrapper_exec_suffix=.exe ;;
+    esac
+    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
+
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+    func_ltwrapper_scriptname_result=""
+    if func_ltwrapper_executable_p "$1"; then
+	func_dirname_and_basename "$1" "" "."
+	func_stripname '' '.exe' "$func_basename_result"
+	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+    fi
+}
+
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+    $opt_debug
+    save_ifs=$IFS; IFS='~'
+    for cmd in $1; do
+      IFS=$save_ifs
+      eval cmd=\"$cmd\"
+      func_show_eval "$cmd" "${2-:}"
+    done
+    IFS=$save_ifs
+}
+
 
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)!  Also, sourcing
+# `FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+    $opt_debug
+    case $1 in
+    */* | *\\*)	. "$1" ;;
+    *)		. "./$1" ;;
+    esac
+}
+
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    $opt_debug
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+        func_quote_for_eval "$arg"
+	CC_quoted="$CC_quoted $func_quote_for_eval_result"
+      done
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	      # Double-quote args containing other shell metacharacters.
+	      func_quote_for_eval "$arg"
+	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
+	    done
+	    case "$@ " in
+	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  func_echo "unable to infer tagged configuration"
+	  func_fatal_error "specify a tag with \`--tag'"
+#	else
+#	  func_verbose "using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+
+
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=${1}
+    if test "$build_libtool_libs" = yes; then
+      write_lobj=\'${2}\'
+    else
+      write_lobj=none
+    fi
+
+    if test "$build_old_libs" = yes; then
+      write_oldobj=\'${3}\'
+    else
+      write_oldobj=none
+    fi
+
+    $opt_dry_run || {
+      cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+      $MV "${write_libobj}T" "${write_libobj}"
+    }
+}
+
+# func_mode_compile arg...
+func_mode_compile ()
+{
+    $opt_debug
     # Get the compilation command and the source file.
     base_compile=
     srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
@@ -664,6 +1109,7 @@ if test -z "$show_help"; then
     arg_mode=normal
     libobj=
     later=
+    pie_flag=
 
     for arg
     do
@@ -684,15 +1130,18 @@ if test -z "$show_help"; then
 	# Accept any command-line options.
 	case $arg in
 	-o)
-	  if test -n "$libobj" ; then
-	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
+	  test -n "$libobj" && \
+	    func_fatal_error "you cannot specify \`-o' more than once"
 	  arg_mode=target
 	  continue
 	  ;;
 
-	-static | -prefer-pic | -prefer-non-pic)
+	-pie | -fpie | -fPIE)
+          pie_flag="$pie_flag $arg"
+	  continue
+	  ;;
+
+	-shared | -static | -prefer-pic | -prefer-non-pic)
 	  later="$later $arg"
 	  continue
 	  ;;
@@ -708,31 +1157,25 @@ if test -z "$show_help"; then
 	  ;;            #  replaced later.  I would guess that would be a bug.
 
 	-Wc,*)
-	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+	  func_stripname '-Wc,' '' "$arg"
+	  args=$func_stripname_result
 	  lastarg=
 	  save_ifs="$IFS"; IFS=','
- 	  for arg in $args; do
+	  for arg in $args; do
 	    IFS="$save_ifs"
-
-	    # Double-quote args containing other shell metacharacters.
-	    # Many Bourne shells cannot handle close brackets correctly
-	    # in scan sets, so we specify it separately.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    lastarg="$lastarg $arg"
+	    func_quote_for_eval "$arg"
+	    lastarg="$lastarg $func_quote_for_eval_result"
 	  done
 	  IFS="$save_ifs"
-	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+	  func_stripname ' ' '' "$lastarg"
+	  lastarg=$func_stripname_result
 
 	  # Add the arguments to base_compile.
 	  base_compile="$base_compile $lastarg"
 	  continue
 	  ;;
 
-	* )
+	*)
 	  # Accept the current argument as the source file.
 	  # The previous "srcfile" becomes the current argument.
 	  #
@@ -744,66 +1187,42 @@ if test -z "$show_help"; then
       esac    #  case $arg_mode
 
       # Aesthetically quote the previous argument.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      case $lastarg in
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, and some SunOS ksh mistreat backslash-escaping
-      # in scan sets (worked around with variable expansion),
-      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
-      # at all, so we specify them separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      base_compile="$base_compile $lastarg"
+      func_quote_for_eval "$lastarg"
+      base_compile="$base_compile $func_quote_for_eval_result"
     done # for arg
 
     case $arg_mode in
     arg)
-      $echo "$modename: you must specify an argument for -Xcompile"
-      exit $EXIT_FAILURE
+      func_fatal_error "you must specify an argument for -Xcompile"
       ;;
     target)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit $EXIT_FAILURE
+      func_fatal_error "you must specify a target with \`-o'"
       ;;
     *)
       # Get the name of the library object.
-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+      test -z "$libobj" && {
+	func_basename "$srcfile"
+	libobj="$func_basename_result"
+      }
       ;;
     esac
 
     # Recognize several different file suffixes.
     # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSifmso]'
     case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.ii) xform=ii ;;
-    *.class) xform=class ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.[fF][09]?) xform=[fF][09]. ;;
-    *.for) xform=for ;;
-    *.java) xform=java ;;
-    *.obj) xform=obj ;;
-    *.sx) xform=sx ;;
+    *.[cCFSifmso] | \
+    *.ada | *.adb | *.ads | *.asm | \
+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
+      func_xform "$libobj"
+      libobj=$func_xform_result
+      ;;
     esac
 
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
     case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
     *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit $EXIT_FAILURE
+      func_fatal_error "cannot determine name of library object from \`$libobj'"
       ;;
     esac
 
@@ -811,7 +1230,15 @@ if test -z "$show_help"; then
 
     for arg in $later; do
       case $arg in
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	continue
+	;;
+
       -static)
+	build_libtool_libs=no
 	build_old_libs=yes
 	continue
 	;;
@@ -828,28 +1255,17 @@ if test -z "$show_help"; then
       esac
     done
 
-    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
-    case $qlibobj in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qlibobj="\"$qlibobj\"" ;;
-    esac
-    test "X$libobj" != "X$qlibobj" \
-	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
-	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$xdir" = "X$obj"; then
-      xdir=
-    else
-      xdir=$xdir/
-    fi
+    func_quote_for_eval "$libobj"
+    test "X$libobj" != "X$func_quote_for_eval_result" \
+      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
+      && func_warning "libobj name \`$libobj' may not contain shell special characters."
+    func_dirname_and_basename "$obj" "/" ""
+    objname="$func_basename_result"
+    xdir="$func_dirname_result"
     lobj=${xdir}$objdir/$objname
 
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
+    test -z "$base_compile" && \
+      func_fatal_help "you must specify a compilation command"
 
     # Delete any leftover library objects.
     if test "$build_old_libs" = yes; then
@@ -858,12 +1274,9 @@ if test -z "$show_help"; then
       removelist="$lobj $libobj ${libobj}T"
     fi
 
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-
     # On Cygwin there's no "real" PIC flag so we must build both object types
     case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
       pic_mode=default
       ;;
     esac
@@ -875,10 +1288,8 @@ if test -z "$show_help"; then
     # Calculate the filename of the output object if compiler does
     # not support -o with -c
     if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
       lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
     else
       output_obj=
       need_locks=no
@@ -888,13 +1299,13 @@ if test -z "$show_help"; then
     # Lock this critical section if it is needed
     # We use this script file to make the link, it avoids creating a new file
     if test "$need_locks" = yes; then
-      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
-	$show "Waiting for $lockfile to be removed"
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
 	sleep 2
       done
     elif test "$need_locks" = warn; then
       if test -f "$lockfile"; then
-	$echo "\
+	$ECHO "\
 *** ERROR, $lockfile exists and contains:
 `cat $lockfile 2>/dev/null`
 
@@ -905,34 +1316,22 @@ repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
-	$run $rm $removelist
+	$opt_dry_run || $RM $removelist
 	exit $EXIT_FAILURE
       fi
-      $echo "$srcfile" > "$lockfile"
+      removelist="$removelist $output_obj"
+      $ECHO "$srcfile" > "$lockfile"
     fi
 
+    $opt_dry_run || $RM $removelist
+    removelist="$removelist $lockfile"
+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
     if test -n "$fix_srcfile_path"; then
       eval srcfile=\"$fix_srcfile_path\"
     fi
-    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
-    case $qsrcfile in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      qsrcfile="\"$qsrcfile\"" ;;
-    esac
-
-    $run $rm "$libobj" "${libobj}T"
-
-    # Create a libtool object file (analogous to a ".la" file),
-    # but don't create it if we're doing a dry run.
-    test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
+    func_quote_for_eval "$srcfile"
+    qsrcfile=$func_quote_for_eval_result
 
     # Only build a PIC object if we are building libtool libraries.
     if test "$build_libtool_libs" = yes; then
@@ -946,32 +1345,19 @@ EOF
 	command="$base_compile $qsrcfile"
       fi
 
-      if test ! -d "${xdir}$objdir"; then
-	$show "$mkdir ${xdir}$objdir"
-	$run $mkdir ${xdir}$objdir
-	exit_status=$?
-	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
-	  exit $exit_status
-	fi
-      fi
+      func_mkdir_p "$xdir$objdir"
 
       if test -z "$output_obj"; then
 	# Place PIC objects in $objdir
 	command="$command -o $lobj"
       fi
 
-      $run $rm "$lobj" "$output_obj"
-
-      $show "$command"
-      if $run eval $lt_env "$command"; then :
-      else
-	test -n "$output_obj" && $run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
+      func_show_eval_locale "$command"	\
+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
 
       if test "$need_locks" = warn &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
+	$ECHO "\
 *** ERROR, $lockfile contains:
 `cat $lockfile 2>/dev/null`
 
@@ -985,45 +1371,27 @@ repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
-	$run $rm $removelist
+	$opt_dry_run || $RM $removelist
 	exit $EXIT_FAILURE
       fi
 
       # Just move the object if needed, then go on to compile the next one
       if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	$show "$mv $output_obj $lobj"
-	if $run $mv $output_obj $lobj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
+	func_show_eval '$MV "$output_obj" "$lobj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
       fi
 
-      # Append the name of the PIC object to the libtool object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
       # Allow error messages only from the first compilation.
       if test "$suppress_opt" = yes; then
-        suppress_output=' >/dev/null 2>&1'
+	suppress_output=' >/dev/null 2>&1'
       fi
-    else
-      # No PIC object so indicate it doesn't exist in the libtool
-      # object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
     fi
 
     # Only build a position-dependent object if we build old libraries.
     if test "$build_old_libs" = yes; then
       if test "$pic_mode" != yes; then
 	# Don't build PIC code
-	command="$base_compile $qsrcfile"
+	command="$base_compile $qsrcfile$pie_flag"
       else
 	command="$base_compile $qsrcfile $pic_flag"
       fi
@@ -1033,17 +1401,12 @@ EOF
 
       # Suppress compiler output if we already did a PIC compilation.
       command="$command$suppress_output"
-      $run $rm "$obj" "$output_obj"
-      $show "$command"
-      if $run eval $lt_env "$command"; then :
-      else
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
+      func_show_eval_locale "$command" \
+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
 
       if test "$need_locks" = warn &&
 	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
+	$ECHO "\
 *** ERROR, $lockfile contains:
 `cat $lockfile 2>/dev/null`
 
@@ -1057,53 +1420,2620 @@ repeat this compilation, it may succeed, by chance, but you had better
 avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
-	$run $rm $removelist
+	$opt_dry_run || $RM $removelist
 	exit $EXIT_FAILURE
       fi
 
       # Just move the object if needed
       if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	$show "$mv $output_obj $obj"
-	if $run $mv $output_obj $obj; then :
+	func_show_eval '$MV "$output_obj" "$obj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+    fi
+
+    $opt_dry_run || {
+      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+
+      # Unlock the critical section if it was locked
+      if test "$need_locks" != no; then
+	removelist=$lockfile
+        $RM "$lockfile"
+      fi
+    }
+
+    exit $EXIT_SUCCESS
+}
+
+$opt_help || {
+test "$mode" = compile && func_mode_compile ${1+"$@"}
+}
+
+func_mode_help ()
+{
+    # We need to display help for each of the modes.
+    case $mode in
+      "")
+        # Generic help is extracted from the usage comments
+        # at the start of this file.
+        func_help
+        ;;
+
+      clean)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      compile)
+      $ECHO \
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -no-suppress      do not suppress compiler output for multiple passes
+  -prefer-pic       try to building PIC objects only
+  -prefer-non-pic   try to building non-PIC objects only
+  -shared           do not build a \`.o' file suitable for static linking
+  -static           only build a \`.o' file suitable for static linking
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+        ;;
+
+      execute)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+        ;;
+
+      finish)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the \`--dry-run' option if you just want to see what would be executed."
+        ;;
+
+      install)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the \`install' or \`cp' program.
+
+The following components of INSTALL-COMMAND are treated specially:
+
+  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+        ;;
+
+      link)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+                    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+                    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -shared           only do dynamic linking of libtool libraries
+  -shrext SUFFIX    override the standard shared library file extension
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+  -weak LIBNAME     declare that the target provides the LIBNAME interface
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+        ;;
+
+      uninstall)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      *)
+        func_fatal_help "invalid operation mode \`$mode'"
+        ;;
+    esac
+
+    $ECHO
+    $ECHO "Try \`$progname --help' for more information about other modes."
+
+    exit $?
+}
+
+  # Now that we've collected a possible --mode arg, show help if necessary
+  $opt_help && func_mode_help
+
+
+# func_mode_execute arg...
+func_mode_execute ()
+{
+    $opt_debug
+    # The first argument is the command name.
+    cmd="$nonopt"
+    test -z "$cmd" && \
+      func_fatal_help "you must specify a COMMAND"
+
+    # Handle -dlopen flags immediately.
+    for file in $execute_dlfiles; do
+      test -f "$file" \
+	|| func_fatal_help "\`$file' is not a file"
+
+      dir=
+      case $file in
+      *.la)
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$lib' is not a valid libtool archive"
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+	func_source "$file"
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && \
+	    func_warning "\`$file' was not linked with \`-export-dynamic'"
+	  continue
+	fi
+
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  dir="$dir/$objdir"
 	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
+	  if test ! -f "$dir/$dlname"; then
+	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	  fi
 	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+	;;
+
+      *)
+	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir="$absdir"
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
       fi
+    done
 
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic="$magic"
 
-EOF
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -*) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if func_ltwrapper_script_p "$file"; then
+	  func_source "$file"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	elif func_ltwrapper_executable_p "$file"; then
+	  func_ltwrapper_scriptname "$file"
+	  func_source "$func_ltwrapper_scriptname_result"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      func_quote_for_eval "$file"
+      args="$args $func_quote_for_eval_result"
+    done
+
+    if test "X$opt_dry_run" = Xfalse; then
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
+
+      # Restore saved environment variables
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+                $lt_var=\$save_$lt_var; export $lt_var
+	      else
+		$lt_unset $lt_var
+	      fi"
+      done
+
+      # Now prepare to actually exec the command.
+      exec_cmd="\$cmd$args"
     else
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	$ECHO "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    fi
+}
 
-EOF
+test "$mode" = execute && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+    $opt_debug
+    libdirs="$nonopt"
+    admincmds=
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for dir
+      do
+	libdirs="$libdirs $dir"
+      done
+
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+'"$cmd"'"'
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+       $cmds"
+	fi
+      done
     fi
 
-    $run $mv "${libobj}T" "${libobj}"
+    # Exit here if they wanted silent mode.
+    $opt_silent && exit $EXIT_SUCCESS
+
+    $ECHO "X----------------------------------------------------------------------" | $Xsed
+    $ECHO "Libraries have been installed in:"
+    for libdir in $libdirs; do
+      $ECHO "   $libdir"
+    done
+    $ECHO
+    $ECHO "If you ever happen to want to link against installed libraries"
+    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
+    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
+    $ECHO "flag during linking and do at least one of the following:"
+    if test -n "$shlibpath_var"; then
+      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+      $ECHO "     during execution"
+    fi
+    if test -n "$runpath_var"; then
+      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
+      $ECHO "     during linking"
+    fi
+    if test -n "$hardcode_libdir_flag_spec"; then
+      libdir=LIBDIR
+      eval flag=\"$hardcode_libdir_flag_spec\"
 
-    # Unlock the critical section if it was locked
-    if test "$need_locks" != no; then
-      $run $rm "$lockfile"
+      $ECHO "   - use the \`$flag' linker flag"
     fi
+    if test -n "$admincmds"; then
+      $ECHO "   - have your system administrator run these commands:$admincmds"
+    fi
+    if test -f /etc/ld.so.conf; then
+      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+    fi
+    $ECHO
 
+    $ECHO "See any operating system documentation about shared libraries for"
+    case $host in
+      solaris2.[6789]|solaris2.1[0-9])
+        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	$ECHO "pages."
+	;;
+      *)
+        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
+        ;;
+    esac
+    $ECHO "X----------------------------------------------------------------------" | $Xsed
     exit $EXIT_SUCCESS
+}
+
+test "$mode" = finish && func_mode_finish ${1+"$@"}
+
+
+# func_mode_install arg...
+func_mode_install ()
+{
+    $opt_debug
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+       # Allow the use of GNU shtool's install command.
+       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
+      # Aesthetically quote it.
+      func_quote_for_eval "$nonopt"
+      install_prog="$func_quote_for_eval_result "
+      arg=$1
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    func_quote_for_eval "$arg"
+    install_prog="$install_prog$func_quote_for_eval_result"
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=no
+    stripme=
+    for arg
+    do
+      if test -n "$dest"; then
+	files="$files $dest"
+	dest=$arg
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=yes ;;
+      -f)
+	case " $install_prog " in
+	*[\\\ /]cp\ *) ;;
+	*) prev=$arg ;;
+	esac
+	;;
+      -g | -m | -o)
+	prev=$arg
+	;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*)
+	;;
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  prev=
+	else
+	  dest=$arg
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      func_quote_for_eval "$arg"
+      install_prog="$install_prog $func_quote_for_eval_result"
+    done
+
+    test -z "$install_prog" && \
+      func_fatal_help "you must specify an install program"
+
+    test -n "$prev" && \
+      func_fatal_help "the \`$prev' option requires an argument"
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	func_fatal_help "no file or destination specified"
+      else
+	func_fatal_help "you must specify a destination"
+      fi
+    fi
+
+    # Strip any trailing slash from the destination.
+    func_stripname '' '/' "$dest"
+    dest=$func_stripname_result
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=yes
+    if test "$isdir" = yes; then
+      destdir="$dest"
+      destname=
+    else
+      func_dirname_and_basename "$dest" "" "."
+      destdir="$func_dirname_result"
+      destname="$func_basename_result"
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files; shift
+      test "$#" -gt 1 && \
+	func_fatal_help "\`$dest' is not a directory"
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  func_fatal_help "\`$destdir' must be an absolute directory name"
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	staticlibs="$staticlibs $file"
+	;;
+
+      *.la)
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$file' is not a valid libtool archive"
+
+	library_names=
+	old_library=
+	relink_command=
+	func_source "$file"
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) current_libdirs="$current_libdirs $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) future_libdirs="$future_libdirs $libdir" ;;
+	  esac
+	fi
+
+	func_dirname "$file" "/" ""
+	dir="$func_dirname_result"
+	dir="$dir$objdir"
+
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  test "$inst_prefix_dir" = "$destdir" && \
+	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
+	  fi
+
+	  func_warning "relinking \`$file'"
+	  func_show_eval "$relink_command" \
+	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+	fi
+
+	# See the names of the shared library.
+	set dummy $library_names; shift
+	if test -n "$1"; then
+	  realname="$1"
+	  shift
+
+	  srcname="$realname"
+	  test -n "$relink_command" && srcname="$realname"T
+
+	  # Install the shared library and build the symlinks.
+	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
+	      'exit $?'
+	  tstripme="$stripme"
+	  case $host_os in
+	  cygwin* | mingw* | pw32* | cegcc*)
+	    case $realname in
+	    *.dll.a)
+	      tstripme=""
+	      ;;
+	    esac
+	    ;;
+	  esac
+	  if test -n "$tstripme" && test -n "$striplib"; then
+	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
+	    for linkname
+	    do
+	      test "$linkname" != "$realname" \
+		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib="$destdir/$realname"
+	  func_execute_cmds "$postinstall_cmds" 'exit $?'
+	fi
+
+	# Install the pseudo-library for information purposes.
+	func_basename "$file"
+	name="$func_basename_result"
+	instname="$dir/$name"i
+	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  func_lo2o "$destfile"
+	  staticdest=$func_lo2o_result
+	  ;;
+	*.$objext)
+	  staticdest="$destfile"
+	  destfile=
+	  ;;
+	*)
+	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	test -n "$destfile" && \
+	  func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+	# Install the old object if enabled.
+	if test "$build_old_libs" = yes; then
+	  # Deduce the name of the old-style object file.
+	  func_lo2o "$file"
+	  staticobj=$func_lo2o_result
+	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
+	fi
+	exit $EXIT_SUCCESS
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# If the file is missing, and there is a .exe on the end, strip it
+	# because it is most likely a libtool script we actually want to
+	# install
+	stripped_ext=""
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      func_stripname '' '.exe' "$file"
+	      file=$func_stripname_result
+	      stripped_ext=".exe"
+	    fi
+	    ;;
+	esac
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin* | *mingw*)
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      wrapper=$func_ltwrapper_scriptname_result
+	    else
+	      func_stripname '' '.exe' "$file"
+	      wrapper=$func_stripname_result
+	    fi
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if func_ltwrapper_script_p "$wrapper"; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  func_source "$wrapper"
+
+	  # Check the variables that should have been set.
+	  test -z "$generated_by_libtool_version" && \
+	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+
+	  finalize=yes
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      func_source "$lib"
+	    fi
+	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      func_warning "\`$lib' has not been installed in \`$libdir'"
+	      finalize=no
+	    fi
+	  done
+
+	  relink_command=
+	  func_source "$wrapper"
+
+	  outputname=
+	  if test "$fast_install" = no && test -n "$relink_command"; then
+	    $opt_dry_run || {
+	      if test "$finalize" = yes; then
+	        tmpdir=`func_mktempdir`
+		func_basename "$file$stripped_ext"
+		file="$func_basename_result"
+	        outputname="$tmpdir/$file"
+	        # Replace the output file specification.
+	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+
+	        $opt_silent || {
+	          func_quote_for_expand "$relink_command"
+		  eval "func_echo $func_quote_for_expand_result"
+	        }
+	        if eval "$relink_command"; then :
+	          else
+		  func_error "error: relink \`$file' with the above command before installing it"
+		  $opt_dry_run || ${RM}r "$tmpdir"
+		  continue
+	        fi
+	        file="$outputname"
+	      else
+	        func_warning "cannot relink \`$file'"
+	      fi
+	    }
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyway
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    func_stripname '' '.exe' "$destfile"
+	    destfile=$func_stripname_result
+	    ;;
+	  esac
+	  ;;
+	esac
+	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+	$opt_dry_run || if test -n "$outputname"; then
+	  ${RM}r "$tmpdir"
+	fi
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      func_basename "$file"
+      name="$func_basename_result"
+
+      # Set up the ranlib parameters.
+      oldlib="$destdir/$name"
+
+      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+      if test -n "$stripme" && test -n "$old_striplib"; then
+	func_show_eval "$old_striplib $oldlib" 'exit $?'
+      fi
+
+      # Do each command in the postinstall commands.
+      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+    done
+
+    test -n "$future_libdirs" && \
+      func_warning "remember to run \`$progname --finish$future_libdirs'"
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      $opt_dry_run && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test "$mode" = install && func_mode_install ${1+"$@"}
+
+
+# func_generate_dlsyms outputname originator pic_p
+# Extract symbols from dlprefiles and create ${outputname}S.o with
+# a dlpreopen symbol table.
+func_generate_dlsyms ()
+{
+    $opt_debug
+    my_outputname="$1"
+    my_originator="$2"
+    my_pic_p="${3-no}"
+    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+    my_dlsyms=
+
+    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+      if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	my_dlsyms="${my_outputname}S.c"
+      else
+	func_error "not configured to extract global symbols from dlpreopened files"
+      fi
+    fi
+
+    if test -n "$my_dlsyms"; then
+      case $my_dlsyms in
+      "") ;;
+      *.c)
+	# Discover the nlist of each of the dlfiles.
+	nlist="$output_objdir/${my_outputname}.nm"
+
+	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+	# Parse the name list into a source file.
+	func_verbose "creating $output_objdir/$my_dlsyms"
+
+	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+/* External symbol declarations for the compiler. */\
+"
+
+	if test "$dlself" = yes; then
+	  func_verbose "generating symbol list for \`$output'"
+
+	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+	  # Add our own program objects to the symbol list.
+	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	  for progfile in $progfiles; do
+	    func_verbose "extracting global C symbols from \`$progfile'"
+	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -n "$exclude_expsyms"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  if test -n "$export_symbols_regex"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  # Prepare the list of exported symbols
+	  if test -z "$export_symbols"; then
+	    export_symbols="$output_objdir/$outputname.exp"
+	    $opt_dry_run || {
+	      $RM $export_symbols
+	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      case $host in
+	      *cygwin* | *mingw* | *cegcc* )
+                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+	        ;;
+	      esac
+	    }
+	  else
+	    $opt_dry_run || {
+	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	      case $host in
+	        *cygwin | *mingw* | *cegcc* )
+	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+	          ;;
+	      esac
+	    }
+	  fi
+	fi
+
+	for dlprefile in $dlprefiles; do
+	  func_verbose "extracting global C symbols from \`$dlprefile'"
+	  func_basename "$dlprefile"
+	  name="$func_basename_result"
+	  $opt_dry_run || {
+	    eval '$ECHO ": $name " >> "$nlist"'
+	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	  }
+	done
+
+	$opt_dry_run || {
+	  # Make sure we have at least an empty file.
+	  test -f "$nlist" || : > "$nlist"
+
+	  if test -n "$exclude_expsyms"; then
+	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	    $MV "$nlist"T "$nlist"
+	  fi
+
+	  # Try sorting and uniquifying the output.
+	  if $GREP -v "^: " < "$nlist" |
+	      if sort -k 3 </dev/null >/dev/null 2>&1; then
+		sort -k 3
+	      else
+		sort +2
+	      fi |
+	      uniq > "$nlist"S; then
+	    :
+	  else
+	    $GREP -v "^: " < "$nlist" > "$nlist"S
+	  fi
+
+	  if test -f "$nlist"S; then
+	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+	  else
+	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	  fi
+
+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+
+/* The mapping between symbol names and symbols.  */
+typedef struct {
+  const char *name;
+  void *address;
+} lt_dlsymlist;
+"
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc* )
+	    $ECHO >> "$output_objdir/$my_dlsyms" "\
+/* DATA imports from DLLs on WIN32 con't be const, because
+   runtime relocations are performed -- see ld's documentation
+   on pseudo-relocs.  */"
+	    lt_dlsym_const= ;;
+	  *osf5*)
+	    echo >> "$output_objdir/$my_dlsyms" "\
+/* This system does not cope well with relocations in const data */"
+	    lt_dlsym_const= ;;
+	  *)
+	    lt_dlsym_const=const ;;
+	  esac
+
+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+extern $lt_dlsym_const lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[];
+$lt_dlsym_const lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[] =
+{\
+  { \"$my_originator\", (void *) 0 },"
+
+	  case $need_lib_prefix in
+	  no)
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  *)
+	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  esac
+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_${my_prefix}_LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	} # !$opt_dry_run
+
+	pic_flag_for_symtable=
+	case "$compile_command " in
+	*" -static "*) ;;
+	*)
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+	  *-*-hpux*)
+	    pic_flag_for_symtable=" $pic_flag"  ;;
+	  *)
+	    if test "X$my_pic_p" != Xno; then
+	      pic_flag_for_symtable=" $pic_flag"
+	    fi
+	    ;;
+	  esac
+	  ;;
+	esac
+	symtab_cflags=
+	for arg in $LTCFLAGS; do
+	  case $arg in
+	  -pie | -fpie | -fPIE) ;;
+	  *) symtab_cflags="$symtab_cflags $arg" ;;
+	  esac
+	done
+
+	# Now compile the dynamic symbol file.
+	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+
+	# Clean up the generated files.
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+
+	# Transform the symbol file into the correct name.
+	symfileobj="$output_objdir/${my_outputname}S.$objext"
+	case $host in
+	*cygwin* | *mingw* | *cegcc* )
+	  if test -f "$output_objdir/$my_outputname.def"; then
+	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	  else
+	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	  fi
+	  ;;
+	*)
+	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	  ;;
+	esac
+	;;
+      *)
+	func_fatal_error "unknown suffix for \`$my_dlsyms'"
+	;;
+      esac
+    else
+      # We keep going just in case the user didn't refer to
+      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+      # really was required.
+
+      # Nullify the symbol file.
+      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+    fi
+}
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+func_win32_libid ()
+{
+  $opt_debug
+  win32_libid_type="unknown"
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+      win32_nmres=`eval $NM -f posix -A $1 |
+	$SED -n -e '
+	    1,100{
+		/ I /{
+		    s,.*,import,
+		    p
+		    q
+		}
+	    }'`
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
     ;;
+  esac
+  $ECHO "$win32_libid_type"
+}
+
 
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    $opt_debug
+    f_ex_an_ar_dir="$1"; shift
+    f_ex_an_ar_oldlib="$1"
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+    fi
+}
+
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    $opt_debug
+    my_gentop="$1"; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=""
+    my_xlib=""
+    my_xabs=""
+    my_xdir=""
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      func_basename "$my_xlib"
+      my_xlib="$func_basename_result"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  func_arith $extracted_serial + 1
+	  extracted_serial=$func_arith_result
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
+
+      func_mkdir_p "$my_xdir"
+
+      case $host in
+      *-darwin*)
+	func_verbose "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	$opt_dry_run || {
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  darwin_base_archive=`basename "$darwin_archive"`
+	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+	  if test -n "$darwin_arches"; then
+	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+	    darwin_arch=
+	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+	    for darwin_arch in  $darwin_arches ; do
+	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	      cd "$darwin_curdir"
+	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	    done # $darwin_arches
+            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+	      $LIPO -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    $RM -rf unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd $darwin_orig_dir
+	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	} # !$opt_dry_run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+	;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+    done
+
+    func_extract_archives_result="$my_oldobjs"
+}
+
+
+
+# func_emit_wrapper_part1 [arg=no]
+#
+# Emit the first part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part1 ()
+{
+	func_emit_wrapper_part1_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_part1_arg1=$1
+	fi
+
+	$ECHO "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='${SED} -e 1s/^X//'
+sed_quote_subst='$sed_quote_subst'
+
+# Be Bourne compatible
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='$macro_version'
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$ECHO are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    ECHO=\"$qecho\"
+    file=\"\$0\"
+    # Make sure echo works.
+    if test \"X\$1\" = X--no-reexec; then
+      # Discard the --no-reexec flag, and continue.
+      shift
+    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
+      # Yippee, \$ECHO works!
+      :
+    else
+      # Restart under the correct shell, and then maybe \$ECHO will work.
+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+    fi
+  fi\
+"
+	$ECHO "\
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+  done
+"
+}
+# end: func_emit_wrapper_part1
+
+# func_emit_wrapper_part2 [arg=no]
+#
+# Emit the second part of a libtool wrapper script on stdout.
+# For more information, see the description associated with
+# func_emit_wrapper(), below.
+func_emit_wrapper_part2 ()
+{
+	func_emit_wrapper_part2_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_part2_arg1=$1
+	fi
+
+	$ECHO "\
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
+  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+    # special case for '.'
+    if test \"\$thisdir\" = \".\"; then
+      thisdir=\`pwd\`
+    fi
+    # remove .libs from thisdir
+    case \"\$thisdir\" in
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    $objdir )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	if test "$fast_install" = yes; then
+	  $ECHO "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" ||
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $MKDIR \"\$progdir\"
+    else
+      $RM \"\$progdir/\$file\"
+    fi"
+
+	  $ECHO "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	$ECHO \"\$relink_command_output\" >&2
+	$RM \"\$progdir/\$file\"
+	exit 1
+      fi
+    fi
+
+    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $RM \"\$progdir/\$program\";
+      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $RM \"\$progdir/\$file\"
+  fi"
+	else
+	  $ECHO "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	$ECHO "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# Export our shlibpath_var if we have one.
+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $ECHO "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	# fixup the dll searchpath if we need to.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	$ECHO "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+"
+	case $host in
+	# Backslashes separate directories on plain windows
+	*-*-mingw | *-*-os2* | *-cegcc*)
+	  $ECHO "\
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+	  ;;
+
+	*)
+	  $ECHO "\
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+	  ;;
+	esac
+	$ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+    fi
+  else
+    # The program doesn't exist.
+    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+}
+# end: func_emit_wrapper_part2
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=no
+	if test -n "$1" ; then
+	  func_emit_wrapper_arg1=$1
+	fi
+
+	# split this up so that func_emit_cwrapperexe_src
+	# can call each part independently.
+	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
+	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
+}
+
+
+# func_to_host_path arg
+#
+# Convert paths to host format when used with build tools.
+# Intended for use with "native" mingw (where libtool itself
+# is running under the msys shell), or in the following cross-
+# build environments:
+#    $build          $host
+#    mingw (msys)    mingw  [e.g. native]
+#    cygwin          mingw
+#    *nix + wine     mingw
+# where wine is equipped with the `winepath' executable.
+# In the native mingw case, the (msys) shell automatically
+# converts paths for any non-msys applications it launches,
+# but that facility isn't available from inside the cwrapper.
+# Similar accommodations are necessary for $host mingw and
+# $build cygwin.  Calling this function does no harm for other
+# $host/$build combinations not listed above.
+#
+# ARG is the path (on $build) that should be converted to
+# the proper representation for $host. The result is stored
+# in $func_to_host_path_result.
+func_to_host_path ()
+{
+  func_to_host_path_result="$1"
+  if test -n "$1" ; then
+    case $host in
+      *mingw* )
+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+        case $build in
+          *mingw* ) # actually, msys
+            # awkward: cmd appends spaces to result
+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          *cygwin* )
+            func_to_host_path_tmp1=`cygpath -w "$1"`
+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          * )
+            # Unfortunately, winepath does not exit with a non-zero
+            # error code, so we are forced to check the contents of
+            # stdout. On the other hand, if the command is not
+            # found, the shell will set an exit code of 127 and print
+            # *an error message* to stdout. So we must check for both
+            # error code of zero AND non-empty stdout, which explains
+            # the odd construction:
+            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
+            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
+              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+                $SED -e "$lt_sed_naive_backslashify"`
+            else
+              # Allow warning below.
+              func_to_host_path_result=""
+            fi
+            ;;
+        esac
+        if test -z "$func_to_host_path_result" ; then
+          func_error "Could not determine host path corresponding to"
+          func_error "  '$1'"
+          func_error "Continuing, but uninstalled executables may not work."
+          # Fallback:
+          func_to_host_path_result="$1"
+        fi
+        ;;
+    esac
+  fi
+}
+# end: func_to_host_path
+
+# func_to_host_pathlist arg
+#
+# Convert pathlists to host format when used with build tools.
+# See func_to_host_path(), above. This function supports the
+# following $build/$host combinations (but does no harm for
+# combinations not listed here):
+#    $build          $host
+#    mingw (msys)    mingw  [e.g. native]
+#    cygwin          mingw
+#    *nix + wine     mingw
+#
+# Path separators are also converted from $build format to
+# $host format. If ARG begins or ends with a path separator
+# character, it is preserved (but converted to $host format)
+# on output.
+#
+# ARG is a pathlist (on $build) that should be converted to
+# the proper representation on $host. The result is stored
+# in $func_to_host_pathlist_result.
+func_to_host_pathlist ()
+{
+  func_to_host_pathlist_result="$1"
+  if test -n "$1" ; then
     case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+      *mingw* )
+        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+        # Remove leading and trailing path separator characters from
+        # ARG. msys behavior is inconsistent here, cygpath turns them
+        # into '.;' and ';.', and winepath ignores them completely.
+        func_to_host_pathlist_tmp2="$1"
+        # Once set for this call, this variable should not be
+        # reassigned. It is used in tha fallback case.
+        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
+          $SED -e 's|^:*||' -e 's|:*$||'`
+        case $build in
+          *mingw* ) # Actually, msys.
+            # Awkward: cmd appends spaces to result.
+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          *cygwin* )
+            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+              $SED -e "$lt_sed_naive_backslashify"`
+            ;;
+          * )
+            # unfortunately, winepath doesn't convert pathlists
+            func_to_host_pathlist_result=""
+            func_to_host_pathlist_oldIFS=$IFS
+            IFS=:
+            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
+              IFS=$func_to_host_pathlist_oldIFS
+              if test -n "$func_to_host_pathlist_f" ; then
+                func_to_host_path "$func_to_host_pathlist_f"
+                if test -n "$func_to_host_path_result" ; then
+                  if test -z "$func_to_host_pathlist_result" ; then
+                    func_to_host_pathlist_result="$func_to_host_path_result"
+                  else
+                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
+                  fi
+                fi
+              fi
+              IFS=:
+            done
+            IFS=$func_to_host_pathlist_oldIFS
+            ;;
+        esac
+        if test -z "$func_to_host_pathlist_result" ; then
+          func_error "Could not determine the host path(s) corresponding to"
+          func_error "  '$1'"
+          func_error "Continuing, but uninstalled executables may not work."
+          # Fallback. This may break if $1 contains DOS-style drive
+          # specifications. The fix is not to complicate the expression
+          # below, but for the user to provide a working wine installation
+          # with winepath so that path translation in the cross-to-mingw
+          # case works properly.
+          lt_replace_pathsep_nix_to_dos="s|:|;|g"
+          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
+            $SED -e "$lt_replace_pathsep_nix_to_dos"`
+        fi
+        # Now, add the leading and trailing path separators back
+        case "$1" in
+          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
+            ;;
+        esac
+        case "$1" in
+          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
+            ;;
+        esac
+        ;;
+    esac
+  fi
+}
+# end: func_to_host_pathlist
+
+# func_emit_cwrapperexe_src
+# emit the source code for a wrapper executable on stdout
+# Must ONLY be called from within func_mode_link because
+# it depends on a number of variable set therein.
+func_emit_cwrapperexe_src ()
+{
+	cat <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+
+   Currently, it simply execs the wrapper *script* "$SHELL $output",
+   but could eventually absorb all of the scripts functionality and
+   exec $objdir/$outputname directly.
+*/
+EOF
+	    cat <<"EOF"
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include <direct.h>
+# include <process.h>
+# include <io.h>
+# define setmode _setmode
+#else
+# include <unistd.h>
+# include <stdint.h>
+# ifdef __CYGWIN__
+#  include <io.h>
+#  define HAVE_SETENV
+#  ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+#  endif
+# endif
+#endif
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef S_IXOTH
+# define S_IXOTH 0
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0
+#endif
+
+#ifdef _MSC_VER
+# define S_IXUSR _S_IEXEC
+# define stat _stat
+# ifndef _INTPTR_T_DEFINED
+#  define intptr_t int
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+  defined (__OS2__)
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#ifdef __CYGWIN__
+# define FOPEN_WB "wb"
+#endif
+
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
+
+#undef LTWRAPPER_DEBUGPRINTF
+#if defined DEBUGWRAPPER
+# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
+static void
+ltwrapper_debugprintf (const char *fmt, ...)
+{
+    va_list args;
+    va_start (args, fmt);
+    (void) vfprintf (stderr, fmt, args);
+    va_end (args);
+}
+#else
+# define LTWRAPPER_DEBUGPRINTF(args)
+#endif
+
+const char *program_name = NULL;
+
+void *xmalloc (size_t num);
+char *xstrdup (const char *string);
+const char *base_name (const char *name);
+char *find_executable (const char *wrapper);
+char *chase_symlinks (const char *pathspec);
+int make_executable (const char *path);
+int check_executable (const char *path);
+char *strendzap (char *str, const char *pat);
+void lt_fatal (const char *message, ...);
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_opt_process_env_set (const char *arg);
+void lt_opt_process_env_prepend (const char *arg);
+void lt_opt_process_env_append (const char *arg);
+int lt_split_name_value (const char *arg, char** name, char** value);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
+
+static const char *script_text_part1 =
+EOF
+
+	    func_emit_wrapper_part1 yes |
+	        $SED -e 's/\([\\"]\)/\\\1/g' \
+	             -e 's/^/  "/' -e 's/$/\\n"/'
+	    echo ";"
+	    cat <<EOF
+
+static const char *script_text_part2 =
+EOF
+	    func_emit_wrapper_part2 yes |
+	        $SED -e 's/\([\\"]\)/\\\1/g' \
+	             -e 's/^/  "/' -e 's/$/\\n"/'
+	    echo ";"
+
+	    cat <<EOF
+const char * MAGIC_EXE = "$magic_exe";
+const char * LIB_PATH_VARNAME = "$shlibpath_var";
+EOF
+
+	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+              func_to_host_pathlist "$temp_rpath"
+	      cat <<EOF
+const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * LIB_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test -n "$dllsearchpath"; then
+              func_to_host_pathlist "$dllsearchpath:"
+	      cat <<EOF
+const char * EXE_PATH_VARNAME = "PATH";
+const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * EXE_PATH_VARNAME = "";
+const char * EXE_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test "$fast_install" = yes; then
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+EOF
+	    else
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+EOF
+	    fi
+
+
+	    cat <<"EOF"
+
+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
+
+static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+
+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
+
+static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
+static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
+  /* argument is putenv-style "foo=bar", value of foo is set to bar */
+
+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
+static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
+  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
+
+static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
+static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
+  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int  newargc;
+  char *tmp_pathspec;
+  char *actual_cwrapper_path;
+  char *actual_cwrapper_name;
+  char *target_name;
+  char *lt_argv_zero;
+  intptr_t rval = 127;
+
+  int i;
+
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
+  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
+
+  /* very simple arg parsing; don't want to rely on getopt */
+  for (i = 1; i < argc; i++)
+    {
+      if (strcmp (argv[i], dumpscript_opt) == 0)
+	{
+EOF
+	    case "$host" in
+	      *mingw* | *cygwin* )
+		# make stdout use "unix" line endings
+		echo "          setmode(1,_O_BINARY);"
+		;;
+	      esac
+
+	    cat <<"EOF"
+	  printf ("%s", script_text_part1);
+	  printf ("%s", script_text_part2);
+	  return 0;
+	}
+    }
+
+  newargz = XMALLOC (char *, argc + 1);
+  tmp_pathspec = find_executable (argv[0]);
+  if (tmp_pathspec == NULL)
+    lt_fatal ("Couldn't find %s", argv[0]);
+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
+			  tmp_pathspec));
+
+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
+			  actual_cwrapper_path));
+  XFREE (tmp_pathspec);
+
+  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+  /* wrapper name transforms */
+  strendzap (actual_cwrapper_name, ".exe");
+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+  XFREE (actual_cwrapper_name);
+  actual_cwrapper_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  /* target_name transforms -- use actual target program name; might have lt- prefix */
+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+  strendzap (target_name, ".exe");
+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+  XFREE (target_name);
+  target_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
+			  target_name));
+EOF
+
+	    cat <<EOF
+  newargz[0] =
+    XMALLOC (char, (strlen (actual_cwrapper_path) +
+		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+  strcpy (newargz[0], actual_cwrapper_path);
+  strcat (newargz[0], "$objdir");
+  strcat (newargz[0], "/");
+EOF
+
+	    cat <<"EOF"
+  /* stop here, and copy so we don't have to do this twice */
+  tmp_pathspec = xstrdup (newargz[0]);
+
+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+  strcat (newargz[0], actual_cwrapper_name);
+
+  /* DO want the lt- prefix here if it exists, so use target_name */
+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+  XFREE (tmp_pathspec);
+  tmp_pathspec = NULL;
+EOF
+
+	    case $host_os in
+	      mingw*)
+	    cat <<"EOF"
+  {
+    char* p;
+    while ((p = strchr (newargz[0], '\\')) != NULL)
+      {
+	*p = '/';
+      }
+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+      {
+	*p = '/';
+      }
+  }
+EOF
+	    ;;
+	    esac
+
+	    cat <<"EOF"
+  XFREE (target_name);
+  XFREE (actual_cwrapper_path);
+  XFREE (actual_cwrapper_name);
+
+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+
+  newargc=0;
+  for (i = 1; i < argc; i++)
+    {
+      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
+        {
+          if (argv[i][env_set_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_set_opt_len + 1;
+              lt_opt_process_env_set (p);
+            }
+          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_set (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_set_opt);
+          continue;
+        }
+      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
+        {
+          if (argv[i][env_prepend_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_prepend_opt_len + 1;
+              lt_opt_process_env_prepend (p);
+            }
+          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_prepend_opt);
+          continue;
+        }
+      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
+        {
+          if (argv[i][env_append_opt_len] == '=')
+            {
+              const char *p = argv[i] + env_append_opt_len + 1;
+              lt_opt_process_env_append (p);
+            }
+          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
+            {
+              lt_opt_process_env_append (argv[++i]); /* don't copy */
+            }
+          else
+            lt_fatal ("%s missing required argument", env_append_opt);
+          continue;
+        }
+      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal ("Unrecognized option in %s namespace: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
+
+  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
+  for (i = 0; i < newargc; i++)
+    {
+      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
+    }
+
+EOF
+
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+  /* execv doesn't actually work on mingw as expected on unix */
+  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  if (rval == -1)
+    {
+      /* failed to start process */
+      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
+      return 127;
+    }
+  return rval;
+EOF
+		;;
+	      *)
+		cat <<"EOF"
+  execv (lt_argv_zero, newargz);
+  return rval; /* =127, but avoids unused variable warning */
+EOF
+		;;
+	    esac
+
+	    cat <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+  void *p = (void *) malloc (num);
+  if (!p)
+    lt_fatal ("Memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+			  string) : NULL;
+}
+
+const char *
+base_name (const char *name)
+{
+  const char *base;
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
+
+int
+check_executable (const char *path)
+{
+  struct stat st;
+
+  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0)
+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+    return 1;
+  else
+    return 0;
+}
+
+int
+make_executable (const char *path)
+{
+  int rval = 0;
+  struct stat st;
+
+  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+  if ((!path) || (!*path))
+    return 0;
+
+  if (stat (path, &st) >= 0)
+    {
+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+    }
+  return rval;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise
+   Does not chase symlinks, even on platforms that support them.
+*/
+char *
+find_executable (const char *wrapper)
+{
+  int has_slash = 0;
+  const char *p;
+  const char *p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  int tmp_len;
+  char *concat_name;
+
+  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
+			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
+
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable (concat_name))
+	return concat_name;
+      XFREE (concat_name);
+    }
+  else
+    {
+#endif
+      if (IS_DIR_SEPARATOR (wrapper[0]))
+	{
+	  concat_name = xstrdup (wrapper);
+	  if (check_executable (concat_name))
+	    return concat_name;
+	  XFREE (concat_name);
+	}
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+    }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+      {
+	has_slash = 1;
+	break;
+      }
+  if (!has_slash)
+    {
+      /* no slashes; search PATH */
+      const char *path = getenv ("PATH");
+      if (path != NULL)
+	{
+	  for (p = path; *p; p = p_next)
+	    {
+	      const char *q;
+	      size_t p_len;
+	      for (q = p; *q; q++)
+		if (IS_PATH_SEPARATOR (*q))
+		  break;
+	      p_len = q - p;
+	      p_next = (*q == '\0' ? q : q + 1);
+	      if (p_len == 0)
+		{
+		  /* empty path: current directory */
+		  if (getcwd (tmp, LT_PATHMAX) == NULL)
+		    lt_fatal ("getcwd failed");
+		  tmp_len = strlen (tmp);
+		  concat_name =
+		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, tmp, tmp_len);
+		  concat_name[tmp_len] = '/';
+		  strcpy (concat_name + tmp_len + 1, wrapper);
+		}
+	      else
+		{
+		  concat_name =
+		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, p, p_len);
+		  concat_name[p_len] = '/';
+		  strcpy (concat_name + p_len + 1, wrapper);
+		}
+	      if (check_executable (concat_name))
+		return concat_name;
+	      XFREE (concat_name);
+	    }
+	}
+      /* not found in PATH; assume curdir */
+    }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal ("getcwd failed");
+  tmp_len = strlen (tmp);
+  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable (concat_name))
+    return concat_name;
+  XFREE (concat_name);
+  return NULL;
+}
+
+char *
+chase_symlinks (const char *pathspec)
+{
+#ifndef S_ISLNK
+  return xstrdup (pathspec);
+#else
+  char buf[LT_PATHMAX];
+  struct stat s;
+  char *tmp_pathspec = xstrdup (pathspec);
+  char *p;
+  int has_symlinks = 0;
+  while (strlen (tmp_pathspec) && !has_symlinks)
+    {
+      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
+			      tmp_pathspec));
+      if (lstat (tmp_pathspec, &s) == 0)
+	{
+	  if (S_ISLNK (s.st_mode) != 0)
+	    {
+	      has_symlinks = 1;
+	      break;
+	    }
+
+	  /* search backwards for last DIR_SEPARATOR */
+	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    p--;
+	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    {
+	      /* no more DIR_SEPARATORS left */
+	      break;
+	    }
+	  *p = '\0';
+	}
+      else
+	{
+	  char *errstr = strerror (errno);
+	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
+	}
+    }
+  XFREE (tmp_pathspec);
+
+  if (!has_symlinks)
+    {
+      return xstrdup (pathspec);
+    }
+
+  tmp_pathspec = realpath (pathspec, buf);
+  if (tmp_pathspec == 0)
+    {
+      lt_fatal ("Could not follow symlinks for %s", pathspec);
+    }
+  return xstrdup (tmp_pathspec);
+#endif
+}
+
+char *
+strendzap (char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert (str != NULL);
+  assert (pat != NULL);
+
+  len = strlen (str);
+  patlen = strlen (pat);
+
+  if (patlen <= len)
+    {
+      str += len - patlen;
+      if (strcmp (str, pat) == 0)
+	*str = '\0';
+    }
+  return str;
+}
+
+static void
+lt_error_core (int exit_status, const char *mode,
+	       const char *message, va_list ap)
+{
+  fprintf (stderr, "%s: %s: ", program_name, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+  va_end (ap);
+}
+
+void
+lt_setenv (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
+  {
+#ifdef HAVE_SETENV
+    /* always make a copy, for consistency with !HAVE_SETENV */
+    char *str = xstrdup (value);
+    setenv (name, str, 1);
+#else
+    int len = strlen (name) + 1 + strlen (value) + 1;
+    char *str = XMALLOC (char, len);
+    sprintf (str, "%s=%s", name, value);
+    if (putenv (str) != EXIT_SUCCESS)
+      {
+        XFREE (str);
+      }
+#endif
+  }
+}
+
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+  char *new_value;
+  if (orig_value && *orig_value)
+    {
+      int orig_value_len = strlen (orig_value);
+      int add_len = strlen (add);
+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+      if (to_end)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
+    }
+  else
+    {
+      new_value = xstrdup (add);
+    }
+  return new_value;
+}
+
+int
+lt_split_name_value (const char *arg, char** name, char** value)
+{
+  const char *p;
+  int len;
+  if (!arg || !*arg)
+    return 1;
+
+  p = strchr (arg, (int)'=');
+
+  if (!p)
+    return 1;
+
+  *value = xstrdup (++p);
+
+  len = strlen (arg) - strlen (*value);
+  *name = XMALLOC (char, len);
+  strncpy (*name, arg, len-1);
+  (*name)[len - 1] = '\0';
+
+  return 0;
+}
+
+void
+lt_opt_process_env_set (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
+    }
+
+  lt_setenv (name, value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_opt_process_env_prepend (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+  char *new_value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
+    }
+
+  new_value = lt_extend_str (getenv (name), value, 0);
+  lt_setenv (name, new_value);
+  XFREE (new_value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_opt_process_env_append (const char *arg)
+{
+  char *name = NULL;
+  char *value = NULL;
+  char *new_value = NULL;
+
+  if (lt_split_name_value (arg, &name, &value) != 0)
+    {
+      XFREE (name);
+      XFREE (value);
+      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
+    }
+
+  new_value = lt_extend_str (getenv (name), value, 1);
+  lt_setenv (name, new_value);
+  XFREE (new_value);
+  XFREE (name);
+  XFREE (value);
+}
+
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      /* some systems can't cope with a ':'-terminated path #' */
+      int len = strlen (new_value);
+      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+        {
+          new_value[len-1] = '\0';
+        }
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                          (name ? name : "<NULL>"),
+                          (value ? value : "<NULL>")));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+
+EOF
+}
+# end: func_emit_cwrapperexe_src
+
+# func_mode_link arg...
+func_mode_link ()
+{
+    $opt_debug
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
       # It is impossible to link a dll without this setting, and
       # we shouldn't force the makefile maintainer to figure out
       # which system we are compiling for in order to pass an extra
@@ -1121,10 +4051,10 @@ EOF
       allow_undefined=yes
       ;;
     esac
-    libtool_args="$nonopt"
+    libtool_args=$nonopt
     base_compile="$nonopt $@"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
+    compile_command=$nonopt
+    finalize_command=$nonopt
 
     compile_rpath=
     finalize_rpath=
@@ -1139,6 +4069,7 @@ EOF
     dllsearchpath=
     lib_search_path=`pwd`
     inst_prefix_dir=
+    new_inherited_linker_flags=
 
     avoid_version=no
     dlfiles=
@@ -1154,7 +4085,6 @@ EOF
     no_install=no
     objs=
     non_pic_objects=
-    notinst_path= # paths that contain not-installed libtool libraries
     precious_files_regex=
     prefer_static_libs=no
     preload=no
@@ -1168,19 +4098,25 @@ EOF
     thread_safe=no
     vinfo=
     vinfo_number=no
+    weak_libs=
     single_module="${wl}-single_module"
-
     func_infer_tag $base_compile
 
     # We need to know -static, to get the right output filenames.
     for arg
     do
       case $arg in
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	break
+	;;
       -all-static | -static | -static-libtool-libs)
 	case $arg in
 	-all-static)
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+	    func_warning "complete static linking is impossible in this configuration"
 	  fi
 	  if test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
@@ -1214,20 +4150,16 @@ EOF
     while test "$#" -gt 0; do
       arg="$1"
       shift
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-	;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
+      func_quote_for_eval "$arg"
+      qarg=$func_quote_for_eval_unquoted_result
+      func_append libtool_args " $func_quote_for_eval_result"
 
       # If the previous option needs an argument, assign it.
       if test -n "$prev"; then
 	case $prev in
 	output)
-	  compile_command="$compile_command @OUTPUT@"
-	  finalize_command="$finalize_command @OUTPUT@"
+	  func_append compile_command " @OUTPUT@"
+	  func_append finalize_command " @OUTPUT@"
 	  ;;
 	esac
 
@@ -1235,8 +4167,8 @@ EOF
 	dlfiles|dlprefiles)
 	  if test "$preload" = no; then
 	    # Add the symbol object into the linking commands.
-	    compile_command="$compile_command @SYMFILE@"
-	    finalize_command="$finalize_command @SYMFILE@"
+	    func_append compile_command " @SYMFILE@"
+	    func_append finalize_command " @SYMFILE@"
 	    preload=yes
 	  fi
 	  case $arg in
@@ -1274,10 +4206,8 @@ EOF
 	  ;;
 	expsyms)
 	  export_symbols="$arg"
-	  if test ! -f "$arg"; then
-	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
+	  test -f "$arg" \
+	    || func_fatal_error "symbol file \`$arg' does not exist"
 	  prev=
 	  continue
 	  ;;
@@ -1286,18 +4216,21 @@ EOF
 	  prev=
 	  continue
 	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
+	framework)
+	  case $host in
+	    *-*-darwin*)
+	      case "$deplibs " in
+		*" $qarg.ltframework "*) ;;
+		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+		   ;;
+	      esac
+	      ;;
+	  esac
 	  prev=
 	  continue
 	  ;;
-	release)
-	  release="-$arg"
+	inst_prefix)
+	  inst_prefix_dir="$arg"
 	  prev=
 	  continue
 	  ;;
@@ -1305,39 +4238,30 @@ EOF
 	  if test -f "$arg"; then
 	    save_arg=$arg
 	    moreargs=
-	    for fil in `cat $save_arg`
+	    for fil in `cat "$save_arg"`
 	    do
 #	      moreargs="$moreargs $fil"
 	      arg=$fil
 	      # A libtool-controlled object.
 
 	      # Check to see that this really is a libtool object.
-	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	      if func_lalib_unsafe_p "$arg"; then
 		pic_object=
 		non_pic_object=
 
 		# Read the .lo file
-		# If there is no directory component, then add one.
-		case $arg in
-		*/* | *\\*) . $arg ;;
-		*) . ./$arg ;;
-		esac
+		func_source "$arg"
 
-		if test -z "$pic_object" || \
+		if test -z "$pic_object" ||
 		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none && \
+		   test "$pic_object" = none &&
 		   test "$non_pic_object" = none; then
-		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-		  exit $EXIT_FAILURE
+		  func_fatal_error "cannot find name of object for \`$arg'"
 		fi
 
 		# Extract subdirectory from the argument.
-		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		if test "X$xdir" = "X$arg"; then
-		  xdir=
-		else
-		  xdir="$xdir/"
-		fi
+		func_dirname "$arg" "/" ""
+		xdir="$func_dirname_result"
 
 		if test "$pic_object" != none; then
 		  # Prepend the subdirectory the object is found in.
@@ -1362,7 +4286,7 @@ EOF
 		  fi
 
 		  # A PIC object.
-		  libobjs="$libobjs $pic_object"
+		  func_append libobjs " $pic_object"
 		  arg="$pic_object"
 		fi
 
@@ -1372,7 +4296,7 @@ EOF
 		  non_pic_object="$xdir$non_pic_object"
 
 		  # A standard non-PIC object
-		  non_pic_objects="$non_pic_objects $non_pic_object"
+		  func_append non_pic_objects " $non_pic_object"
 		  if test -z "$pic_object" || test "$pic_object" = none ; then
 		    arg="$non_pic_object"
 		  fi
@@ -1380,46 +4304,48 @@ EOF
 		  # If the PIC object exists, use it instead.
 		  # $xdir was prepended to $pic_object above.
 		  non_pic_object="$pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
+		  func_append non_pic_objects " $non_pic_object"
 		fi
 	      else
 		# Only an error if not doing a dry-run.
-		if test -z "$run"; then
-		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-		  exit $EXIT_FAILURE
-		else
-		  # Dry-run case.
-
+		if $opt_dry_run; then
 		  # Extract subdirectory from the argument.
-		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		  if test "X$xdir" = "X$arg"; then
-		    xdir=
-		  else
-		    xdir="$xdir/"
-		  fi
-
-		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-		  libobjs="$libobjs $pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
+		  func_dirname "$arg" "/" ""
+		  xdir="$func_dirname_result"
+
+		  func_lo2o "$arg"
+		  pic_object=$xdir$objdir/$func_lo2o_result
+		  non_pic_object=$xdir$func_lo2o_result
+		  func_append libobjs " $pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+	        else
+		  func_fatal_error "\`$arg' is not a valid libtool object"
 		fi
 	      fi
 	    done
 	  else
-	    $echo "$modename: link input file \`$save_arg' does not exist"
-	    exit $EXIT_FAILURE
+	    func_fatal_error "link input file \`$arg' does not exist"
 	  fi
 	  arg=$save_arg
 	  prev=
 	  continue
 	  ;;
+	precious_regex)
+	  precious_files_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release="-$arg"
+	  prev=
+	  continue
+	  ;;
 	rpath | xrpath)
 	  # We need an absolute path.
 	  case $arg in
 	  [\\/]* | [A-Za-z]:[\\/]*) ;;
 	  *)
-	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit $EXIT_FAILURE
+	    func_fatal_error "only absolute run-paths are allowed"
 	    ;;
 	  esac
 	  if test "$prev" = rpath; then
@@ -1436,39 +4362,37 @@ EOF
 	  prev=
 	  continue
 	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
+	shrext)
+	  shrext_cmds="$arg"
 	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
 	  continue
 	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
+	weak)
+	  weak_libs="$weak_libs $arg"
 	  prev=
-	  compile_command="$compile_command $wl$qarg"
-	  finalize_command="$finalize_command $wl$qarg"
 	  continue
 	  ;;
 	xcclinker)
 	  linker_flags="$linker_flags $qarg"
 	  compiler_flags="$compiler_flags $qarg"
 	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
 	  continue
 	  ;;
-	shrext)
-  	  shrext_cmds="$arg"
+	xcompiler)
+	  compiler_flags="$compiler_flags $qarg"
 	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
 	  continue
 	  ;;
-	darwin_framework|darwin_framework_skip)
-	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
+	xlinker)
+	  linker_flags="$linker_flags $qarg"
+	  compiler_flags="$compiler_flags $wl$qarg"
 	  prev=
+	  func_append compile_command " $wl$qarg"
+	  func_append finalize_command " $wl$qarg"
 	  continue
 	  ;;
 	*)
@@ -1484,16 +4408,16 @@ EOF
       case $arg in
       -all-static)
 	if test -n "$link_static_flag"; then
-	  compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
+	  # See comment for -static flag below, for more details.
+	  func_append compile_command " $link_static_flag"
+	  func_append finalize_command " $link_static_flag"
 	fi
 	continue
 	;;
 
       -allow-undefined)
 	# FIXME: remove this flag sometime in the future.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-	continue
+	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
 	;;
 
       -avoid-version)
@@ -1518,8 +4442,7 @@ EOF
 
       -export-symbols | -export-symbols-regex)
 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit $EXIT_FAILURE
+	  func_fatal_error "more than one -exported-symbols argument is not allowed"
 	fi
 	if test "X$arg" = "X-export-symbols"; then
 	  prev=expsyms
@@ -1529,15 +4452,8 @@ EOF
 	continue
 	;;
 
-      -framework|-arch|-isysroot)
-	case " $CC " in
-	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
-		prev=darwin_framework_skip ;;
-	  *) compiler_flags="$compiler_flags $arg"
-	     prev=darwin_framework ;;
-	esac
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
+      -framework)
+	prev=framework
 	continue
 	;;
 
@@ -1551,25 +4467,30 @@ EOF
       -L[A-Z][A-Z]*:*)
 	case $with_gcc/$host in
 	no/*-*-irix* | /*-*-irix*)
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
 	  ;;
 	esac
 	continue
 	;;
 
       -L*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
+	func_stripname '-L' '' "$arg"
+	dir=$func_stripname_result
+	if test -z "$dir"; then
+	  if test "$#" -gt 0; then
+	    func_fatal_error "require no space between \`-L' and \`$1'"
+	  else
+	    func_fatal_error "need path for \`-L' option"
+	  fi
+	fi
 	# We need an absolute path.
 	case $dir in
 	[\\/]* | [A-Za-z]:[\\/]*) ;;
 	*)
 	  absdir=`cd "$dir" && pwd`
-	  if test -z "$absdir"; then
-	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    absdir="$dir"
-	    notinst_path="$notinst_path $dir"
-	  fi
+	  test -z "$absdir" && \
+	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
 	  dir="$absdir"
 	  ;;
 	esac
@@ -1581,14 +4502,16 @@ EOF
 	  ;;
 	esac
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$dir:"*) ;;
+	  ::) dllsearchpath=$dir;;
 	  *) dllsearchpath="$dllsearchpath:$dir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
 	  *) dllsearchpath="$dllsearchpath:$testbindir";;
 	  esac
 	  ;;
@@ -1599,7 +4522,7 @@ EOF
       -l*)
 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
 	    # These systems don't actually have a C or math library (as such)
 	    continue
 	    ;;
@@ -1613,7 +4536,7 @@ EOF
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs -framework System"
+	    deplibs="$deplibs System.ltframework"
 	    continue
 	    ;;
 	  *-*-sco3.2v5* | *-*-sco5v6*)
@@ -1637,20 +4560,30 @@ EOF
 	continue
 	;;
 
+      -module)
+	module=yes
+	continue
+	;;
+
       # Tru64 UNIX uses -model [arg] to determine the layout of C++
       # classes, name mangling, and exception handling.
-      -model)
-	compile_command="$compile_command $arg"
+      # Darwin uses the -arch flag to determine output architecture.
+      -model|-arch|-isysroot)
 	compiler_flags="$compiler_flags $arg"
-	finalize_command="$finalize_command $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
 	prev=xcompiler
 	continue
 	;;
 
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	compiler_flags="$compiler_flags $arg"
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	case "$new_inherited_linker_flags " in
+	    *" $arg "*) ;;
+	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
+	esac
 	continue
 	;;
 
@@ -1659,44 +4592,6 @@ EOF
 	continue
 	;;
 
-      -module)
-	module=yes
-	continue
-	;;
-
-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -m* pass through architecture-specific compiler args for GCC
-      # -m*, -t[45]*, -txscale* pass through architecture-specific
-      # compiler args for GCC
-      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-      # -F/path gives path to uninstalled frameworks, gcc on darwin
-      # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-        compile_command="$compile_command $arg"
-        finalize_command="$finalize_command $arg"
-        compiler_flags="$compiler_flags $arg"
-        continue
-        ;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
       -no-fast-install)
 	fast_install=no
 	continue
@@ -1704,11 +4599,11 @@ EOF
 
       -no-install)
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
 	  # The PATH hackery in wrapper scripts is required on Windows
 	  # and Darwin in order for the loader to find any dlls it needs.
-	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+	  func_warning "\`-no-install' is ignored for $host"
+	  func_warning "assuming \`-no-fast-install' instead"
 	  fast_install=no
 	  ;;
 	*) no_install=yes ;;
@@ -1749,13 +4644,13 @@ EOF
 	;;
 
       -R*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
+	func_stripname '-R' '' "$arg"
+	dir=$func_stripname_result
 	# We need an absolute path.
 	case $dir in
 	[\\/]* | [A-Za-z]:[\\/]*) ;;
 	*)
-	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit $EXIT_FAILURE
+	  func_fatal_error "only absolute run-paths are allowed"
 	  ;;
 	esac
 	case "$xrpath " in
@@ -1765,6 +4660,16 @@ EOF
 	continue
 	;;
 
+      -shared)
+	# The effects of -shared are defined in a previous loop.
+	continue
+	;;
+
+      -shrext)
+	prev=shrext
+	continue
+	;;
+
       -static | -static-libtool-libs)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
@@ -1783,47 +4688,49 @@ EOF
 	prev=vinfo
 	continue
 	;;
+
       -version-number)
 	prev=vinfo
 	vinfo_number=yes
 	continue
 	;;
 
+      -weak)
+        prev=weak
+	continue
+	;;
+
       -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
+	func_stripname '-Wc,' '' "$arg"
+	args=$func_stripname_result
 	arg=
 	save_ifs="$IFS"; IFS=','
 	for flag in $args; do
 	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $flag"
+          func_quote_for_eval "$flag"
+	  arg="$arg $wl$func_quote_for_eval_result"
+	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
 	done
 	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
 	;;
 
       -Wl,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+	func_stripname '-Wl,' '' "$arg"
+	args=$func_stripname_result
 	arg=
 	save_ifs="$IFS"; IFS=','
 	for flag in $args; do
 	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $wl$flag"
-	  linker_flags="$linker_flags $flag"
+          func_quote_for_eval "$flag"
+	  arg="$arg $wl$func_quote_for_eval_result"
+	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
+	  linker_flags="$linker_flags $func_quote_for_eval_result"
 	done
 	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
 	;;
 
       -Xcompiler)
@@ -1841,16 +4748,36 @@ EOF
 	continue
 	;;
 
+      # -msg_* for osf cc
+      -msg_*)
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+
+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+      # +DA*, +DD* enable 64-bit mode on the HP compiler
+      # -q* pass through compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* pass through architecture-specific
+      # compiler args for GCC
+      # -F/path gives path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+      # @file GCC response files
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+        func_append compile_command " $arg"
+        func_append finalize_command " $arg"
+        compiler_flags="$compiler_flags $arg"
+        continue
+        ;;
+
       # Some other compiler flag.
       -* | +*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
 	;;
 
       *.$objext)
@@ -1862,32 +4789,23 @@ EOF
 	# A libtool-controlled object.
 
 	# Check to see that this really is a libtool object.
-	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	if func_lalib_unsafe_p "$arg"; then
 	  pic_object=
 	  non_pic_object=
 
 	  # Read the .lo file
-	  # If there is no directory component, then add one.
-	  case $arg in
-	  */* | *\\*) . $arg ;;
-	  *) . ./$arg ;;
-	  esac
+	  func_source "$arg"
 
-	  if test -z "$pic_object" || \
+	  if test -z "$pic_object" ||
 	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none && \
+	     test "$pic_object" = none &&
 	     test "$non_pic_object" = none; then
-	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-	    exit $EXIT_FAILURE
+	    func_fatal_error "cannot find name of object for \`$arg'"
 	  fi
 
 	  # Extract subdirectory from the argument.
-	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	  if test "X$xdir" = "X$arg"; then
-	    xdir=
- 	  else
-	    xdir="$xdir/"
-	  fi
+	  func_dirname "$arg" "/" ""
+	  xdir="$func_dirname_result"
 
 	  if test "$pic_object" != none; then
 	    # Prepend the subdirectory the object is found in.
@@ -1912,7 +4830,7 @@ EOF
 	    fi
 
 	    # A PIC object.
-	    libobjs="$libobjs $pic_object"
+	    func_append libobjs " $pic_object"
 	    arg="$pic_object"
 	  fi
 
@@ -1922,7 +4840,7 @@ EOF
 	    non_pic_object="$xdir$non_pic_object"
 
 	    # A standard non-PIC object
-	    non_pic_objects="$non_pic_objects $non_pic_object"
+	    func_append non_pic_objects " $non_pic_object"
 	    if test -z "$pic_object" || test "$pic_object" = none ; then
 	      arg="$non_pic_object"
 	    fi
@@ -1930,28 +4848,22 @@ EOF
 	    # If the PIC object exists, use it instead.
 	    # $xdir was prepended to $pic_object above.
 	    non_pic_object="$pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
+	    func_append non_pic_objects " $non_pic_object"
 	  fi
 	else
 	  # Only an error if not doing a dry-run.
-	  if test -z "$run"; then
-	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-	    exit $EXIT_FAILURE
-	  else
-	    # Dry-run case.
-
+	  if $opt_dry_run; then
 	    # Extract subdirectory from the argument.
-	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	    if test "X$xdir" = "X$arg"; then
-	      xdir=
-	    else
-	      xdir="$xdir/"
-	    fi
-
-	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-	    libobjs="$libobjs $pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
+	    func_dirname "$arg" "/" ""
+	    xdir="$func_dirname_result"
+
+	    func_lo2o "$arg"
+	    pic_object=$xdir$objdir/$func_lo2o_result
+	    non_pic_object=$xdir$func_lo2o_result
+	    func_append libobjs " $pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  else
+	    func_fatal_error "\`$arg' is not a valid libtool object"
 	  fi
 	fi
 	;;
@@ -1984,70 +4896,51 @@ EOF
       *)
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
 	;;
       esac # arg
 
       # Now actually substitute the argument into the commands.
       if test -n "$arg"; then
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
       fi
     done # argument parsing loop
 
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
+    test -n "$prev" && \
+      func_fatal_help "the \`$prevarg' option requires an argument"
 
     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
       eval arg=\"$export_dynamic_flag_spec\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
+      func_append compile_command " $arg"
+      func_append finalize_command " $arg"
     fi
 
     oldlibs=
     # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+    func_basename "$output"
+    outputname="$func_basename_result"
     libobjs_save="$libobjs"
 
     if test -n "$shlibpath_var"; then
       # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
     else
       shlib_search_path=
     fi
     eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
     eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
 
-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$output_objdir" = "X$output"; then
-      output_objdir="$objdir"
-    else
-      output_objdir="$output_objdir/$objdir"
-    fi
+    func_dirname "$output" "/" ""
+    output_objdir="$func_dirname_result$objdir"
     # Create the object directory.
-    if test ! -d "$output_objdir"; then
-      $show "$mkdir $output_objdir"
-      $run $mkdir $output_objdir
-      exit_status=$?
-      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
-	exit $exit_status
-      fi
-    fi
+    func_mkdir_p "$output_objdir"
 
     # Determine the type of output
     case $output in
     "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
+      func_fatal_help "you must specify an output file"
       ;;
     *.$libext) linkmode=oldlib ;;
     *.lo | *.$objext) linkmode=obj ;;
@@ -2055,22 +4948,13 @@ EOF
     *) linkmode=prog ;; # Anything else should be a program.
     esac
 
-    case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplications in $postdeps and $predeps
-      duplicate_compiler_generated_deps=yes
-      ;;
-    *)
-      duplicate_compiler_generated_deps=$duplicate_deps
-      ;;
-    esac
     specialdeplibs=
 
     libs=
     # Find all interdependent deplibs by searching for libraries
     # that are linked more than once (e.g. -la -lb -la)
     for deplib in $deplibs; do
-      if test "X$duplicate_deps" = "Xyes" ; then
+      if $opt_duplicate_deps ; then
 	case "$libs " in
 	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 	esac
@@ -2085,7 +4969,7 @@ EOF
       # $postdeps and mark them as special (i.e., whose duplicates are
       # not to be eliminated).
       pre_post_deps=
-      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
+      if $opt_duplicate_compiler_generated_deps; then
 	for pre_post_dep in $predeps $postdeps; do
 	  case "$pre_post_deps " in
 	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
@@ -2101,15 +4985,16 @@ EOF
     newlib_search_path=
     need_relink=no # whether we're linking any uninstalled libtool libraries
     notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+
     case $linkmode in
     lib)
-	passes="conv link"
+	passes="conv dlpreopen link"
 	for file in $dlfiles $dlprefiles; do
 	  case $file in
 	  *.la) ;;
 	  *)
-	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit $EXIT_FAILURE
+	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
 	    ;;
 	  esac
 	done
@@ -2125,7 +5010,20 @@ EOF
     *)  passes="conv"
 	;;
     esac
+
     for pass in $passes; do
+      # The preopen pass in lib mode reverses $deplibs; put it back here
+      # so that -L comes before libs that need it for instance...
+      if test "$linkmode,$pass" = "lib,link"; then
+	## FIXME: Find the place where the list is rebuilt in the wrong
+	##        order, and fix it there properly
+        tmp_deplibs=
+	for deplib in $deplibs; do
+	  tmp_deplibs="$deplib $tmp_deplibs"
+	done
+	deplibs="$tmp_deplibs"
+      fi
+
       if test "$linkmode,$pass" = "lib,link" ||
 	 test "$linkmode,$pass" = "prog,scan"; then
 	libs="$deplibs"
@@ -2138,11 +5036,33 @@ EOF
 	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
 	esac
       fi
+      if test "$linkmode,$pass" = "lib,dlpreopen"; then
+	# Collect and forward deplibs of preopened libtool libs
+	for lib in $dlprefiles; do
+	  # Ignore non-libtool-libs
+	  dependency_libs=
+	  case $lib in
+	  *.la)	func_source "$lib" ;;
+	  esac
+
+	  # Collect preopened libtool deplibs, except any this library
+	  # has declared as weak libs
+	  for deplib in $dependency_libs; do
+            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
+	    case " $weak_libs " in
+	    *" $deplib_base "*) ;;
+	    *) deplibs="$deplibs $deplib" ;;
+	    esac
+	  done
+	done
+	libs="$dlprefiles"
+      fi
       if test "$pass" = dlopen; then
 	# Collect dlpreopened libraries
 	save_deplibs="$deplibs"
 	deplibs=
       fi
+
       for deplib in $libs; do
 	lib=
 	found=no
@@ -2153,15 +5073,22 @@ EOF
 	    finalize_deplibs="$deplib $finalize_deplibs"
 	  else
 	    compiler_flags="$compiler_flags $deplib"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		esac
+	    fi
 	  fi
 	  continue
 	  ;;
 	-l*)
 	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+	    func_warning "\`-l' is ignored for archives/objects"
 	    continue
 	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+	  func_stripname '-l' '' "$deplib"
+	  name=$func_stripname_result
 	  if test "$linkmode" = lib; then
 	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
 	  else
@@ -2197,21 +5124,17 @@ EOF
 	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 	      case " $predeps $postdeps " in
 	      *" $deplib "*)
-		if (${SED} -e '2q' $lib |
-                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+		if func_lalib_p "$lib"; then
 		  library_names=
 		  old_library=
-		  case $lib in
-		  */* | *\\*) . $lib ;;
-		  *) . ./$lib ;;
-		  esac
+		  func_source "$lib"
 		  for l in $old_library $library_names; do
 		    ll="$l"
 		  done
 		  if test "X$ll" = "X$old_library" ; then # only static version available
 		    found=no
-		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-		    test "X$ladir" = "X$lib" && ladir="."
+		    func_dirname "$lib" "" "."
+		    ladir="$func_dirname_result"
 		    lib=$ladir/$old_library
 		    if test "$linkmode,$pass" = "prog,link"; then
 		      compile_deplibs="$deplib $compile_deplibs"
@@ -2223,19 +5146,35 @@ EOF
 		    continue
 		  fi
 		fi
-	        ;;
+		;;
 	      *) ;;
 	      esac
 	    fi
 	  fi
 	  ;; # -l
+	*.ltframework)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    deplibs="$deplib $deplibs"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
 	-L*)
 	  case $linkmode in
 	  lib)
 	    deplibs="$deplib $deplibs"
 	    test "$pass" = conv && continue
 	    newdependency_libs="$deplib $newdependency_libs"
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+	    func_stripname '-L' '' "$deplib"
+	    newlib_search_path="$newlib_search_path $func_stripname_result"
 	    ;;
 	  prog)
 	    if test "$pass" = conv; then
@@ -2248,17 +5187,19 @@ EOF
 	      compile_deplibs="$deplib $compile_deplibs"
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    fi
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+	    func_stripname '-L' '' "$deplib"
+	    newlib_search_path="$newlib_search_path $func_stripname_result"
 	    ;;
 	  *)
-	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+	    func_warning "\`-L' is ignored for archives/objects"
 	    ;;
 	  esac # linkmode
 	  continue
 	  ;; # -L
 	-R*)
 	  if test "$pass" = link; then
-	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+	    func_stripname '-R' '' "$deplib"
+	    dir=$func_stripname_result
 	    # Make sure the xrpath contains only unique directories.
 	    case "$xrpath " in
 	    *" $dir "*) ;;
@@ -2276,35 +5217,41 @@ EOF
 	  fi
 	  case $linkmode in
 	  lib)
-	    valid_a_lib=no
-	    case $deplibs_check_method in
-	      match_pattern*)
-		set dummy $deplibs_check_method
-	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-		if eval $echo \"$deplib\" 2>/dev/null \
-		    | $SED 10q \
+	    # Linking convenience modules into shared libraries is allowed,
+	    # but linking other static libraries is non-portable.
+	    case " $dlpreconveniencelibs " in
+	    *" $deplib "*) ;;
+	    *)
+	      valid_a_lib=no
+	      case $deplibs_check_method in
+		match_pattern*)
+		  set dummy $deplibs_check_method; shift
+		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+		  if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
 		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		  valid_a_lib=yes
-		fi
+		    valid_a_lib=yes
+		  fi
 		;;
-	      pass_all)
-		valid_a_lib=yes
+		pass_all)
+		  valid_a_lib=yes
 		;;
-            esac
-	    if test "$valid_a_lib" != yes; then
-	      $echo
-	      $echo "*** Warning: Trying to link with static lib archive $deplib."
-	      $echo "*** I have the capability to make that library automatically link in when"
-	      $echo "*** you link to this library.  But I can only do this if you have a"
-	      $echo "*** shared version of the library, which you do not appear to have"
-	      $echo "*** because the file extensions .$libext of this argument makes me believe"
-	      $echo "*** that it is just a static archive that I should not used here."
-	    else
-	      $echo
-	      $echo "*** Warning: Linking the shared library $output against the"
-	      $echo "*** static library $deplib is not portable!"
-	      deplibs="$deplib $deplibs"
-	    fi
+	      esac
+	      if test "$valid_a_lib" != yes; then
+		$ECHO
+		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
+		$ECHO "*** I have the capability to make that library automatically link in when"
+		$ECHO "*** you link to this library.  But I can only do this if you have a"
+		$ECHO "*** shared version of the library, which you do not appear to have"
+		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
+		$ECHO "*** that it is just a static archive that I should not use here."
+	      else
+		$ECHO
+		$ECHO "*** Warning: Linking the shared library $output against the"
+		$ECHO "*** static library $deplib is not portable!"
+		deplibs="$deplib $deplibs"
+	      fi
+	      ;;
+	    esac
 	    continue
 	    ;;
 	  prog)
@@ -2339,21 +5286,18 @@ EOF
 	  continue
 	  ;;
 	esac # case $deplib
+
 	if test "$found" = yes || test -f "$lib"; then :
 	else
-	  $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
-	  exit $EXIT_FAILURE
+	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
 	fi
 
 	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit $EXIT_FAILURE
-	fi
+	func_lalib_unsafe_p "$lib" \
+	  || func_fatal_error "\`$lib' is not a valid libtool archive"
 
-	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$ladir" = "X$lib" && ladir="."
+	func_dirname "$lib" "" "."
+	ladir="$func_dirname_result"
 
 	dlname=
 	dlopen=
@@ -2361,6 +5305,7 @@ EOF
 	libdir=
 	library_names=
 	old_library=
+	inherited_linker_flags=
 	# If the library was installed with an old release of libtool,
 	# it will not redefine variables installed, or shouldnotlink
 	installed=yes
@@ -2369,11 +5314,19 @@ EOF
 
 
 	# Read the .la file
-	case $lib in
-	*/* | *\\*) . $lib ;;
-	*) . ./$lib ;;
-	esac
-
+	func_source "$lib"
+
+	# Convert "-framework foo" to "foo.ltframework"
+	if test -n "$inherited_linker_flags"; then
+	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+	    case " $new_inherited_linker_flags " in
+	      *" $tmp_inherited_linker_flag "*) ;;
+	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
+	    esac
+	  done
+	fi
+	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
 	if test "$linkmode,$pass" = "lib,link" ||
 	   test "$linkmode,$pass" = "prog,scan" ||
 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
@@ -2386,26 +5339,24 @@ EOF
 	  deplibs="$lib $deplibs"
 	  if test -z "$libdir"; then
 	    if test -z "$old_library"; then
-	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit $EXIT_FAILURE
+	      func_fatal_error "cannot find name of link library for \`$lib'"
 	    fi
 	    # It is a libtool convenience library, so add in its objects.
 	    convenience="$convenience $ladir/$objdir/$old_library"
 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-              if test "X$duplicate_deps" = "Xyes" ; then
-	        case "$tmp_libs " in
-	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	        esac
-              fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit $EXIT_FAILURE
+	    func_fatal_error "\`$lib' is not a convenience library"
 	  fi
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    deplibs="$deplib $deplibs"
+	    if $opt_duplicate_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done
 	  continue
 	fi # $pass = conv
 
@@ -2416,15 +5367,13 @@ EOF
 	  linklib="$l"
 	done
 	if test -z "$linklib"; then
-	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
+	  func_fatal_error "cannot find name of link library for \`$lib'"
 	fi
 
 	# This library was specified with -dlopen.
 	if test "$pass" = dlopen; then
 	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
+	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
 	  fi
 	  if test -z "$dlname" ||
 	     test "$dlopen_support" != yes ||
@@ -2446,18 +5395,19 @@ EOF
 	*)
 	  abs_ladir=`cd "$ladir" && pwd`
 	  if test -z "$abs_ladir"; then
-	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
+	    func_warning "cannot determine absolute directory name of \`$ladir'"
+	    func_warning "passing it literally to the linker, although it might fail"
 	    abs_ladir="$ladir"
 	  fi
 	  ;;
 	esac
-	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+	func_basename "$lib"
+	laname="$func_basename_result"
 
 	# Find the relevant object directory and library name.
 	if test "X$installed" = Xyes; then
 	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
+	    func_warning "library \`$lib' was moved."
 	    dir="$ladir"
 	    absdir="$abs_ladir"
 	    libdir="$abs_ladir"
@@ -2479,18 +5429,22 @@ EOF
 	    notinst_path="$notinst_path $abs_ladir"
 	  fi
 	fi # $installed = yes
-	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+	func_stripname 'lib' '.la' "$laname"
+	name=$func_stripname_result
 
 	# This library was specified with -dlpreopen.
 	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
+	  if test -z "$libdir" && test "$linkmode" = prog; then
+	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
 	  fi
 	  # Prefer using a static library (so that no silly _DYNAMIC symbols
 	  # are required to link).
 	  if test -n "$old_library"; then
 	    newdlprefiles="$newdlprefiles $dir/$old_library"
+	    # Keep a list of preopened convenience libraries to check
+	    # that they are being used correctly in the link pass.
+	    test -z "$libdir" && \
+		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
 	  # Otherwise, use the dlname, so that lt_dlopen finds it.
 	  elif test -n "$dlname"; then
 	    newdlprefiles="$newdlprefiles $dir/$dlname"
@@ -2526,7 +5480,9 @@ EOF
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    case $deplib in
-	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+	    -L*) func_stripname '-L' '' "$deplib"
+	         newlib_search_path="$newlib_search_path $func_stripname_result"
+		 ;;
 	    esac
 	    # Need to link against all dependency_libs?
 	    if test "$linkalldeplibs" = yes; then
@@ -2536,7 +5492,7 @@ EOF
 	      # or/and link against static libraries
 	      newdependency_libs="$deplib $newdependency_libs"
 	    fi
-	    if test "X$duplicate_deps" = "Xyes" ; then
+	    if $opt_duplicate_deps ; then
 	      case "$tmp_libs " in
 	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 	      esac
@@ -2549,15 +5505,14 @@ EOF
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
 	     { { test "$prefer_static_libs" = no ||
-		 test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
 	       test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath " in
-	      *" $dir "*) ;;
-	      *" $absdir "*) ;;
-	      *) temp_rpath="$temp_rpath $absdir" ;;
+	      case "$temp_rpath:" in
+	      *"$absdir:"*) ;;
+	      *) temp_rpath="$temp_rpath$absdir:" ;;
 	      esac
 	    fi
 
@@ -2595,27 +5550,43 @@ EOF
 
 	link_static=no # Whether the deplib will be linked statically
 	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes ; then
+	if test "$use_static_libs" = built && test "$installed" = yes; then
 	  use_static_libs=no
 	fi
 	if test -n "$library_names" &&
 	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
-	  if test "$installed" = no; then
-	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
-	  fi
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc*)
+	      # No point in relinking DLLs because paths are not encoded
+	      notinst_deplibs="$notinst_deplibs $lib"
+	      need_relink=no
+	    ;;
+	  *)
+	    if test "$installed" = no; then
+	      notinst_deplibs="$notinst_deplibs $lib"
+	      need_relink=yes
+	    fi
+	    ;;
+	  esac
 	  # This is a shared library
 
-	  # Warn about portability, can't link against -module's on
-	  # some systems (darwin)
-	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
-	    $echo
+	  # Warn about portability, can't link against -module's on some
+	  # systems (darwin).  Don't bleat about dlopened modules though!
+	  dlopenmodule=""
+	  for dlpremoduletest in $dlprefiles; do
+	    if test "X$dlpremoduletest" = "X$lib"; then
+	      dlopenmodule="$dlpremoduletest"
+	      break
+	    fi
+	  done
+	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+	    $ECHO
 	    if test "$linkmode" = prog; then
-	      $echo "*** Warning: Linking the executable $output against the loadable module"
+	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
 	    else
-	      $echo "*** Warning: Linking the shared library $output against the loadable module"
+	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
 	    fi
-	    $echo "*** $linklib is not portable!"
+	    $ECHO "*** $linklib is not portable!"
 	  fi
 	  if test "$linkmode" = lib &&
 	     test "$hardcode_into_libs" = yes; then
@@ -2645,17 +5616,19 @@ EOF
 	  if test -n "$old_archive_from_expsyms_cmds"; then
 	    # figure out the soname
 	    set dummy $library_names
-	    realname="$2"
-	    shift; shift
-	    libname=`eval \\$echo \"$libname_spec\"`
+	    shift
+	    realname="$1"
+	    shift
+	    libname=`eval "\\$ECHO \"$libname_spec\""`
 	    # use dlname if we got it. it's perfectly good, no?
 	    if test -n "$dlname"; then
 	      soname="$dlname"
 	    elif test -n "$soname_spec"; then
 	      # bleh windows
 	      case $host in
-	      *cygwin* | mingw*)
-		major=`expr $current - $age`
+	      *cygwin* | mingw* | *cegcc*)
+	        func_arith $current - $age
+		major=$func_arith_result
 		versuffix="-$major"
 		;;
 	      esac
@@ -2666,36 +5639,22 @@ EOF
 
 	    # Make a new name for the extract_expsyms_cmds to use
 	    soroot="$soname"
-	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
+	    func_basename "$soroot"
+	    soname="$func_basename_result"
+	    func_stripname 'lib' '.dll' "$soname"
+	    newlib=libimp-$func_stripname_result.a
 
 	    # If the library has no export list, then create one now
 	    if test -f "$output_objdir/$soname-def"; then :
 	    else
-	      $show "extracting exported symbol list from \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$extract_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
+	      func_verbose "extracting exported symbol list from \`$soname'"
+	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
 	    fi
 
 	    # Create $newlib
 	    if test -f "$output_objdir/$newlib"; then :; else
-	      $show "generating import library for \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$old_archive_from_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
+	      func_verbose "generating import library for \`$soname'"
+	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
 	    fi
 	    # make sure the library variables are pointing to the new library
 	    dir=$output_objdir
@@ -2717,17 +5676,21 @@ EOF
 		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
 		    *-*-unixware7*) add_dir="-L$dir" ;;
 		  *-*-darwin* )
-		    # if the lib is a module then we can not link against
-		    # it, someone is ignoring the new warnings I added
+		    # if the lib is a (non-dlopened) module then we can not
+		    # link against it, someone is ignoring the earlier warnings
 		    if /usr/bin/file -L $add 2> /dev/null |
-                      $EGREP ": [^:]* bundle" >/dev/null ; then
-		      $echo "** Warning, lib $linklib is a module, not a shared library"
-		      if test -z "$old_library" ; then
-		        $echo
-		        $echo "** And there doesn't seem to be a static archive available"
-		        $echo "** The link will probably fail, sorry"
-		      else
-		        add="$dir/$old_library"
+			 $GREP ": [^:]* bundle" >/dev/null ; then
+		      if test "X$dlopenmodule" != "X$lib"; then
+			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
+			if test -z "$old_library" ; then
+			  $ECHO
+			  $ECHO "*** And there doesn't seem to be a static archive available"
+			  $ECHO "*** The link will probably fail, sorry"
+			else
+			  add="$dir/$old_library"
+			fi
+		      elif test -n "$old_library"; then
+			add="$dir/$old_library"
 		      fi
 		    fi
 		esac
@@ -2745,7 +5708,8 @@ EOF
 	      fi
 	      ;;
 	    relink)
-	      if test "$hardcode_direct" = yes; then
+	      if test "$hardcode_direct" = yes &&
+	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
 		add_dir="-L$dir"
@@ -2769,8 +5733,7 @@ EOF
 	    esac
 
 	    if test "$lib_linked" != yes; then
-	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit $EXIT_FAILURE
+	      func_fatal_configuration "unsupported hardcode properties"
 	    fi
 
 	    if test -n "$add_shlibpath"; then
@@ -2785,8 +5748,8 @@ EOF
 	    else
 	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
 	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes && \
-		 test "$hardcode_minus_L" != yes && \
+	      if test "$hardcode_direct" != yes &&
+		 test "$hardcode_minus_L" != yes &&
 		 test "$hardcode_shlibpath_var" = yes; then
 		case :$finalize_shlibpath: in
 		*":$libdir:"*) ;;
@@ -2801,7 +5764,8 @@ EOF
 	    add_dir=
 	    add=
 	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes; then
+	    if test "$hardcode_direct" = yes &&
+	       test "$hardcode_direct_absolute" = no; then
 	      add="$libdir/$linklib"
 	    elif test "$hardcode_minus_L" = yes; then
 	      add_dir="-L$libdir"
@@ -2815,9 +5779,9 @@ EOF
 	    elif test "$hardcode_automatic" = yes; then
 	      if test -n "$inst_prefix_dir" &&
 		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-	        add="$inst_prefix_dir$libdir/$linklib"
+		add="$inst_prefix_dir$libdir/$linklib"
 	      else
-	        add="$libdir/$linklib"
+		add="$libdir/$linklib"
 	      fi
 	    else
 	      # We cannot seem to hardcode it, guess we'll fake it.
@@ -2861,21 +5825,21 @@ EOF
 
 	    # Just print a warning and add the library to dependency_libs so
 	    # that the program can be linked against the static library.
-	    $echo
-	    $echo "*** Warning: This system can not link to static lib archive $lib."
-	    $echo "*** I have the capability to make that library automatically link in when"
-	    $echo "*** you link to this library.  But I can only do this if you have a"
-	    $echo "*** shared version of the library, which you do not appear to have."
+	    $ECHO
+	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
+	    $ECHO "*** I have the capability to make that library automatically link in when"
+	    $ECHO "*** you link to this library.  But I can only do this if you have a"
+	    $ECHO "*** shared version of the library, which you do not appear to have."
 	    if test "$module" = yes; then
-	      $echo "*** But as you try to build a module library, libtool will still create "
-	      $echo "*** a static module, that should work as long as the dlopening application"
-	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      $ECHO "*** But as you try to build a module library, libtool will still create "
+	      $ECHO "*** a static module, that should work as long as the dlopening application"
+	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
 	      if test -z "$global_symbol_pipe"; then
-		$echo
-		$echo "*** However, this would only work if libtool was able to extract symbol"
-		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$echo "*** not find such a program.  So, this module is probably useless."
-		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
+		$ECHO
+		$ECHO "*** However, this would only work if libtool was able to extract symbol"
+		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		$ECHO "*** not find such a program.  So, this module is probably useless."
+		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
 	      fi
 	      if test "$build_old_libs" = no; then
 		build_libtool_libs=module
@@ -2899,7 +5863,8 @@ EOF
 	    temp_deplibs=
 	    for libdir in $dependency_libs; do
 	      case $libdir in
-	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
+	      -R*) func_stripname '-R' '' "$libdir"
+	           temp_xrpath=$func_stripname_result
 		   case " $xrpath " in
 		   *" $temp_xrpath "*) ;;
 		   *) xrpath="$xrpath $temp_xrpath";;
@@ -2917,7 +5882,7 @@ EOF
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    newdependency_libs="$deplib $newdependency_libs"
-	    if test "X$duplicate_deps" = "Xyes" ; then
+	    if $opt_duplicate_deps ; then
 	      case "$tmp_libs " in
 	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
 	      esac
@@ -2931,94 +5896,71 @@ EOF
 	      case $deplib in
 	      -L*) path="$deplib" ;;
 	      *.la)
-		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-		test "X$dir" = "X$deplib" && dir="."
+	        func_dirname "$deplib" "" "."
+		dir="$func_dirname_result"
 		# We need an absolute path.
 		case $dir in
 		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
 		*)
 		  absdir=`cd "$dir" && pwd`
 		  if test -z "$absdir"; then
-		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
+		    func_warning "cannot determine absolute directory name of \`$dir'"
 		    absdir="$dir"
 		  fi
 		  ;;
 		esac
-		if grep "^installed=no" $deplib > /dev/null; then
-		  path="$absdir/$objdir"
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  if test -z "$libdir"; then
-		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		    exit $EXIT_FAILURE
-		  fi
-		  if test "$absdir" != "$libdir"; then
-		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  fi
-		  path="$absdir"
-		fi
-		depdepl=
+		if $GREP "^installed=no" $deplib > /dev/null; then
 		case $host in
 		*-*-darwin*)
-		  # we do not want to link against static libs,
-		  # but need to link against shared
+		  depdepl=
 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		  if test -n "$deplibrary_names" ; then
 		    for tmp in $deplibrary_names ; do
 		      depdepl=$tmp
 		    done
-		    if test -f "$deplibdir/$depdepl" ; then
-		      depdepl="$deplibdir/$depdepl"
-	      	    elif test -f "$path/$depdepl" ; then
-		      depdepl="$path/$depdepl"
-		    else
-		      # Can't find it, oh well...
-		      depdepl=
+		    if test -f "$absdir/$objdir/$depdepl" ; then
+		      depdepl="$absdir/$objdir/$depdepl"
+		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+                      if test -z "$darwin_install_name"; then
+                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                      fi
+		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
+		      path=
 		    fi
-		    # do not add paths which are already there
-		    case " $newlib_search_path " in
-		    *" $path "*) ;;
-		    *) newlib_search_path="$newlib_search_path $path";;
-		    esac
 		  fi
-		  path=""
 		  ;;
 		*)
-		  path="-L$path"
-		  ;;
-		esac
-		;;
-	      -l*)
-		case $host in
-		*-*-darwin*)
-		  # Again, we only want to link against shared libraries
-		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-		  for tmp in $newlib_search_path ; do
-		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
-		      eval depdepl="$tmp/lib$tmp_libs.dylib"
-		      break
-		    fi
-		  done
-		  path=""
+		  path="-L$absdir/$objdir"
 		  ;;
-		*) continue ;;
 		esac
+		else
+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  test -z "$libdir" && \
+		    func_fatal_error "\`$deplib' is not a valid libtool archive"
+		  test "$absdir" != "$libdir" && \
+		    func_warning "\`$deplib' seems to be moved"
+
+		  path="-L$absdir"
+		fi
 		;;
-	      *) continue ;;
 	      esac
 	      case " $deplibs " in
 	      *" $path "*) ;;
 	      *) deplibs="$path $deplibs" ;;
 	      esac
-	      case " $deplibs " in
-	      *" $depdepl "*) ;;
-	      *) deplibs="$depdepl $deplibs" ;;
-	      esac
 	    done
 	  fi # link_all_deplibs != no
 	fi # linkmode = lib
       done # for deplib in $libs
+      if test "$pass" = link; then
+	if test "$linkmode" = "prog"; then
+	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+	else
+	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	fi
+      fi
       dependency_libs="$newdependency_libs"
       if test "$pass" = dlpreopen; then
 	# Link the dlpreopened libraries before other libraries
@@ -3117,39 +6059,36 @@ EOF
     done # for pass
     if test "$linkmode" = prog; then
       dlfiles="$newdlfiles"
+    fi
+    if test "$linkmode" = prog || test "$linkmode" = lib; then
       dlprefiles="$newdlprefiles"
     fi
 
     case $linkmode in
     oldlib)
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	func_warning "\`-dlopen' is ignored for archives"
+      fi
+
       case " $deplibs" in
       *\ -l* | *\ -L*)
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
+	func_warning "\`-l' and \`-L' are ignored for archives" ;;
       esac
 
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-      fi
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for archives"
 
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-      fi
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for archives"
 
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
-      fi
+      test -n "$vinfo" && \
+	func_warning "\`-version-info/-version-number' is ignored for archives"
 
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-      fi
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for archives"
 
-      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-      fi
+      test -n "$export_symbols$export_symbols_regex" && \
+	func_warning "\`-export-symbols' is ignored for archives"
 
       # Now set the variables for building old libraries.
       build_libtool_libs=no
@@ -3161,48 +6100,48 @@ EOF
       # Make sure we only generate libraries of the form `libNAME.la'.
       case $outputname in
       lib*)
-	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+	func_stripname 'lib' '.la' "$outputname"
+	name=$func_stripname_result
 	eval shared_ext=\"$shrext_cmds\"
 	eval libname=\"$libname_spec\"
 	;;
       *)
-	if test "$module" = no; then
-	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
+	test "$module" = no && \
+	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
+
 	if test "$need_lib_prefix" != no; then
 	  # Add the "lib" prefix for modules if required
-	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	  func_stripname '' '.la' "$outputname"
+	  name=$func_stripname_result
 	  eval shared_ext=\"$shrext_cmds\"
 	  eval libname=\"$libname_spec\"
 	else
-	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	  func_stripname '' '.la' "$outputname"
+	  libname=$func_stripname_result
 	fi
 	;;
       esac
 
       if test -n "$objs"; then
 	if test "$deplibs_check_method" != pass_all; then
-	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-	  exit $EXIT_FAILURE
+	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
 	else
-	  $echo
-	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-	  $echo "*** objects $objs is not portable!"
+	  $ECHO
+	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+	  $ECHO "*** objects $objs is not portable!"
 	  libobjs="$libobjs $objs"
 	fi
       fi
 
-      if test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-      fi
+      test "$dlself" != no && \
+	func_warning "\`-dlopen self' is ignored for libtool libraries"
 
       set dummy $rpath
-      if test "$#" -gt 2; then
-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
+      shift
+      test "$#" -gt 1 && \
+	func_warning "ignoring multiple \`-rpath's for a libtool library"
+
+      install_libdir="$1"
 
       oldlibs=
       if test -z "$rpath"; then
@@ -3216,25 +6155,21 @@ EOF
 	  build_old_libs=yes
 	fi
 
-	if test -n "$vinfo"; then
-	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
-	fi
+	test -n "$vinfo" && \
+	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
 
-	if test -n "$release"; then
-	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-	fi
+	test -n "$release" && \
+	  func_warning "\`-release' is ignored for convenience libraries"
       else
 
 	# Parse the version information argument.
 	save_ifs="$IFS"; IFS=':'
 	set dummy $vinfo 0 0 0
+	shift
 	IFS="$save_ifs"
 
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
+	test -n "$7" && \
+	  func_fatal_help "too many parameters to \`-version-info'"
 
 	# convert absolute version numbers to libtool ages
 	# this retains compatibility with .la files and attempts
@@ -3242,9 +6177,9 @@ EOF
 
 	case $vinfo_number in
 	yes)
-	  number_major="$2"
-	  number_minor="$3"
-	  number_revision="$4"
+	  number_major="$1"
+	  number_minor="$2"
+	  number_revision="$3"
 	  #
 	  # There are really only two kinds -- those that
 	  # use the current revision as the major version
@@ -3254,7 +6189,8 @@ EOF
 	  #
 	  case $version_type in
 	  darwin|linux|osf|windows|none)
-	    current=`expr $number_major + $number_minor`
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
 	    age="$number_minor"
 	    revision="$number_revision"
 	    ;;
@@ -3264,7 +6200,8 @@ EOF
 	    age="0"
 	    ;;
 	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor`
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
 	    age="$number_minor"
 	    revision="$number_minor"
 	    lt_irix_increment=no
@@ -3272,9 +6209,9 @@ EOF
 	  esac
 	  ;;
 	no)
-	  current="$2"
-	  revision="$3"
-	  age="$4"
+	  current="$1"
+	  revision="$2"
+	  age="$3"
 	  ;;
 	esac
 
@@ -3282,34 +6219,30 @@ EOF
 	case $current in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
+	  func_error "CURRENT \`$current' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	case $revision in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
+	  func_error "REVISION \`$revision' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	case $age in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
+	  func_error "AGE \`$age' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
 	  ;;
 	esac
 
 	if test "$age" -gt "$current"; then
-	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
+	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
+	  func_fatal_error "\`$vinfo' is not valid version information"
 	fi
 
 	# Calculate the version variables.
@@ -3322,10 +6255,12 @@ EOF
 	darwin)
 	  # Like Linux, but with the current version available in
 	  # verstring for coding it into the library header
-	  major=.`expr $current - $age`
+	  func_arith $current - $age
+	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
 	  # Darwin ld doesn't like 0 for these options...
-	  minor_current=`expr $current + 1`
+	  func_arith $current + 1
+	  minor_current=$func_arith_result
 	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
 	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
 	  ;;
@@ -3337,15 +6272,17 @@ EOF
 
 	freebsd-elf)
 	  major=".$current"
-	  versuffix=".$current";
+	  versuffix=".$current"
 	  ;;
 
 	irix | nonstopux)
 	  if test "X$lt_irix_increment" = "Xno"; then
-	    major=`expr $current - $age`
+	    func_arith $current - $age
 	  else
-	    major=`expr $current - $age + 1`
+	    func_arith $current - $age + 1
 	  fi
+	  major=$func_arith_result
+
 	  case $version_type in
 	    nonstopux) verstring_prefix=nonstopux ;;
 	    *)         verstring_prefix=sgi ;;
@@ -3355,8 +6292,10 @@ EOF
 	  # Add in all the interfaces that we are compatible with.
 	  loop=$revision
 	  while test "$loop" -ne 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
+	    func_arith $revision - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
 	    verstring="$verstring_prefix$major.$iface:$verstring"
 	  done
 
@@ -3366,20 +6305,24 @@ EOF
 	  ;;
 
 	linux)
-	  major=.`expr $current - $age`
+	  func_arith $current - $age
+	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
 	  ;;
 
 	osf)
-	  major=.`expr $current - $age`
+	  func_arith $current - $age
+	  major=.$func_arith_result
 	  versuffix=".$current.$age.$revision"
 	  verstring="$current.$age.$revision"
 
 	  # Add in all the interfaces that we are compatible with.
 	  loop=$age
 	  while test "$loop" -ne 0; do
-	    iface=`expr $current - $loop`
-	    loop=`expr $loop - 1`
+	    func_arith $current - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
 	    verstring="$verstring:${iface}.0"
 	  done
 
@@ -3387,6 +6330,11 @@ EOF
 	  verstring="$verstring:${current}.0"
 	  ;;
 
+	qnx)
+	  major=".$current"
+	  versuffix=".$current"
+	  ;;
+
 	sunos)
 	  major=".$current"
 	  versuffix=".$current.$revision"
@@ -3395,14 +6343,13 @@ EOF
 	windows)
 	  # Use '-' rather than '.', since we only want one
 	  # extension on DOS 8.3 filesystems.
-	  major=`expr $current - $age`
+	  func_arith $current - $age
+	  major=$func_arith_result
 	  versuffix="-$major"
 	  ;;
 
 	*)
-	  $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
+	  func_fatal_configuration "unknown library version type \`$version_type'"
 	  ;;
 	esac
 
@@ -3436,7 +6383,7 @@ EOF
 	# Check to see if the archive will have undefined symbols.
 	if test "$allow_undefined" = yes; then
 	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+	    func_warning "undefined symbols not allowed in $host shared libraries"
 	    build_libtool_libs=no
 	    build_old_libs=yes
 	  fi
@@ -3444,21 +6391,26 @@ EOF
 	  # Don't allow undefined symbols.
 	  allow_undefined_flag="$no_undefined_flag"
 	fi
+
       fi
 
+      func_generate_dlsyms "$libname" "$libname" "yes"
+      libobjs="$libobjs $symfileobj"
+      test "X$libobjs" = "X " && libobjs=
+
       if test "$mode" != relink; then
 	# Remove our outputs, but don't remove object files since they
 	# may have been created when compiling PIC objects.
 	removelist=
-	tempremovelist=`$echo "$output_objdir/*"`
+	tempremovelist=`$ECHO "$output_objdir/*"`
 	for p in $tempremovelist; do
 	  case $p in
-	    *.$objext)
+	    *.$objext | *.gcno)
 	       ;;
 	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
 	       if test "X$precious_files_regex" != "X"; then
-	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-	         then
+		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+		 then
 		   continue
 		 fi
 	       fi
@@ -3467,10 +6419,8 @@ EOF
 	    *) ;;
 	  esac
 	done
-	if test -n "$removelist"; then
-	  $show "${rm}r $removelist"
-	  $run ${rm}r $removelist
-	fi
+	test -n "$removelist" && \
+	  func_show_eval "${RM}r \$removelist"
       fi
 
       # Now set the variables for building old libraries.
@@ -3478,14 +6428,14 @@ EOF
 	oldlibs="$oldlibs $output_objdir/$libname.$libext"
 
 	# Transform .lo files to .o files.
-	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
       fi
 
       # Eliminate all temporary directories.
       #for path in $notinst_path; do
-      #	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-      #	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-      #	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
+      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
       #done
 
       if test -n "$xrpath"; then
@@ -3526,12 +6476,12 @@ EOF
       if test "$build_libtool_libs" = yes; then
 	if test -n "$rpath"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
 	    # these systems don't actually have a c library (as such)!
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs -framework System"
+	    deplibs="$deplibs System.ltframework"
 	    ;;
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
@@ -3545,7 +6495,7 @@ EOF
 	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
 	    # Compiler inserts libc in the correct place for threads to work
 	    ;;
- 	  *)
+	  *)
 	    # Add libc to deplibs on all other systems if necessary.
 	    if test "$build_libtool_need_lc" = "yes"; then
 	      deplibs="$deplibs -lc"
@@ -3582,17 +6532,18 @@ EOF
 	  # limits. Maybe even breaks it.  We compile a program, linking it
 	  # against the deplibs as a proxy for the library.  Then we can check
 	  # whether they linked in statically or dynamically with ldd.
-	  $rm conftest.c
+	  $opt_dry_run || $RM conftest.c
 	  cat > conftest.c <<EOF
 	  int main() { return 0; }
 EOF
-	  $rm conftest
+	  $opt_dry_run || $RM conftest
 	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3600,37 +6551,40 @@ EOF
 		    i=""
 		    ;;
 		  esac
-	        fi
+		fi
 		if test -n "$i" ; then
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
+		  libname=`eval "\\$ECHO \"$libname_spec\""`
+		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		  set dummy $deplib_matches; shift
+		  deplib_match=$1
 		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
 		    newdeplibs="$newdeplibs $i"
 		  else
 		    droppeddeps=yes
-		    $echo
-		    $echo "*** Warning: dynamic linker does not accept needed library $i."
-		    $echo "*** I have the capability to make that library automatically link in when"
-		    $echo "*** you link to this library.  But I can only do this if you have a"
-		    $echo "*** shared version of the library, which I believe you do not have"
-		    $echo "*** because a test_compile did reveal that the linker did not use it for"
-		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		    $ECHO
+		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		    $ECHO "*** I have the capability to make that library automatically link in when"
+		    $ECHO "*** you link to this library.  But I can only do this if you have a"
+		    $ECHO "*** shared version of the library, which I believe you do not have"
+		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
+		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
 		  fi
 		fi
-	      else
+		;;
+	      *)
 		newdeplibs="$newdeplibs $i"
-	      fi
+		;;
+	      esac
 	    done
 	  else
 	    # Error occurred in the first compile.  Let's try to salvage
 	    # the situation: Compile a separate program for each library.
 	    for i in $deplibs; do
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-		$rm conftest
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		$opt_dry_run || $RM conftest
 		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3642,44 +6596,47 @@ EOF
 		    esac
 		  fi
 		  if test -n "$i" ; then
-		    libname=`eval \\$echo \"$libname_spec\"`
-		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		    set dummy $deplib_matches
-		    deplib_match=$2
+		    libname=`eval "\\$ECHO \"$libname_spec\""`
+		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		    set dummy $deplib_matches; shift
+		    deplib_match=$1
 		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
 		      newdeplibs="$newdeplibs $i"
 		    else
 		      droppeddeps=yes
-		      $echo
-		      $echo "*** Warning: dynamic linker does not accept needed library $i."
-		      $echo "*** I have the capability to make that library automatically link in when"
-		      $echo "*** you link to this library.  But I can only do this if you have a"
-		      $echo "*** shared version of the library, which you do not appear to have"
-		      $echo "*** because a test_compile did reveal that the linker did not use this one"
-		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		      $ECHO
+		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		      $ECHO "*** I have the capability to make that library automatically link in when"
+		      $ECHO "*** you link to this library.  But I can only do this if you have a"
+		      $ECHO "*** shared version of the library, which you do not appear to have"
+		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"
+		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
 		    fi
 		  fi
 		else
 		  droppeddeps=yes
-		  $echo
-		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "*** make it link in!  You will probably need to install it or some"
-		  $echo "*** library that it depends on before this library will be fully"
-		  $echo "*** functional.  Installing it before continuing would be even better."
+		  $ECHO
+		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
+		  $ECHO "*** make it link in!  You will probably need to install it or some"
+		  $ECHO "*** library that it depends on before this library will be fully"
+		  $ECHO "*** functional.  Installing it before continuing would be even better."
 		fi
-	      else
+		;;
+	      *)
 		newdeplibs="$newdeplibs $i"
-	      fi
+		;;
+	      esac
 	    done
 	  fi
 	  ;;
 	file_magic*)
-	  set dummy $deplibs_check_method
-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+	  set dummy $deplibs_check_method; shift
+	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
 	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-            if test "$name" != "" && test  "$name" != "0"; then
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
@@ -3689,13 +6646,13 @@ EOF
 		esac
 	      fi
 	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
+		libname=`eval "\\$ECHO \"$libname_spec\""`
 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
 		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
 		  for potent_lib in $potential_libs; do
 		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null \
-			 | grep " -> " >/dev/null; then
+		      if ls -lLd "$potent_lib" 2>/dev/null |
+			 $GREP " -> " >/dev/null; then
 			continue
 		      fi
 		      # The statement above tries to avoid entering an
@@ -3708,12 +6665,12 @@ EOF
 			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
 			case $potliblink in
 			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
 			esac
 		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | ${SED} 10q \
-			 | $EGREP "$file_magic_regex" > /dev/null; then
+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+			 $SED -e 10q |
+			 $EGREP "$file_magic_regex" > /dev/null; then
 			newdeplibs="$newdeplibs $a_deplib"
 			a_deplib=""
 			break 2
@@ -3723,32 +6680,35 @@ EOF
 	      fi
 	      if test -n "$a_deplib" ; then
 		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
+		$ECHO
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		$ECHO "*** I have the capability to make that library automatically link in when"
+		$ECHO "*** you link to this library.  But I can only do this if you have a"
+		$ECHO "*** shared version of the library, which you do not appear to have"
+		$ECHO "*** because I did check the linker path looking for a file starting"
 		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
+		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
 		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a file magic. Last file checked: $potlib"
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a file magic. Last file checked: $potlib"
 		fi
 	      fi
-	    else
+	      ;;
+	    *)
 	      # Add a -L argument.
 	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
+	      ;;
+	    esac
 	  done # Gone through all deplibs.
 	  ;;
 	match_pattern*)
-	  set dummy $deplibs_check_method
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+	  set dummy $deplibs_check_method; shift
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
 	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-	    if test -n "$name" && test "$name" != "0"; then
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
@@ -3758,14 +6718,13 @@ EOF
 		esac
 	      fi
 	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
+		libname=`eval "\\$ECHO \"$libname_spec\""`
 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
 		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
 		  for potent_lib in $potential_libs; do
 		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval $echo \"$potent_lib\" 2>/dev/null \
-		        | ${SED} 10q \
-		        | $EGREP "$match_pattern_regex" > /dev/null; then
+		    if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
+		       $EGREP "$match_pattern_regex" > /dev/null; then
 		      newdeplibs="$newdeplibs $a_deplib"
 		      a_deplib=""
 		      break 2
@@ -3775,44 +6734,46 @@ EOF
 	      fi
 	      if test -n "$a_deplib" ; then
 		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
+		$ECHO
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		$ECHO "*** I have the capability to make that library automatically link in when"
+		$ECHO "*** you link to this library.  But I can only do this if you have a"
+		$ECHO "*** shared version of the library, which you do not appear to have"
+		$ECHO "*** because I did check the linker path looking for a file starting"
 		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
+		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
 		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a regex pattern. Last file checked: $potlib"
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
 		fi
 	      fi
-	    else
+	      ;;
+	    *)
 	      # Add a -L argument.
 	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
+	      ;;
+	    esac
 	  done # Gone through all deplibs.
 	  ;;
 	none | unknown | *)
 	  newdeplibs=""
-	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	    -e 's/ -[LR][^ ]*//g'`
+	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
+	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
 	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 	    for i in $predeps $postdeps ; do
 	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
+	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
 	    done
 	  fi
-	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
-	    | grep . >/dev/null; then
-	    $echo
+	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
+	     $GREP . >/dev/null; then
+	    $ECHO
 	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
+	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
 	    else
-	      $echo "*** Warning: inter-library dependencies are not known to be supported."
+	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
 	    fi
-	    $echo "*** All declared inter-library dependencies are being dropped."
+	    $ECHO "*** All declared inter-library dependencies are being dropped."
 	    droppeddeps=yes
 	  fi
 	  ;;
@@ -3825,24 +6786,24 @@ EOF
 
 	case $host in
 	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library is the System framework
-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	  # On Rhapsody replace the C library with the System framework
+	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
 	  ;;
 	esac
 
 	if test "$droppeddeps" = yes; then
 	  if test "$module" = yes; then
-	    $echo
-	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $echo "*** a static module, that should work as long as the dlopening"
-	    $echo "*** application is linked with the -dlopen flag."
+	    $ECHO
+	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
+	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
+	    $ECHO "*** a static module, that should work as long as the dlopening"
+	    $ECHO "*** application is linked with the -dlopen flag."
 	    if test -z "$global_symbol_pipe"; then
-	      $echo
-	      $echo "*** However, this would only work if libtool was able to extract symbol"
-	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $echo "*** not find such a program.  So, this module is probably useless."
-	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	      $ECHO
+	      $ECHO "*** However, this would only work if libtool was able to extract symbol"
+	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      $ECHO "*** not find such a program.  So, this module is probably useless."
+	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
 	    fi
 	    if test "$build_old_libs" = no; then
 	      oldlibs="$output_objdir/$libname.$libext"
@@ -3852,16 +6813,16 @@ EOF
 	      build_libtool_libs=no
 	    fi
 	  else
-	    $echo "*** The inter-library dependencies that have been dropped here will be"
-	    $echo "*** automatically added whenever a program is linked with this library"
-	    $echo "*** or is declared to -dlopen it."
+	    $ECHO "*** The inter-library dependencies that have been dropped here will be"
+	    $ECHO "*** automatically added whenever a program is linked with this library"
+	    $ECHO "*** or is declared to -dlopen it."
 
 	    if test "$allow_undefined" = no; then
-	      $echo
-	      $echo "*** Since this library must not contain undefined symbols,"
-	      $echo "*** because either the platform does not support them or"
-	      $echo "*** it was explicitly requested with -no-undefined,"
-	      $echo "*** libtool will only create a static version of it."
+	      $ECHO
+	      $ECHO "*** Since this library must not contain undefined symbols,"
+	      $ECHO "*** because either the platform does not support them or"
+	      $ECHO "*** it was explicitly requested with -no-undefined,"
+	      $ECHO "*** libtool will only create a static version of it."
 	      if test "$build_old_libs" = no; then
 		oldlibs="$output_objdir/$libname.$libext"
 		build_libtool_libs=module
@@ -3875,7 +6836,14 @@ EOF
 	# Done checking deplibs!
 	deplibs=$newdeplibs
       fi
-
+      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+      case $host in
+	*-*-darwin*)
+	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  ;;
+      esac
 
       # move library search paths that coincide with paths to not yet
       # installed libraries to the beginning of the library search list
@@ -3904,7 +6872,6 @@ EOF
       done
       deplibs="$new_libs"
 
-
       # All the library-specific variables (install_libdir is set above).
       library_names=
       old_library=
@@ -3949,10 +6916,7 @@ EOF
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
 	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      case $archive_cmds in
-	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
-	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
-	      esac
+	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
 	    else
 	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
 	    fi
@@ -3978,8 +6942,9 @@ EOF
 	eval shared_ext=\"$shrext_cmds\"
 	eval library_names=\"$library_names_spec\"
 	set dummy $library_names
-	realname="$2"
-	shift; shift
+	shift
+	realname="$1"
+	shift
 
 	if test -n "$soname_spec"; then
 	  eval soname=\"$soname_spec\"
@@ -3998,71 +6963,122 @@ EOF
 	done
 
 	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	test "X$libobjs" = "X " && libobjs=
+
+	delfiles=
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+	  export_symbols="$output_objdir/$libname.uexp"
+	  delfiles="$delfiles $export_symbols"
+	fi
+
+	orig_export_symbols=
+	case $host_os in
+	cygwin* | mingw* | cegcc*)
+	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+	    # exporting using user supplied symfile
+	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+	      # and it's NOT already a .def file. Must figure out
+	      # which of the given symbols are data symbols and tag
+	      # them as such. So, trigger use of export_symbols_cmds.
+	      # export_symbols gets reassigned inside the "prepare
+	      # the list of exported symbols" if statement, so the
+	      # include_expsyms logic still works.
+	      orig_export_symbols="$export_symbols"
+	      export_symbols=
+	      always_export_symbols=yes
+	    fi
+	  fi
+	  ;;
+	esac
 
 	# Prepare the list of exported symbols
 	if test -z "$export_symbols"; then
 	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    $show "generating symbol list for \`$libname.la'"
+	    func_verbose "generating symbol list for \`$libname.la'"
 	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
+	    $opt_dry_run || $RM $export_symbols
 	    cmds=$export_symbols_cmds
 	    save_ifs="$IFS"; IFS='~'
 	    for cmd in $cmds; do
 	      IFS="$save_ifs"
 	      eval cmd=\"$cmd\"
-	      if len=`expr "X$cmd" : ".*"` &&
-	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	        $show "$cmd"
-	        $run eval "$cmd" || exit $?
-	        skipped_export=false
+	      func_len " $cmd"
+	      len=$func_len_result
+	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
 	      else
-	        # The command line is too long to execute in one step.
-	        $show "using reloadable object file for export list..."
-	        skipped_export=:
+		# The command line is too long to execute in one step.
+		func_verbose "using reloadable object file for export list..."
+		skipped_export=:
 		# Break out early, otherwise skipped_export may be
 		# set to false by a later but shorter cmd.
 		break
 	      fi
 	    done
 	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex"; then
-	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
+	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
 	    fi
 	  fi
 	fi
 
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
+	  tmp_export_symbols="$export_symbols"
+	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+	fi
+
+	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+	  # The given exports_symbols file has to be filtered, so filter it.
+	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	  # 's' commands which not all seds can handle. GNU sed should be fine
+	  # though. Also, the filter scales superlinearly with the number of
+	  # global variables. join(1) would be nice here, but unfortunately
+	  # isn't a blessed tool.
+	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	  export_symbols=$output_objdir/$libname.def
+	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	fi
 
 	tmp_deplibs=
 	for test_deplib in $deplibs; do
-		case " $convenience " in
-		*" $test_deplib "*) ;;
-		*)
-			tmp_deplibs="$tmp_deplibs $test_deplib"
-			;;
-		esac
+	  case " $convenience " in
+	  *" $test_deplib "*) ;;
+	  *)
+	    tmp_deplibs="$tmp_deplibs $test_deplib"
+	    ;;
+	  esac
 	done
 	deplibs="$tmp_deplibs"
 
 	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec" &&
+	    test "$compiler_needs_object" = yes &&
+	    test -z "$libobjs"; then
+	    # extract the archives, so we have objects to list.
+	    # TODO: could optimize this to just extract one archive.
+	    whole_archive_flag_spec=
+	  fi
 	  if test -n "$whole_archive_flag_spec"; then
 	    save_libobjs=$libobjs
 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
 	  else
 	    gentop="$output_objdir/${outputname}x"
 	    generated="$generated $gentop"
 
 	    func_extract_archives $gentop $convenience
 	    libobjs="$libobjs $func_extract_archives_result"
+	    test "X$libobjs" = "X " && libobjs=
 	  fi
 	fi
-	
+
 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
 	  eval flag=\"$thread_safe_flag_spec\"
 	  linker_flags="$linker_flags $flag"
@@ -4070,7 +7086,7 @@ EOF
 
 	# Make a backup of the uninstalled library when relinking
 	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
 	fi
 
 	# Do each of the archive commands.
@@ -4083,22 +7099,24 @@ EOF
 	    cmds=$module_cmds
 	  fi
 	else
-	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	  eval test_cmds=\"$archive_expsym_cmds\"
-	  cmds=$archive_expsym_cmds
-	else
-	  eval test_cmds=\"$archive_cmds\"
-	  cmds=$archive_cmds
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    eval test_cmds=\"$archive_expsym_cmds\"
+	    cmds=$archive_expsym_cmds
+	  else
+	    eval test_cmds=\"$archive_cmds\"
+	    cmds=$archive_cmds
 	  fi
 	fi
 
 	if test "X$skipped_export" != "X:" &&
-	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	   func_len " $test_cmds" &&
+	   len=$func_len_result &&
+	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 	  :
 	else
-	  # The command line is too long to link in one step, link piecewise.
-	  $echo "creating reloadable object files..."
+	  # The command line is too long to link in one step, link piecewise
+	  # or, if using GNU ld and skipped_export is not :, use a linker
+	  # script.
 
 	  # Save the value of $output and $libobjs because we want to
 	  # use them later.  If we have whole_archive_flag_spec, we
@@ -4112,77 +7130,162 @@ EOF
 	    save_libobjs=$libobjs
 	  fi
 	  save_output=$output
-	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
+	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
 
 	  # Clear the reloadable object creation command queue and
 	  # initialize k to one.
 	  test_cmds=
 	  concat_cmds=
 	  objlist=
-	  delfiles=
 	  last_robj=
 	  k=1
-	  output=$output_objdir/$output_la-${k}.$objext
-	  # Loop over the list of objects to be linked.
-	  for obj in $save_libobjs
-	  do
-	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-	    if test "X$objlist" = X ||
-	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-		 test "$len" -le "$max_cmd_len"; }; then
-	      objlist="$objlist $obj"
+
+	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
+	    output=${output_objdir}/${output_la}.lnkscript
+	    func_verbose "creating GNU ld script: $output"
+	    $ECHO 'INPUT (' > $output
+	    for obj in $save_libobjs
+	    do
+	      $ECHO "$obj" >> $output
+	    done
+	    $ECHO ')' >> $output
+	    delfiles="$delfiles $output"
+	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
+	    output=${output_objdir}/${output_la}.lnk
+	    func_verbose "creating linker input file list: $output"
+	    : > $output
+	    set x $save_libobjs
+	    shift
+	    firstobj=
+	    if test "$compiler_needs_object" = yes; then
+	      firstobj="$1 "
+	      shift
+	    fi
+	    for obj
+	    do
+	      $ECHO "$obj" >> $output
+	    done
+	    delfiles="$delfiles $output"
+	    output=$firstobj\"$file_list_spec$output\"
+	  else
+	    if test -n "$save_libobjs"; then
+	      func_verbose "creating reloadable object files..."
+	      output=$output_objdir/$output_la-${k}.$objext
+	      eval test_cmds=\"$reload_cmds\"
+	      func_len " $test_cmds"
+	      len0=$func_len_result
+	      len=$len0
+
+	      # Loop over the list of objects to be linked.
+	      for obj in $save_libobjs
+	      do
+		func_len " $obj"
+		func_arith $len + $func_len_result
+		len=$func_arith_result
+		if test "X$objlist" = X ||
+		   test "$len" -lt "$max_cmd_len"; then
+		  func_append objlist " $obj"
+		else
+		  # The command $test_cmds is almost too long, add a
+		  # command to the queue.
+		  if test "$k" -eq 1 ; then
+		    # The first file doesn't have a previous command to add.
+		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+		  else
+		    # All subsequent reloadable object files will link in
+		    # the last one created.
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
+		  fi
+		  last_robj=$output_objdir/$output_la-${k}.$objext
+		  func_arith $k + 1
+		  k=$func_arith_result
+		  output=$output_objdir/$output_la-${k}.$objext
+		  objlist=$obj
+		  func_len " $last_robj"
+		  func_arith $len0 + $func_len_result
+		  len=$func_arith_result
+		fi
+	      done
+	      # Handle the remaining objects by creating one last
+	      # reloadable object file.  All subsequent reloadable object
+	      # files will link in the last one created.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+	      if test -n "$last_robj"; then
+	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+	      fi
+	      delfiles="$delfiles $output"
+
 	    else
-	      # The command $test_cmds is almost too long, add a
-	      # command to the queue.
-	      if test "$k" -eq 1 ; then
-		# The first file doesn't have a previous command to add.
-		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-	      else
-		# All subsequent reloadable object files will link in
-		# the last one created.
-		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+	      output=
+	    fi
+
+	    if ${skipped_export-false}; then
+	      func_verbose "generating symbol list for \`$libname.la'"
+	      export_symbols="$output_objdir/$libname.exp"
+	      $opt_dry_run || $RM $export_symbols
+	      libobjs=$output
+	      # Append the command to create the export file.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+	      if test -n "$last_robj"; then
+		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
 	      fi
-	      last_robj=$output_objdir/$output_la-${k}.$objext
-	      k=`expr $k + 1`
-	      output=$output_objdir/$output_la-${k}.$objext
-	      objlist=$obj
-	      len=1
 	    fi
-	  done
-	  # Handle the remaining objects by creating one last
-	  # reloadable object file.  All subsequent reloadable object
-	  # files will link in the last one created.
-	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-
-	  if ${skipped_export-false}; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    libobjs=$output
-	    # Append the command to create the export file.
-	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-          fi
-
-	  # Set up a command to remove the reloadable object files
-	  # after they are used.
-	  i=0
-	  while test "$i" -lt "$k"
-	  do
-	    i=`expr $i + 1`
-	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
-	  done
 
-	  $echo "creating a temporary reloadable object file: $output"
+	    test -n "$save_libobjs" &&
+	      func_verbose "creating a temporary reloadable object file: $output"
 
-	  # Loop through the commands generated above and execute them.
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $concat_cmds; do
+	    # Loop through the commands generated above and execute them.
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd in $concat_cmds; do
+	      IFS="$save_ifs"
+	      $opt_silent || {
+		  func_quote_for_expand "$cmd"
+		  eval "func_echo $func_quote_for_expand_result"
+	      }
+	      $opt_dry_run || eval "$cmd" || {
+		lt_exit=$?
+
+		# Restore the uninstalled library and exit
+		if test "$mode" = relink; then
+		  ( cd "$output_objdir" && \
+		    $RM "${realname}T" && \
+		    $MV "${realname}U" "$realname" )
+		fi
+
+		exit $lt_exit
+	      }
+	    done
 	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
+
+	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+
+          if ${skipped_export-false}; then
+	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	      tmp_export_symbols="$export_symbols"
+	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+	    fi
+
+	    if test -n "$orig_export_symbols"; then
+	      # The given exports_symbols file has to be filtered, so filter it.
+	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	      # 's' commands which not all seds can handle. GNU sed should be fine
+	      # though. Also, the filter scales superlinearly with the number of
+	      # global variables. join(1) would be nice here, but unfortunately
+	      # isn't a blessed tool.
+	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	      export_symbols=$output_objdir/$libname.def
+	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	    fi
+	  fi
 
 	  libobjs=$output
 	  # Restore the value of output.
@@ -4190,6 +7293,7 @@ EOF
 
 	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
 	  fi
 	  # Expand the library linking commands again to reset the
 	  # value of $libobjs for piecewise linking.
@@ -4202,28 +7306,45 @@ EOF
 	      cmds=$module_cmds
 	    fi
 	  else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    cmds=$archive_expsym_cmds
-	  else
-	    cmds=$archive_cmds
+	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	      cmds=$archive_expsym_cmds
+	    else
+	      cmds=$archive_cmds
 	    fi
 	  fi
+	fi
+
+	if test -n "$delfiles"; then
+	  # Append the command to remove temporary files to $cmds.
+	  eval cmds=\"\$cmds~\$RM $delfiles\"
+	fi
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  generated="$generated $gentop"
 
-	  # Append the command to remove the reloadable object files
-	  # to the just-reset $cmds.
-	  eval cmds=\"\$cmds~\$rm $delfiles\"
+	  func_extract_archives $gentop $dlprefiles
+	  libobjs="$libobjs $func_extract_archives_result"
+	  test "X$libobjs" = "X " && libobjs=
 	fi
+
 	save_ifs="$IFS"; IFS='~'
 	for cmd in $cmds; do
 	  IFS="$save_ifs"
 	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || {
+	  $opt_silent || {
+	    func_quote_for_expand "$cmd"
+	    eval "func_echo $func_quote_for_expand_result"
+	  }
+	  $opt_dry_run || eval "$cmd" || {
 	    lt_exit=$?
 
 	    # Restore the uninstalled library and exit
 	    if test "$mode" = relink; then
-	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+	      ( cd "$output_objdir" && \
+	        $RM "${realname}T" && \
+		$MV "${realname}U" "$realname" )
 	    fi
 
 	    exit $lt_exit
@@ -4233,12 +7354,11 @@ EOF
 
 	# Restore the uninstalled library and exit
 	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
 
 	  if test -n "$convenience"; then
 	    if test -z "$whole_archive_flag_spec"; then
-	      $show "${rm}r $gentop"
-	      $run ${rm}r "$gentop"
+	      func_show_eval '${RM}r "$gentop"'
 	    fi
 	  fi
 
@@ -4248,8 +7368,7 @@ EOF
 	# Create links to the real library.
 	for linkname in $linknames; do
 	  if test "$realname" != "$linkname"; then
-	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
+	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
 	  fi
 	done
 
@@ -4262,39 +7381,35 @@ EOF
       ;;
 
     obj)
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	func_warning "\`-dlopen' is ignored for objects"
+      fi
+
       case " $deplibs" in
       *\ -l* | *\ -L*)
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
+	func_warning "\`-l' and \`-L' are ignored for objects" ;;
       esac
 
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-      fi
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for objects"
 
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-      fi
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for objects"
 
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-      fi
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for objects"
 
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for objects"
 
       case $output in
       *.lo)
-	if test -n "$objs$old_deplibs"; then
-	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	libobj="$output"
-	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+	test -n "$objs$old_deplibs" && \
+	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+
+	libobj=$output
+	func_lo2o "$libobj"
+	obj=$func_lo2o_result
 	;;
       *)
 	libobj=
@@ -4303,7 +7418,7 @@ EOF
       esac
 
       # Delete the old objects.
-      $run $rm $obj $libobj
+      $opt_dry_run || $RM $obj $libobj
 
       # Objects from convenience libraries.  This assumes
       # single-version convenience libraries.  Whenever we create
@@ -4319,7 +7434,7 @@ EOF
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
 	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -4330,24 +7445,15 @@ EOF
       fi
 
       # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
 
       output="$obj"
-      cmds=$reload_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
+      func_execute_cmds "$reload_cmds" 'exit $?'
 
       # Exit if we aren't doing a library object file.
       if test -z "$libobj"; then
 	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
+	  func_show_eval '${RM}r "$gentop"'
 	fi
 
 	exit $EXIT_SUCCESS
@@ -4355,14 +7461,13 @@ EOF
 
       if test "$build_libtool_libs" != yes; then
 	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
+	  func_show_eval '${RM}r "$gentop"'
 	fi
 
 	# Create an invalid libtool object if no PIC, so that we don't
 	# accidentally link it into a program.
 	# $show "echo timestamp > $libobj"
-	# $run eval "echo timestamp > $libobj" || exit $?
+	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
 	exit $EXIT_SUCCESS
       fi
 
@@ -4370,20 +7475,11 @@ EOF
 	# Only do commands if we really have different PIC objects.
 	reload_objs="$libobjs $reload_conv_objs"
 	output="$libobj"
-	cmds=$reload_cmds
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
+	func_execute_cmds "$reload_cmds" 'exit $?'
       fi
 
       if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
+	func_show_eval '${RM}r "$gentop"'
       fi
 
       exit $EXIT_SUCCESS
@@ -4391,39 +7487,45 @@ EOF
 
     prog)
       case $host in
-	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
+	*cygwin*) func_stripname '' '.exe' "$output"
+	          output=$func_stripname_result.exe;;
       esac
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-      fi
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for programs"
 
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for programs"
 
-      if test "$preload" = yes; then
-	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-	   test "$dlopen_self_static" = unknown; then
-	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-	fi
-      fi
+      test "$preload" = yes \
+        && test "$dlopen_support" = unknown \
+	&& test "$dlopen_self" = unknown \
+	&& test "$dlopen_self_static" = unknown && \
+	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
 
       case $host in
       *-*-rhapsody* | *-*-darwin1.[012])
 	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
 	;;
       esac
 
       case $host in
-      *darwin*)
-        # Don't allow lazy linking, it breaks C++ global constructors
-        if test "$tagname" = CXX ; then
-        compile_command="$compile_command ${wl}-bind_at_load"
-        finalize_command="$finalize_command ${wl}-bind_at_load"
-        fi
-        ;;
+      *-*-darwin*)
+	# Don't allow lazy linking, it breaks C++ global constructors
+	# But is supposedly fixed on 10.4 or later (yay!).
+	if test "$tagname" = CXX ; then
+	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+	    10.[0123])
+	      compile_command="$compile_command ${wl}-bind_at_load"
+	      finalize_command="$finalize_command ${wl}-bind_at_load"
+	    ;;
+	  esac
+	fi
+	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	;;
       esac
 
 
@@ -4498,14 +7600,16 @@ EOF
 	  esac
 	fi
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
+	  ::) dllsearchpath=$libdir;;
 	  *) dllsearchpath="$dllsearchpath:$libdir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
 	  *) dllsearchpath="$dllsearchpath:$testbindir";;
 	  esac
 	  ;;
@@ -4557,281 +7661,51 @@ EOF
 
       if test -n "$libobjs" && test "$build_old_libs" = yes; then
 	# Transform all the library objects into standard objects.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-      fi
-
-      dlsyms=
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	  dlsyms="${outputname}S.c"
-	else
-	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-	fi
+	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
       fi
 
-      if test -n "$dlsyms"; then
-	case $dlsyms in
-	"") ;;
-	*.c)
-	  # Discover the nlist of each of the dlfiles.
-	  nlist="$output_objdir/${outputname}.nm"
-
-	  $show "$rm $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Parse the name list into a source file.
-	  $show "creating $output_objdir/$dlsyms"
-
-	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
-	  if test "$dlself" = yes; then
-	    $show "generating symbol list for \`$output'"
-
-	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-
-	    # Add our own program objects to the symbol list.
-	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	    for arg in $progfiles; do
-	      $show "extracting global C symbols from \`$arg'"
-	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	    done
-
-	    if test -n "$exclude_expsyms"; then
-	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    if test -n "$export_symbols_regex"; then
-	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    # Prepare the list of exported symbols
-	    if test -z "$export_symbols"; then
-	      export_symbols="$output_objdir/$outputname.exp"
-	      $run $rm $export_symbols
-	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-              case $host in
-              *cygwin* | *mingw* )
-	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-		$run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-                ;;
-              esac
-	    else
-	      $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      $run eval 'mv "$nlist"T "$nlist"'
-              case $host in
-              *cygwin* | *mingw* )
-	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-		$run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-                ;;
-              esac
-	    fi
-	  fi
-
-	  for arg in $dlprefiles; do
-	    $show "extracting global C symbols from \`$arg'"
-	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
-	    $run eval '$echo ": $name " >> "$nlist"'
-	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -z "$run"; then
-	    # Make sure we have at least an empty file.
-	    test -f "$nlist" || : > "$nlist"
-
-	    if test -n "$exclude_expsyms"; then
-	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	      $mv "$nlist"T "$nlist"
-	    fi
-
-	    # Try sorting and uniquifying the output.
-	    if grep -v "^: " < "$nlist" |
-		if sort -k 3 </dev/null >/dev/null 2>&1; then
-		  sort -k 3
-		else
-		  sort +2
-		fi |
-		uniq > "$nlist"S; then
-	      :
-	    else
-	      grep -v "^: " < "$nlist" > "$nlist"S
-	    fi
-
-	    if test -f "$nlist"S; then
-	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-	    else
-	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-"
+      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
 
-	    case $host in
-	    *cygwin* | *mingw* )
-	  $echo >> "$output_objdir/$dlsyms" "\
-/* DATA imports from DLLs on WIN32 can't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs */
-struct {
-"
-	      ;;
-	    * )
-	  $echo >> "$output_objdir/$dlsyms" "\
-const struct {
-"
-	      ;;
-	    esac
-
-
-	  $echo >> "$output_objdir/$dlsyms" "\
-  const char *name;
-  lt_ptr address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	  fi
-
-	  pic_flag_for_symtable=
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
-	    esac;;
-	  *-*-hpux*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag";;
-	    esac
-	  esac
-
-	  # Now compile the dynamic symbol file.
-	  $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-	  $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
-	  # Clean up the generated files.
-	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Transform the symbol file into the correct name.
-          case $host in
-          *cygwin* | *mingw* )
-            if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            else
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-             fi
-            ;;
-          * )
-            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            ;;
-          esac
-	  ;;
-	*)
-	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      else
-	# We keep going just in case the user didn't refer to
-	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-	# really was required.
-
-	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+      # template prelinking step
+      if test -n "$prelink_cmds"; then
+	func_execute_cmds "$prelink_cmds" 'exit $?'
       fi
 
-      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+      wrappers_required=yes
+      case $host in
+      *cygwin* | *mingw* )
+        if test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      *cegcc)
+        # Disable wrappers for cegcc, we are cross compiling anyway.
+        wrappers_required=no
+        ;;
+      *)
+        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      esac
+      if test "$wrappers_required" = no; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
+	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
-	$show "$link_command"
-	$run eval "$link_command"
-	exit_status=$?
+	exit_status=0
+	func_show_eval "$link_command" 'exit_status=$?'
 
 	# Delete the generated files.
-	if test -n "$dlsyms"; then
-	  $show "$rm $output_objdir/${outputname}S.${objext}"
-	  $run $rm "$output_objdir/${outputname}S.${objext}"
+	if test -f "$output_objdir/${outputname}S.${objext}"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
 	fi
 
 	exit $exit_status
       fi
 
-      if test -n "$shlibpath_var"; then
-	# We should set the shlibpath_var
-	rpath=
-	for dir in $temp_rpath; do
-	  case $dir in
-	  [\\/]* | [A-Za-z]:[\\/]*)
-	    # Absolute path.
-	    rpath="$rpath$dir:"
-	    ;;
-	  *)
-	    # Relative path: add a thisdir entry.
-	    rpath="$rpath\$thisdir/$dir:"
-	    ;;
-	  esac
-	done
-	temp_rpath="$rpath"
-      fi
-
       if test -n "$compile_shlibpath$finalize_shlibpath"; then
 	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
       fi
@@ -4864,12 +7738,11 @@ static const void *lt_preloaded_setup() {
 	# We don't need to create a wrapper script.
 	link_command="$compile_var$compile_command$compile_rpath"
 	# Replace the output file specification.
-	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
 	# Delete the old output file.
-	$run $rm $output
+	$opt_dry_run || $RM $output
 	# Link the executable and exit
-	$show "$link_command"
-	$run eval "$link_command" || exit $?
+	func_show_eval "$link_command" 'exit $?'
 	exit $EXIT_SUCCESS
       fi
 
@@ -4878,13 +7751,13 @@ static const void *lt_preloaded_setup() {
 	link_command="$compile_var$compile_command$compile_rpath"
 	relink_command="$finalize_var$finalize_command$finalize_rpath"
 
-	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-	$echo "$modename: \`$output' will be relinked during installation" 1>&2
+	func_warning "this platform does not like uninstalled shared libraries"
+	func_warning "\`$output' will be relinked during installation"
       else
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4896,608 +7769,103 @@ static const void *lt_preloaded_setup() {
       fi
 
       # Replace the output file specification.
-      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
 
       # Delete the old output files.
-      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
 
-      $show "$link_command"
-      $run eval "$link_command" || exit $?
+      func_show_eval "$link_command" 'exit $?'
 
       # Now create the wrapper script.
-      $show "creating $output"
+      func_verbose "creating $output"
 
       # Quote the relink command for shipping.
       if test -n "$relink_command"; then
 	# Preserve any variables that may affect compiler behavior
 	for var in $variables_saved_for_relink; do
 	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
 	  elif eval var_value=\$$var; test -z "$var_value"; then
 	    relink_command="$var=; export $var; $relink_command"
 	  else
-	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
+	    func_quote_for_eval "$var_value"
+	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       fi
 
-      # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
+      # Quote $ECHO for shipping.
+      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
 	case $progpath in
 	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
 	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
 	esac
-	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
       else
-	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
+	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
       fi
 
-      # Only actually do things if our run command is non-null.
-      if test -z "$run"; then
+      # Only actually do things if not in dry run mode.
+      $opt_dry_run || {
 	# win32 will think the script is a binary if it has
 	# a .exe suffix, so we strip it off here.
 	case $output in
-	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
+	  *.exe) func_stripname '' '.exe' "$output"
+	         output=$func_stripname_result ;;
 	esac
 	# test for cygwin because mv fails w/o .exe extensions
 	case $host in
 	  *cygwin*)
 	    exeext=.exe
-	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
+	    func_stripname '' '.exe' "$outputname"
+	    outputname=$func_stripname_result ;;
 	  *) exeext= ;;
 	esac
 	case $host in
 	  *cygwin* | *mingw* )
-            output_name=`basename $output`
-            output_path=`dirname $output`
-            cwrappersource="$output_path/$objdir/lt-$output_name.c"
-            cwrapper="$output_path/$output_name.exe"
-            $rm $cwrappersource $cwrapper
-            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    cat > $cwrappersource <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "/bin/sh $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-	    cat >> $cwrappersource<<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/stat.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-/* -DDEBUG is fairly common in CFLAGS.  */
-#undef DEBUG
-#if defined DEBUGWRAPPER
-# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
-#else
-# define DEBUG(format, ...)
-#endif
-
-const char *program_name = NULL;
-
-void * xmalloc (size_t num);
-char * xstrdup (const char *string);
-const char * base_name (const char *name);
-char * find_executable(const char *wrapper);
-int    check_executable(const char *path);
-char * strendzap(char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int i;
-
-  program_name = (char *) xstrdup (base_name (argv[0]));
-  DEBUG("(main) argv[0]      : %s\n",argv[0]);
-  DEBUG("(main) program_name : %s\n",program_name);
-  newargz = XMALLOC(char *, argc+2);
-EOF
-
-            cat >> $cwrappersource <<EOF
-  newargz[0] = (char *) xstrdup("$SHELL");
-EOF
-
-            cat >> $cwrappersource <<"EOF"
-  newargz[1] = find_executable(argv[0]);
-  if (newargz[1] == NULL)
-    lt_fatal("Couldn't find %s", argv[0]);
-  DEBUG("(main) found exe at : %s\n",newargz[1]);
-  /* we know the script has the same name, without the .exe */
-  /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe");
-  for (i = 1; i < argc; i++)
-    newargz[i+1] = xstrdup(argv[i]);
-  newargz[argc+1] = NULL;
-
-  for (i=0; i<argc+1; i++)
-  {
-    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
-    ;
-  }
-
-EOF
-
-            case $host_os in
-              mingw*)
-                cat >> $cwrappersource <<EOF
-  execv("$SHELL",(char const **)newargz);
-EOF
-              ;;
-              *)
-                cat >> $cwrappersource <<EOF
-  execv("$SHELL",newargz);
-EOF
-              ;;
-            esac
-
-            cat >> $cwrappersource <<"EOF"
-  return 127;
-}
-
-void *
-xmalloc (size_t num)
-{
-  void * p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-;
-}
-
-const char *
-base_name (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return base;
-}
-
-int
-check_executable(const char * path)
-{
-  struct stat st;
-
-  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
-  if ((!path) || (!*path))
-    return 0;
-
-  if ((stat (path, &st) >= 0) &&
-      (
-        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
-#if defined (S_IXOTH)
-       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
-#endif
-#if defined (S_IXGRP)
-       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
-#endif
-       ((st.st_mode & S_IXUSR) == S_IXUSR))
-      )
-    return 1;
-  else
-    return 0;
-}
-
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise */
-char *
-find_executable (const char* wrapper)
-{
-  int has_slash = 0;
-  const char* p;
-  const char* p_next;
-  /* static buffer for getcwd */
-  char tmp[LT_PATHMAX + 1];
-  int tmp_len;
-  char* concat_name;
-
-  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
-
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
-
-  /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
-  {
-    concat_name = xstrdup (wrapper);
-    if (check_executable(concat_name))
-      return concat_name;
-    XFREE(concat_name);
-  }
-  else
-  {
-#endif
-    if (IS_DIR_SEPARATOR (wrapper[0]))
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable(concat_name))
-        return concat_name;
-      XFREE(concat_name);
-    }
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  }
-#endif
-
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-    {
-      has_slash = 1;
-      break;
-    }
-  if (!has_slash)
-  {
-    /* no slashes; search PATH */
-    const char* path = getenv ("PATH");
-    if (path != NULL)
-    {
-      for (p = path; *p; p = p_next)
-      {
-        const char* q;
-        size_t p_len;
-        for (q = p; *q; q++)
-          if (IS_PATH_SEPARATOR(*q))
-            break;
-        p_len = q - p;
-        p_next = (*q == '\0' ? q : q + 1);
-        if (p_len == 0)
-        {
-          /* empty path: current directory */
-          if (getcwd (tmp, LT_PATHMAX) == NULL)
-            lt_fatal ("getcwd failed");
-          tmp_len = strlen(tmp);
-          concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-          memcpy (concat_name, tmp, tmp_len);
-          concat_name[tmp_len] = '/';
-          strcpy (concat_name + tmp_len + 1, wrapper);
-        }
-        else
-        {
-          concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
-          memcpy (concat_name, p, p_len);
-          concat_name[p_len] = '/';
-          strcpy (concat_name + p_len + 1, wrapper);
-        }
-        if (check_executable(concat_name))
-          return concat_name;
-        XFREE(concat_name);
-      }
-    }
-    /* not found in PATH; assume curdir */
-  }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  tmp_len = strlen(tmp);
-  concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_name[tmp_len] = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
-
-  if (check_executable(concat_name))
-    return concat_name;
-  XFREE(concat_name);
-  return NULL;
-}
-
-char *
-strendzap(char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert(str != NULL);
-  assert(pat != NULL);
-
-  len = strlen(str);
-  patlen = strlen(pat);
-
-  if (patlen <= len)
-  {
-    str += len - patlen;
-    if (strcmp(str, pat) == 0)
-      *str = '\0';
-  }
-  return str;
-}
-
-static void
-lt_error_core (int exit_status, const char * mode,
-          const char * message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-EOF
-          # we should really use a build-platform specific compiler
-          # here, but OTOH, the wrappers (shell script and this C one)
-          # are only useful if you want to execute the "real" binary.
-          # Since the "real" binary is built for $host, then this
-          # wrapper might as well be built for $host, too.
-          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
-          ;;
-        esac
-        $rm $output
-        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
-
-	$echo > $output "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variable:
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    echo=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$echo will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$echo >> $output "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $echo >> $output "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" || \\
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $mkdir \"\$progdir\"
-    else
-      $rm \"\$progdir/\$file\"
-    fi"
-
-	  $echo >> $output "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$echo \"\$relink_command_output\" >&2
-	$rm \"\$progdir/\$file\"
-	exit $EXIT_FAILURE
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-	else
-	  $echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$echo >> $output "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $echo >> $output "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $echo >> $output "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
+	    func_dirname_and_basename "$output" "" "."
+	    output_name=$func_basename_result
+	    output_path=$func_dirname_result
+	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
+	    cwrapper="$output_path/$output_name.exe"
+	    $RM $cwrappersource $cwrapper
+	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_cwrapperexe_src > $cwrappersource
+
+	    # The wrapper executable is built using the $host compiler,
+	    # because it contains $host paths and files. If cross-
+	    # compiling, it, like the target executable, must be
+	    # executed on the $host or under an emulation environment.
+	    $opt_dry_run || {
+	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+	      $STRIP $cwrapper
+	    }
 
-	$echo >> $output "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
+	    # Now, create the wrapper script for func_source use:
+	    func_ltwrapper_scriptname $cwrapper
+	    $RM $func_ltwrapper_scriptname_result
+	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+	    $opt_dry_run || {
+	      # note: this script will not be executed, so do not chmod.
+	      if test "x$build" = "x$host" ; then
+		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+	      else
+		func_emit_wrapper no > $func_ltwrapper_scriptname_result
+	      fi
+	    }
 	  ;;
+	  * )
+	    $RM $output
+	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
 
-	*)
-	  $echo >> $output "\
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
+	    func_emit_wrapper no > $output
+	    chmod +x $output
 	  ;;
 	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \$*\"
-      exit $EXIT_FAILURE
-    fi
-  else
-    # The program doesn't exist.
-    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi\
-"
-	chmod +x $output
-      fi
+      }
       exit $EXIT_SUCCESS
       ;;
     esac
@@ -5506,7 +7874,7 @@ fi\
     for oldlib in $oldlibs; do
 
       if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save"
+	oldobjs="$libobjs_save $symfileobj"
 	addlibs="$convenience"
 	build_libtool_libs=no
       else
@@ -5515,6 +7883,9 @@ fi\
 	  build_libtool_libs=no
 	else
 	  oldobjs="$old_deplibs $non_pic_objects"
+	  if test "$preload" = yes && test -f "$symfileobj"; then
+	    oldobjs="$oldobjs $symfileobj"
+	  fi
 	fi
 	addlibs="$old_convenience"
       fi
@@ -5529,8 +7900,18 @@ fi\
 
       # Do each command in the archive commands.
       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-       cmds=$old_archive_from_new_cmds
+	cmds=$old_archive_from_new_cmds
       else
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  generated="$generated $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  oldobjs="$oldobjs $func_extract_archives_result"
+	fi
+
 	# POSIX demands no paths to be encoded in archives.  We have
 	# to avoid creating archives with duplicate basenames if we
 	# might have to extract them afterwards, e.g., when creating a
@@ -5539,32 +7920,22 @@ fi\
 	# not supported by libtool).
 	if (for obj in $oldobjs
 	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+	      func_basename "$obj"
+	      $ECHO "$func_basename_result"
 	    done | sort | sort -uc >/dev/null 2>&1); then
 	  :
 	else
-	  $echo "copying selected object files to avoid basename conflicts..."
-
-	  if test -z "$gentop"; then
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    exit_status=$?
-	    if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
-	      exit $exit_status
-	    fi
-	  fi
-
+	  $ECHO "copying selected object files to avoid basename conflicts..."
+	  gentop="$output_objdir/${outputname}x"
+	  generated="$generated $gentop"
+	  func_mkdir_p "$gentop"
 	  save_oldobjs=$oldobjs
 	  oldobjs=
 	  counter=1
 	  for obj in $save_oldobjs
 	  do
-	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+	    func_basename "$obj"
+	    objbase="$func_basename_result"
 	    case " $oldobjs " in
 	    " ") oldobjs=$obj ;;
 	    *[\ /]"$objbase "*)
@@ -5572,58 +7943,62 @@ fi\
 		# Make sure we don't pick an alternate name that also
 		# overlaps.
 		newobj=lt$counter-$objbase
-		counter=`expr $counter + 1`
+		func_arith $counter + 1
+		counter=$func_arith_result
 		case " $oldobjs " in
 		*[\ /]"$newobj "*) ;;
 		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
 		esac
 	      done
-	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      $run ln "$obj" "$gentop/$newobj" ||
-	      $run cp "$obj" "$gentop/$newobj"
+	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
 	      oldobjs="$oldobjs $gentop/$newobj"
 	      ;;
 	    *) oldobjs="$oldobjs $obj" ;;
 	    esac
 	  done
 	fi
-
 	eval cmds=\"$old_archive_cmds\"
 
-	if len=`expr "X$cmds" : ".*"` &&
-	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	func_len " $cmds"
+	len=$func_len_result
+	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 	  cmds=$old_archive_cmds
 	else
 	  # the command line is too long to link in one step, link in parts
-	  $echo "using piecewise archive linking..."
+	  func_verbose "using piecewise archive linking..."
 	  save_RANLIB=$RANLIB
 	  RANLIB=:
 	  objlist=
 	  concat_cmds=
 	  save_oldobjs=$oldobjs
-
+	  oldobjs=
 	  # Is there a better way of finding the last object in the list?
 	  for obj in $save_oldobjs
 	  do
 	    last_oldobj=$obj
 	  done
+	  eval test_cmds=\"$old_archive_cmds\"
+	  func_len " $test_cmds"
+	  len0=$func_len_result
+	  len=$len0
 	  for obj in $save_oldobjs
 	  do
-	    oldobjs="$objlist $obj"
-	    objlist="$objlist $obj"
-	    eval test_cmds=\"$old_archive_cmds\"
-	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	       test "$len" -le "$max_cmd_len"; then
+	    func_len " $obj"
+	    func_arith $len + $func_len_result
+	    len=$func_arith_result
+	    func_append objlist " $obj"
+	    if test "$len" -lt "$max_cmd_len"; then
 	      :
 	    else
 	      # the above command should be used before it gets too long
 	      oldobjs=$objlist
 	      if test "$obj" = "$last_oldobj" ; then
-	        RANLIB=$save_RANLIB
+		RANLIB=$save_RANLIB
 	      fi
 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
 	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
 	      objlist=
+	      len=$len0
 	    fi
 	  done
 	  RANLIB=$save_RANLIB
@@ -5635,49 +8010,39 @@ fi\
 	  fi
 	fi
       fi
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-        eval cmd=\"$cmd\"
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
+      func_execute_cmds "$cmds" 'exit $?'
     done
 
-    if test -n "$generated"; then
-      $show "${rm}r$generated"
-      $run ${rm}r$generated
-    fi
+    test -n "$generated" && \
+      func_show_eval "${RM}r$generated"
 
     # Now create the libtool archive.
     case $output in
     *.la)
       old_library=
       test "$build_old_libs" = yes && old_library="$libname.$libext"
-      $show "creating $output"
+      func_verbose "creating $output"
 
       # Preserve any variables that may affect compiler behavior
       for var in $variables_saved_for_relink; do
 	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
 	elif eval var_value=\$$var; test -z "$var_value"; then
 	  relink_command="$var=; export $var; $relink_command"
 	else
-	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
+	  func_quote_for_eval "$var_value"
+	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
 	fi
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
 
-
       # Only create the output if not a dry run.
-      if test -z "$run"; then
+      $opt_dry_run || {
 	for installed in no yes; do
 	  if test "$installed" = yes; then
 	    if test -z "$install_libdir"; then
@@ -5689,12 +8054,11 @@ fi\
 	    for deplib in $dependency_libs; do
 	      case $deplib in
 	      *.la)
-		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+		func_basename "$deplib"
+		name="$func_basename_result"
 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		if test -z "$libdir"; then
-		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		  exit $EXIT_FAILURE
-		fi
+		test -z "$libdir" && \
+		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 		newdependency_libs="$newdependency_libs $libdir/$name"
 		;;
 	      *) newdependency_libs="$newdependency_libs $deplib" ;;
@@ -5702,25 +8066,37 @@ fi\
 	    done
 	    dependency_libs="$newdependency_libs"
 	    newdlfiles=
+
 	    for lib in $dlfiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlfiles="$newdlfiles $libdir/$name"
+	      case $lib in
+	      *.la)
+	        func_basename "$lib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		newdlfiles="$newdlfiles $libdir/$name"
+		;;
+	      *) newdlfiles="$newdlfiles $lib" ;;
+	      esac
 	    done
 	    dlfiles="$newdlfiles"
 	    newdlprefiles=
 	    for lib in $dlprefiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlprefiles="$newdlprefiles $libdir/$name"
+	      case $lib in
+	      *.la)
+		# Only pass preopened files to the pseudo-archive (for
+		# eventual linking with the app. that links it) if we
+		# didn't already link the preopened objects directly into
+		# the library:
+		func_basename "$lib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		newdlprefiles="$newdlprefiles $libdir/$name"
+		;;
+	      esac
 	    done
 	    dlprefiles="$newdlprefiles"
 	  else
@@ -5743,15 +8119,15 @@ fi\
 	    done
 	    dlprefiles="$newdlprefiles"
 	  fi
-	  $rm $output
+	  $RM $output
 	  # place dlname in correct position for cygwin
 	  tdlname=$dlname
 	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
 	  esac
-	  $echo > $output "\
+	  $ECHO > $output "\
 # $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -5765,9 +8141,15 @@ library_names='$library_names'
 # The name of the static archive.
 old_library='$old_library'
 
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags='$new_inherited_linker_flags'
+
 # Libraries that this one depends upon.
 dependency_libs='$dependency_libs'
 
+# Names of additional weak libraries provided by this library
+weak_library_names='$weak_libs'
+
 # Version information for $libname.
 current=$current
 age=$age
@@ -5786,748 +8168,29 @@ dlpreopen='$dlprefiles'
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
 	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $echo >> $output "\
+	    $ECHO >> $output "\
 relink_command=\"$relink_command\""
 	  fi
 	done
-      fi
+      }
 
       # Do a symbolic link so that the libtool archive can be found in
       # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
       ;;
     esac
     exit $EXIT_SUCCESS
-    ;;
-
-  # libtool install mode
-  install)
-    modename="$modename: install"
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | grep shtool > /dev/null; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f) 
-      	case " $install_prog " in
-	*[\\\ /]cp\ *) ;;
-	*) prev=$arg ;;
-	esac
-	;;
-      -g | -m | -o) prev=$arg ;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	$echo "$modename: no file or destination specified" 1>&2
-      else
-	$echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test "$#" -gt 2; then
-	$echo "$modename: \`$dest' is not a directory" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	library_names=
-	old_library=
-	relink_command=
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
-	  esac
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-	test "X$dir" = "X$file/" && dir=
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  if test "$inst_prefix_dir" = "$destdir"; then
-	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
-	  else
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
-	  fi
-
-	  $echo "$modename: warning: relinking \`$file'" 1>&2
-	  $show "$relink_command"
-	  if $run eval "$relink_command"; then :
-	  else
-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names
-	if test -n "$2"; then
-	  realname="$2"
-	  shift
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  $show "$install_prog $dir/$srcname $destdir/$realname"
-	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-	  if test -n "$stripme" && test -n "$striplib"; then
-	    $show "$striplib $destdir/$realname"
-	    $run eval "$striplib $destdir/$realname" || exit $?
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      if test "$linkname" != "$realname"; then
-                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-	      fi
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  cmds=$postinstall_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || {
-	      lt_exit=$?
-
-	      # Restore the uninstalled library and exit
-	      if test "$mode" = relink; then
-		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-	      fi
-
-	      exit $lt_exit
-	    }
-	  done
-	  IFS="$save_ifs"
-	fi
-
-	# Install the pseudo-library for information purposes.
-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	if test -n "$destfile"; then
-	  $show "$install_prog $file $destfile"
-	  $run eval "$install_prog $file $destfile" || exit $?
-	fi
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
-	  $show "$install_prog $staticobj $staticdest"
-	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      file=`$echo $file|${SED} 's,.exe$,,'`
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin*|*mingw*)
-	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-	  # `FILE.' does not work on cygwin managed mounts.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  # Check the variables that should have been set.
-	  if test -z "$notinst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      # If there is no directory component, then add one.
-	      case $lib in
-	      */* | *\\*) . $lib ;;
-	      *) . ./$lib ;;
-	      esac
-	    fi
-	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
-	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
-	  # `FILE.' does not work on cygwin managed mounts.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    if test "$finalize" = yes && test -z "$run"; then
-	      tmpdir=`func_mktempdir`
-	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
-	      outputname="$tmpdir/$file"
-	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
-
-	      $show "$relink_command"
-	      if $run eval "$relink_command"; then :
-	      else
-		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-		${rm}r "$tmpdir"
-		continue
-	      fi
-	      file="$outputname"
-	    else
-	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
-	    fi
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway 
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
-	    ;;
-	  esac
-	  ;;
-	esac
-	$show "$install_prog$stripme $file $destfile"
-	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-	test -n "$outputname" && ${rm}r "$tmpdir"
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	$show "$old_striplib $oldlib"
-	$run eval "$old_striplib $oldlib" || exit $?
-      fi
-
-      # Do each command in the postinstall commands.
-      cmds=$old_postinstall_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  cmds=$finish_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-	  done
-	  IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    test "$show" = : && exit $EXIT_SUCCESS
-
-    $echo "X----------------------------------------------------------------------" | $Xsed
-    $echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $echo "   $libdir"
-    done
-    $echo
-    $echo "If you ever happen to want to link against installed libraries"
-    $echo "in a given directory, LIBDIR, you must either use libtool, and"
-    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $echo
-    $echo "See any operating system documentation about shared libraries for"
-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "X----------------------------------------------------------------------" | $Xsed
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit $EXIT_FAILURE
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-	$echo "$modename: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  if test ! -f "$dir/$dlname"; then
-	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-	;;
-
-      *)
-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
+}
 
-    if test -z "$run"; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
+{ test "$mode" = link || test "$mode" = relink; } &&
+    func_mode_link ${1+"$@"}
 
-      # Restore saved environment variables
-      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-	eval "if test \"\${save_$lt_var+set}\" = set; then
-		$lt_var=\$save_$lt_var; export $lt_var
-	      fi"
-      done
 
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-	$echo "export $shlibpath_var"
-      fi
-      $echo "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool clean and uninstall mode
-  clean | uninstall)
-    modename="$modename: $mode"
-    rm="$nonopt"
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+    $opt_debug
+    RM="$nonopt"
     files=
     rmforce=
     exit_status=0
@@ -6539,30 +8202,28 @@ relink_command=\"$relink_command\""
     for arg
     do
       case $arg in
-      -f) rm="$rm $arg"; rmforce=yes ;;
-      -*) rm="$rm $arg" ;;
+      -f) RM="$RM $arg"; rmforce=yes ;;
+      -*) RM="$RM $arg" ;;
       *) files="$files $arg" ;;
       esac
     done
 
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
+    test -z "$RM" && \
+      func_fatal_help "you must specify an RM program"
 
     rmdirs=
 
     origobjdir="$objdir"
     for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-	dir=.
+      func_dirname "$file" "" "."
+      dir="$func_dirname_result"
+      if test "X$dir" = X.; then
 	objdir="$origobjdir"
       else
 	objdir="$dir/$origobjdir"
       fi
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+      func_basename "$file"
+      name="$func_basename_result"
       test "$mode" = uninstall && objdir="$dir"
 
       # Remember objdir for removal later, being careful to avoid duplicates
@@ -6574,9 +8235,9 @@ relink_command=\"$relink_command\""
       fi
 
       # Don't error if the file doesn't exist and rm -f was used.
-      if (test -L "$file") >/dev/null 2>&1 \
-	|| (test -h "$file") >/dev/null 2>&1 \
-	|| test -f "$file"; then
+      if { test -L "$file"; } >/dev/null 2>&1 ||
+	 { test -h "$file"; } >/dev/null 2>&1 ||
+	 test -f "$file"; then
 	:
       elif test -d "$file"; then
 	exit_status=1
@@ -6590,8 +8251,8 @@ relink_command=\"$relink_command\""
       case $name in
       *.la)
 	# Possibly a libtool archive, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $dir/$name
+	if func_lalib_p "$file"; then
+	  func_source $dir/$name
 
 	  # Delete the libtool libraries and symlinks.
 	  for n in $library_names; do
@@ -6606,39 +8267,17 @@ relink_command=\"$relink_command\""
 	    *" $dlname "*) ;;
 	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
 	    esac
-	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
 	    ;;
 	  uninstall)
 	    if test -n "$library_names"; then
 	      # Do each command in the postuninstall commands.
-	      cmds=$postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
+	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
 	    fi
 
 	    if test -n "$old_library"; then
 	      # Do each command in the old_postuninstall commands.
-	      cmds=$old_postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
+	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
 	    fi
 	    # FIXME: should reinstall the best remaining shared library.
 	    ;;
@@ -6648,20 +8287,20 @@ relink_command=\"$relink_command\""
 
       *.lo)
 	# Possibly a libtool object, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	if func_lalib_p "$file"; then
 
 	  # Read the .lo file
-	  . $dir/$name
+	  func_source $dir/$name
 
 	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" \
-	     && test "$pic_object" != none; then
+	  if test -n "$pic_object" &&
+	     test "$pic_object" != none; then
 	    rmfiles="$rmfiles $dir/$pic_object"
 	  fi
 
 	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" \
-	     && test "$non_pic_object" != none; then
+	  if test -n "$non_pic_object" &&
+	     test "$non_pic_object" != none; then
 	    rmfiles="$rmfiles $dir/$non_pic_object"
 	  fi
 	fi
@@ -6672,17 +8311,26 @@ relink_command=\"$relink_command\""
 	  noexename=$name
 	  case $file in
 	  *.exe)
-	    file=`$echo $file|${SED} 's,.exe$,,'`
-	    noexename=`$echo $name|${SED} 's,.exe$,,'`
+	    func_stripname '' '.exe' "$file"
+	    file=$func_stripname_result
+	    func_stripname '' '.exe' "$name"
+	    noexename=$func_stripname_result
 	    # $file with .exe has already been added to rmfiles,
 	    # add $file without .exe
 	    rmfiles="$rmfiles $file"
 	    ;;
 	  esac
 	  # Do a test to see if this is a libtool program.
-	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	    relink_command=
-	    . $dir/$noexename
+	  if func_ltwrapper_p "$file"; then
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      relink_command=
+	      func_source $func_ltwrapper_scriptname_result
+	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+	    else
+	      relink_command=
+	      func_source $dir/$noexename
+	    fi
 
 	    # note $name still contains .exe if it was in $file originally
 	    # as does the version of $file that was added into $rmfiles
@@ -6697,239 +8345,38 @@ relink_command=\"$relink_command\""
 	fi
 	;;
       esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles || exit_status=1
+      func_show_eval "$RM $rmfiles" 'exit_status=1'
     done
     objdir="$origobjdir"
 
     # Try to remove the ${objdir}s in the directories where we deleted files
     for dir in $rmdirs; do
       if test -d "$dir"; then
-	$show "rmdir $dir"
-	$run rmdir $dir >/dev/null 2>&1
+	func_show_eval "rmdir $dir >/dev/null 2>&1"
       fi
     done
 
     exit $exit_status
-    ;;
+}
 
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-  esac
+{ test "$mode" = uninstall || test "$mode" = clean; } &&
+    func_mode_uninstall ${1+"$@"}
 
-  if test -z "$exec_cmd"; then
-    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi # test -z "$show_help"
+test -z "$mode" && {
+  help="$generic_help"
+  func_fatal_help "you must specify a MODE"
+}
+
+test -z "$exec_cmd" && \
+  func_fatal_help "invalid operation mode \`$mode'"
 
 if test -n "$exec_cmd"; then
-  eval exec $exec_cmd
+  eval exec "$exec_cmd"
   exit $EXIT_FAILURE
 fi
 
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-Provide generalized library-building support services.
-
-    --config          show all configuration variables
-    --debug           enable verbose shell tracing
--n, --dry-run         display commands without modifying any files
-    --features        display basic configuration information and exit
-    --finish          same as \`--mode=finish'
-    --help            display this help message and exit
-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
-    --tag=TAG         use configuration variables from tag TAG
-    --version         print version information
-
-MODE must be one of the following:
-
-      clean           remove files from the build directory
-      compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
-      finish          complete the installation of libtool libraries
-      install         install libraries or executables
-      link            create a library or an executable
-      uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-
-Report bugs to <bug-libtool@gnu.org>."
-  exit $EXIT_SUCCESS
-  ;;
-
-clean)
-  $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-  ;;
+exit $exit_status
 
-compile)
-  $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -static           always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-  ;;
-
-execute)
-  $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-  ;;
-
-finish)
-  $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-  ;;
-
-install)
-  $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-  ;;
-
-uninstall)
-  $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-  ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit $?
 
 # The TAGs below are defined such that we never get into a situation
 # in which we disable both kinds of libraries.  Given conflicting
@@ -6943,14 +8390,17 @@ exit $?
 # configuration.  But we'll never go from static-only to shared-only.
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-disable_libs=shared
+build_libtool_libs=no
+build_old_libs=yes
 # ### END LIBTOOL TAG CONFIG: disable-shared
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-static
-disable_libs=static
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
 # ### END LIBTOOL TAG CONFIG: disable-static
 
 # Local Variables:
 # mode:shell-script
 # sh-indentation:2
 # End:
+# vi:sw=2
+
diff --git a/scripts/mkchlog b/scripts/mkchlog
index fa54b5d..8d1d431 100755
--- a/scripts/mkchlog
+++ b/scripts/mkchlog
@@ -14,9 +14,17 @@ use strict;
 my $emailsuffix;
 my $symbolic_name_regexp;
 my (@ignoreprefix);
+my $reverse = 0;
+my $use_rcs_filename = 0;
+my $print_each_file = 0;
+my $print_time = 0;
 
 GetOptions("e:s" => \$emailsuffix,
 	   "X=s" => \@ignoreprefix,
+	   "r!"  => \$reverse,
+	   "R!"  => \$use_rcs_filename,
+	   "v!"  => \$print_each_file,
+	   "t!"  => \$print_time,
 	   "s:s" => \$symbolic_name_regexp);
 
 my %logmsgs = ();			# Index by date, time, and author
@@ -44,7 +52,7 @@ foreach my $d (@cvsdirs) {
     }
 }
 
-sub compare_versions
+sub compare_versions($$)
 {
     # vw: version of the working file
     # vl: version from the log
@@ -135,6 +143,7 @@ sub compare_versions
 }
 
 my ($in_header) = 0;
+my ($has_rcs_file) = 0;
 my (%symbols);
 my $revision;
 my $ignore;
@@ -144,10 +153,32 @@ my $currentbasefile;
 my %symbols_printed = ();
 
 while (<>) {
-    if (/^Working file: /) {
+    if (/^RCS file: /) {
+	next if (! $use_rcs_filename);
 	$in_header = 1;
+	$has_rcs_file = 1;
 	chomp;
-	($ignore, $ignore, $currentfile) = split;
+	$currentfile = $_;
+	$currentfile =~ s,/RCS/,/,;
+	$currentfile =~ s,^RCS file: *\./,,;
+	$currentfile =~ s/,v$//;
+	$currentfile =~ s/\s/\000/g;
+	if (grep { $currentfile =~ /^$_/ } @ignoreprefix) {
+	    $skipfile = 1;
+	} else {
+	    $skipfile = 0;
+	}
+	$symbols{$currentfile} = {};
+	next;
+    } elsif (/^Working file: /) {
+	if ($has_rcs_file) {
+	    $has_rcs_file = 0;
+	    next;
+	}
+	$in_header = 1;
+	chomp;
+	($ignore, $ignore, $currentfile) = split(/\s+/, $_, 3);
+	$currentfile =~ s/\s/\000/g;
 	if (grep { $currentfile =~ /^$_/ } @ignoreprefix) {
 	    $skipfile = 1;
 	} else {
@@ -196,11 +227,29 @@ while (<>) {
 	    $skipme = 1;
 	}
     } elsif (! $in_header && $_ =~ /^date: /) {
-	my ($ignore, $date, $time, $ignore, $author, $ignore, $state,
-	    $ignore, $plus, $minus, $ignore) = split;
+	my (@stuff) = split;
+	my ($date, $time, $author, $state, $plus, $minus);
+	if ($stuff[3] =~ /^[-+][0-9][0-9][0-9][0-9]/) {
+	    $date = $stuff[1];
+	    $time = $stuff[2];
+	    $author = $stuff[5];
+	    $state = $stuff[7];
+	    $plus = $stuff[9];
+	    $minus = $stuff[10];
+	} else {
+	    $date = $stuff[1];
+	    $time = $stuff[2];
+	    $author = $stuff[4];
+	    $state = $stuff[6];
+	    $plus = $stuff[8];
+	    $minus = $stuff[9];
+	}
 #	$time =~ s/[0-9]:[0-9][0-9];$//;
 #	$time =~ s/[0-9][0-9];$//;
+	$time =~ s/;$//;
 	$author =~ s/;$//;
+	$plus =~ s/;$//;
+	$minus =~ s/;$//;
 	my $body = "";
 	my $firstline = 1;
 	while (<>) {
@@ -238,14 +287,47 @@ while (<>) {
 }
 
 my $prevmsg="";
+my $prevdate="";
+my $prevtime="";
+my $prevauthor="";
 my $header="";
-my @fileinfo = ();
+my %deltainfo = ();
+my %revinfo = ();
 
-my @chlog = reverse sort keys %logmsgs;
+my @chlog = $reverse ? sort keys %logmsgs : reverse sort keys %logmsgs;
 my %filenames_printed = ();
 my ($date, $time, $author, $junk, $file, $revision, @symbols);
 my $filestuff;
 
+sub printmsg($$$$$\%\%)
+{
+    my ($date, $time, $author, $emailsuffix, $prevmsg, $revinfo, $deltainfo) = @_;
+    if ($print_time) {
+	$time = " $time";
+    } else {
+	$time = "";
+    }
+    print "$date$time\t<$author$emailsuffix>\n\n";
+    my $filestuff = join "", (map { "\t\t$_ ($$revinfo{$_}) ($$deltainfo{$_})\n" } sort keys %revinfo);
+    $filestuff =~ s/\000/ /g;
+    $filestuff =~ s/\t/\tFiles:/;
+    print "$filestuff\n";
+    $prevmsg =~ s/^/\t/g;
+    $prevmsg =~ s/\n/\n\t/g;
+    $prevmsg =~ s/[ \t]+\n/\n/g;
+    $prevmsg =~ s/[ \t]+$//g;
+    print "$prevmsg\n";
+}
+
+sub printsyms(@) {
+    my (@symbols_to_print) = @_;
+    print "===============================================================================\n";
+    map {
+	print "Name: $_\n";
+    } @symbols_to_print;
+    print "\n";
+}
+
 foreach (@chlog) {
     ($date, $time, $author, $junk, $file, $revision, @symbols) = split;
     $date =~ s,/,-,g;
@@ -256,25 +338,23 @@ foreach (@chlog) {
     } else {
 	$delta = "$plus{$_} $minus{$_}";
     }
-    if ($prevmsg eq $msg && !$filenames_printed{$file}) {
-	push @fileinfo, "\t\t$file ($revision) ($delta)\n";
+    if (! $print_each_file && $prevmsg eq $msg && !$filenames_printed{$file}) {
+	$deltainfo{$file} = $delta;
+	$revinfo{$file} = $revision;
     } else {
-	if ($prevmsg ne "" || $#fileinfo >= 0) {
-	    print $header;
-	    $filestuff = join "", sort @fileinfo;
-	    $filestuff =~ s/\t/\tFiles:/;
-	    print "$filestuff\n";
-	    $prevmsg =~ s/^/\t/g;
-	    $prevmsg =~ s/\n/\n\t/g;
-	    $prevmsg =~ s/[ \t]+\n/\n/g;
-	    $prevmsg =~ s/[ \t]+$//g;
-	    print "$prevmsg\n";
+	if ($prevmsg ne "" || keys %deltainfo > 0) {
+	    printmsg($prevdate, $prevtime, $prevauthor, $emailsuffix, $prevmsg, %revinfo, %deltainfo);
 	    %filenames_printed = ();
 	}
 	$header = "$date\t<$author$emailsuffix>\n\n";
 	$prevmsg = $msg;
-	@fileinfo = ();
-	push @fileinfo, "\t\t$file ($revision) ($delta)\n";
+	$prevdate = $date;
+	$prevauthor = $author;
+	$prevtime = $time;
+	%deltainfo = ();
+	%revinfo = ();
+	$deltainfo{$file} = $delta;
+	$revinfo{$file} = $revision;
 	$filenames_printed{$file} = 1;
     }
     my (@symbols_to_print);
@@ -285,22 +365,10 @@ foreach (@chlog) {
 	}
     }
     if (@symbols_to_print) {
-	print "===============================================================================\n";
-	map {
-	    print "Name: $_\n";
-	} @symbols_to_print;
-	print "\n";
+	printsyms(@symbols_to_print);
     }
 }
 
-if ($prevmsg ne "" or $#fileinfo >= 0) {
-    print "$date\t<$author$emailsuffix>\n\n";
-    $filestuff = join "", sort @fileinfo;
-    $filestuff =~ s/\t/\tFiles:/;
-    print "$filestuff\n";
-    $prevmsg =~ s/^/\t/g;
-    $prevmsg =~ s/\n/\n\t/g;
-    $prevmsg =~ s/[ \t]+\n/\n/g;
-    $prevmsg =~ s/[ \t]+$//g;
-    print "$prevmsg\n";
+if ($prevmsg ne "" || keys %deltainfo > 0) {
+    printmsg($prevdate, $prevtime, $prevauthor, $emailsuffix, $prevmsg, %revinfo, %deltainfo);
 }
diff --git a/src/Makefile.in b/src/Makefile.in
index afa9459..5421d27 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -43,11 +43,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -87,10 +90,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -100,16 +99,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -154,6 +152,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -165,6 +164,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -177,8 +177,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -212,8 +216,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -258,6 +261,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -270,6 +274,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
diff --git a/src/cups/Makefile.am b/src/cups/Makefile.am
index c093bde..bebc47f 100644
--- a/src/cups/Makefile.am
+++ b/src/cups/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.118 2008/09/22 03:10:45 easysw Exp $
+## $Id: Makefile.am,v 1.119 2009/04/11 16:16:20 rlk Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -182,10 +182,11 @@ all-local: $(INSTALL_DATA_LOCAL_DEPS)
 ppd: ppd-stamp
 
 ppd-stamp: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/xml/xml-stamp
+	$(MAKE) ppd-stamp-pre
 	$(MAKE) ppd-stamp-phony
 	touch ppd-stamp
 
-ppd-stamp-phony: ppd-stamp-pre $(PPD)
+ppd-stamp-phony: $(PPD)
 
 ppd-stamp-pre:
 	-$(RM) -r ppd
diff --git a/src/cups/Makefile.in b/src/cups/Makefile.in
index 4bbd121..29ce8e8 100644
--- a/src/cups/Makefile.in
+++ b/src/cups/Makefile.in
@@ -52,11 +52,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -175,10 +178,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -188,16 +187,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -242,6 +240,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -253,6 +252,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -265,8 +265,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = cups
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -300,8 +304,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -346,6 +349,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -358,6 +362,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
@@ -1087,10 +1092,11 @@ all-local: $(INSTALL_DATA_LOCAL_DEPS)
 ppd: ppd-stamp
 
 ppd-stamp: cups-genppd.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ $(top_srcdir)/src/xml/xml-stamp
+	$(MAKE) ppd-stamp-pre
 	$(MAKE) ppd-stamp-phony
 	touch ppd-stamp
 
-ppd-stamp-phony: ppd-stamp-pre $(PPD)
+ppd-stamp-phony: $(PPD)
 
 ppd-stamp-pre:
 	-$(RM) -r ppd
diff --git a/src/cups/cups-genppdupdate.in b/src/cups/cups-genppdupdate.in
index 48324ee..1286c45 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.53 2008/09/22 11:04:24 rlk Exp $
+# $Id: cups-genppdupdate.in,v 1.57 2009/06/07 02:34:55 rlk Exp $
 # Update CUPS PPDs for Gutenprint queues.
 # Copyright (C) 2002-2003 Roger Leigh (rleigh@debian.org)
 #
@@ -20,8 +20,11 @@
 use strict;
 use Getopt::Std;
 use Fcntl qw(:mode);
+use FileHandle;
+use IPC::Open2;
 
 sub parse_options ();
+sub get_driver_version ();
 sub update_ppd ($); # Original PPD filename
 sub get_ppd_fh ($$$$$); # Return contents of desired PPD
 sub find_ppd ($$$$); # Gutenprint Filename, driver, language (e.g. en, sv),
@@ -68,9 +71,11 @@ my @languages = qw(Global C @ALL_LINGUAS@);
 my $serverdir = "@cups_conf_serverbin@";
 my $driver_bin = "$serverdir/driver/gutenprint.$version";
 my $driver_version = "";
+my $server_multicat = 0;
+my $server_multicat_initialized = 0;
+
 if (-x $driver_bin) {
-    $driver_version = `$driver_bin VERSION`;
-    chomp $driver_version;
+    get_driver_version();
 }
 
 $Getopt::Std::STANDARD_HELP_VERSION = 1;
@@ -222,6 +227,24 @@ sub VERSION_MESSAGE($;$$$) {
 sub help() {
     HELP_MESSAGE(\*STDOUT);
 }
+		  
+sub check_multicat() {
+}
+
+sub get_driver_version() {
+    open(DBIN, "$driver_bin org.gutenprint.extensions 2>/dev/null |") or return 0;
+    my ($line);
+    $server_multicat = 0;
+    while ($line = <DBIN>) {
+	if ($line =~ /^org.gutenprint.multicat$/) {
+	    $server_multicat = 1;
+	    last;
+	}
+    }
+    close DBIN;
+    $driver_version = `$driver_bin VERSION`;
+    chomp $driver_version;
+}
 
 sub parse_options () {
     if (!getopts('d:hnqs:vNo:p:P:r:ifl:')) {
@@ -259,6 +282,7 @@ sub parse_options () {
 		if (-d $opt_s) {
 		    $ppd_base_dir = "$opt_s";
 		    $driver_bin = "";
+		    $server_multicat = 0;
 		    $use_static_ppd = "yes";
 		} else {
 		    die "$opt_s: invalid directory: $!\n";
@@ -272,9 +296,8 @@ sub parse_options () {
 	    # for an exact match.
 	    $file_version = "\"$version";
 	    if (-x $driver_bin) {
-		$driver_version = `$driver_bin VERSION`;
+		get_driver_version();
 		$use_static_ppd = "no";
-		chomp $driver_version;
 		$file_version = "\"$driver_version\"\$";
 	    } elsif (! -d $ppd_base_dir && ! -l $ppd_base_dir) {
 		die "Gutenprint $version does not appear to be installed!\n";
@@ -285,6 +308,7 @@ sub parse_options () {
 	if (-d $opt_s) {
 	    $ppd_base_dir = "$opt_s";
 	    $driver_bin = "";
+	    $server_multicat = 0;
 	    $driver_version = "";
 	    $use_static_ppd = "yes";
 	}
@@ -303,8 +327,7 @@ sub parse_options () {
     if ($opt_P) {
 	if (-x $opt_P) {
 	    $driver_bin = "$opt_P";
-	    $driver_version = `$driver_bin VERSION`;
-	    chomp $driver_version;
+	    get_driver_version();
 	    $use_static_ppd = "no";
 	}
 	else {
@@ -356,7 +379,15 @@ sub get_ppd_fh($$$$$) {
 	foreach $url (@url_list) {
 	    $new_ppd_filename = $url;
 	    if ($debug & 8) {
-		print "Trying $driver_bin cat $url for $driver, $simplified, $locale, $region\n";
+		print "Trying ", (! $server_multicat ? "$driver_bin cat " : ""), "$url for $driver, $simplified, $locale, $region\n";
+	    }
+	    if ($server_multicat) {
+		if (! $server_multicat_initialized) {
+		    my ($pid) = open2(*Reader, *Writer, "$driver_bin org.gutenprint.multicat");
+		    $server_multicat_initialized = 1;
+		}
+		print Writer "$url\n";
+		return ($new_ppd_filename, \*Reader);
 	    }
 	    if (open PPD, "$driver_bin cat $url |") {
 		return ($new_ppd_filename, \*PPD);
@@ -491,11 +522,11 @@ sub update_ppd ($) {
 	print "Update PPD $ppd_source_filename from $new_ppd_filename [nyq]? ";
 	my $input = readline(*STDIN);
 	if ($input =~ /^q/i) {
-	    close $source_fd;
+	    close $source_fd if !$server_multicat;
 	    print "Skipping all...\n";
 	    return -2;
 	} elsif (! ($input =~ /^y/i)) {
-	    close $source_fd;
+	    close $source_fd if !$server_multicat;
 	    print "Skipping...\n";
 	    return -1;
 	}
@@ -511,7 +542,7 @@ sub update_ppd ($) {
     # Close original and temporary files...
 
     close ORIG;
-    if (! close $source_fd) {
+    if (! $server_multicat && ! close $source_fd) {
 	print "Unable to retrieve new PPD file: $!\n";
 	return 0;
     }
@@ -808,6 +839,7 @@ sub get_ppd_data(*$$$$$) {
 
     if ($resolutions || $types || $opts || $defaults || $data) {
 	while (<$fh>) {
+	    last if $_ eq "*%*%EOFEOF\n";
 	    $source_data .= $_ if ($data);
 	    chomp;
 	    if (($types || $opts) && m/^\*OpenUI/) {
diff --git a/src/cups/genppd.c b/src/cups/genppd.c
index 580c59c..2af44a6 100644
--- a/src/cups/genppd.c
+++ b/src/cups/genppd.c
@@ -1,5 +1,5 @@
-/*
- * "$Id: genppd.c,v 1.171 2008/12/05 03:27:20 easysw Exp $"
+ /*
+ * "$Id: genppd.c,v 1.178 2009/07/18 00:55:45 rlk Exp $"
  *
  *   PPD file generation program for the CUPS drivers.
  *
@@ -161,7 +161,7 @@ const char *parameter_level_names[] =
  */
 
 #ifdef CUPS_DRIVER_INTERFACE
-static int	cat_ppd(int argc, char **argv);
+static int	cat_ppd(const char *uri);
 static int	list_ppds(const char *argv0);
 #else  /* !CUPS_DRIVER_INTERFACE */
 static int	generate_ppd(const char *prefix, int verbose,
@@ -176,10 +176,12 @@ static char	**getlangs(void);
 static int	is_special_option(const char *name);
 static void	print_group_close(gzFile fp, stp_parameter_class_t p_class,
 				  stp_parameter_level_t p_level,
-				  const char *language, stp_string_list_t *po);
+				  const char *language,
+				  const stp_string_list_t *po);
 static void	print_group_open(gzFile fp, stp_parameter_class_t p_class,
 				 stp_parameter_level_t p_level,
-				 const char *language, stp_string_list_t *po);
+				 const char *language,
+				 const stp_string_list_t *po);
 static int	write_ppd(gzFile fp, const stp_printer_t *p,
 		          const char *language, const char *ppd_location,
 			  int simplified);
@@ -196,6 +198,13 @@ static int	write_ppd(gzFile fp, const stp_printer_t *p,
  * 'main()' - Process files on the command-line...
  */
 
+const char slang_c[] = "LANG=C";
+const char slcall_c[] = "LC_ALL=C";
+const char slcnumeric_c[] = "LC_NUMERIC=C";
+char lang_c[sizeof(slang_c) + 1];
+char lcall_c[sizeof(slcall_c) + 1];
+char lcnumeric_c[sizeof(slcnumeric_c) + 1];
+
 int				    /* O - Exit status */
 main(int  argc,			    /* I - Number of command-line arguments */
      char *argv[])		    /* I - Command-line arguments */
@@ -204,9 +213,12 @@ main(int  argc,			    /* I - Number of command-line arguments */
   * Force POSIX locale, since stp_init incorrectly calls setlocale...
   */
 
-  putenv((char *)"LANG=C");
-  putenv((char *)"LC_ALL=C");
-  putenv((char *)"LC_NUMERIC=C");
+  strcpy(lang_c, slang_c);
+  strcpy(lcall_c, slcall_c);
+  strcpy(lcnumeric_c, slcnumeric_c);
+  putenv(lang_c);
+  putenv(lcall_c);
+  putenv(lcnumeric_c);
 
  /*
   * Initialise libgutenprint
@@ -221,12 +233,34 @@ main(int  argc,			    /* I - Number of command-line arguments */
   if (argc == 2 && !strcmp(argv[1], "list"))
     return (list_ppds(argv[0]));
   else if (argc == 3 && !strcmp(argv[1], "cat"))
-    return (cat_ppd(argc, argv));
+    return (cat_ppd(argv[2]));
+  else if (argc == 2 && !strcmp(argv[1], "org.gutenprint.multicat"))
+    {
+      char buf[1024];
+      int status = 0;
+      while (status == 0 && fgets(buf, sizeof(buf) - 1, stdin))
+	{
+	  size_t len = strlen(buf);
+	  if (len == 0)
+	    continue;
+	  if (buf[len - 1] == '\n')
+	    buf[len - 1] = '\0';
+	  status = cat_ppd(buf);
+	  fputs("*%*%EOFEOF\n", stdout);
+	  (void) fflush(stdout);
+	}
+      return status;
+    }
   else if (argc == 2 && !strcmp(argv[1], "VERSION"))
     {
       printf("%s\n", VERSION);
       return (0);
     }
+  else if (argc == 2 && !strcasecmp(argv[1], "org.gutenprint.extensions"))
+    {
+      printf("org.gutenprint.multicat");
+      return (0);
+    }
   else
   {
     fprintf(stderr, "Usage: %s list\n", argv[0]);
@@ -241,9 +275,8 @@ main(int  argc,			    /* I - Number of command-line arguments */
  */
 
 static int				/* O - Exit status */
-cat_ppd(int argc, char **argv)	/* I - Driver URI */
+cat_ppd(const char *uri)	/* I - Driver URI */
 {
-  const char		*uri = argv[2];
   char			scheme[64],	/* URI scheme */
 			userpass[32],	/* URI user/pass (unused) */
 			hostname[32],	/* URI hostname */
@@ -800,7 +833,7 @@ print_group(
     stp_parameter_class_t p_class,	/* I - Option class */
     stp_parameter_level_t p_level,	/* I - Option level */
     const char		  *language,	/* I - Language */
-    stp_string_list_t     *po)		/* I - Message catalog */
+    const stp_string_list_t     *po)		/* I - Message catalog */
 {
   char buf[64];
   const char *class = stp_i18n_lookup(po, parameter_class_names[p_class]);
@@ -816,7 +849,7 @@ print_group(
 
       for (langnum = 0; all_langs[langnum]; langnum ++)
 	{
-	  stp_string_list_t *altpo;
+	  const stp_string_list_t *altpo;
 
 	  lang = all_langs[langnum];
 
@@ -846,7 +879,7 @@ print_group_close(
     stp_parameter_class_t p_class,	/* I - Option class */
     stp_parameter_level_t p_level,	/* I - Option level */
     const char		 *language,	/* I - language */
-    stp_string_list_t    *po)		/* I - Message catalog */
+    const stp_string_list_t    *po)		/* I - Message catalog */
 {
   print_group(fp, "Close", p_class, p_level, NULL, NULL);
 }
@@ -862,7 +895,7 @@ print_group_open(
     stp_parameter_class_t p_class,	/* I - Option class */
     stp_parameter_level_t p_level,	/* I - Option level */
     const char		 *language,	/* I - language */
-    stp_string_list_t    *po)		/* I - Message catalog */
+    const stp_string_list_t    *po)		/* I - Message catalog */
 {
   print_group(fp, "Open", p_class, p_level, language ? language : "C", po);
 }
@@ -911,7 +944,7 @@ write_ppd(
   char		*default_resolution = NULL;  /* Default resolution mapped name */
   stp_string_list_t *resolutions = stp_string_list_create();
   char		**all_langs = getlangs();/* All languages */
-  stp_string_list_t	*po = stp_i18n_load(language);
+  const stp_string_list_t	*po = stp_i18n_load(language);
 					/* Message catalog */
 
 
@@ -1535,7 +1568,7 @@ write_ppd(
 		  !stp_string_list_is_present(res_list, res_name))
 		{
 		  resolution_ok = 1;
-		  stp_string_list_add_string(res_list, res_name, res_name);
+		  stp_string_list_add_string(res_list, res_name, opt->text);
 		}
 	      else if (tmp_ydpi > tmp_xdpi &&
 		       tmp_ydpi < MAXIMUM_SAFE_PPD_Y_RESOLUTION)
@@ -1548,7 +1581,7 @@ write_ppd(
 	      else
 		tmp_xdpi /= 2;
 	    } while (!resolution_ok);
-	  stp_string_list_add_string(resolutions, res_name, res_name);
+	  stp_string_list_add_string(resolutions, res_name, opt->text);
 	  gzprintf(fp, "*Resolution %s/%s:\t\"<</HWResolution[%d %d]/cupsCompression %d>>setpagedevice\"\n",
 		   res_name, stp_i18n_lookup(po, opt->text), xdpi, ydpi, i + 1);
 	  if (strcmp(res_name, opt->name) != 0)
@@ -1760,7 +1793,7 @@ write_ppd(
 			{
 			  gzprintf(fp, "*OpenUI *StpFine%s/%s %s: PickOne\n",
 				   desc.name, stp_i18n_lookup(po, desc.text), _("Fine Adjustment"));
-			  gzprintf(fp, "*OPOptionHints Stp%s: \"hide\"\n",
+			  gzprintf(fp, "*OPOptionHints StpFine%s: \"hide\"\n",
 				   lparam->name);
 			  gzprintf(fp, "*StpStpFine%s: %d %d %d %d %d %.3f %.3f %.3f\n",
 				   desc.name, STP_PARAMETER_TYPE_INVALID, 0,
@@ -1860,7 +1893,7 @@ write_ppd(
 		      */
 
 		      gzprintf(fp, "*CustomStp%s True: \"pop\"\n", desc.name);
-		      gzprintf(fp, "*ParamCustomStp%s Value/%s: 1 points %d %d\n\n",
+		      gzprintf(fp, "*ParamCustomStp%s Value/%s: 1 int %d %d\n\n",
 		               desc.name, _("Value"),
 			       desc.bounds.dimension.lower,
 			       desc.bounds.dimension.upper);
@@ -1878,6 +1911,7 @@ write_ppd(
 	    print_group_close(fp, j, k, language, po);
 	}
     }
+  stp_parameter_list_destroy(param_list);
   stp_describe_parameter(v, "ImageType", &desc);
   if (desc.is_active && desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
     {
@@ -1906,7 +1940,7 @@ write_ppd(
     */
 
     const char *lang;
-    stp_string_list_t *altpo;
+    const stp_string_list_t *altpo;
     int langnum;
 
     for (langnum = 0; all_langs[langnum]; langnum ++)
@@ -2240,6 +2274,7 @@ write_ppd(
 		}
 	    }
 	}
+      stp_parameter_list_destroy(param_list);
       stp_describe_parameter(v, "ImageType", &desc);
       if (desc.is_active && desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
 	{
@@ -2262,8 +2297,6 @@ write_ppd(
     stp_free(default_resolution);
   stp_string_list_destroy(resolutions);
 
-  stp_parameter_list_destroy(param_list);
-
 #undef _
 #define _(x) x
 
@@ -2320,5 +2353,5 @@ write_ppd(
 
 
 /*
- * End of "$Id: genppd.c,v 1.171 2008/12/05 03:27:20 easysw Exp $".
+ * End of "$Id: genppd.c,v 1.178 2009/07/18 00:55:45 rlk Exp $".
  */
diff --git a/src/cups/i18n.c b/src/cups/i18n.c
index 59406ec..81c4488 100644
--- a/src/cups/i18n.c
+++ b/src/cups/i18n.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: i18n.c,v 1.6 2008/08/16 16:56:06 rlk Exp $"
+ * "$Id: i18n.c,v 1.8 2009/04/11 19:05:12 rlk Exp $"
  *
  *   Internationalization functions for CUPS drivers.
  *
@@ -87,7 +87,7 @@ static stpi_i18n_t	*stpi_pocache = NULL;
  * 'stp_i18n_load()' - Load a message catalog for a locale.
  */
 
-stp_string_list_t *			/* O - Message catalog */
+const stp_string_list_t *		/* O - Message catalog */
 stp_i18n_load(const char *locale)	/* I - Locale name */
 {
   stp_string_list_t	*po;		/* Message catalog */
@@ -385,6 +385,8 @@ stp_i18n_load(const char *locale)	/* I - Locale name */
     stpi_pocache  = pocache;
   }
   
+  if (ic)
+    iconv_close(ic);
   return (po);
 }
 
@@ -395,7 +397,7 @@ stp_i18n_load(const char *locale)	/* I - Locale name */
 
 const char *				/* O - Localized message */
 stp_i18n_lookup(
-    stp_string_list_t *po,		/* I - Message catalog */
+    const stp_string_list_t *po,		/* I - Message catalog */
     const char        *message)		/* I - Message */
 {
   stp_param_string_t	*param;		/* Matching message */
@@ -414,7 +416,7 @@ stp_i18n_lookup(
 
 void
 stp_i18n_printf(
-    stp_string_list_t *po,		/* I - Message catalog */
+    const stp_string_list_t *po,		/* I - Message catalog */
     const char        *message,		/* I - Printf-style message */
     ...)				/* I - Additional arguments as needed */
 {
@@ -477,5 +479,5 @@ stpi_unquote(char *s)		/* IO - Original string */
 
 
 /*
- * End of "$Id: i18n.c,v 1.6 2008/08/16 16:56:06 rlk Exp $".
+ * End of "$Id: i18n.c,v 1.8 2009/04/11 19:05:12 rlk Exp $".
  */
diff --git a/src/cups/i18n.h b/src/cups/i18n.h
index f5ae7af..a75510b 100644
--- a/src/cups/i18n.h
+++ b/src/cups/i18n.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: i18n.h,v 1.1 2008/08/13 07:35:52 easysw Exp $"
+ * "$Id: i18n.h,v 1.3 2009/04/11 19:05:12 rlk Exp $"
  *
  *   Internationalization definitions for CUPS drivers.
  *
@@ -35,13 +35,13 @@
  * Prototypes...
  */
 
-extern stp_string_list_t	*stp_i18n_load(const char *locale);
-extern const char		*stp_i18n_lookup(stp_string_list_t *po,
+extern const stp_string_list_t	*stp_i18n_load(const char *locale);
+extern const char		*stp_i18n_lookup(const stp_string_list_t *po,
 				                 const char *message);
-extern void			stp_i18n_printf(stp_string_list_t *po,
+extern void			stp_i18n_printf(const stp_string_list_t *po,
 				                const char *message, ...);
 
 
 /*
- * End of "$Id: i18n.h,v 1.1 2008/08/13 07:35:52 easysw Exp $".
+ * End of "$Id: i18n.h,v 1.3 2009/04/11 19:05:12 rlk Exp $".
  */
diff --git a/src/escputil/Makefile.in b/src/escputil/Makefile.in
index d441e3c..07325b5 100644
--- a/src/escputil/Makefile.in
+++ b/src/escputil/Makefile.in
@@ -45,11 +45,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -98,10 +101,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -111,16 +110,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -165,6 +163,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -176,6 +175,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -188,8 +188,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -223,8 +227,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -269,6 +272,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -281,6 +285,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
diff --git a/src/escputil/escputil.c b/src/escputil/escputil.c
index df65b46..0d14b08 100644
--- a/src/escputil/escputil.c
+++ b/src/escputil/escputil.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escputil.c,v 1.99 2008/12/21 18:35:43 rlk Exp $"
+ * "$Id: escputil.c,v 1.100 2009/03/22 01:35:18 rlk Exp $"
  *
  *   Printer maintenance utility for EPSON Stylus (R) printers
  *
@@ -1242,7 +1242,7 @@ print_old_ink_levels(const char *ind, stp_string_list_t *color_list)
       if (!ind[0] || ind[0] == ';')
 	return;
       val = (get_digit(ind[0]) << 4) + get_digit(ind[1]);
-      printf("%18s    %20d\n",
+      printf("%20s    %20d\n",
 	     gettext(stp_string_list_param(color_list, i)->text), val);
       ind += 2;
     }
@@ -1292,7 +1292,7 @@ do_old_status(status_cmd_t cmd, const char *buf, const stp_printer_t *printer)
 	  
 	  if (cmd == CMD_STATUS)
 	    printf(_("Ink Levels:\n"));
-	  printf("%18s    %20s\n", _("Ink color"), _("Percent remaining"));
+	  printf("%20s    %20s\n", _("Ink color"), _("Percent remaining"));
 	  print_old_ink_levels(ind, color_list);
 	  stp_string_list_destroy(color_list);
 	  if (cmd == CMD_STATUS)
@@ -1331,16 +1331,16 @@ do_new_status(status_cmd_t cmd, char *buf, int bytes,
 	  ind = buf + i + 3;
 	  if (cmd == CMD_STATUS)
 	    printf(_("Ink Levels:\n"));
-	  printf("%18s    %20s\n", _("Ink color"), _("Percent remaining"));
+	  printf("%20s    %20s\n", _("Ink color"), _("Percent remaining"));
 	  for (j = 0; j < count; j++)
 	    {
 	      if (ind[0] < color_count && param == 3 &&
 		  (interchangeable_inks || ind[1] >= aux_color_count ||
 		   ! aux_colors[(int) ind[1]]))
-		printf("%18s    %20d\n",
+		printf("%20s    %20d\n",
 		       gettext(colors_new[(int) ind[0]]), ind[2]);
 	      else if (ind[1] < aux_color_count && aux_colors[(int) ind[1]])
-		printf("%18s    %20d\n",
+		printf("%20s    %20d\n",
 		       gettext(aux_colors[(int) ind[1]]), ind[2]);
 	      else
 		printf("%8s 0x%02x 0x%02x    %20d\n",
@@ -1603,14 +1603,14 @@ do_extended_ink_info(int extended_output)
 			  &year2, &month2, &id2) == 12)
 	    {
 	      int j;
-	      printf("%18s    %20s   %12s   %7s\n",
+	      printf("%20s    %20s   %12s   %7s\n",
 		     _("Ink cartridge"), _("Percent remaining"), _("Part number"),
 		     _("Date"));
-	      printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
+	      printf("%20s    %20d    T0%03d            %2d%02d-%02d\n",
 		     gettext(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",
+		printf("%20s    %20d    T0%03d            %2d%02d-%02d\n",
 		       gettext(stp_string_list_param(color_list, j)->text),
 		       iv[j], id2, (year2 > 80 ? 19 : 20), year2, month2);
 	      break;
@@ -1627,14 +1627,14 @@ do_extended_ink_info(int extended_output)
 			  &year2, &month2, &id2) == 10)
 	    {
 	      int j;
-	      printf("%18s    %20s   %12s   %7s\n",
+	      printf("%20s    %20s   %12s   %7s\n",
 		     _("Ink cartridge"), _("Percent remaining"), _("Part number"),
 		     _("Date"));
-	      printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
+	      printf("%20s    %20d    T0%03d            %2d%02d-%02d\n",
 		     gettext(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",
+		printf("%20s    %20d    T0%03d            %2d%02d-%02d\n",
 		       gettext(stp_string_list_param(color_list, j)->text),
 		       iv[j], id2, (year2 > 80 ? 19 : 20), year2, month2);
 	      break;
@@ -1647,10 +1647,10 @@ do_extended_ink_info(int extended_output)
 			  &val, &year, &month, &id ) == 4)
 	    {
 	      if (i == 0)
-		printf("%18s    %20s   %12s   %7s\n",
+		printf("%20s    %20s   %12s   %7s\n",
 		       _("Ink cartridge"), _("Percent remaining"), _("Part number"),
 		       _("Date"));
-	      printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
+	      printf("%20s    %20d    T0%03d            %2d%02d-%02d\n",
 		     gettext(stp_string_list_param(color_list, i)->text),
 		     val, id, (year > 80 ? 19 : 20), year, month);
 	    }
diff --git a/src/foomatic/Makefile.in b/src/foomatic/Makefile.in
index 2267efe..2be4684 100644
--- a/src/foomatic/Makefile.in
+++ b/src/foomatic/Makefile.in
@@ -50,11 +50,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -116,10 +119,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -129,16 +128,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -183,6 +181,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -194,6 +193,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -206,8 +206,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -241,8 +245,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -287,6 +290,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -299,6 +303,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
diff --git a/src/foomatic/foomatic-printermap b/src/foomatic/foomatic-printermap
index ff2b87d..11121aa 100644
--- a/src/foomatic/foomatic-printermap
+++ b/src/foomatic/foomatic-printermap
@@ -85,6 +85,7 @@
 #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-cp520 printer/Canon-SELPHY-CP-520
 #gptofoo canon-cp600 printer/Canon-SELPHY-CP-600
 #gptofoo canon-cp710 printer/Canon-SELPHY-CP-710
 #gptofoo canon-cp720 printer/Canon-SELPHY-CP-720
@@ -109,6 +110,7 @@
 #gptofoo bjc-PIXMA-iP6000D printer/Canon-PIXMA-iP6000D
 #gptofoo bjc-PIXMA-iP6700 printer/Canon-PIXMA-iP6700
 #gptofoo bjc-PIXMA-iP8500 printer/Canon-PIXMA-iP8500
+#gptofoo bjc-PIXMA-iX4000 printer/Canon-PIXMA-iX4000
 #gptofoo bjc-PIXMA-iX5000 printer/Canon-PIXMA-iX5000
 #gptofoo bjc-PIXMA-Pro9500 printer/Canon-PIXMA-Pro9500
 #gptofoo bjc-MULTIPASS-MP150 printer/Canon-MULTIPASS-MP150
@@ -141,6 +143,8 @@
 #gptofoo compaq-ij1200 printer/Compaq-IJ1200
 #gptofoo dec-1800 printer/DEC-1800
 #gptofoo dec-ln17 printer/DEC-LN17
+#gptofoo dnp-ds40 printer/DNP-DS40
+#gptofoo dnp-ds80 printer/DNP-DS80
 #gptofoo epson-actl_1100 printer/Epson-ActionLaser_1100
 #gptofoo epson-actl_ii printer/Epson-ActionLaser_II
 #gptofoo epson-acl_c2000 printer/Epson-AcuLaser_C2000
@@ -242,6 +246,7 @@
 #gptofoo escp2-pmg4500 printer/Epson-PM_G4500
 #gptofoo escp2-pmt960 printer/Epson-PM_T960
 #gptofoo escp2-px5500 printer/Epson-PX_5500
+#gptofoo escp2-pxg5600 printer/Epson-PX_G5600
 #gptofoo escp2-px7000 printer/Epson-PX_7000
 #gptofoo escp2-px9000 printer/Epson-PX_9000
 #gptofoo escp2-pxa650 printer/Epson-PX_A650
@@ -394,6 +399,7 @@
 #gptofoo escp2-d120 printer/Epson-Stylus_D120
 #gptofoo escp2-dx3800 printer/Epson-Stylus_DX3800
 #gptofoo escp2-dx3850 printer/Epson-Stylus_DX3850
+#gptofoo escp2-dx4000 printer/Epson-Stylus_DX4000
 #gptofoo escp2-dx4050 printer/Epson-Stylus_DX4050
 #gptofoo escp2-dx4200 printer/Epson-Stylus_DX4200
 #gptofoo escp2-dx4250 printer/Epson-Stylus_DX4250
@@ -448,6 +454,7 @@
 #gptofoo escp2-r1800 printer/Epson-Stylus_Photo_R1800
 #gptofoo escp2-r1900 printer/Epson-Stylus_Photo_R1900
 #gptofoo escp2-r2400 printer/Epson-Stylus_Photo_R2400
+#gptofoo escp2-r2880 printer/Epson-Stylus_Photo_R2880
 #gptofoo escp2-r200 printer/Epson-Stylus_Photo_R200
 #gptofoo escp2-r210 printer/Epson-Stylus_Photo_R210
 #gptofoo escp2-r220 printer/Epson-Stylus_Photo_R220
@@ -530,7 +537,7 @@
 #gptofoo escp2-wf40 printer/Epson-WorkForce_40
 #gptofoo escp2-wf500 printer/Epson-WorkForce_500
 #gptofoo escp2-wf600 printer/Epson-WorkForce_600
-#gptofoo escp2-px700fw printer/Epson-Stylus_PX700FW
+#gptofoo escp2-px700fw printer/Epson-Stylus_PX700W
 #gptofoo escp2-px800fw printer/Epson-Stylus_PX800FW
 #gptofoo escp2-s20 printer/Epson-Stylus_S20
 #gptofoo escp2-sx100 printer/Epson-Stylus_SX100
@@ -551,7 +558,7 @@
 #gptofoo escp2-tx200 printer/Epson-Stylus_TX200
 #gptofoo escp2-tx400 printer/Epson-Stylus_TX400
 #gptofoo escp2-tx700w printer/Epson-Stylus_Photo_TX700W
-#gptofoo escp2-tx800w printer/Epson-Stylus_Photo_TX800W
+#gptofoo escp2-tx800w printer/Epson-Stylus_Photo_TX800FW
 #gptofoo fujifilm-cx400 printer/Fujifilm-Printpix-CX-400
 #gptofoo fujifilm-cx550 printer/Fujifilm-Printpix-CX-550
 #gptofoo fujifilm-nx500 printer/Fujifilm-FinePix-NX-500
@@ -997,11 +1004,9 @@
 #gptofoo gestetner-2712 printer/Gestetner-2712
 #gptofoo gestetner-3212 printer/Gestetner-3212
 #gptofoo gestetner-3502 printer/Gestetner-3502
-#gptofoo gestetner-3532 printer/Gestetner-3532
-#gptofoo gestetner-4235g printer/Gestetner-4235g
+#gptofoo gestetner-4235g printer/Gestetner-3532_4235g
 #gptofoo gestetner-4502 printer/Gestetner-4502
-#gptofoo gestetner-4532 printer/Gestetner-4532
-#gptofoo gestetner-4245g printer/Gestetner-4245g
+#gptofoo gestetner-4245g printer/Gestetner-4532_4245g
 #gptofoo gestetner-6002 printer/Gestetner-6002
 #gptofoo gestetner-7502 printer/Gestetner-7502
 #gptofoo gestetner-9002 printer/Gestetner-9002
@@ -1014,49 +1019,31 @@
 #gptofoo gestetner-dsm620d printer/Gestetner-DSm620d
 #gptofoo gestetner-dsm622 printer/Gestetner-DSm622
 #gptofoo gestetner-dsm627 printer/Gestetner-DSm627
-#gptofoo gestetner-dsm635 printer/Gestetner-DSm635
-#gptofoo gestetner-dsm635g printer/Gestetner-DSm635G
-#gptofoo gestetner-dsm645 printer/Gestetner-DSm645
-#gptofoo gestetner-ds645g printer/Gestetner-DS645G
+#gptofoo gestetner-dsm635g printer/Gestetner-DSm635_635G
+#gptofoo gestetner-ds645g printer/Gestetner-DSm645_645G
 #gptofoo gestetner-dsm651 printer/Gestetner-DSm651
 #gptofoo gestetner-dsm660 printer/Gestetner-DSm660
 #gptofoo gestetner-dsm675 printer/Gestetner-DSm675
 #gptofoo gestetner-dsm725 printer/Gestetner-DSm725
 #gptofoo gestetner-dsm730 printer/Gestetner-DSm730
-#gptofoo gestetner-dsm735 printer/Gestetner-DSm735
-#gptofoo gestetner-dsm735g printer/Gestetner-DSm735G
-#gptofoo gestetner-dsm745 printer/Gestetner-DSm745
-#gptofoo gestetner-dsm745g printer/Gestetner-DSm745G
-#gptofoo gestetner-mp1100 printer/Gestetner-MP1100
-#gptofoo gestetner-dsm7110 printer/Gestetner-DSm7110
-#gptofoo gestetner-mp1350 printer/Gestetner-MP1350
-#gptofoo gestetner-dsm7135 printer/Gestetner-DSm7135
-#gptofoo gestetner-mp1600 printer/Gestetner-MP1600
-#gptofoo gestetner-dsm716 printer/Gestetner-DSm716
-#gptofoo gestetner-mp2000 printer/Gestetner-MP2000
-#gptofoo gestetner-dsm721d printer/Gestetner-DSm721d
-#gptofoo gestetner-mp2500 printer/Gestetner-MP2500
-#gptofoo gestetner-dsm625 printer/Gestetner-DSm625
-#gptofoo gestetner-mp3500 printer/Gestetner-MP3500
-#gptofoo gestetner-dsm735e printer/Gestetner-DSm735e
-#gptofoo gestetner-mp4500 printer/Gestetner-MP4500
-#gptofoo gestetner-dsm745e printer/Gestetner-DSm745e
-#gptofoo gestetner-mp5500 printer/Gestetner-MP5500
-#gptofoo gestetner-dsm755 printer/Gestetner-DSm755
-#gptofoo gestetner-mp6500 printer/Gestetner-MP6500
-#gptofoo gestetner-dsm765 printer/Gestetner-DSm765
-#gptofoo gestetner-mp7500 printer/Gestetner-MP7500
-#gptofoo gestetner-dsm775 printer/Gestetner-DSm775
-#gptofoo gestetner-mp9000 printer/Gestetner-MP9000
-#gptofoo gestetner-dsm790 printer/Gestetner-DSm790
-#gptofoo gestetner-mp_161 printer/Gestetner-MP_161
-#gptofoo gestetner-dsm416 printer/Gestetner-DSm416
-#gptofoo gestetner-mp_2510 printer/Gestetner-MP_2510
-#gptofoo gestetner-dsm725e printer/Gestetner-DSm725e
+#gptofoo gestetner-dsm735g printer/Gestetner-DSm735_735G
+#gptofoo gestetner-dsm745g printer/Gestetner-DSm745_745G
+#gptofoo gestetner-dsm7110 printer/Gestetner-MP1100_DSm7110
+#gptofoo gestetner-dsm7135 printer/Gestetner-MP1350_DSm7135
+#gptofoo gestetner-dsm716 printer/Gestetner-MP1600_DSm716
+#gptofoo gestetner-dsm721d printer/Gestetner-MP2000_DSm721d
+#gptofoo gestetner-dsm625 printer/Gestetner-MP2500_DSm625
+#gptofoo gestetner-dsm735e printer/Gestetner-MP3500_DSm735e
+#gptofoo gestetner-dsm745e printer/Gestetner-MP4500_DSm745e
+#gptofoo gestetner-dsm755 printer/Gestetner-MP5500_DSm755
+#gptofoo gestetner-dsm765 printer/Gestetner-MP6500_DSm765
+#gptofoo gestetner-dsm775 printer/Gestetner-MP7500_DSm775
+#gptofoo gestetner-dsm790 printer/Gestetner-MP9000_DSm790
+#gptofoo gestetner-dsm416 printer/Gestetner-MP_161_DSm416
+#gptofoo gestetner-dsm725e printer/Gestetner-MP_2510_DSm725e
 #gptofoo gestetner-mp_2550 printer/Gestetner-MP_2550
 #gptofoo gestetner-mp_2550b printer/Gestetner-MP_2550B
-#gptofoo gestetner-mp_3010 printer/Gestetner-MP_3010
-#gptofoo gestetner-dsm730e printer/Gestetner-DSm730e
+#gptofoo gestetner-dsm730e printer/Gestetner-MP_3010_DSm730e
 #gptofoo gestetner-mp_3350 printer/Gestetner-MP_3350
 #gptofoo gestetner-mp_3350b printer/Gestetner-MP_3350B
 #gptofoo gestetner-mp_4000 printer/Gestetner-MP_4000
@@ -1145,85 +1132,41 @@
 #gptofoo lanier-ld230 printer/Lanier-LD230
 #gptofoo lanier-ld235 printer/Lanier-LD235
 #gptofoo lanier-ld245 printer/Lanier-LD245
-#gptofoo lanier-mp_2500 printer/Lanier-MP_2500
-#gptofoo lanier-ld125 printer/Lanier-LD125
-#gptofoo lanier-mp_1100 printer/Lanier-MP_1100
-#gptofoo lanier-ld1100 printer/Lanier-LD1100
-#gptofoo lanier-mp_1350 printer/Lanier-MP_1350
-#gptofoo lanier-ld1135 printer/Lanier-LD1135
-#gptofoo lanier-mp_1600 printer/Lanier-MP_1600
-#gptofoo lanier-ld316 printer/Lanier-LD316
-#gptofoo lanier-mp_161 printer/Lanier-MP_161
-#gptofoo lanier-ld016 printer/Lanier-LD016
-#gptofoo lanier-mp_2000 printer/Lanier-MP_2000
-#gptofoo lanier-ld320d printer/Lanier-LD320d
-#gptofoo lanier-mp_2510 printer/Lanier-MP_2510
-#gptofoo lanier-ld325 printer/Lanier-LD325
-#gptofoo lanier-mp_2550b printer/Lanier-MP_2550B
-#gptofoo lanier-ld425b printer/Lanier-LD425B
-#gptofoo lanier-mp_2550 printer/Lanier-MP_2550
-#gptofoo lanier-ld425 printer/Lanier-LD425
-#gptofoo lanier-mp_3010 printer/Lanier-MP_3010
-#gptofoo lanier-ld330 printer/Lanier-LD330
-#gptofoo lanier-mp_3350b printer/Lanier-MP_3350B
-#gptofoo lanier-ld433b printer/Lanier-LD433B
-#gptofoo lanier-mp_3350 printer/Lanier-MP_3350
-#gptofoo lanier-ld433 printer/Lanier-LD433
-#gptofoo lanier-mp_3500 printer/Lanier-MP_3500
-#gptofoo lanier-ld335 printer/Lanier-LD335
-#gptofoo lanier-mp_4000b printer/Lanier-MP_4000B
-#gptofoo lanier-ld040b printer/Lanier-LD040B
-#gptofoo lanier-mp_4000 printer/Lanier-MP_4000
-#gptofoo lanier-ld040 printer/Lanier-LD040
-#gptofoo lanier-mp_4500 printer/Lanier-MP_4500
-#gptofoo lanier-ld345 printer/Lanier-LD345
-#gptofoo lanier-mp_5000b printer/Lanier-MP_5000B
-#gptofoo lanier-ld050b printer/Lanier-LD050B
-#gptofoo lanier-mp_5000 printer/Lanier-MP_5000
-#gptofoo lanier-ld050 printer/Lanier-LD050
-#gptofoo lanier-mp_5500 printer/Lanier-MP_5500
-#gptofoo lanier-ld255 printer/Lanier-LD255
-#gptofoo lanier-mp_6500 printer/Lanier-MP_6500
-#gptofoo lanier-ld265 printer/Lanier-LD265
-#gptofoo lanier-mp_7500 printer/Lanier-MP_7500
-#gptofoo lanier-ld275 printer/Lanier-LD275
-#gptofoo lanier-mp_9000 printer/Lanier-MP_9000
-#gptofoo lanier-ld190 printer/Lanier-LD190
+#gptofoo lanier-ld125 printer/Lanier-MP2500_LD125
+#gptofoo lanier-ld1100 printer/Lanier-MP_1100_LD1100
+#gptofoo lanier-ld1135 printer/Lanier-MP_1350_LD1135
+#gptofoo lanier-ld316 printer/Lanier-MP_1600_LD316
+#gptofoo lanier-ld016 printer/Lanier-MP_161_LD016
+#gptofoo lanier-ld320d printer/Lanier-MP_2000_LD320d
+#gptofoo lanier-ld325 printer/Lanier-MP_2510_LD325
+#gptofoo lanier-ld425b printer/Lanier-MP_2550B_LD425B
+#gptofoo lanier-ld425 printer/Lanier-MP_2550_LD425
+#gptofoo lanier-ld330 printer/Lanier-MP_3010_LD330
+#gptofoo lanier-ld433b printer/Lanier-MP_3350B_LD433B
+#gptofoo lanier-ld433 printer/Lanier-MP_3350_LD433
+#gptofoo lanier-ld335 printer/Lanier-MP_3500_LD335
+#gptofoo lanier-ld040b printer/Lanier-MP_4000B_LD040B
+#gptofoo lanier-ld040 printer/Lanier-MP_4000_LD040
+#gptofoo lanier-ld345 printer/Lanier-MP_4500_LD345
+#gptofoo lanier-ld050b printer/Lanier-MP_5000B_LD050B
+#gptofoo lanier-ld050 printer/Lanier-MP_5000_LD050
+#gptofoo lanier-ld255 printer/Lanier-MP_5500_LD255
+#gptofoo lanier-ld265 printer/Lanier-MP_6500_LD265
+#gptofoo lanier-ld275 printer/Lanier-MP_7500_LD275
+#gptofoo lanier-ld190 printer/Lanier-MP_9000_LD190
 #gptofoo lexmark-optra_e321 printer/Lexmark-Optra_E321
 #gptofoo lexmark-optra_e323 printer/Lexmark-Optra_E323
-#gptofoo nrg-10515 printer/NRG-10515
-#gptofoo nrg-10518 printer/NRG-10518
-#gptofoo nrg-10512 printer/NRG-10512
-#gptofoo nrg-2205 printer/NRG-2205
-#gptofoo nrg-2238 printer/NRG-2238
-#gptofoo nrg-2212 printer/NRG-2212
-#gptofoo nrg-2705 printer/NRG-2705
-#gptofoo nrg-2738 printer/NRG-2738
-#gptofoo nrg-2712 printer/NRG-2712
-#gptofoo nrg-3205 printer/NRG-3205
-#gptofoo nrg-3238 printer/NRG-3238
-#gptofoo nrg-3212 printer/NRG-3212
-#gptofoo nrg-3525 printer/NRG-3525
-#gptofoo nrg-3508 printer/NRG-3508
-#gptofoo nrg-3502 printer/NRG-3502
-#gptofoo nrg-3545 printer/NRG-3545
-#gptofoo nrg-3518 printer/NRG-3518
-#gptofoo nrg-3532 printer/NRG-3532
-#gptofoo nrg-4525 printer/NRG-4525
-#gptofoo nrg-4508 printer/NRG-4508
-#gptofoo nrg-4502 printer/NRG-4502
-#gptofoo nrg-4545 printer/NRG-4545
-#gptofoo nrg-4518 printer/NRG-4518
-#gptofoo nrg-4532 printer/NRG-4532
-#gptofoo nrg-6002 printer/NRG-6002
-#gptofoo nrg-6005 printer/NRG-6005
-#gptofoo nrg-6008 printer/NRG-6008
-#gptofoo nrg-7502 printer/NRG-7502
-#gptofoo nrg-7505 printer/NRG-7505
-#gptofoo nrg-7508 printer/NRG-7508
-#gptofoo nrg-9005 printer/NRG-9005
-#gptofoo nrg-9008 printer/NRG-9008
-#gptofoo nrg-9002 printer/NRG-9002
+#gptofoo nrg-10512 printer/NRG-10515_10518_10512
+#gptofoo nrg-2212 printer/NRG-2205_2238_2212
+#gptofoo nrg-2712 printer/NRG-2705_2738_2712
+#gptofoo nrg-3212 printer/NRG-3205_3238_3212
+#gptofoo nrg-3502 printer/NRG-3525_3508_3502
+#gptofoo nrg-3532 printer/NRG-3545_3518_3532
+#gptofoo nrg-4502 printer/NRG-4525_4508_4502
+#gptofoo nrg-4532 printer/NRG-4545_4518_4532
+#gptofoo nrg-6008 printer/NRG-6002_6005_6008
+#gptofoo nrg-7508 printer/NRG-7502_7505_7508
+#gptofoo nrg-9002 printer/NRG-9005_9008_9002
 #gptofoo nrg-dsm415 printer/NRG-DSm415
 #gptofoo nrg-dsm615 printer/NRG-DSm615
 #gptofoo nrg-dsm616 printer/NRG-DSm616
@@ -1338,10 +1281,8 @@
 #gptofoo savin-2522 printer/Savin-2522
 #gptofoo savin-2527 printer/Savin-2527
 #gptofoo savin-2532 printer/Savin-2532
-#gptofoo savin-2535 printer/Savin-2535
-#gptofoo savin-2235 printer/Savin-2235
-#gptofoo savin-2545 printer/Savin-2545
-#gptofoo savin-2245 printer/Savin-2245
+#gptofoo savin-2235 printer/Savin-2535_2235
+#gptofoo savin-2245 printer/Savin-2545_2245
 #gptofoo savin-2560 printer/Savin-2560
 #gptofoo savin-2575 printer/Savin-2575
 #gptofoo savin-3515 printer/Savin-3515
@@ -1351,14 +1292,10 @@
 #gptofoo savin-4018d printer/Savin-4018d
 #gptofoo savin-4022 printer/Savin-4022
 #gptofoo savin-4027 printer/Savin-4027
-#gptofoo savin-4035 printer/Savin-4035
-#gptofoo savin-4135g printer/Savin-4135g
-#gptofoo savin-4035e printer/Savin-4035e
-#gptofoo savin-4135eg printer/Savin-4135eG
-#gptofoo savin-4045 printer/Savin-4045
-#gptofoo savin-4145g printer/Savin-4145g
-#gptofoo savin-4045e printer/Savin-4045e
-#gptofoo savin-4145eg printer/Savin-4145eG
+#gptofoo savin-4135g printer/Savin-4035_4135g
+#gptofoo savin-4135eg printer/Savin-4035e_4135eG
+#gptofoo savin-4145g printer/Savin-4045_4145g
+#gptofoo savin-4145eg printer/Savin-4045e_4145eG
 #gptofoo savin-4051 printer/Savin-4051
 #gptofoo savin-4060 printer/Savin-4060
 #gptofoo savin-4075 printer/Savin-4075
@@ -1371,11 +1308,9 @@
 #gptofoo savin-8025e printer/Savin-8025e
 #gptofoo savin-8030 printer/Savin-8030
 #gptofoo savin-8030e printer/Savin-8030e
-#gptofoo savin-8035 printer/Savin-8035
-#gptofoo savin-8035g printer/Savin-8035g
+#gptofoo savin-8035g printer/Savin-8035_8035g
 #gptofoo savin-8035e printer/Savin-8035e
-#gptofoo savin-8045 printer/Savin-8045
-#gptofoo savin-8045g printer/Savin-8045g
+#gptofoo savin-8045g printer/Savin-8045_8045g
 #gptofoo savin-8045e printer/Savin-8045e
 #gptofoo savin-8055 printer/Savin-8055
 #gptofoo savin-8065 printer/Savin-8065
diff --git a/src/ghost/Makefile.in b/src/ghost/Makefile.in
index 22e953d..e1e89e0 100644
--- a/src/ghost/Makefile.in
+++ b/src/ghost/Makefile.in
@@ -45,11 +45,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -108,10 +111,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -121,16 +120,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -175,6 +173,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -186,6 +185,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -198,8 +198,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -233,8 +237,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -279,6 +282,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -291,6 +295,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
diff --git a/src/gimp2/Makefile.in b/src/gimp2/Makefile.in
index 67c22c4..9874a38 100644
--- a/src/gimp2/Makefile.in
+++ b/src/gimp2/Makefile.in
@@ -46,11 +46,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -102,10 +105,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -115,16 +114,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -169,6 +167,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -180,6 +179,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -192,8 +192,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -227,8 +231,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -273,6 +276,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -285,6 +289,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
diff --git a/src/gutenprintui2/Makefile.in b/src/gutenprintui2/Makefile.in
index 5265a0d..61e955f 100644
--- a/src/gutenprintui2/Makefile.in
+++ b/src/gutenprintui2/Makefile.in
@@ -46,11 +46,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -128,10 +131,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -141,16 +140,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -195,6 +193,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -206,6 +205,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -218,8 +218,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -253,8 +257,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -299,6 +302,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -311,6 +315,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index cd04b9d..8fbf0f9 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -45,11 +45,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -217,10 +220,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -230,16 +229,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -284,6 +282,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -295,6 +294,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -307,8 +307,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -342,8 +346,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -388,6 +391,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -400,6 +404,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
diff --git a/src/main/bit-ops.c b/src/main/bit-ops.c
index a110adf..6ecf227 100644
--- a/src/main/bit-ops.c
+++ b/src/main/bit-ops.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: bit-ops.c,v 1.12 2007/03/08 13:34:27 faust3 Exp $"
+ * "$Id: bit-ops.c,v 1.14 2009/06/07 15:21:22 rlk Exp $"
  *
  *   Softweave calculator for Gutenprint.
  *
@@ -49,7 +49,7 @@ stp_fold(const unsigned char *line,
       unsigned char l1 = line[single_length];
       if (l0 || l1)
 	{
-	  outbuf[0] =
+	  outbuf[0] =		/* B7 A7 B6 A6 B5 A5 B4 A4 */
 	    ((l0 & (1 << 7)) >> 1) +
 	    ((l0 & (1 << 6)) >> 2) +
 	    ((l0 & (1 << 5)) >> 3) +
@@ -58,7 +58,7 @@ stp_fold(const unsigned char *line,
 	    ((l1 & (1 << 6)) >> 1) +
 	    ((l1 & (1 << 5)) >> 2) +
 	    ((l1 & (1 << 4)) >> 3);
-	  outbuf[1] =
+	  outbuf[1] =		/* B3 A3 B2 A2 B1 A1 B0 A0 */
 	    ((l0 & (1 << 3)) << 3) +
 	    ((l0 & (1 << 2)) << 2) +
 	    ((l0 & (1 << 1)) << 1) +
@@ -80,34 +80,41 @@ stp_fold_3bit(const unsigned char *line,
 {
   int i;
   memset(outbuf, 0, single_length * 3);
-  for (i = 0; i < single_length; i++) {
-    outbuf[0] =
-      ((line[0] & (1 << 7)) >> 2) |
-      ((line[0] & (1 << 6)) >> 4) |
-      ((line[single_length] & (1 << 7)) >> 1) |
-      ((line[single_length] & (1 << 6)) >> 3) |
-      ((line[single_length] & (1 << 5)) >> 5) |
-      ((line[2*single_length] & (1 << 7)) << 0) |
-      ((line[2*single_length] & (1 << 6)) >> 2) |
-      ((line[2*single_length] & (1 << 5)) >> 4);
-    outbuf[1] =
-      ((line[0] & (1 << 5)) << 2) |
-      ((line[0] & (1 << 4)) << 0) |
-      ((line[0] & (1 << 3)) >> 2) |
-      ((line[single_length] & (1 << 4)) << 1) |
-      ((line[single_length] & (1 << 3)) >> 1) |
-      ((line[2*single_length] & (1 << 4)) << 2) |
-      ((line[2*single_length] & (1 << 3)) << 0) |
-      ((line[2*single_length] & (1 << 2)) >> 2);
-    outbuf[2] =
-      ((line[0] & (1 << 2)) << 4) |
-      ((line[0] & (1 << 1)) << 2) |
-      ((line[0] & (1 << 0)) << 0) |
-      ((line[single_length] & (1 << 2)) << 5) |
-      ((line[single_length] & (1 << 1)) << 3) |
-      ((line[single_length] & (1 << 0)) << 1) |
-      ((line[2*single_length] & (1 << 1)) << 4) |
-      ((line[2*single_length] & (1 << 0)) << 2);
+  for (i = 0; i < single_length; i++)
+    {
+      unsigned char l0 = line[0];
+      unsigned char l1 = line[single_length];
+      unsigned char l2 = line[single_length * 2];
+      if (l0 || l1 || l2)
+	{
+	  outbuf[0] =		/* C7 B7 A7 C6 B6 A6 C5 B5  */
+	    ((l0 & (1 << 7)) >> 2) |
+	    ((l0 & (1 << 6)) >> 4) |
+	    ((l1 & (1 << 7)) >> 1) |
+	    ((l1 & (1 << 6)) >> 3) |
+	    ((l1 & (1 << 5)) >> 5) |
+	    ((l2 & (1 << 7)) << 0) |
+	    ((l2 & (1 << 6)) >> 2) |
+	    ((l2 & (1 << 5)) >> 4);
+	  outbuf[1] =		/* A5 C4 B4 A4 C3 B3 A3 C2 */
+	    ((l0 & (1 << 5)) << 2) |
+	    ((l0 & (1 << 4)) << 0) |
+	    ((l0 & (1 << 3)) >> 2) |
+	    ((l1 & (1 << 4)) << 1) |
+	    ((l1 & (1 << 3)) >> 1) |
+	    ((l2 & (1 << 4)) << 2) |
+	    ((l2 & (1 << 3)) << 0) |
+	    ((l2 & (1 << 2)) >> 2);
+	  outbuf[2] =		/* B2 A2 C1 B1 A1 C0 B0 A0 */
+	    ((l0 & (1 << 2)) << 4) |
+	    ((l0 & (1 << 1)) << 2) |
+	    ((l0 & (1 << 0)) << 0) |
+	    ((l1 & (1 << 2)) << 5) |
+	    ((l1 & (1 << 1)) << 3) |
+	    ((l1 & (1 << 0)) << 1) |
+	    ((l2 & (1 << 1)) << 4) |
+	    ((l2 & (1 << 0)) << 2);
+	}
     line++;
     outbuf += 3;
   }
@@ -115,100 +122,101 @@ stp_fold_3bit(const unsigned char *line,
 
 void
 stp_fold_3bit_323(const unsigned char *line,
-		int single_length,
-		unsigned char *outbuf)
+		  int single_length,
+		  unsigned char *outbuf)
 {
-  unsigned char A0,A1,A2,B0,B1,B2,C0,C1,C2;
-  const unsigned char *last= line+single_length;
+  const unsigned char *last= line + single_length;
   memset(outbuf, 0, single_length * 3);
-  for (; line < last; line+=3, outbuf+=8) {
-
-    A0= line[0]; B0= line[single_length]; C0= line[2*single_length];
-
-    if (line<last-2) {
-      A1= line[1]; B1= line[single_length+1]; C1= line[2*single_length+1];
-    } else {
-      A1= 0; B1= 0; C1= 0;
-    }
-    if (line<last-1) {
-      A2= line[2]; B2= line[single_length+2]; C2= line[2*single_length+2];
-    } else {
-      A2= 0; B2= 0; C2= 0;
+  for (; line < last; line += 3)
+    {
+      unsigned char A0 = line[0];
+      unsigned char B0 = line[single_length];
+      unsigned char C0 = line[2*single_length];
+      unsigned char A1 = (line < last - 2) ? line[1] : 0;
+      unsigned char B1 = (line < last - 2) ? line[single_length + 1] : 0;
+      unsigned char C1 = (line < last - 2) ? line[(single_length * 2) + 1] : 0;
+      unsigned char A2 = (line < last - 1) ? line[2] : 0;
+      unsigned char B2 = (line < last - 1) ? line[single_length + 2] : 0;
+      unsigned char C2 = (line < last - 1) ? line[(single_length * 2) + 2] : 0;
+
+      if (A0 || A1 || A2 || B0 || B1 || B2 || C0 || C1 || C2)
+	{
+	  /* Missing: C0_6, C0_3, C0_0, C1_5, C1_2, C2_7, C2_4, C2_1 ??? */
+	  outbuf[0] =		/* C0_7 B0_7 A0_7 B0_6 A0_6 C0_5 B0_5 A0_5 */
+	    ((C0 & (1 << 7)) >> 0) |
+	    ((B0 & (1 << 7)) >> 1) |
+	    ((A0 & (1 << 7)) >> 2) |
+	    ((B0 & (1 << 6)) >> 2) |
+	    ((A0 & (1 << 6)) >> 3) |
+	    ((C0 & (1 << 5)) >> 3) |
+	    ((B0 & (1 << 5)) >> 4) |
+	    ((A0 & (1 << 5)) >> 5);
+	  outbuf[1] =		/* C0_4 B0_4 A0_4 B0_3 A0_3 C0_2 B0_2 A0_2 */
+	    ((C0 & (1 << 4)) << 3) |
+	    ((B0 & (1 << 4)) << 2) |
+	    ((A0 & (1 << 4)) << 1) |
+	    ((B0 & (1 << 3)) << 1) |
+	    ((A0 & (1 << 3)) << 0) |
+	    ((C0 & (1 << 2)) >> 0) |
+	    ((B0 & (1 << 2)) >> 1) |
+	    ((A0 & (1 << 2)) >> 2);
+	  outbuf[2] =		/* C0_1 B0_1 A0_1 B0_0 A0_0 C1_7 B1_7 A1_7 */
+	    ((C0 & (1 << 1)) << 6) |
+	    ((B0 & (1 << 1)) << 5) |
+	    ((A0 & (1 << 1)) << 4) |
+	    ((B0 & (1 << 0)) << 4) |
+	    ((A0 & (1 << 0)) << 3) |
+	    ((C1 & (1 << 7)) >> 5) |
+	    ((B1 & (1 << 7)) >> 6) |
+	    ((A1 & (1 << 7)) >> 7);
+	  outbuf[3] =		/* C1_6 B1_6 A1_6 B1_5 A1_5 C1_4 B1_4 A1_4 */
+	    ((C1 & (1 << 6)) << 1) |
+	    ((B1 & (1 << 6)) << 0) |
+	    ((A1 & (1 << 6)) >> 1) |
+	    ((B1 & (1 << 5)) >> 1) |
+	    ((A1 & (1 << 5)) >> 2) |
+	    ((C1 & (1 << 4)) >> 2) |
+	    ((B1 & (1 << 4)) >> 3) |
+	    ((A1 & (1 << 4)) >> 4);
+	  outbuf[4] =		/* C1_3 B1_3 A1_3 B1_2 A1_2 C1_1 B1_1 A1_1 */
+	    ((C1 & (1 << 3)) << 4) |
+	    ((B1 & (1 << 3)) << 3) |
+	    ((A1 & (1 << 3)) << 2) |
+	    ((B1 & (1 << 2)) << 2) |
+	    ((A1 & (1 << 2)) << 1) |
+	    ((C1 & (1 << 1)) << 1) |
+	    ((B1 & (1 << 1)) >> 0) |
+	    ((A1 & (1 << 1)) >> 1);
+	  outbuf[5] =		/* C1_0 B1_0 A1_0 B2_7 A2_7 C2_6 B2_6 A2_6 */
+	    ((C1 & (1 << 0)) << 7) |
+	    ((B1 & (1 << 0)) << 6) |
+	    ((A1 & (1 << 0)) << 5) |
+	    ((B2 & (1 << 7)) >> 3) |
+	    ((A2 & (1 << 7)) >> 4) |
+	    ((C2 & (1 << 6)) >> 4) |
+	    ((B2 & (1 << 6)) >> 5) |
+	    ((A2 & (1 << 6)) >> 6);
+	  outbuf[6] =		/* C2_5 B2_5 A2_5 B2_4 A2_4 C2_3 B2_3 A2_3 */
+	    ((C2 & (1 << 5)) << 2) |
+	    ((B2 & (1 << 5)) << 1) |
+	    ((A2 & (1 << 5)) << 0) |
+	    ((B2 & (1 << 4)) >> 0) |
+	    ((A2 & (1 << 4)) >> 1) |
+	    ((C2 & (1 << 3)) >> 1) |
+	    ((B2 & (1 << 3)) >> 2) |
+	    ((A2 & (1 << 3)) >> 3);
+	  outbuf[7] =		/* C2_2 B2_2 A2_2 B2_1 A2_1 C2_0 B2_0 A2_0 */
+	    ((C2 & (1 << 2)) << 5) |
+	    ((B2 & (1 << 2)) << 4) |
+	    ((A2 & (1 << 2)) << 3) |
+	    ((B2 & (1 << 1)) << 3) |
+	    ((A2 & (1 << 1)) << 2) |
+	    ((C2 & (1 << 0)) << 2) |
+	    ((B2 & (1 << 0)) << 1) |
+	    ((A2 & (1 << 0)) << 0);
+	}
+      outbuf += 8;
     }
-
-    outbuf[0] =
-      ((C0 & 0x80) >> 0) |
-      ((B0 & 0x80) >> 1) |
-      ((A0 & 0x80) >> 2) |
-      ((B0 & 0x40) >> 2) |
-      ((A0 & 0x40) >> 3) |
-      ((C0 & 0x20) >> 3) |
-      ((B0 & 0x20) >> 4) |
-      ((A0 & 0x20) >> 5);
-    outbuf[1] =
-      ((C0 & 0x10) << 3) |
-      ((B0 & 0x10) << 2) |
-      ((A0 & 0x10) << 1) |
-      ((B0 & 0x08) << 1) |
-      ((A0 & 0x08) << 0) |
-      ((C0 & 0x04) >> 0) |
-      ((B0 & 0x04) >> 1) |
-      ((A0 & 0x04) >> 2);
-    outbuf[2] =
-      ((C0 & 0x02) << 6) |
-      ((B0 & 0x02) << 5) |
-      ((A0 & 0x02) << 4) |
-      ((B0 & 0x01) << 4) |
-      ((A0 & 0x01) << 3) |
-      ((C1 & 0x80) >> 5) |
-      ((B1 & 0x80) >> 6) |
-      ((A1 & 0x80) >> 7);
-    outbuf[3] =
-      ((C1 & 0x40) << 1) |
-      ((B1 & 0x40) << 0) |
-      ((A1 & 0x40) >> 1) |
-      ((B1 & 0x20) >> 1) |
-      ((A1 & 0x20) >> 2) |
-      ((C1 & 0x10) >> 2) |
-      ((B1 & 0x10) >> 3) |
-      ((A1 & 0x10) >> 4);
-    outbuf[4] =
-      ((C1 & 0x08) << 4) |
-      ((B1 & 0x08) << 3) |
-      ((A1 & 0x08) << 2) |
-      ((B1 & 0x04) << 2) |
-      ((A1 & 0x04) << 1) |
-      ((C1 & 0x02) << 1) |
-      ((B1 & 0x02) >> 0) |
-      ((A1 & 0x02) >> 1);
-    outbuf[5] =
-      ((C1 & 0x01) << 7) |
-      ((B1 & 0x01) << 6) |
-      ((A1 & 0x01) << 5) |
-      ((B2 & 0x80) >> 3) |
-      ((A2 & 0x80) >> 4) |
-      ((C2 & 0x40) >> 4) |
-      ((B2 & 0x40) >> 5) |
-      ((A2 & 0x40) >> 6);
-    outbuf[6] =
-      ((C2 & 0x20) << 2) |
-      ((B2 & 0x20) << 1) |
-      ((A2 & 0x20) << 0) |
-      ((B2 & 0x10) >> 0) |
-      ((A2 & 0x10) >> 1) |
-      ((C2 & 0x08) >> 1) |
-      ((B2 & 0x08) >> 2) |
-      ((A2 & 0x08) >> 3);
-    outbuf[7] =
-      ((C2 & 0x04) << 5) |
-      ((B2 & 0x04) << 4) |
-      ((A2 & 0x04) << 3) |
-      ((B2 & 0x02) << 3) |
-      ((A2 & 0x02) << 2) |
-      ((C2 & 0x01) << 2) |
-      ((B2 & 0x01) << 1) |
-      ((A2 & 0x01) << 0);
-  }
 }
 
 void
@@ -218,158 +226,120 @@ stp_fold_4bit(const unsigned char *line,
 {
   int i;
   memset(outbuf, 0, single_length * 4);
-  for (i = 0; i < single_length; i++){
-    unsigned char l0 = line[0];
-    unsigned char l1 = line[single_length];
-    unsigned char l2 = line[single_length*2];
-    unsigned char l3 = line[single_length*3];
-    if(l0 || l1 || l2 || l3){
-      outbuf[0] =
-            ((l3 & (1<<7)) >> 0)|
-            ((l2 & (1<<7)) >> 1)|
-            ((l1 & (1<<7)) >> 2)|
-            ((l0 & (1<<7)) >> 3)|
-            ((l3 & (1<<6)) >> 3)|
-            ((l2 & (1<<6)) >> 4)|
-            ((l1 & (1<<6)) >> 5)|
-            ((l0 & (1<<6)) >> 6);
-
-      outbuf[1] =
-            ((l3 & (1<<5)) << 2)|
-            ((l2 & (1<<5)) << 1)|
-            ((l1 & (1<<5)) << 0)|
-            ((l0 & (1<<5)) >> 1)|
-            ((l3 & (1<<4)) >> 1)|
-            ((l2 & (1<<4)) >> 2)|
-            ((l1 & (1<<4)) >> 3)|
-            ((l0 & (1<<4)) >> 4);
-
-       outbuf[2] =
-            ((l3 & (1<<3)) << 4)|
-            ((l2 & (1<<3)) << 3)|
-            ((l1 & (1<<3)) << 2)|
-            ((l0 & (1<<3)) << 1)|
-            ((l3 & (1<<2)) << 1)|
-            ((l2 & (1<<2)) << 0)|
-            ((l1 & (1<<2)) >> 1)|
-            ((l0 & (1<<2)) >> 2);
-       outbuf[3] =
-            ((l3 & (1<<1)) << 6)|
-            ((l2 & (1<<1)) << 5)|
-            ((l1 & (1<<1)) << 4)|
-            ((l0 & (1<<1)) << 3)|
-            ((l3 & (1<<0)) << 3)|
-            ((l2 & (1<<0)) << 2)|
-            ((l1 & (1<<0)) << 1)|
-            ((l0 & (1<<0)) << 0);
-    }
-    line++;
-    outbuf += 4;
-  }
-}
-
-static void
-stpi_split_2_1(int length,
-	       const unsigned char *in,
-	       unsigned char *outhi,
-	       unsigned char *outlo)
-{
-  unsigned char *outs[2];
-  int i;
-  int row = 0;
-  int limit = length;
-  outs[0] = outhi;
-  outs[1] = outlo;
-  memset(outs[1], 0, limit);
-  for (i = 0; i < limit; i++)
+  for (i = 0; i < single_length; i++)
     {
-      unsigned char inbyte = in[i];
-      outs[0][i] = 0;
-      if (inbyte == 0)
-	continue;
-      /* For some reason gcc isn't unrolling this, even with -funroll-loops */
-      if (inbyte & 1)
-	{
-	  outs[row][i] |= 1 & inbyte;
-	  row = row ^ 1;
-	}
-      if (inbyte & (1 << 1))
-	{
-	  outs[row][i] |= (1 << 1) & inbyte;
-	  row = row ^ 1;
-	}
-      if (inbyte & (1 << 2))
-	{
-	  outs[row][i] |= (1 << 2) & inbyte;
-	  row = row ^ 1;
-	}
-      if (inbyte & (1 << 3))
-	{
-	  outs[row][i] |= (1 << 3) & inbyte;
-	  row = row ^ 1;
-	}
-      if (inbyte & (1 << 4))
-	{
-	  outs[row][i] |= (1 << 4) & inbyte;
-	  row = row ^ 1;
-	}
-      if (inbyte & (1 << 5))
-	{
-	  outs[row][i] |= (1 << 5) & inbyte;
-	  row = row ^ 1;
-	}
-      if (inbyte & (1 << 6))
-	{
-	  outs[row][i] |= (1 << 6) & inbyte;
-	  row = row ^ 1;
-	}
-      if (inbyte & (1 << 7))
+      unsigned char l0 = line[0];
+      unsigned char l1 = line[single_length];
+      unsigned char l2 = line[single_length*2];
+      unsigned char l3 = line[single_length*3];
+      if (l0 || l1 || l2 || l3)
 	{
-	  outs[row][i] |= (1 << 7) & inbyte;
-	  row = row ^ 1;
+	  outbuf[0] =		/* D7 C7 B7 A7 D6 C6 B6 A6 */
+            ((l3 & (1 << 7)) >> 0)|
+            ((l2 & (1 << 7)) >> 1)|
+            ((l1 & (1 << 7)) >> 2)|
+            ((l0 & (1 << 7)) >> 3)|
+            ((l3 & (1 << 6)) >> 3)|
+            ((l2 & (1 << 6)) >> 4)|
+            ((l1 & (1 << 6)) >> 5)|
+            ((l0 & (1 << 6)) >> 6);
+
+	  outbuf[1] =		/* D5 C5 B5 A5 D4 C4 B4 A4 */
+            ((l3 & (1 << 5)) << 2)|
+            ((l2 & (1 << 5)) << 1)|
+            ((l1 & (1 << 5)) << 0)|
+            ((l0 & (1 << 5)) >> 1)|
+            ((l3 & (1 << 4)) >> 1)|
+            ((l2 & (1 << 4)) >> 2)|
+            ((l1 & (1 << 4)) >> 3)|
+            ((l0 & (1 << 4)) >> 4);
+
+	  outbuf[2] =		/* D3 C3 B3 A3 D2 C2 B2 A2 */
+            ((l3 & (1 << 3)) << 4)|
+            ((l2 & (1 << 3)) << 3)|
+            ((l1 & (1 << 3)) << 2)|
+            ((l0 & (1 << 3)) << 1)|
+            ((l3 & (1 << 2)) << 1)|
+            ((l2 & (1 << 2)) << 0)|
+            ((l1 & (1 << 2)) >> 1)|
+            ((l0 & (1 << 2)) >> 2);
+
+	  outbuf[3] =		/* D1 C1 B1 A1 D0 C0 B0 A0 */
+            ((l3 & (1 << 1)) << 6)|
+            ((l2 & (1 << 1)) << 5)|
+            ((l1 & (1 << 1)) << 4)|
+            ((l0 & (1 << 1)) << 3)|
+            ((l3 & (1 << 0)) << 3)|
+            ((l2 & (1 << 0)) << 2)|
+            ((l1 & (1 << 0)) << 1)|
+            ((l0 & (1 << 0)) << 0);
 	}
+      line++;
+      outbuf += 4;
     }
 }
 
-static void
-stp_split_2_2(int length,
-	      const unsigned char *in,
-	      unsigned char *outhi,
-	      unsigned char *outlo)
+#define SPLIT_MASK(k, b) (((1 << (b)) - 1) << ((k) * (b)))
+
+#define SPLIT_STEP(k, b, i, o, in, r, inc, rl)	\
+do						\
+  {						\
+    if (in & SPLIT_MASK(k, b))			\
+      {						\
+	o[r][i] |= SPLIT_MASK(k, b) & in;	\
+	r += inc;				\
+	if (r >= rl)				\
+	  r = 0;				\
+      }						\
+  } while (0)
+
+void
+stp_split(int length,
+	  int bits,
+	  int n,
+	  const unsigned char *in,
+	  int increment,
+	  unsigned char **outs)
 {
-  unsigned char *outs[2];
+  int row = 0;
+  int limit = length * bits;
+  int rlimit = n * increment;
   int i;
-  unsigned row = 0;
-  int limit = length * 2;
-  outs[0] = outhi;
-  outs[1] = outlo;
-  memset(outs[1], 0, limit);
-  for (i = 0; i < limit; i++)
+  for (i = 1; i < n; i++)
+    memset(outs[i * increment], 0, limit);
+
+  if (bits == 1)
     {
-      unsigned char inbyte = in[i];
-      outs[0][i] = 0;
-      if (inbyte == 0)
-	continue;
-      /* For some reason gcc isn't unrolling this, even with -funroll-loops */
-      if (inbyte & 3)
-	{
-	  outs[row][i] |= (3 & inbyte);
-	  row = row ^ 1;
-	}
-      if (inbyte & (3 << 2))
+      for (i = 0; i < limit; i++)
 	{
-	  outs[row][i] |= ((3 << 2) & inbyte);
-	  row = row ^ 1;
+	  unsigned char inbyte = in[i];
+	  outs[0][i] = 0;
+	  if (inbyte == 0)
+	    continue;
+	  /* For some reason gcc isn't unrolling this, even with -funroll-loops */
+	  SPLIT_STEP(0, 1, i, outs, inbyte, row, increment, rlimit);
+	  SPLIT_STEP(1, 1, i, outs, inbyte, row, increment, rlimit);
+	  SPLIT_STEP(2, 1, i, outs, inbyte, row, increment, rlimit);
+	  SPLIT_STEP(3, 1, i, outs, inbyte, row, increment, rlimit);
+	  SPLIT_STEP(4, 1, i, outs, inbyte, row, increment, rlimit);
+	  SPLIT_STEP(5, 1, i, outs, inbyte, row, increment, rlimit);
+	  SPLIT_STEP(6, 1, i, outs, inbyte, row, increment, rlimit);
+	  SPLIT_STEP(7, 1, i, outs, inbyte, row, increment, rlimit);
 	}
-      if (inbyte & (3 << 4))
-	{
-	  outs[row][i] |= ((3 << 4) & inbyte);
-	  row = row ^ 1;
-	}
-      if (inbyte & (3 << 6))
+    }
+  else
+    {
+      for (i = 0; i < limit; i++)
 	{
-	  outs[row][i] |= ((3 << 6) & inbyte);
-	  row = row ^ 1;
+	  unsigned char inbyte = in[i];
+	  outs[0][i] = 0;
+	  if (inbyte == 0)
+	    continue;
+	  /* For some reason gcc isn't unrolling this, even with -funroll-loops */
+	  SPLIT_STEP(0, 2, i, outs, inbyte, row, increment, rlimit);
+	  SPLIT_STEP(1, 2, i, outs, inbyte, row, increment, rlimit);
+	  SPLIT_STEP(2, 2, i, outs, inbyte, row, increment, rlimit);
+	  SPLIT_STEP(3, 2, i, outs, inbyte, row, increment, rlimit);
 	}
     }
 }
@@ -381,128 +351,10 @@ stp_split_2(int length,
 	    unsigned char *outhi,
 	    unsigned char *outlo)
 {
-  if (bits == 2)
-    stp_split_2_2(length, in, outhi, outlo);
-  else
-    stpi_split_2_1(length, in, outhi, outlo);
-}
-
-static void
-stpi_split_4_1(int length,
-	       const unsigned char *in,
-	       unsigned char *out0,
-	       unsigned char *out1,
-	       unsigned char *out2,
-	       unsigned char *out3)
-{
-  unsigned char *outs[4];
-  int i;
-  int row = 0;
-  int limit = length;
-  outs[0] = out0;
-  outs[1] = out1;
-  outs[2] = out2;
-  outs[3] = out3;
-  memset(outs[1], 0, limit);
-  memset(outs[2], 0, limit);
-  memset(outs[3], 0, limit);
-  for (i = 0; i < limit; i++)
-    {
-      unsigned char inbyte = in[i];
-      outs[0][i] = 0;
-      if (inbyte == 0)
-	continue;
-      /* For some reason gcc isn't unrolling this, even with -funroll-loops */
-      if (inbyte & 1)
-	{
-	  outs[row][i] |= 1 & inbyte;
-	  row = (row + 1) & 3;
-	}
-      if (inbyte & (1 << 1))
-	{
-	  outs[row][i] |= (1 << 1) & inbyte;
-	  row = (row + 1) & 3;
-	}
-      if (inbyte & (1 << 2))
-	{
-	  outs[row][i] |= (1 << 2) & inbyte;
-	  row = (row + 1) & 3;
-	}
-      if (inbyte & (1 << 3))
-	{
-	  outs[row][i] |= (1 << 3) & inbyte;
-	  row = (row + 1) & 3;
-	}
-      if (inbyte & (1 << 4))
-	{
-	  outs[row][i] |= (1 << 4) & inbyte;
-	  row = (row + 1) & 3;
-	}
-      if (inbyte & (1 << 5))
-	{
-	  outs[row][i] |= (1 << 5) & inbyte;
-	  row = (row + 1) & 3;
-	}
-      if (inbyte & (1 << 6))
-	{
-	  outs[row][i] |= (1 << 6) & inbyte;
-	  row = (row + 1) & 3;
-	}
-      if (inbyte & (1 << 7))
-	{
-	  outs[row][i] |= (1 << 7) & inbyte;
-	  row = (row + 1) & 3;
-	}
-    }
-}
-
-static void
-stpi_split_4_2(int length,
-	       const unsigned char *in,
-	       unsigned char *out0,
-	       unsigned char *out1,
-	       unsigned char *out2,
-	       unsigned char *out3)
-{
-  unsigned char *outs[4];
-  int i;
-  int row = 0;
-  int limit = length * 2;
-  outs[0] = out0;
-  outs[1] = out1;
-  outs[2] = out2;
-  outs[3] = out3;
-  memset(outs[1], 0, limit);
-  memset(outs[2], 0, limit);
-  memset(outs[3], 0, limit);
-  for (i = 0; i < limit; i++)
-    {
-      unsigned char inbyte = in[i];
-      outs[0][i] = 0;
-      if (inbyte == 0)
-	continue;
-      /* For some reason gcc isn't unrolling this, even with -funroll-loops */
-      if (inbyte & 3)
-	{
-	  outs[row][i] |= 3 & inbyte;
-	  row = (row + 1) & 3;
-	}
-      if (inbyte & (3 << 2))
-	{
-	  outs[row][i] |= (3 << 2) & inbyte;
-	  row = (row + 1) & 3;
-	}
-      if (inbyte & (3 << 4))
-	{
-	  outs[row][i] |= (3 << 4) & inbyte;
-	  row = (row + 1) & 3;
-	}
-      if (inbyte & (3 << 6))
-	{
-	  outs[row][i] |= (3 << 6) & inbyte;
-	  row = (row + 1) & 3;
-	}
-    }
+  unsigned char *outs[2];
+  outs[0] = outhi;
+  outs[1] = outlo;
+  stp_split(length, bits, 2, in, 1, outs);
 }
 
 void
@@ -514,26 +366,19 @@ stp_split_4(int length,
 	    unsigned char *out2,
 	    unsigned char *out3)
 {
-  if (bits == 2)
-    stpi_split_4_2(length, in, out0, out1, out2, out3);
-  else
-    stpi_split_4_1(length, in, out0, out1, out2, out3);
+  unsigned char *outs[4];
+  outs[0] = out0;
+  outs[1] = out1;
+  outs[2] = out2;
+  outs[3] = out3;
+  stp_split(length, bits, 4, in, 1, outs);
 }
 
 
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define SH20 0
-#define SH21 8
-#else
-#define SH20 8
-#define SH21 0
-#endif
-
 static void
 stpi_unpack_2_1(int length,
 		const unsigned char *in,
-		unsigned char *out0,
-		unsigned char *out1)
+		unsigned char **outs)
 {
   unsigned char	tempin, bit, temp0, temp1;
 
@@ -570,8 +415,8 @@ stpi_unpack_2_1(int length,
       else
       {
         bit     = 128;
-	*out0++ = temp0;
-	*out1++ = temp1;
+	*outs[0]++ = temp0;
+	*outs[1]++ = temp1;
 
 	temp0   = 0;
 	temp1   = 0;
@@ -580,16 +425,15 @@ stpi_unpack_2_1(int length,
 
   if (bit < 128)
     {
-      *out0++ = temp0;
-      *out1++ = temp1;
+      *outs[0]++ = temp0;
+      *outs[1]++ = temp1;
     }
 }
 
 static void
 stpi_unpack_2_2(int length,
-	       const unsigned char *in,
-	       unsigned char *out0,
-	       unsigned char *out1)
+		const unsigned char *in,
+		unsigned char **outs)
 {
   if (length <= 0)
     return;
@@ -600,11 +444,11 @@ stpi_unpack_2_2(int length,
       ti0 = in[0];
       ti1 = in[1];
 
-      *out0++  = (ti0 & 0xc0) << 0
+      *outs[0]++  = (ti0 & 0xc0) << 0
 	| (ti0 & 0x0c) << 2
 	| (ti1 & 0xc0) >> 4
 	| (ti1 & 0x0c) >> 2;
-      *out1++  = (ti0 & 0x30) << 2
+      *outs[1]++  = (ti0 & 0x30) << 2
 	| (ti0 & 0x03) << 4
 	| (ti1 & 0x30) >> 2
 	| (ti1 & 0x03) >> 0;
@@ -612,38 +456,10 @@ stpi_unpack_2_2(int length,
     }
 }
 
-void
-stp_unpack_2(int length,
-	     int bits,
-	     const unsigned char *in,
-	     unsigned char *outlo,
-	     unsigned char *outhi)
-{
-  if (bits == 1)
-    stpi_unpack_2_1(length, in, outlo, outhi);
-  else
-    stpi_unpack_2_2(length, in, outlo, outhi);
-}
-
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define SH40 0
-#define SH41 8
-#define SH42 16
-#define SH43 24
-#else
-#define SH40 24
-#define SH41 16
-#define SH42 8
-#define SH43 0
-#endif
-
 static void
 stpi_unpack_4_1(int length,
 		 const unsigned char *in,
-		 unsigned char *out0,
-		 unsigned char *out1,
-		 unsigned char *out2,
-		 unsigned char *out3)
+		 unsigned char **outs)
 {
   unsigned char	tempin, bit, temp0, temp1, temp2, temp3;
 
@@ -678,10 +494,10 @@ stpi_unpack_4_1(int length,
       else
       {
         bit     = 128;
-	*out0++ = temp0;
-	*out1++ = temp1;
-	*out2++ = temp2;
-	*out3++ = temp3;
+	*outs[0]++ = temp0;
+	*outs[1]++ = temp1;
+	*outs[2]++ = temp2;
+	*outs[3]++ = temp3;
 
 	temp0   = 0;
 	temp1   = 0;
@@ -692,20 +508,17 @@ stpi_unpack_4_1(int length,
 
   if (bit < 128)
     {
-      *out0++ = temp0;
-      *out1++ = temp1;
-      *out2++ = temp2;
-      *out3++ = temp3;
+      *outs[0]++ = temp0;
+      *outs[1]++ = temp1;
+      *outs[2]++ = temp2;
+      *outs[3]++ = temp3;
     }
 }
 
 static void
 stpi_unpack_4_2(int length,
 		 const unsigned char *in,
-		 unsigned char *out0,
-		 unsigned char *out1,
-		 unsigned char *out2,
-		 unsigned char *out3)
+		 unsigned char **outs)
 {
   unsigned char	tempin,
 		shift,
@@ -741,10 +554,10 @@ stpi_unpack_4_2(int length,
       else
       {
         shift   = 0;
-	*out0++ = temp0;
-	*out1++ = temp1;
-	*out2++ = temp2;
-	*out3++ = temp3;
+	*outs[0]++ = temp0;
+	*outs[1]++ = temp1;
+	*outs[2]++ = temp2;
+	*outs[3]++ = temp3;
 
 	temp0   = 0;
 	temp1   = 0;
@@ -755,39 +568,17 @@ stpi_unpack_4_2(int length,
 
   if (shift)
     {
-      *out0++ = temp0;
-      *out1++ = temp1;
-      *out2++ = temp2;
-      *out3++ = temp3;
+      *outs[0]++ = temp0;
+      *outs[1]++ = temp1;
+      *outs[2]++ = temp2;
+      *outs[3]++ = temp3;
     }
 }
 
-void
-stp_unpack_4(int length,
-	     int bits,
-	     const unsigned char *in,
-	     unsigned char *out0,
-	     unsigned char *out1,
-	     unsigned char *out2,
-	     unsigned char *out3)
-{
-  if (bits == 1)
-    stpi_unpack_4_1(length, in, out0, out1, out2, out3);
-  else
-    stpi_unpack_4_2(length, in, out0, out1, out2, out3);
-}
-
 static void
 stpi_unpack_8_1(int length,
 		const unsigned char *in,
-		unsigned char *out0,
-		unsigned char *out1,
-		unsigned char *out2,
-		unsigned char *out3,
-		unsigned char *out4,
-		unsigned char *out5,
-		unsigned char *out6,
-		unsigned char *out7)
+		unsigned char **outs)
 {
   unsigned char	tempin, bit, temp0, temp1, temp2, temp3, temp4, temp5, temp6,
     temp7;
@@ -824,14 +615,14 @@ stpi_unpack_8_1(int length,
       else
       {
         bit     = 128;
-	*out0++ = temp0;
-	*out1++ = temp1;
-	*out2++ = temp2;
-	*out3++ = temp3;
-	*out4++ = temp4;
-	*out5++ = temp5;
-	*out6++ = temp6;
-	*out7++ = temp7;
+	*outs[0]++ = temp0;
+	*outs[1]++ = temp1;
+	*outs[2]++ = temp2;
+	*outs[3]++ = temp3;
+	*outs[4]++ = temp4;
+	*outs[5]++ = temp5;
+	*outs[6]++ = temp6;
+	*outs[7]++ = temp7;
 
 	temp0   = 0;
 	temp1   = 0;
@@ -846,28 +637,21 @@ stpi_unpack_8_1(int length,
 
   if (bit < 128)
     {
-      *out0++ = temp0;
-      *out1++ = temp1;
-      *out2++ = temp2;
-      *out3++ = temp3;
-      *out4++ = temp4;
-      *out5++ = temp5;
-      *out6++ = temp6;
-      *out7++ = temp7;
+      *outs[0]++ = temp0;
+      *outs[1]++ = temp1;
+      *outs[2]++ = temp2;
+      *outs[3]++ = temp3;
+      *outs[4]++ = temp4;
+      *outs[5]++ = temp5;
+      *outs[6]++ = temp6;
+      *outs[7]++ = temp7;
     }
 }
 
 static void
 stpi_unpack_8_2(int length,
 		const unsigned char *in,
-		unsigned char *out0,
-		unsigned char *out1,
-		unsigned char *out2,
-		unsigned char *out3,
-		unsigned char *out4,
-		unsigned char *out5,
-		unsigned char *out6,
-		unsigned char *out7)
+		unsigned char **outs)
 {
   unsigned char	tempin,
 		shift,
@@ -918,14 +702,14 @@ stpi_unpack_8_2(int length,
       else
       {
         shift   = 0;
-	*out0++ = temp0;
-	*out1++ = temp1;
-	*out2++ = temp2;
-	*out3++ = temp3;
-	*out4++ = temp4;
-	*out5++ = temp5;
-	*out6++ = temp6;
-	*out7++ = temp7;
+	*outs[0]++ = temp0;
+	*outs[1]++ = temp1;
+	*outs[2]++ = temp2;
+	*outs[3]++ = temp3;
+	*outs[4]++ = temp4;
+	*outs[5]++ = temp5;
+	*outs[6]++ = temp6;
+	*outs[7]++ = temp7;
 
 	temp0   = 0;
 	temp1   = 0;
@@ -940,61 +724,25 @@ stpi_unpack_8_2(int length,
 
   if (shift)
     {
-      *out0++ = temp0;
-      *out1++ = temp1;
-      *out2++ = temp2;
-      *out3++ = temp3;
-      *out4++ = temp4;
-      *out5++ = temp5;
-      *out6++ = temp6;
-      *out7++ = temp7;
+      *outs[0]++ = temp0;
+      *outs[1]++ = temp1;
+      *outs[2]++ = temp2;
+      *outs[3]++ = temp3;
+      *outs[4]++ = temp4;
+      *outs[5]++ = temp5;
+      *outs[6]++ = temp6;
+      *outs[7]++ = temp7;
     }
 }
 
-void
-stp_unpack_8(int length,
-	     int bits,
-	     const unsigned char *in,
-	     unsigned char *out0,
-	     unsigned char *out1,
-	     unsigned char *out2,
-	     unsigned char *out3,
-	     unsigned char *out4,
-	     unsigned char *out5,
-	     unsigned char *out6,
-	     unsigned char *out7)
-{
-  if (bits == 1)
-    stpi_unpack_8_1(length, in, out0, out1, out2, out3,
-		     out4, out5, out6, out7);
-  else
-    stpi_unpack_8_2(length, in, out0, out1, out2, out3,
-		     out4, out5, out6, out7);
-}
-
-
 static void
 stpi_unpack_16_1(int length,
 		 const unsigned char *in,
-		 unsigned char *out0,
-		 unsigned char *out1,
-		 unsigned char *out2,
-		 unsigned char *out3,
-		 unsigned char *out4,
-		 unsigned char *out5,
-		 unsigned char *out6,
-		 unsigned char *out7,
-		 unsigned char *out8,
-		 unsigned char *out9,
-		 unsigned char *out10,
-		 unsigned char *out11,
-		 unsigned char *out12,
-		 unsigned char *out13,
-		 unsigned char *out14,
-		 unsigned char *out15)
+		 unsigned char **outs)
 {
   unsigned char	tempin, bit;
   unsigned char temp[16];
+  int j;
 
   if (length <= 0)
     return;
@@ -1046,70 +794,26 @@ stpi_unpack_16_1(int length,
       else
 	{
 	  bit     = 128;
-	  *out0++ = temp[0];
-	  *out1++ = temp[1];
-	  *out2++ = temp[2];
-	  *out3++ = temp[3];
-	  *out4++ = temp[4];
-	  *out5++ = temp[5];
-	  *out6++ = temp[6];
-	  *out7++ = temp[7];
-	  *out8++ = temp[8];
-	  *out9++ = temp[9];
-	  *out10++ = temp[10];
-	  *out11++ = temp[11];
-	  *out12++ = temp[12];
-	  *out13++ = temp[13];
-	  *out14++ = temp[14];
-	  *out15++ = temp[15];
+	  for (j = 0; j < 16; j++)
+	    *outs[j]++ = temp[j];
 
 	  memset(temp, 0, 16);
 	}
     }
 
   if (bit < 128)
-    {
-      *out0++ = temp[0];
-      *out1++ = temp[1];
-      *out2++ = temp[2];
-      *out3++ = temp[3];
-      *out4++ = temp[4];
-      *out5++ = temp[5];
-      *out6++ = temp[6];
-      *out7++ = temp[7];
-      *out8++ = temp[8];
-      *out9++ = temp[9];
-      *out10++ = temp[10];
-      *out11++ = temp[11];
-      *out12++ = temp[12];
-      *out13++ = temp[13];
-      *out14++ = temp[14];
-      *out15++ = temp[15];
-    }
+    for (j = 0; j < 16; j++)
+      *outs[j]++ = temp[j];
 }
 
 static void
 stpi_unpack_16_2(int length,
 		 const unsigned char *in,
-		 unsigned char *out0,
-		 unsigned char *out1,
-		 unsigned char *out2,
-		 unsigned char *out3,
-		 unsigned char *out4,
-		 unsigned char *out5,
-		 unsigned char *out6,
-		 unsigned char *out7,
-		 unsigned char *out8,
-		 unsigned char *out9,
-		 unsigned char *out10,
-		 unsigned char *out11,
-		 unsigned char *out12,
-		 unsigned char *out13,
-		 unsigned char *out14,
-		 unsigned char *out15)
+		 unsigned char **outs)
 {
   unsigned char	tempin, shift;
   unsigned char temp[16];
+  int j;
 
   if (length <= 0)
     return;
@@ -1175,46 +879,120 @@ stpi_unpack_16_2(int length,
       else
 	{
 	  shift   = 0;
-	  *out0++ = temp[0];
-	  *out1++ = temp[1];
-	  *out2++ = temp[2];
-	  *out3++ = temp[3];
-	  *out4++ = temp[4];
-	  *out5++ = temp[5];
-	  *out6++ = temp[6];
-	  *out7++ = temp[7];
-	  *out8++ = temp[8];
-	  *out9++ = temp[9];
-	  *out10++ = temp[10];
-	  *out11++ = temp[11];
-	  *out12++ = temp[12];
-	  *out13++ = temp[13];
-	  *out14++ = temp[14];
-	  *out15++ = temp[15];
+	  for (j = 0; j < 16; j++)
+	    *outs[j]++ = temp[j];
 
 	  memset(temp, 0, 16);
 	}
     }
 
   if (shift)
-    {
-      *out0++ = temp[0];
-      *out1++ = temp[1];
-      *out2++ = temp[2];
-      *out3++ = temp[3];
-      *out4++ = temp[4];
-      *out5++ = temp[5];
-      *out6++ = temp[6];
-      *out7++ = temp[7];
-      *out8++ = temp[8];
-      *out9++ = temp[9];
-      *out10++ = temp[10];
-      *out11++ = temp[11];
-      *out12++ = temp[12];
-      *out13++ = temp[13];
-      *out14++ = temp[14];
-      *out15++ = temp[15];
-    }
+    for (j = 0; j < 16; j++)
+      *outs[j]++ = temp[j];
+}
+
+void
+stp_unpack(int length,
+	   int bits,
+	   int n,
+	   const unsigned char *in,
+	   unsigned char **outs)
+{
+  unsigned char **touts;
+  int i;
+  if (n < 2)
+    return;
+  touts = stp_malloc(sizeof(unsigned char *) * n);
+  for (i = 0; i < n; i++)
+    touts[i] = outs[i];
+  if (bits == 1)
+    switch (n)
+      {
+      case 2:
+	stpi_unpack_2_1(length, in, touts);
+	break;
+      case 4:
+	stpi_unpack_4_1(length, in, touts);
+	break;
+      case 8:
+	stpi_unpack_8_1(length, in, touts);
+	break;
+      case 16:
+	stpi_unpack_16_1(length, in, touts);
+	break;
+      }
+  else
+    switch (n)
+      {
+      case 2:
+	stpi_unpack_2_2(length, in, touts);
+	break;
+      case 4:
+	stpi_unpack_4_2(length, in, touts);
+	break;
+      case 8:
+	stpi_unpack_8_2(length, in, touts);
+	break;
+      case 16:
+	stpi_unpack_16_2(length, in, touts);
+	break;
+      }
+  stp_free(touts);
+}
+
+void
+stp_unpack_2(int length,
+	     int bits,
+	     const unsigned char *in,
+	     unsigned char *outhi,
+	     unsigned char *outlo)
+{
+  unsigned char *outs[2];
+  outs[0] = outhi;
+  outs[1] = outlo;
+  stp_unpack(length, bits, 2, in, outs);
+}
+
+void
+stp_unpack_4(int length,
+	     int bits,
+	     const unsigned char *in,
+	     unsigned char *out0,
+	     unsigned char *out1,
+	     unsigned char *out2,
+	     unsigned char *out3)
+{
+  unsigned char *outs[4];
+  outs[0] = out0;
+  outs[1] = out1;
+  outs[2] = out2;
+  outs[3] = out3;
+  stp_unpack(length, bits, 4, in, outs);
+}
+
+void
+stp_unpack_8(int length,
+	     int bits,
+	     const unsigned char *in,
+	     unsigned char *out0,
+	     unsigned char *out1,
+	     unsigned char *out2,
+	     unsigned char *out3,
+	     unsigned char *out4,
+	     unsigned char *out5,
+	     unsigned char *out6,
+	     unsigned char *out7)
+{
+  unsigned char *outs[8];
+  outs[0] = out0;
+  outs[1] = out1;
+  outs[2] = out2;
+  outs[3] = out3;
+  outs[4] = out4;
+  outs[5] = out5;
+  outs[6] = out6;
+  outs[7] = out7;
+  stp_unpack(length, bits, 8, in, outs);
 }
 
 void
@@ -1238,14 +1016,24 @@ stp_unpack_16(int length,
 	      unsigned char *out14,
 	      unsigned char *out15)
 {
-  if (bits == 1)
-    stpi_unpack_16_1(length, in,
-		     out0, out1, out2, out3, out4, out5, out6, out7,
-		     out8, out9, out10, out11, out12, out13, out14, out15);
-  else
-    stpi_unpack_16_2(length, in,
-		     out0, out1, out2, out3, out4, out5, out6, out7,
-		     out8, out9, out10, out11, out12, out13, out14, out15);
+  unsigned char *outs[16];
+  outs[0] = out0;
+  outs[1] = out1;
+  outs[2] = out2;
+  outs[3] = out3;
+  outs[4] = out4;
+  outs[5] = out5;
+  outs[6] = out6;
+  outs[7] = out7;
+  outs[8] = out8;
+  outs[9] = out9;
+  outs[10] = out10;
+  outs[11] = out11;
+  outs[12] = out12;
+  outs[13] = out13;
+  outs[14] = out14;
+  outs[15] = out15;
+  stp_unpack(length, bits, 16, in, outs);
 }
 
 static void
diff --git a/src/main/channel.c b/src/main/channel.c
index b31a4f6..96043a2 100644
--- a/src/main/channel.c
+++ b/src/main/channel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: channel.c,v 1.31 2008/10/29 00:10:42 easysw Exp $"
+ * "$Id: channel.c,v 1.32 2009/03/01 17:14:15 rlk Exp $"
  *
  *   Dither routine entrypoints
  *
@@ -618,9 +618,9 @@ stp_channel_initialize(stp_vars_t *v, stp_image_t *image,
   stp_dprintf(STP_DBG_INK, v, "   black_channel  %d\n", cg->black_channel);
   stp_dprintf(STP_DBG_INK, v, "   gloss_channel  %d\n", cg->gloss_channel);
   stp_dprintf(STP_DBG_INK, v, "   gloss_physical %d\n", cg->gloss_physical_channel);
-  stp_dprintf(STP_DBG_INK, v, "   cyan           %.3f", cg->cyan_balance);
-  stp_dprintf(STP_DBG_INK, v, "   magenta        %.3f", cg->magenta_balance);
-  stp_dprintf(STP_DBG_INK, v, "   yellow         %.3f", cg->yellow_balance);
+  stp_dprintf(STP_DBG_INK, v, "   cyan           %.3f\n", cg->cyan_balance);
+  stp_dprintf(STP_DBG_INK, v, "   magenta        %.3f\n", cg->magenta_balance);
+  stp_dprintf(STP_DBG_INK, v, "   yellow         %.3f\n", cg->yellow_balance);
   stp_dprintf(STP_DBG_INK, v, "   input_data     %p\n",
 	      (void *) cg->input_data);
   stp_dprintf(STP_DBG_INK, v, "   multi_tmp      %p\n",
diff --git a/src/main/escp2-channels.c b/src/main/escp2-channels.c
index b899c78..5f16887 100644
--- a/src/main/escp2-channels.c
+++ b/src/main/escp2-channels.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-channels.c,v 1.87 2008/10/29 00:10:42 easysw Exp $"
+ * "$Id: escp2-channels.c,v 1.89 2009/03/07 19:38:00 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -47,6 +47,12 @@ load_subchannel(stp_mxml_node_t *node, stp_mxml_node_t *root, physical_subchanne
   name = stp_mxmlElementGetAttr(node, "headOffset");
   if (name)
     icl->head_offset = stp_xmlstrtol(name);
+  name = stp_mxmlElementGetAttr(node, "name");
+  if (name)
+    icl->name = stp_strdup(name);
+  name = stp_mxmlElementGetAttr(node, "text");
+  if (name)
+    icl->text = stp_strdup(name);
   while (child)
     {
       if (child->type == STP_MXML_ELEMENT)
@@ -234,6 +240,8 @@ load_inkname(stp_mxml_node_t *node, stp_mxml_node_t *root, inkname_t *inl)
 	inl->inkset = INKSET_CcMmYKk;
       else if (!strcmp(name, "Quadtone"))
 	inl->inkset = INKSET_QUADTONE;
+      else if (!strcmp(name, "Hextone"))
+	inl->inkset = INKSET_HEXTONE;
       else if (!strcmp(name, "OTHER"))
 	inl->inkset = INKSET_OTHER;
       else if (!strcmp(name, "Extended"))
diff --git a/src/main/escp2-papers.c b/src/main/escp2-papers.c
index 457aa0c..05593e9 100644
--- a/src/main/escp2-papers.c
+++ b/src/main/escp2-papers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-papers.c,v 1.117 2008/07/06 02:17:43 rlk Exp $"
+ * "$Id: escp2-papers.c,v 1.118 2009/07/21 11:07:06 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -449,6 +449,9 @@ build_input_slot(const stp_vars_t *v, const char *name)
   n1 = stp_mxmlFindElement(node, node, "DeinitSequence", NULL, NULL, STP_MXML_DESCEND);
   if (n1 && n1->child && n1->child->type == STP_MXML_TEXT)
     answer->deinit_sequence = stp_xmlstrtoraw(n1->child->value.text.string);
+  n1 = stp_mxmlFindElement(node, node, "ExtraHeight", NULL, NULL, STP_MXML_DESCEND);
+  if (n1 && n1->child && n1->child->type == STP_MXML_TEXT)
+    answer->extra_height = stp_xmlstrtoul(n1->child->value.text.string);
   return answer;
 }
 
diff --git a/src/main/print-escp2.c b/src/main/print-escp2.c
index 096fb43..0ccc74c 100644
--- a/src/main/print-escp2.c
+++ b/src/main/print-escp2.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2.c,v 1.416 2008/11/22 20:34:29 rlk Exp $"
+ * "$Id: print-escp2.c,v 1.424 2009/07/21 11:07:06 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -317,6 +317,12 @@ static const stp_parameter_t the_parameters[] =
     STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
   },
   {
+    "RawChannelNames", N_("Raw Channel Names"), N_("Advanced Printer Functionality"),
+    N_("Raw Channel Names"),
+    STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
+    STP_PARAMETER_LEVEL_INTERNAL, 0, 0, STP_CHANNEL_NONE, 0, 0
+  },
+  {
     "ChannelNames", N_("Channel Names"), N_("Advanced Printer Functionality"),
     N_("Channel Names"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
@@ -740,6 +746,126 @@ static const float_param_t float_parameters[] =
   },
   {
     {
+      "HGray5Value", N_("Hextone Gray 5 Value"), N_("Advanced Ink Adjustment"),
+      N_("Hextone Gray 5 (Darkest) Value"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0.0, 5.0, 1.0, 1
+  },
+  {
+    {
+      "HGray5Trans", N_("Hextone Gray 5 Transition"), N_("Advanced Ink Adjustment"),
+      N_("Hextone Gray 5 (Darkest) Transition"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0.0, 5.0, 1.0, 1
+  },
+  {
+    {
+      "HGray5Scale", N_("Hextone Gray 5 Density Scale"), N_("Advanced Ink Adjustment"),
+      N_("Hextone Gray 5 (Darkest) Density Scale"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0.0, 5.0, 1.0, 1
+  },
+  {
+    {
+      "HGray4Value", N_("Hextone Gray 4 Value"), N_("Advanced Ink Adjustment"),
+      N_("Hextone Gray 4 Value"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0.0, 5.0, 1.0, 1
+  },
+  {
+    {
+      "HGray4Trans", N_("Hextone Gray 4 Transition"), N_("Advanced Ink Adjustment"),
+      N_("Hextone Gray 4 Transition"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0.0, 5.0, 1.0, 1
+  },
+  {
+    {
+      "HGray4Scale", N_("Hextone Gray 4 Density Scale"), N_("Advanced Ink Adjustment"),
+      N_("Hextone Gray 4 Density Scale"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0.0, 5.0, 1.0, 1
+  },
+  {
+    {
+      "HGray3Value", N_("Hextone Gray 3 Value"), N_("Advanced Ink Adjustment"),
+      N_("Hextone Gray 3 Value"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0.0, 5.0, 1.0, 1
+  },
+  {
+    {
+      "HGray3Trans", N_("Hextone Gray 3 Transition"), N_("Advanced Ink Adjustment"),
+      N_("Hextone Gray 3 Transition"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0.0, 5.0, 1.0, 1
+  },
+  {
+    {
+      "HGray3Scale", N_("Hextone Gray 3 Density Scale"), N_("Advanced Ink Adjustment"),
+      N_("Hextone Gray 3 Density Scale"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0.0, 5.0, 1.0, 1
+  },
+  {
+    {
+      "HGray2Value", N_("Hextone Gray 2 Value"), N_("Advanced Ink Adjustment"),
+      N_("Hextone Gray 2 Value"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0.0, 5.0, 1.0, 1
+  },
+  {
+    {
+      "HGray2Trans", N_("Hextone Gray 2 Transition"), N_("Advanced Ink Adjustment"),
+      N_("Hextone Gray 2 Transition"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0.0, 5.0, 1.0, 1
+  },
+  {
+    {
+      "HGray2Scale", N_("Hextone Gray 2 Density Scale"), N_("Advanced Ink Adjustment"),
+      N_("Hextone Gray 2 Density Scale"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0.0, 5.0, 1.0, 1
+  },
+  {
+    {
+      "HGray1Value", N_("Hextone Gray 1 Value"), N_("Advanced Ink Adjustment"),
+      N_("Hextone Gray 1 (Lightest) Value"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0.0, 5.0, 1.0, 1
+  },
+  {
+    {
+      "HGray1Trans", N_("Hextone Gray 1 Transition"), N_("Advanced Ink Adjustment"),
+      N_("Hextone Gray 1 (Lightest) Transition"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0.0, 5.0, 1.0, 1
+  },
+  {
+    {
+      "HGray1Scale", N_("Hextone Gray 1 Density Scale"), N_("Advanced Ink Adjustment"),
+      N_("Hextone Gray 1 (Lightest) Density Scale"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0.0, 5.0, 1.0, 1
+  },
+  {
+    {
       "BlackTrans", N_("GCR Transition"), N_("Advanced Output Control"),
       N_("Adjust the gray component transition rate"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
@@ -796,6 +922,14 @@ static const int_param_t int_parameters[] =
 {
   {
     {
+      "QualityEnhancement", N_("Quality Enhancement"), N_("Advanced Printer Functionality"),
+      N_("Enhance print quality by additional passes"),
+      STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
+      STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, STP_CHANNEL_NONE, 1, 0
+    }, 0, 4, 0
+  },
+  {
+    {
       "PaperThickness", N_("Paper Thickness"), N_("Advanced Printer Functionality"),
       N_("Set printer paper thickness"),
       STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
@@ -837,6 +971,7 @@ static const int_param_t int_parameters[] =
   {
     {
       "FeedAdjustment", N_("Feed Adjustment"), N_("Advanced Printer Functionality"),
+      /* xgettext:no-c-format */
       N_("Set paper feed adjustment (0.01% units)"),
       STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
       STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, STP_CHANNEL_NONE, 1, 0
@@ -1544,6 +1679,40 @@ get_inktype(const stp_vars_t *v)
   return &(ink_list->inknames[0]);
 }
 
+static const inkname_t *
+get_inktype_only(const stp_vars_t *v)
+{
+  const char	*ink_type = stp_get_string_parameter(v, "InkType");
+
+  if (!ink_type)
+    return NULL;
+  else
+    return get_inktype(v);
+}
+
+static int
+printer_supports_inkset(const stp_vars_t *v, inkset_id_t inkset)
+{
+  const inkgroup_t *ink_group = escp2_inkgroup(v);
+  int i;
+  for (i = 0; i < ink_group->n_inklists; i++)
+    {
+      const inklist_t *ink_list = &(ink_group->inklists[i]);
+      if (ink_list)
+	{
+	  int j;
+	  for (j = 0; j < ink_list->n_inks; j++)
+	    {
+	      if (ink_list->inknames[j].inkset == inkset)
+		{
+		  return 1;
+		}
+	    }
+	}
+    }
+  return 0;
+}
+
 static const stp_vars_t *
 get_media_adjustment(const stp_vars_t *v)
 {
@@ -1680,9 +1849,13 @@ set_gray_value_parameter(const stp_vars_t *v,
 			 stp_parameter_t *description,
 			 int expected_channels)
 {
-  const inkname_t *ink_name = get_inktype(v);
+  const inkname_t *ink_name = get_inktype_only(v);
   description->is_active = 0;
-  if (ink_name && 
+  if (!ink_name &&
+      ((expected_channels == 4 && printer_supports_inkset(v, INKSET_QUADTONE)) ||
+       (expected_channels == 6 && printer_supports_inkset(v, INKSET_HEXTONE))))
+    fill_value_parameters(v, description, STP_ECOLOR_K);
+  else if (ink_name && 
       (ink_name->channels[STP_ECOLOR_K].n_subchannels ==
        expected_channels))
     fill_value_parameters(v, description, STP_ECOLOR_K);
@@ -1727,8 +1900,12 @@ set_gray_transition_parameter(const stp_vars_t *v,
 			      stp_parameter_t *description,
 			      int expected_channels)
 {
-  const inkname_t *ink_name = get_inktype(v);
+  const inkname_t *ink_name = get_inktype_only(v);
   description->is_active = 0;
+  if (!ink_name &&
+      ((expected_channels == 4 && printer_supports_inkset(v, INKSET_QUADTONE)) ||
+       (expected_channels == 6 && printer_supports_inkset(v, INKSET_HEXTONE))))
+    fill_transition_parameters(v, description, STP_ECOLOR_K);
   if (ink_name && 
       (ink_name->channels[STP_ECOLOR_K].n_subchannels ==
        expected_channels))
@@ -1768,8 +1945,12 @@ set_gray_scale_parameter(const stp_vars_t *v,
 			      stp_parameter_t *description,
 			      int expected_channels)
 {
-  const inkname_t *ink_name = get_inktype(v);
+  const inkname_t *ink_name = get_inktype_only(v);
   description->is_active = 0;
+  if (!ink_name &&
+      ((expected_channels == 4 && printer_supports_inkset(v, INKSET_QUADTONE)) ||
+       (expected_channels == 6 && printer_supports_inkset(v, INKSET_HEXTONE))))
+    fill_transition_parameters(v, description, STP_ECOLOR_K);
   if (ink_name &&
       (ink_name->channels[STP_ECOLOR_K].n_subchannels ==
        expected_channels))
@@ -1941,6 +2122,30 @@ find_resolution_from_quality(const stp_vars_t *v, const char *quality,
   return NULL;
 }
 
+static const inkname_t *
+get_raw_inktype(const stp_vars_t *v)
+{
+  if (strcmp(stp_get_string_parameter(v, "InputImageType"), "Raw") == 0)
+    {
+      const inklist_t *inks = stp_escp2_inklist(v);
+      int ninktypes = inks->n_inks;
+      int i;
+      const char *channel_name = stp_get_string_parameter(v, "RawChannels");
+      const channel_count_t *count;
+      if (!channel_name)
+	goto none;
+      count = get_channel_count_by_name(channel_name);
+      if (!count)
+	goto none;
+      for (i = 0; i < ninktypes; i++)
+	if (inks->inknames[i].inkset == INKSET_EXTENDED &&
+	    (inks->inknames[i].channel_count == count->count))
+	  return &(inks->inknames[i]);
+    }
+ none:
+  return get_inktype(v);
+}
+
 static void
 escp2_parameters(const stp_vars_t *v, const char *name,
 		 stp_parameter_t *description)
@@ -2455,7 +2660,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
       const inklist_t *inks = stp_escp2_inklist(v);
       int ninktypes = inks->n_inks;
       description->bounds.str = stp_string_list_create();
-      if (ninktypes > 1)
+      if (ninktypes >= 1)
 	{
 	  stp_string_list_add_string(description->bounds.str, "None", "None");
 	  for (i = 0; i < ninktypes; i++)
@@ -2470,9 +2675,41 @@ escp2_parameters(const stp_vars_t *v, const char *name,
 	  description->deflt.str =
 	    stp_string_list_param(description->bounds.str, 0)->name;
 	}
-      if (ninktypes <= 1)
+      else
 	description->is_active = 0;
     }
+  else if (strcmp(name, "RawChannelNames") == 0)
+    {
+      const inkname_t *ink_name = get_raw_inktype(v);
+      if (ink_name)
+	{
+	  description->bounds.str = stp_string_list_create();
+	  for (i = 0; i < ink_name->channel_count; i++)
+	    {
+	      int j;
+	      const ink_channel_t *ic = &(ink_name->channels[i]);
+	      if (ic)
+		for (j = 0; j < ic->n_subchannels; j++)
+		  if (ic->subchannels[j].name)
+		    stp_string_list_add_string(description->bounds.str,
+					       ic->subchannels[j].name,
+					       gettext(ic->subchannels[j].text));
+	    }
+	  for (i = 0; i < ink_name->aux_channel_count; i++)
+	    {
+	      int j;
+	      const ink_channel_t *ic = &(ink_name->aux_channels[i]);
+	      if (ic)
+		for (j = 0; j < ic->n_subchannels; j++)
+		  if (ic->subchannels[j].name)
+		    stp_string_list_add_string(description->bounds.str,
+					       ic->subchannels[j].name,
+					       gettext(ic->subchannels[j].text));
+	    }
+	  description->deflt.str =
+	    stp_string_list_param(description->bounds.str, 0)->name;
+	}
+    }
   else if (strcmp(name, "MultiChannelLimit") == 0)
     {
       description->is_active = 0;
@@ -2500,6 +2737,10 @@ escp2_parameters(const stp_vars_t *v, const char *name,
       if (stp_escp2_has_media_feature(v, name))
 	description->is_active = 1;
     }
+  else if (strcmp(name, "QualityEnhancement") == 0)
+    {
+      description->is_active = 1;
+    }
 }
 
 const res_t *
@@ -2790,6 +3031,7 @@ escp2_describe_output(const stp_vars_t *v)
 	  switch (ink_type->inkset)
 	    {
 	    case INKSET_QUADTONE:
+	    case INKSET_HEXTONE:
 	      return "Grayscale";
 	    case INKSET_OTHER:
 	    case INKSET_CMYK:
@@ -3638,6 +3880,7 @@ setup_printer_weave_parameters(stp_vars_t *v)
   pd->nozzle_start = 0;
   pd->min_nozzles = 1;
   pd->use_black_parameters = 0;
+  pd->extra_vertical_passes = 1;
 }
 
 static void
@@ -3665,6 +3908,7 @@ setup_head_parameters(stp_vars_t *v)
 
   pd->printer_weave = get_printer_weave(v);
 
+  pd->extra_vertical_passes = 1 << stp_get_int_parameter(v, "QualityEnhancement");
   if (stp_escp2_has_cap(v, MODEL_FAST_360, MODEL_FAST_360_YES) &&
       (pd->inkname->inkset == INKSET_CMYK || pd->physical_channels == 1) &&
       pd->res->hres == pd->physical_xdpi && pd->res->vres == 360)
@@ -3806,7 +4050,11 @@ setup_page(stp_vars_t *v)
     }
   else
     {
-      pd->page_extra_height = 0;
+      if (input_slot)
+	pd->page_extra_height = input_slot->extra_height *
+	  pd->page_management_units / escp2_base_separation(v);
+      else
+	pd->page_extra_height = 0;
       pd->paper_extra_bottom = escp2_paper_extra_bottom(v);
     }
   internal_imageable_area(v, 0, 0, &pd->page_left, &pd->page_right,
@@ -4051,7 +4299,7 @@ escp2_print_page(stp_vars_t *v, stp_image_t *image)
      pd->nozzles,
      pd->nozzle_separation * pd->res->vres / escp2_base_separation(v),
      pd->horizontal_passes,
-     pd->res->vertical_passes,
+     pd->res->vertical_passes * pd->extra_vertical_passes,
      1,
      pd->channels_in_use,
      pd->bitwidth,
@@ -4135,6 +4383,12 @@ escp2_do_print(stp_vars_t *v, stp_image_t *image, int print_op)
       stp_eprintf(v, "Warning: Quadtone inkset only available in MONO\n");
       stp_set_string_parameter(v, "PrintingMode", "BW");
     }
+  if (pd->inkname && pd->inkname->inkset == INKSET_HEXTONE &&
+      strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0)
+    {
+      stp_eprintf(v, "Warning: Hextone inkset only available in MONO\n");
+      stp_set_string_parameter(v, "PrintingMode", "BW");
+    }
   pd->channels_in_use = count_channels(pd->inkname, pd->use_aux_channels);
 
   setup_basic(v);
diff --git a/src/main/print-escp2.h b/src/main/print-escp2.h
index 4f27add..465cab1 100644
--- a/src/main/print-escp2.h
+++ b/src/main/print-escp2.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2.h,v 1.133 2008/11/22 20:28:04 rlk Exp $"
+ * "$Id: print-escp2.h,v 1.137 2009/07/21 11:07:06 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -161,6 +161,8 @@ typedef struct
   const char *subchannel_transition;
   const char *subchannel_value;
   const char *subchannel_scale;
+  const char *name;
+  const char *text;
   short *split_channels;
 } physical_subchannel_t;
 
@@ -180,8 +182,9 @@ typedef enum
   INKSET_CcMmYyK          = 2,
   INKSET_CcMmYKk          = 3,
   INKSET_QUADTONE         = 4,
-  INKSET_OTHER		  = 5,
-  INKSET_EXTENDED	  = 6
+  INKSET_HEXTONE          = 5,
+  INKSET_OTHER		  = 6,
+  INKSET_EXTENDED	  = 7
 } inkset_id_t;
 
 typedef struct
@@ -241,6 +244,7 @@ typedef struct
   short is_cd;
   short is_roll_feed;
   short duplex;
+  short extra_height;
   unsigned roll_feed_cut_flags;
   const stp_raw_t *init_sequence;
   const stp_raw_t *deinit_sequence;
@@ -555,6 +559,7 @@ typedef struct
   const res_t *res;		/* Description of the printing resolution */
   const stp_raw_t *printer_weave; /* Printer weave parameters */
   int use_printer_weave;	/* Use the printer weaving mechanism */
+  int extra_vertical_passes;	/* Quality enhancement */
 
   /* page parameters */		/* Indexed from top left */
   int page_left;		/* Left edge of page (points) */
@@ -614,5 +619,5 @@ extern void stpi_escp2_terminate_page(stp_vars_t *v);
 
 #endif /* GUTENPRINT_INTERNAL_ESCP2_H */
 /*
- * End of "$Id: print-escp2.h,v 1.133 2008/11/22 20:28:04 rlk Exp $".
+ * End of "$Id: print-escp2.h,v 1.137 2009/07/21 11:07:06 rlk Exp $".
  */
diff --git a/src/main/print-olympus.c b/src/main/print-olympus.c
index a0dc7e0..29836ed 100644
--- a/src/main/print-olympus.c
+++ b/src/main/print-olympus.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-olympus.c,v 1.89 2008/08/14 01:01:41 rlk Exp $"
+ * "$Id: print-olympus.c,v 1.94 2009/06/22 11:58:34 rlk Exp $"
  *
  *   Print plug-in DyeSub driver (formerly Olympus driver) for the GIMP.
  *
@@ -50,6 +50,7 @@
 #define DYESUB_FEATURE_BORDERLESS	0x00000008
 #define DYESUB_FEATURE_WHITE_BORDER	0x00000010
 #define DYESUB_FEATURE_PLANE_INTERLACE	0x00000020
+#define DYESUB_FEATURE_PLANE_LEFTTORIGHT	0x00000040
 
 #define DYESUB_PORTRAIT	0
 #define DYESUB_LANDSCAPE	1
@@ -168,6 +169,7 @@ typedef struct {
   int prnh_px, prnw_px, prnt_px, prnb_px, prnl_px, prnr_px;
   int print_mode;	/* portrait or landscape */
   int image_rows;
+  int plane_lefttoright;
 } dyesub_print_vars_t;
 
 typedef struct /* printer specific parameters */
@@ -851,6 +853,37 @@ static const dyesub_printsize_t cp220_printsize[] =
 
 LIST(dyesub_printsize_list_t, cp220_printsize_list, dyesub_printsize_t, cp220_printsize);
 
+
+/* Canon SELPHY CP-520 */
+static void cp520_printer_init_func(stp_vars_t *v)
+{
+  char pg = (strcmp(privdata.pagesize, "Postcard") == 0 ? '\1' :
+		(strcmp(privdata.pagesize, "w253h337") == 0 ? '\2' :
+		(strcmp(privdata.pagesize, "w155h244") == 0 ? '\3' :
+		(strcmp(privdata.pagesize, "w283h566") == 0 ? '\4' : 
+		 '\1' ))));
+
+  stp_put16_be(0x4000, v);
+  stp_putc('\0', v);
+  stp_putc(pg, v);
+  dyesub_nputc(v, '\0', 8); 
+  /* The CP520 does not want the printer_init and plane_init command to be sent
+     in the same USB-packet so we fill up first USB-Packet  with '\0'. */
+  dyesub_nputc(v, '\0', 1012); 
+}
+
+static void cp520_plane_init_func(stp_vars_t *v)
+{
+  stp_put16_be(0x4001, v);
+  stp_putc(3 - privdata.plane, v);  /* The CP520 differs from the cp-printer
+                                       in that it reqires the plane in the 3rd
+                                       byte not in the 4th */
+  stp_putc('\0', v);
+  stp_put32_le(privdata.w_size * privdata.h_size, v);
+  dyesub_nputc(v, '\0', 4);
+}
+
+
 /* Canon SELPHY ES series */
 static void es1_printer_init_func(stp_vars_t *v)
 {
@@ -1406,6 +1439,89 @@ static void shinko_chcs9045_printer_init(stp_vars_t *v)
 }
 
 
+/* Dai Nippon Printing DS40 */
+static const dyesub_pagesize_t dnpds40_dock_page[] =
+{
+  { "w288h432", "4x6", PT(1920,300)+1, PT(1240,300)+1, 0, 0, 0, 0,
+						DYESUB_PORTRAIT},
+  { "w432h576", "6x9", PT(1920,300)+1, PT(2740,300)+1, 0, 0, 0, 0,
+							DYESUB_PORTRAIT},
+  { "A5", "6x8", PT(1920,300)+1, PT(2436,300)+1, 0, 0, 0, 0,
+						DYESUB_PORTRAIT},
+};
+
+LIST(dyesub_pagesize_list_t, dnpds40_dock_page_list, dyesub_pagesize_t, dnpds40_dock_page);
+
+static const dyesub_printsize_t dnpds40_dock_printsize[] =
+{
+  { "300x300", "w288h432", 1920, 1240},
+  { "300x300", "w432h576", 1920, 2740},
+  { "300x300", "A5", 1920, 2436},
+};
+
+LIST(dyesub_printsize_list_t, dnpds40_dock_printsize_list, dyesub_printsize_t, dnpds40_dock_printsize);
+
+static void dnpds40_printer_end(stp_vars_t *v)
+{
+  stp_zprintf(v, "\033PCNTRL START"); dyesub_nputc(v, ' ', 19);
+}
+
+static void dnpds40_plane_init(stp_vars_t *v)
+{
+  char p = (privdata.plane == 3 ? 'Y' :
+	    (privdata.plane == 2 ? 'M' :
+	     'C' ));
+
+  long RFSize = (privdata.w_size*privdata.h_size) + 1024 + 54;
+  long AdSize = (32 - (RFSize % 32));
+  long FSize = RFSize + AdSize;
+
+  stp_zprintf(v, "\033PCNTRL RETENTION       0000000800000000");
+  stp_zprintf(v, "\033PIMAGE %cPLANE", p); dyesub_nputc(v, ' ', 10);
+
+  stp_zprintf(v, "0%ld", FSize);
+  stp_zprintf(v, "BM");
+  stp_put32_le(FSize, v);
+  dyesub_nputc(v, '\0', 4);
+  stp_put32_le(1088, v);
+  stp_put32_le(40, v);
+  stp_put32_le(privdata.w_size, v);
+  stp_put32_le(privdata.h_size, v);
+  stp_put16_le(1, v);
+  stp_put16_le(8, v);
+  dyesub_nputc(v, '\0', 24);
+  dyesub_nputc(v, '\0', 1024);   /*RGB Array*/
+  dyesub_nputc(v, '\0', AdSize); /*Locate to 32bit border */
+}
+
+
+
+/* Dai Nippon Printing DS80 */
+static const dyesub_pagesize_t dnpds80_dock_page[] =
+{
+  { "c8x10", "8x10", PT(2560,300)+1, PT(3036,300)+1, 0, 0, 0, 0, DYESUB_PORTRAIT},
+  { "C6", "8x4", PT(2560,300)+1, PT(1236,300)+1, 0, 0, 0, 0, DYESUB_PORTRAIT},/* 8x4 */
+  { "C5", "8x5", PT(2560,300)+1, PT(1536,300)+1, 0, 0, 0, 0, DYESUB_PORTRAIT},
+  { "C4", "8x6", PT(2560,300)+1, PT(1836,300)+1, 0, 0, 0, 0, DYESUB_PORTRAIT},
+  { "C3", "8x8", PT(2560,300)+1, PT(2436,300)+1, 0, 0, 0, 0, DYESUB_PORTRAIT},
+  { "C2", "8x12", PT(2560,300)+1, PT(3636,300)+1, 0, 0, 0, 0, DYESUB_PORTRAIT},
+  { "C1", "A4 Length", PT(2560,300)+1, PT(3544,300)+1, 0, 0, 0, 0, DYESUB_PORTRAIT},
+};
+
+LIST(dyesub_pagesize_list_t, dnpds80_dock_page_list, dyesub_pagesize_t, dnpds80_dock_page);
+
+static const dyesub_printsize_t dnpds80_dock_printsize[] =
+{
+  { "300x300", "c8x10", 2560, 3036},
+  { "300x300", "C6", 2560, 1236},
+  { "300x300", "C5", 2560, 1536},
+  { "300x300", "C4", 2560, 1836},
+  { "300x300", "C3", 2560, 2436},
+  { "300x300", "C2", 2560, 3636},
+  { "300x300", "C1", 2560, 3544},
+};
+
+LIST(dyesub_printsize_list_t, dnpds80_dock_printsize_list, dyesub_printsize_t, dnpds80_dock_printsize);
 
 /* Model capabilities */
 
@@ -1549,6 +1665,22 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
     cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
     NULL,
   },
+  { /* Canon CP-520 */
+    1004,
+    &ymc_ink_list,
+    &res_300dpi_list,
+    &cp220_page_list,
+    &cp220_printsize_list,
+    SHRT_MAX,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT
+      | DYESUB_FEATURE_BORDERLESS | DYESUB_FEATURE_WHITE_BORDER
+      | DYESUB_FEATURE_PLANE_INTERLACE,
+    &cp520_printer_init_func, NULL,
+    &cp520_plane_init_func, NULL,
+    NULL, NULL,
+    cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
+    NULL,
+  },
   { /* Canon SELPHY ES1, ES2, ES20 (!experimental) */
     1003,
     &ymc_ink_list,
@@ -1696,6 +1828,36 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
     NULL, NULL, NULL,
     NULL,
   },
+  { /* Dai Nippon Printing DS40 */
+    6000,
+    &rgb_ink_list,
+    &res_300dpi_list,
+    &dnpds40_dock_page_list,
+    &dnpds40_dock_printsize_list,
+    SHRT_MAX,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT
+      | DYESUB_FEATURE_PLANE_INTERLACE | DYESUB_FEATURE_PLANE_LEFTTORIGHT,
+    NULL, &dnpds40_printer_end,
+    &dnpds40_plane_init, NULL,
+    NULL, NULL,
+    NULL, NULL, NULL,
+    NULL,
+  },
+  { /* Dai Nippon Printing DS80 */
+    6001,
+    &rgb_ink_list,
+    &res_300dpi_list,
+    &dnpds80_dock_page_list,
+    &dnpds80_dock_printsize_list,
+    SHRT_MAX,
+    DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT
+      | DYESUB_FEATURE_PLANE_INTERLACE | DYESUB_FEATURE_PLANE_LEFTTORIGHT,
+    NULL, &dnpds40_printer_end,
+    &dnpds40_plane_init, NULL,
+    NULL, NULL,
+    NULL, NULL, NULL,
+    NULL,
+  },
 };
 
 static const stp_parameter_t the_parameters[] =
@@ -1731,6 +1893,10 @@ static const stp_parameter_t the_parameters[] =
     STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0
   },
   {
+    /* TRANSLATORS: 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. */
     "Laminate", N_("Laminate Pattern"), N_("Advanced Printer Setup"),
     N_("Laminate Pattern"),
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
@@ -2365,7 +2531,10 @@ dyesub_print_row(stp_vars_t *v,
   for (w = 0; w < pv->outw_px; w++)
     {
       col = dyesub_interpolate(w, pv->outw_px, pv->imgw_px);
-      ret = dyesub_print_pixel(v, pv, row, col, plane);
+      if (pv->plane_lefttoright)
+	ret = dyesub_print_pixel(v, pv, row, pv->imgw_px - col - 1, plane);
+      else
+	ret = dyesub_print_pixel(v, pv, row, col, plane);
       if (ret > 1)
       	break;
     }
@@ -2553,6 +2722,7 @@ dyesub_do_print(stp_vars_t *v, stp_image_t *image)
  		(strcmp(ink_type, "RGB") == 0 || strcmp(ink_type, "BGR") == 0)
 		? '\xff' : '\0');
   pv.plane_interlacing = dyesub_feature(caps, DYESUB_FEATURE_PLANE_INTERLACE);
+  pv.plane_lefttoright = dyesub_feature(caps, DYESUB_FEATURE_PLANE_LEFTTORIGHT);
   pv.print_mode = page_mode;
   if (!pv.image_data)
     {
diff --git a/src/main/print-weave.c b/src/main/print-weave.c
index 0207082..98eae16 100644
--- a/src/main/print-weave.c
+++ b/src/main/print-weave.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-weave.c,v 1.72 2008/10/29 00:10:42 easysw Exp $"
+ * "$Id: print-weave.c,v 1.75 2009/05/24 01:53:53 rlk Exp $"
  *
  *   Softweave calculator for Gutenprint.
  *
@@ -1149,6 +1149,10 @@ stp_initialize_weave(stp_vars_t *v,
   sw->horizontal_width =
     (sw->compute_linewidth)(v, ((sw->linewidth + sw->horizontal_weave - 1) /
 				 sw->horizontal_weave));
+  stp_dprintf(STP_DBG_WEAVE_PARAMS, v,
+	      "Computing linewidth for linewidth %d weave %d => %d (%d)\n",
+	      sw->linewidth, sw->horizontal_weave, sw->horizontal_width,
+	      ((sw->horizontal_width + 7) / 8));
   sw->horizontal_width = ((sw->horizontal_width + 7) / 8);
 
   for (i = 0; i < sw->vmod; i++)
@@ -1173,6 +1177,10 @@ stp_initialize_weave(stp_vars_t *v,
 	      sw->oversample, sw->vmod,
 	      sw->vmod * sw->virtual_jets * sw->bitwidth *
 	      sw->ncolors * sw->horizontal_width, page_height);
+  stp_dprintf(STP_DBG_WEAVE_PARAMS, v,
+	      "      ***Buffer limit %d (vj %d bw %d hw %d)\n",
+	      sw->virtual_jets * sw->bitwidth * sw->horizontal_width,
+	      sw->virtual_jets, sw->bitwidth, sw->horizontal_width);
   stp_allocate_component_data(v, "Weave", NULL, stpi_destroy_weave, sw);
   return;
 }
@@ -1499,9 +1507,44 @@ add_to_row(stp_vars_t *v, stpi_softweave_t *sw, int row, unsigned char *buf,
   size_t count = linecount->v[color];
   if (place + nbytes > sw->virtual_jets * sw->bitwidth * sw->horizontal_width)
     {
-      stp_eprintf(v, "Buffer overflow: limit %d, actual %ld, count %ld\n",
+      int i;
+      stp_eprintf(v, "ERROR: %s\n", _("Fatal error!"));
+      stp_eprintf(v, "ERROR: Static weave data follows:\n");
+      stp_eprintf(v, "ERROR:    jets: %d\n", sw->jets);
+      stp_eprintf(v, "ERROR:    virtual_jets: %d\n", sw->virtual_jets);
+      stp_eprintf(v, "ERROR:    separation: %d\n", sw->separation);
+      stp_eprintf(v, "ERROR:    horizontal_weave: %d\n", sw->horizontal_weave);
+      stp_eprintf(v, "ERROR:    vertical_subpasses: %d\n", sw->vertical_subpasses);
+      stp_eprintf(v, "ERROR:    vmod: %d\n", sw->vmod);
+      stp_eprintf(v, "ERROR:    oversample: %d\n", sw->oversample);
+      stp_eprintf(v, "ERROR:    repeat_count: %d\n", sw->repeat_count);
+      stp_eprintf(v, "ERROR:    ncolors: %d\n", sw->ncolors);
+      stp_eprintf(v, "ERROR:    linewidth: %d\n", sw->linewidth);
+      stp_eprintf(v, "ERROR:    vertical_height: %d\n", sw->vertical_height);
+      stp_eprintf(v, "ERROR:    firstline: %d\n", sw->firstline);
+      stp_eprintf(v, "ERROR:    bitwidth: %d\n", sw->bitwidth);
+      stp_eprintf(v, "ERROR:    vertical_oversample: %d\n", sw->vertical_oversample);
+      stp_eprintf(v, "ERROR:    horizontal_width: %d\n", sw->horizontal_width);
+      if (sw->head_offset)
+	{
+	  stp_eprintf(v, "ERROR:    head_offset:\n");
+	  for (i = 0; i < sw->ncolors; i++)
+	    stp_eprintf(v, "ERROR:      head %d: %d\n", i, sw->head_offset[i]);
+	}
+      stp_eprintf(v, "ERROR: Dynamic weave data follows:\n");
+      stp_eprintf(v, "ERROR:    last_pass_offset: %d\n", sw->last_pass_offset);
+      stp_eprintf(v, "ERROR:    last_pass: %d\n", sw->last_pass);
+      stp_eprintf(v, "ERROR:    lineno: %d\n", sw->lineno);
+      stp_eprintf(v, "ERROR:    current_vertical_subpass: %d\n", sw->current_vertical_subpass);
+      stp_eprintf(v, "ERROR:    rcache: %d\n", sw->rcache);
+      stp_eprintf(v, "ERROR:    vcache: %d\n", sw->vcache);
+      stp_eprintf(v, "ERROR: Other parameters: row %d color %d setactive %d hpass %d\n",
+		  row, color, setactive, h_pass);
+      stp_eprintf(v, "ERROR: Buffer overflow: limit %d (jets %d bits %d horizontal %d), actual %ld (current %d added %d), count %ld\n",
 		  sw->virtual_jets * sw->bitwidth * sw->horizontal_width,
-		  (long)(place + nbytes), (long)count);
+		  sw->virtual_jets, sw->bitwidth, sw->horizontal_width,
+		  (long) (place + nbytes), (int) place, (int) nbytes, (long) count);
+      stp_eprintf(v, "ERROR: %s\n", _("Please report the above information to gimp-print-devel@lists.sourceforge.net"));
       stp_abort();
     }
   memcpy(bufs->v[color] + lineoffs->v[color], buf, nbytes);
@@ -1582,10 +1625,23 @@ stp_write_weave(stp_vars_t *v, unsigned char *const cols[])
   int cpass = sw->current_vertical_subpass * h_passes;
 
   if (!sw->fold_buf)
-    sw->fold_buf = stp_zalloc(sw->bitwidth * ylength);
+    {
+      stp_dprintf(STP_DBG_WEAVE_PARAMS, v,
+		  "fold buffer allocation: length %d lw %d weave %d xlength %d ylength %d\n",
+		  length, sw->linewidth, sw->horizontal_weave, xlength, ylength);
+      stp_dprintf(STP_DBG_WEAVE_PARAMS, v,
+		  "Allocating fold buf %d * %d (%d)\n", ylength, sw->bitwidth,
+		  sw->bitwidth * ylength);
+      sw->fold_buf = stp_zalloc(sw->bitwidth * ylength);
+    }
   if (!sw->comp_buf)
-    sw->comp_buf = stp_zalloc(sw->bitwidth *
-			      (sw->compute_linewidth)(v,ylength));
+    {
+      stp_dprintf(STP_DBG_WEAVE_PARAMS, v,
+		  "Allocating compression buffer based on %d, %d\n",
+		  sw->bitwidth, ylength);
+      sw->comp_buf = stp_zalloc(sw->bitwidth *
+				(sw->compute_linewidth)(v,ylength));
+    }
   if (sw->current_vertical_subpass == 0)
     initialize_row(v, sw, sw->lineno, xlength, cols);
 
@@ -1622,47 +1678,15 @@ stp_write_weave(stp_vars_t *v, unsigned char *const cols[])
 	    }
 	  else
 	    in = cols[j];
-	  switch (sw->horizontal_weave)
-	    {
-	    case 1:
-	      memcpy(sw->s[0], in, length * sw->bitwidth);
-	      break;
-	    case 2:
-	      stp_unpack_2(length, sw->bitwidth, in, sw->s[0], sw->s[1]);
-	      break;
-	    case 4:
-	      stp_unpack_4(length, sw->bitwidth, in,
-			   sw->s[0], sw->s[1], sw->s[2], sw->s[3]);
-	      break;
-	    case 8:
-	      stp_unpack_8(length, sw->bitwidth, in,
-			   sw->s[0], sw->s[1], sw->s[2], sw->s[3],
-			   sw->s[4], sw->s[5], sw->s[6], sw->s[7]);
-	      break;
-	    case 16:
-	      stp_unpack_16(length, sw->bitwidth, in,
-			    sw->s[0], sw->s[1], sw->s[2], sw->s[3],
-			    sw->s[4], sw->s[5], sw->s[6], sw->s[7],
-			    sw->s[8], sw->s[9], sw->s[10], sw->s[11],
-			    sw->s[12], sw->s[13], sw->s[14], sw->s[15]);
-	      break;
-	    }
-	  switch (sw->vertical_subpasses)
+	  if (sw->horizontal_weave == 1)
+	    memcpy(sw->s[0], in, length * sw->bitwidth);
+	  else
+	    stp_unpack(length, sw->bitwidth, sw->horizontal_weave, in, sw->s);
+	  if (sw->vertical_subpasses > 1)
 	    {
-	    case 4:
-	      for (idx = 0; idx < sw->horizontal_weave; idx++)
-		stp_split_4(length, sw->bitwidth, sw->s[idx], sw->s[idx],
-			    sw->s[idx + sw->horizontal_weave],
-			    sw->s[idx + sw->horizontal_weave * 2],
-			    sw->s[idx + sw->horizontal_weave * 3]);
-	      break;
-	    case 2:
 	      for (idx = 0; idx < sw->horizontal_weave; idx++)
-		stp_split_2(length, sw->bitwidth, sw->s[idx], sw->s[idx],
-			    sw->s[idx + sw->horizontal_weave]);
-	      break;
-	      /* case 1 is taken care of because the various unpack */
-	      /* functions will do the trick themselves */
+		stp_split(length, sw->bitwidth, sw->vertical_subpasses,
+			  sw->s[idx], sw->horizontal_weave, &(sw->s[idx]));
 	    }
 	  for (i = 0; i < h_passes; i++)
 	    {
diff --git a/src/testpattern/Makefile.in b/src/testpattern/Makefile.in
index d463d43..fc25c0b 100644
--- a/src/testpattern/Makefile.in
+++ b/src/testpattern/Makefile.in
@@ -49,11 +49,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -127,10 +130,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -140,16 +139,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -194,6 +192,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -205,6 +204,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -217,8 +217,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -252,8 +256,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -298,6 +301,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -310,6 +314,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
diff --git a/src/testpattern/run-testpattern-2.in b/src/testpattern/run-testpattern-2.in
index 3e5b7d9..ecc28d7 100644
--- a/src/testpattern/run-testpattern-2.in
+++ b/src/testpattern/run-testpattern-2.in
@@ -15,10 +15,11 @@ my $retval = 0;
 my $testpattern_command;
 my @printer_list = ();
 my @special_options = ();
-my @standard_options = qw(InkType InkSet DitherAlgorithm Duplex MediaType InputSlot ColorCorrection ImageType FullBleed Quality UseGloss Weave RawChannels PrintingDirection Density CyanDensity);
+my @standard_options = qw(InkType InkSet,RawChannels DitherAlgorithm Duplex MediaType InputSlot ColorCorrection ImageType FullBleed Quality UseGloss Weave PrintingDirection Density CyanDensity);
 my $global_status = 1;
 my $run_installed = 0;
 my $use_min_res = 0;
+my $help = 0;
 my $output = undef;
 
 my @extras = ();
@@ -32,6 +33,7 @@ my %models;
 my %families;
 my $skip_duplicate_printers = 0;
 my $std_pages = 1;
+my $duplex_pages = 4;
 my $skip_resolutions = 0;
 my $quiet = 0;
 my $single = 0;
@@ -49,6 +51,7 @@ GetOptions("v+"  => \$valgrind,
 	   "g"   => \$gdb_attach,
 	   "n"   => \$dontrun,
 	   "p:i" => \$std_pages,
+	   "P:i" => \$duplex_pages,
 	   "s!"  => \$skip_duplicate_printers,
 	   "S!"  => \$single,
 	   "i!"  => \$run_installed,
@@ -60,7 +63,58 @@ GetOptions("v+"  => \$valgrind,
 	   "O=s" => \$output,
 	   "d=s" => \@default_options,
 	   "m:s" => \$calc_md5_dir,
-	   "M:s" => \$calc_md5_file);
+	   "M:s" => \$calc_md5_file,
+	   "h"   => \$help);
+
+if ($help) {
+    my $options = join("\n                        ", sort @standard_options);
+    print STDERR <<EOF;
+Usage: run-testpattern-2 [opts] [model ...]
+
+  Options:
+    -c              Use callgrind (incompatible with -v)
+    -f family       Test printers only in the specified family.  Multiple
+                    families may be tested.  By default, all printer families
+		    are tested.
+    -g              Attach testpattern job to gdb
+    -i              Use the installed Gutenprint libraries rather than
+                    source tree
+    -m md5_dir      Generate MD5 checksums and place them in the specified
+                    directory, one file per run.  Directory will be created
+		    if necessary.
+    -M md5_file     Generate MD5 checksums and place them in the specified
+                    file, one line per run.
+    -n              Do not actually run testpattern
+    -O out_dir      Generate actual output and place it in the specified
+                    directory, one file per run.  Directory will be created
+		    if necessary.
+    -o option       Test this option.  Multiple -o options may be specified.
+                    option1,option2 indicates to test each value of option1
+		    in combination with each value of option2.  For floating
+		    point and integer options, a selection of values is
+		    tested.
+		    Default:
+		        $options
+    -p page count   Specify number of pages to print per printer.  Default $std_pages.
+    -P page count   Specify number of pages to print per printer when testing
+                    duplex mode.  Default $duplex_pages.
+    -q              Do not print progress messages
+    -r              Do not test each resolution (test only the default)
+    -R              Use the minimum resolution (rather than the default)
+                    to test other options.
+    -RR             Use only the minimum resolution, and do not test other
+                    resolutions.
+    -s              Skip duplicate printers (with the same model number
+                    in printers.xml)
+    -S              Run a separate testpattern command for each printer
+    -v[v[v[v]]]     Use valgrind.  Number of -v options controls usage:
+                    -v    Basic valgrind checking, no leak checking
+                    -vv   Additional leak checking
+                    -vvv  Show reachable data also
+                    -vvvv Minimal checks only
+EOF
+exit 1;
+}
 
 my $pages = $std_pages;
 
@@ -412,10 +466,6 @@ sub do_printer($$) {
 		    @job_extras = ();
 		    @messages = ();
 		    @global_messages = ();
-		    if ($first_time) {
-			set_global_message("$printer\n");
-			$first_time = 0;
-		    }
 		    set_opt("PrintingMode", $pmode, $printer);
 		    if ($use_min_res) {
 			set_opt("Resolution", $min_res_name, $printer);
@@ -426,6 +476,7 @@ sub do_printer($$) {
 			my $k = $subkeys[$_];
 			my $v = $subopts[$_];
 			if ($k eq "RawChannels") {
+			    next if ($v ne "None" && $pmode ne "Color");
 			    $rawval = $v;
 			} else {
 			    set_opt($k, $v, $printer);
@@ -433,15 +484,18 @@ sub do_printer($$) {
 			push @mvals, "${k}_${v}";
 			push @ovals, "${k}=${v}";
 		    } (0..$#subkeys);
+		    if ($first_time) {
+			set_global_message("$printer\n");
+			$first_time = 0;
+		    }
 		    # FIXME! need to handle Duplex as a subkey
 		    map {
+			$pages = $std_pages;
 			if ($key ne $_) {
 			    set_opt($_, $base_settings{$_}, $printer);
 			    if ($key eq "Duplex") {
 				set_opt("JobMode", "Job", $printer);
-				$pages = 4;
-			    } else {
-				$pages = $std_pages;
+				$pages = $duplex_pages;
 			    }
 			}
 		    } keys %base_settings;
@@ -520,7 +574,7 @@ if ($dontrun) {
 	$suppress = '-n';
     }
     my ($qopt) = $quiet ? "-q" : "";
-    $testpattern_command = "$valgrind_command ./testpattern $suppress $qopt";
+    $testpattern_command = "$valgrind_command ./testpattern -y $suppress $qopt";
     if ($single) {
 	foreach my $printer (@printer_list) {
 	    open TESTPATTERN, "|$testpattern_command" or
diff --git a/src/testpattern/testpattern.c b/src/testpattern/testpattern.c
index 512739d..e27e73d 100644
--- a/src/testpattern/testpattern.c
+++ b/src/testpattern/testpattern.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: testpattern.c,v 1.54 2008/07/16 23:59:23 rlk Exp $"
+ * "$Id: testpattern.c,v 1.57 2009/06/14 17:12:44 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -92,11 +92,15 @@ int global_did_something;
 int global_noscale = 0;
 int global_suppress_output = 0;
 int global_quiet = 0;
+int global_fail_verify_ok = 0;
 char *global_output = NULL;
 FILE *output = NULL;
 int write_to_process = 0;
 int start_job = 0;
 int end_job = 0;
+int passes = 0;
+int failures = 0;
+int skipped = 0;
 
 static testpattern_t *static_testpatterns;
 
@@ -249,6 +253,7 @@ initialize_global_parameters(void)
 static int
 do_print(void)
 {
+  int status = 0;
   stp_vars_t *v;
   const stp_printer_t *the_printer;
   int left, right, top, bottom;
@@ -421,22 +426,50 @@ do_print(void)
   stp_set_top(v, top);
 
   stp_merge_printvars(v, stp_printer_get_defaults(the_printer));
-  if (start_job)
+  if (stp_verify(v))
     {
-      stp_start_job(v, &theImage);
-      start_job = 0;
+      if (start_job)
+	{
+	  stp_start_job(v, &theImage);
+	  start_job = 0;
+	}
+      if (stp_print(v, &theImage) != 1)
+	{
+	  if (!global_quiet)
+	    fprintf(stderr, "FAILED!");
+	  failures++;
+	  status = 2;
+	}
+      else
+	passes++;
+      if (end_job)
+	{
+	  stp_end_job(v, &theImage);
+	  end_job = 0;
+	}
     }
-  if (stp_print(v, &theImage) != 1)
-    return 2;
-  if (end_job)
+  else
     {
-      stp_end_job(v, &theImage);
-      end_job = 0;
+      if (! global_fail_verify_ok)
+	{
+	  if (!global_quiet)
+	    fprintf(stderr, "FAILED!");
+	  failures++;
+	  status = 2;
+	}
+      else
+	{
+	  if (!global_quiet)
+	    fprintf(stderr, "(skipped)");
+	  skipped++;
+	}
     }
+  if (!global_quiet)
+    fprintf(stderr, "\n");
   stp_vars_destroy(v);
   stp_free(static_testpatterns);
   static_testpatterns = NULL;
-  return 0;
+  return status;
 }
 
 int
@@ -447,7 +480,7 @@ main(int argc, char **argv)
   int global_status = 0;
   while (1)
     {
-      c = getopt(argc, argv, "nq");
+      c = getopt(argc, argv, "nqy");
       if (c == -1)
 	break;
       switch (c)
@@ -458,6 +491,9 @@ main(int argc, char **argv)
 	case 'q':
 	  global_quiet = 1;
 	  break;
+	case 'y':
+	  global_fail_verify_ok = 1;
+	  break;
 	default:
 	  break;
 	}
@@ -474,6 +510,8 @@ main(int argc, char **argv)
 	global_status = 1;
     }
   close_output();
+  if (!global_quiet)
+    fprintf(stderr, "%d pass, %d fail, %d skipped\n", passes, failures, skipped);
   return global_status;
 }
 
@@ -1134,8 +1172,6 @@ Image_conclude(stp_image_t *image)
       abort();
     }
   Image_is_valid = 0;
-  if (!global_quiet)
-    fprintf(stderr, "\n");
 }
 
 static const char *
diff --git a/src/testpattern/testpatternl.c b/src/testpattern/testpatternl.c
index 167b521..a3d8dd5 100644
--- a/src/testpattern/testpatternl.c
+++ b/src/testpattern/testpatternl.c
@@ -8,7 +8,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 33
+#define YY_FLEX_SUBMINOR_VERSION 35
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -30,7 +30,7 @@
 
 /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
 
-#if __STDC_VERSION__ >= 199901L
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
  * if you want the limit (max/min) macros for int types. 
@@ -93,11 +93,12 @@ typedef unsigned int flex_uint32_t;
 
 #else	/* ! __cplusplus */
 
-#if __STDC__
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
 
 #define YY_USE_CONST
 
-#endif	/* __STDC__ */
+#endif	/* defined (__STDC__) */
 #endif	/* ! __cplusplus */
 
 #ifdef YY_USE_CONST
@@ -177,14 +178,9 @@ extern FILE *yyin, *yyout;
 
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-
 #ifndef YY_TYPEDEF_YY_SIZE_T
 #define YY_TYPEDEF_YY_SIZE_T
-typedef unsigned int yy_size_t;
+typedef size_t yy_size_t;
 #endif
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -343,6 +339,9 @@ FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
 typedef int yy_state_type;
 
 extern int yylineno;
+
+int yylineno = 1;
+
 extern char *yytext;
 #define yytext_ptr yytext
 
@@ -361,8 +360,8 @@ static void yy_fatal_error (yyconst char msg[]  );
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 54
-#define YY_END_OF_BUFFER 55
+#define YY_NUM_RULES 47
+#define YY_END_OF_BUFFER 48
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -370,37 +369,37 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_accept[264] =
+static yyconst flex_int16_t yy_accept[268] =
     {   0,
-        0,    0,   55,   54,   51,   53,   54,   52,   54,   54,
-       48,   48,   33,   50,   50,   50,   50,   50,   50,   50,
-       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
-       50,   50,   50,   50,   51,    0,   52,    0,   50,   48,
-       50,    0,   48,   50,   50,   50,   50,   50,   50,   50,
-       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
-       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
-       50,   50,   50,   50,   50,    0,   49,    0,   50,   49,
-       48,   50,   50,   38,   50,   50,   50,   47,   50,   50,
-       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
-
-       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
-       50,   37,   50,   50,   21,   50,   50,   50,   50,   49,
-       50,   50,   35,    1,   50,   50,   50,   50,   50,   40,
-       39,   30,   50,   50,   50,   36,   50,   50,   50,   22,
-       50,   50,   50,   34,   50,   50,   50,   50,   50,   50,
-       50,   50,   50,   50,   50,   50,    7,   50,   50,   50,
-       50,   50,    9,   23,   28,   50,   50,   50,   50,   10,
-       50,   50,   50,   50,   50,   50,   50,   50,   50,   11,
-       24,   41,   50,   50,   50,   50,   50,   50,   50,   50,
-       50,   50,    2,   50,   50,   50,   50,   42,   50,   50,
-
-       50,   50,   50,   50,    5,   50,   31,   50,   20,   46,
-       50,   50,    8,   50,    3,   43,   44,   50,   50,   26,
-       13,   50,   50,   50,    6,   29,   50,   50,   50,   50,
-       50,   27,   25,   12,    4,   32,   14,   45,   50,   50,
-       50,   50,   50,   50,   50,   50,   50,   50,   50,   50,
-       50,   50,   15,   50,   16,   50,   50,   50,   19,   18,
-       50,   17,    0
+        0,    0,   48,   47,   44,   46,   47,   45,   47,   47,
+       41,   41,   25,   43,   43,   43,   43,   43,   43,   43,
+       43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+       43,   43,   43,   43,   44,    0,   43,   45,    0,   41,
+       41,   43,    0,   41,   42,   43,   43,   41,   43,   43,
+       43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+       43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+       43,   43,   43,   43,   43,   43,   43,   43,   42,    0,
+       41,   42,    0,   43,   42,   41,   43,   43,   30,   43,
+       43,   43,   39,   43,   43,   43,   43,   43,   43,   43,
+
+       43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+       43,   43,   43,   43,   43,   43,   43,   43,   29,   43,
+       43,   13,   43,   43,   43,   43,   42,   43,   43,   27,
+       40,   43,   43,   43,   43,   43,   32,   31,   22,   43,
+       43,   43,   28,   14,   43,   43,   43,   43,   43,   26,
+       43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+       43,   43,   40,   43,   43,   43,   43,   43,    1,   15,
+       20,   43,    2,   43,   43,   43,   43,   43,   43,   43,
+       43,   43,   43,   43,    3,   16,   33,   43,   43,   43,
+       43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+
+       43,   34,   43,   43,   43,   43,   43,   43,   40,   43,
+       23,   12,   43,   38,   43,   43,   40,   43,   40,   35,
+       36,   43,   43,   18,    5,   43,   43,   43,   40,   21,
+       43,   43,   43,   43,   43,   19,   17,    4,   40,   24,
+        6,   37,   43,   43,   43,   43,   43,   43,   43,   43,
+       43,   43,   43,   43,   43,   43,    7,   43,    8,   43,
+       43,   43,   11,   10,   43,    9,    0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -410,15 +409,15 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    2,    1,    4,    5,    1,    1,    1,    6,    1,
         1,    1,    7,    1,    8,    9,    1,   10,   11,   11,
-       11,   11,   11,   11,   11,   11,   11,    1,   12,    1,
+       11,   11,   11,   11,   11,   12,   12,    1,   13,    1,
         1,    1,    1,    1,   14,   15,   16,   17,   18,   19,
        20,   21,   22,   23,   24,   25,   26,   27,   28,   29,
        30,   31,   32,   33,   34,   35,   36,   37,   38,   39,
-        1,    1,    1,    1,   13,    1,   14,   15,   16,   17,
+        1,    1,    1,    1,   40,    1,   41,   42,   43,   44,
 
-       18,   19,   20,   21,   22,   23,   24,   25,   26,   27,
-       28,   29,   30,   31,   32,   33,   34,   35,   36,   37,
-       38,   39,    1,    1,    1,    1,    1,    1,    1,    1,
+       45,   46,   47,   48,   49,   50,   51,   52,   53,   54,
+       55,   56,   30,   57,   58,   59,   60,   61,   62,   63,
+       64,   65,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -435,214 +434,291 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst flex_int32_t yy_meta[40] =
+static yyconst flex_int32_t yy_meta[66] =
     {   0,
-        1,    1,    2,    3,    1,    1,    1,    4,    4,    4,
-        4,    1,    4,    4,    4,    4,    4,    4,    4,    4,
-        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-        4,    4,    4,    4,    4,    4,    4,    4,    4
+        1,    1,    2,    1,    1,    1,    1,    3,    3,    3,
+        3,    3,    1,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+        3,    3,    3,    3,    3
     } ;
 
-static yyconst flex_int16_t yy_base[268] =
+static yyconst flex_int16_t yy_base[272] =
     {   0,
-        0,    0,  547,  548,  544,  548,    0,    0,  539,   30,
-       33,   36,  548,  535,   39,   40,   44,   46,   49,   43,
-       41,   56,   68,   70,   62,   51,   60,   67,   73,   80,
-       83,   84,   85,   86,  541,  538,    0,  535,  548,   91,
-      531,   86,  101,  113,  107,  116,  117,   90,  118,   98,
-      120,  124,  104,  125,  126,  130,  129,  133,  136,  140,
-      141,  144,  137,  150,  145,  149,  152,  156,  159,  161,
-      162,  164,  171,  175,  172,  188,  190,  177,  193,  196,
-      200,  203,  204,  205,  206,  207,  185,  209,  212,  211,
-      154,  214,  215,  217,  218,  226,  219,  225,  227,  231,
-
-      233,  235,  237,  232,  240,  238,  234,  242,  253,  239,
-      250,  530,  252,  259,  529,  260,  261,  262,  264,  264,
-      267,  269,  528,  527,  272,  270,  275,  273,  271,  526,
-      525,  524,  284,  292,  278,  523,  295,  297,  296,  522,
-      298,  281,  303,  521,  304,  305,  306,  311,  312,  313,
-      315,  317,  316,  318,  319,  322,  320,  323,  326,  324,
-      331,  338,  520,  519,  518,  334,  344,  335,  345,  517,
-      333,  349,  352,  355,  358,  356,  361,  362,  359,  516,
-      515,  514,  364,  366,  367,  369,  370,  372,  376,  375,
-      374,  377,  513,  378,  390,  388,  394,  512,  386,  387,
-
-      398,  400,  404,  402,  511,  405,  510,  406,  503,  500,
-      407,  408,  495,  410,  494,  493,  492,  409,  417,  491,
-      489,  412,  414,  419,  488,  487,  413,  420,  427,  429,
-      435,  486,  485,  484,  483,  482,  438,  457,  452,  430,
-      443,  440,  445,  446,  447,  450,  448,  453,  454,  444,
-      455,  464,  329,  461,  277,  471,  473,  478,  181,   94,
-      479,   50,  548,  506,  510,  514,   52
+        0,    0,  824,  843,  821,  843,  818,    0,  815,   56,
+       60,   64,  843,  810,   68,   74,   70,   71,   72,   75,
+       90,   76,  112,  117,  109,   80,  132,   81,  115,  123,
+      127,  133,  138,  147,  816,  812,  843,    0,  809,  159,
+      187,  801,  172,  191,  201,  213,  238,  217,  146,  152,
+      170,  166,  179,  177,  221,  181,  233,  249,  242,  252,
+      167,  234,  266,  319,  268,  260,  228,  264,  267,  290,
+      280,  288,  295,  296,  297,  302,  324,  307,  357,  366,
+      370,  374,  331,  344,  384,    0,  354,  378,  380,  381,
+      382,  389,  230,  391,  305,  390,  392,  394,  403,  397,
+
+      299,  401,  404,  407,  418,  409,  308,  412,  415,  432,
+      413,  437,  442,  420,  439,  450,  453,  452,  799,  457,
+      460,  796,  458,  463,  465,  469,  489,  466,  478,  786,
+      782,  471,  483,  486,  498,  501,  763,  754,  738,  493,
+      495,  494,  708,  684,  509,  517,  518,  520,  530,  639,
+      534,  519,  528,  536,  532,  521,  540,  546,  547,  548,
+      550,  542,  560,  558,  554,  563,  572,  573,  627,  555,
+      474,  585,  472,  575,  577,  586,  596,  589,  587,  592,
+      612,  597,  613,  599,  414,  411,  355,  614,  601,  616,
+      617,  602,  624,  638,  626,  642,  640,  646,  647,  658,
+
+      663,  351,  653,  661,  665,  668,  673,  669,  341,  674,
+      311,  298,  675,  286,  680,  664,  269,  689,  265,  259,
+      235,  676,  698,  222,  208,  681,  695,  703,  207,  186,
+      697,  709,  720,  722,  725,  144,  141,  140,  130,  102,
+      705,   97,  771,  718,  701,  730,  735,  733,  741,  743,
+      742,  745,  750,  759,  748,  785,   95,  749,   93,  767,
+      768,  779,   87,   85,  755,   82,  843,  833,  836,  839,
+       84
     } ;
 
-static yyconst flex_int16_t yy_def[268] =
+static yyconst flex_int16_t yy_def[272] =
     {   0,
-      263,    1,  263,  263,  263,  263,  264,  265,  266,  263,
-      267,  267,  263,  267,  267,  267,  267,  267,  267,  267,
-      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
-      267,  267,  267,  267,  263,  264,  265,  266,  263,  263,
-      267,  263,  267,  267,  267,  267,  267,  267,  267,  267,
-      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
-      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
-      267,  267,  267,  267,  267,  263,  263,  263,  267,  267,
-      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
-      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
-
-      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
-      267,  267,  267,  267,  267,  267,  267,  267,  267,  263,
-      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
-      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
-      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
-      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
-      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
-      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
-      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
-      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,    1,  267,  267,  267,  267,  268,  269,  270,  267,
+      271,  271,  267,  271,  271,  271,  271,  271,  271,  271,
+      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+      271,  271,  271,  271,  267,  268,  267,  269,  270,  267,
+      267,  271,  267,  271,  271,  271,  271,  271,  271,  271,
+      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+      271,  271,  271,  271,  271,  271,  271,  271,  267,  267,
+      267,  267,  267,  271,  271,   47,  271,  271,  271,  271,
+      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+
+      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+      271,  271,  271,  271,  271,  271,  267,  271,  271,  271,
+      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+
+      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+      271,  271,  271,  271,  271,  271,  271,  271,  271,  271,
+      271,  271,  271,  271,  271,  271,    0,  267,  267,  267,
+      267
+    } ;
 
+static yyconst flex_int16_t yy_nxt[909] =
+    {   0,
+        4,    5,    6,    7,    8,    9,   10,   10,    4,   11,
+       12,   12,   13,   14,   15,   16,   17,   18,   14,   19,
+       20,   21,   14,   22,   23,   24,   25,   26,   27,   14,
+       28,   29,   30,   14,   31,   32,   33,   34,   14,   14,
+       14,   15,   16,   17,   18,   14,   19,   20,   21,   14,
+       22,   23,   24,   25,   26,   27,   28,   29,   30,   14,
+       31,   32,   33,   34,   14,   40,   41,   41,   43,   44,
+       44,   45,   43,   48,   48,   48,  267,   46,  267,  267,
+      267,   46,  267,  267,  267,   57,   42,   53,  267,  267,
+      267,   62,   49,  267,   50,  267,   47,   55,  267,   51,
+
+       72,  267,   58,  267,   46,  267,   59,   56,   46,   54,
+      267,   52,   57,   69,   53,   60,   61,  267,   62,   49,
+      267,   50,   47,  267,   55,  267,   51,   72,   58,   63,
+       65,  267,   59,   56,   66,  267,   68,   52,  267,   69,
+      267,  267,   60,   61,   67,   70,  267,   73,  267,  267,
+       74,   64,  267,   76,  267,  267,   63,   65,   75,   87,
+      267,   66,   71,   68,   78,   88,   77,   43,   79,   79,
+       79,   67,   70,   73,  267,  267,   80,   74,  267,   90,
+       76,   82,   82,   82,   75,  267,   87,  267,   71,  267,
+      101,   78,   88,   77,  267,   43,   81,   81,   81,   43,
+
+       44,   44,   45,   80,   80,   91,   90,   89,   46,   43,
+       45,   45,   45,   94,   92,  267,  267,  101,   46,   83,
+       84,  267,   85,   85,   85,   43,   48,   48,   48,  267,
+      267,   80,   91,   89,   46,   46,  267,   93,  267,   94,
+       92,  267,  267,  267,  112,   46,  267,   86,   86,   86,
+      267,   86,   86,   86,   86,   86,   86,  267,   95,  102,
+      267,   46,   96,   99,   93,  100,   97,  267,  267,  134,
+       98,  112,  267,  267,  267,  267,  267,  267,   86,   86,
+       86,   86,   86,   86,  103,   95,  102,  110,  267,   96,
+       99,  111,  100,   97,  267,  113,  267,   98,  267,  114,
+
+      104,  118,  119,  267,  267,  267,  267,  267,  120,  115,
+      267,  103,  121,  267,  110,  267,  267,  111,  123,  267,
+      116,  113,  117,  124,  122,  114,  104,  267,  118,  119,
+      136,  126,  267,  105,  106,  120,  115,  125,  142,  121,
+      127,  127,  127,  107,  108,  123,  116,  147,  117,  267,
+      124,  122,  267,   85,   85,   85,  109,  136,  126,  267,
+      105,  106,  267,  267,  125,   43,   79,   79,   79,  128,
+      107,  108,   83,   83,   80,  127,  127,  127,   43,   81,
+       81,   81,  109,   82,   82,   82,  267,   80,  267,  267,
+      267,   80,  267,   85,   85,   85,  128,  267,  267,  267,
+
+      267,   80,  267,  130,  129,  267,  133,  131,  135,  267,
+      139,  267,  267,  132,   80,  267,  141,  267,   80,  267,
+      267,  267,  267,  267,  145,   65,  267,  137,  267,  138,
+      130,  129,   78,  133,  131,  135,  144,  139,  143,  132,
+      267,  140,  146,  141,  149,  267,   52,  267,  152,  148,
+      267,  145,   65,  137,  150,  138,  153,  151,  267,   78,
+      267,  267,  144,  154,  143,  267,  267,  140,  267,  146,
+      149,  267,   52,  267,  267,  152,  148,  267,  156,  267,
+      267,  150,  267,  153,  151,  155,  267,  157,  158,  163,
+      154,  267,  165,  162,  267,  160,  159,  161,  127,  127,
+
+      127,  267,  267,  267,  164,  156,  267,  166,  167,  267,
+      170,  155,  171,  157,  169,  158,  163,  267,  172,  165,
+      162,  160,  159,  161,  168,  267,  267,  267,  267,  267,
+      174,  164,  175,  173,  166,  167,  267,  170,  267,  171,
+      267,  169,  267,  177,  267,  172,  176,  178,  267,  182,
+      267,  168,  179,  183,  267,  267,  267,  174,  267,  175,
+      173,  181,  267,  267,  186,  187,  267,  180,  267,  189,
+      177,  267,  184,  176,  178,  191,  182,  185,  179,  183,
+      267,  267,  188,  267,  190,  267,  192,  193,  181,  195,
+      197,  186,  187,  267,  267,  267,  189,  267,  184,  194,
+
+      267,  198,  191,  185,  267,  267,  196,  267,  188,  267,
+      267,  190,  192,  201,  193,  200,  195,  197,  199,  202,
+      267,  267,  267,  203,  267,  267,  194,  205,  198,  204,
+      206,  208,  267,  196,  267,  267,  209,  210,  207,  212,
+      201,  211,  200,  215,  199,  202,  267,  267,  267,  203,
+      267,  213,  214,  205,  267,  267,  204,  206,  208,  218,
+      219,  267,  209,  217,  210,  212,  267,  216,  211,  267,
+      215,  267,  267,  267,  222,  220,  267,  267,  213,  214,
+      221,  267,  267,  267,  267,  231,  218,  219,  267,  267,
+      217,  224,  267,  223,  216,  226,  230,  267,  225,  227,
+
+      228,  222,  220,  267,  232,  267,  267,  221,  235,  267,
+      229,  267,  231,  267,  233,  234,  267,  267,  224,  223,
+      237,  236,  226,  230,  225,  227,  267,  228,  267,  238,
+      267,  232,  239,  267,  250,  235,  229,  240,  267,  242,
+      233,  267,  234,  267,  243,  249,  267,  237,  236,  267,
+      267,  267,  241,  267,  251,  238,  267,  267,  267,  239,
+      250,  252,  267,  267,  240,  253,  242,  267,  254,  256,
+      262,  267,  249,  255,  266,  267,  267,  257,  241,  267,
+      258,  251,  260,  259,  263,  244,  245,  267,  252,  246,
+      267,  253,  247,  267,  267,  254,  256,  262,  261,  255,
+
+      264,  266,  248,  257,  267,  265,  258,  267,  260,  267,
+      259,  263,  244,  245,   37,   37,  246,   35,  267,  247,
+       37,   37,   35,  267,  267,  261,  264,  267,  248,  267,
+      267,  267,  265,   36,   36,   36,   38,  267,   38,   39,
+       39,   39,    3,  267,  267,  267,  267,  267,  267,  267,
       267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
       267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
       267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
       267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
       267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
-      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
-      267,  267,    0,  263,  263,  263,  263
-    } ;
 
-static yyconst flex_int16_t yy_nxt[588] =
-    {   0,
-        4,    5,    6,    7,    8,    9,   10,   10,    4,   11,
-       12,   13,   14,   14,   15,   16,   17,   18,   14,   19,
-       20,   21,   14,   22,   23,   24,   25,   26,   27,   14,
-       28,   29,   30,   14,   31,   32,   33,   34,   14,   40,
-       40,   42,   43,   43,   42,   43,   43,  263,  263,  263,
-       44,  263,  263,   44,  263,   41,   50,  263,  263,  263,
-       47,   51,   54,   46,  263,   48,   57,   58,  263,   45,
-      263,   59,   52,   67,   56,  263,  263,   49,  263,   55,
-       60,  263,   53,   62,   66,   61,   69,   63,  263,   65,
-       68,  263,  263,  263,  263,   77,   77,   64,  263,   42,
-
-       40,   40,  263,   75,   73,   70,  263,   71,   76,   42,
-       43,   43,  263,   74,   72,  263,   81,   81,   44,   78,
-       79,  263,   80,   80,  263,  263,  263,   84,  263,   82,
-       83,   85,  263,  263,  263,   86,   89,  263,  263,   91,
-       88,  263,   95,   92,  263,  263,   87,   93,  263,  263,
-       90,   94,  263,  263,   98,   99,   96,  263,  263,  101,
-      263,   97,  263,  103,  263,  100,  105,  263,  104,  263,
-      263,  108,  263,  112,  113,  102,  106,  111,  114,  263,
-      263,  107,  109,  263,  110,  116,  120,  120,  118,  263,
-      115,  130,  117,  263,   78,   78,  119,  120,  120,   77,
-
-       77,  263,   80,   80,  263,   80,   80,   76,  263,   81,
-       81,  263,  263,  263,  263,  263,  126,  263,  121,  263,
-      263,  127,  263,  263,  125,  263,  263,  263,  123,  128,
-      122,  132,  124,  263,  263,  263,  129,  134,  135,  263,
-      263,  263,  263,  263,  139,  263,  263,  263,  263,  137,
-      263,  131,  141,  145,  142,  133,  136,  144,  263,  147,
-      263,  263,  146,  143,  138,  140,  148,  263,  263,  263,
-      263,  149,  263,  120,  120,  263,  150,  263,  263,  263,
-      263,  263,  151,  263,  163,  263,  263,  152,  156,  263,
-      157,  160,  263,  154,  155,  158,  159,  161,  153,  162,
-
-      263,  164,  166,  263,  263,  263,  263,  171,  167,  165,
-      168,  263,  263,  263,  263,  169,  172,  173,  175,  263,
-      263,  263,  170,  263,  263,  263,  263,  263,  263,  177,
-      263,  263,  263,  181,  263,  182,  176,  263,  174,  263,
-      186,  263,  263,  263,  185,  178,  263,  179,  180,  184,
-      187,  183,  263,  263,  190,  191,  188,  263,  189,  192,
-      263,  193,  194,  263,  263,  195,  263,  263,  196,  263,
-      263,  203,  263,  200,  263,  263,  197,  263,  263,  202,
-      263,  204,  263,  263,  263,  263,  263,  198,  206,  199,
-      210,  201,  211,  207,  263,  263,  263,  208,  263,  212,
-
-      213,  205,  263,  215,  214,  216,  263,  218,  263,  209,
-      263,  217,  263,  263,  263,  263,  263,  263,  263,  219,
-      263,  263,  263,  226,  220,  263,  222,  263,  263,  227,
-      221,  224,  223,  235,  230,  263,  233,  263,  263,  231,
-      232,  225,  228,  263,  236,  234,  263,  229,  263,  238,
-      239,  263,  263,  263,  263,  263,  263,  245,  263,  237,
-      263,  263,  263,  263,  247,  263,  240,  241,  255,  263,
-      242,  248,  263,  243,  250,  252,  246,  257,  249,  263,
-      251,  263,  258,  244,  254,  253,  263,  263,  259,  256,
-      263,  263,  263,  263,  263,  263,  263,  263,  262,  263,
-
-      263,  263,  263,  263,  261,  260,   36,   36,  263,   36,
-       37,  263,   37,   37,   38,   38,   38,   38,  263,  263,
-      263,  263,  263,  263,  263,  263,  263,  263,  263,  263,
-      263,  263,  263,  263,  263,  263,  263,  263,  263,  263,
-       39,   39,   35,  263,   39,   35,  263,    3,  263,  263,
-      263,  263,  263,  263,  263,  263,  263,  263,  263,  263,
-      263,  263,  263,  263,  263,  263,  263,  263,  263,  263,
-      263,  263,  263,  263,  263,  263,  263,  263,  263,  263,
-      263,  263,  263,  263,  263,  263,  263
+      267,  267,  267,  267,  267,  267,  267,  267
     } ;
 
-static yyconst flex_int16_t yy_chk[588] =
+static yyconst flex_int16_t yy_chk[909] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,   10,
-       10,   11,   11,   11,   12,   12,   12,   15,   16,   21,
-       11,   20,   17,   12,   18,  267,   17,   19,  262,   26,
-       16,   17,   19,   15,   22,   16,   21,   21,   27,   11,
-       25,   22,   18,   27,   20,   28,   23,   16,   24,   19,
-       23,   29,   18,   24,   26,   23,   28,   24,   30,   25,
-       27,   31,   32,   33,   34,   42,   42,   24,   48,   40,
-
-       40,   40,  260,   34,   32,   29,   50,   30,   40,   43,
-       43,   43,   53,   33,   31,   45,   45,   45,   43,   44,
-       44,   44,   44,   44,   46,   47,   49,   48,   51,   46,
-       47,   49,   52,   54,   55,   50,   53,   57,   56,   55,
-       52,   58,   57,   55,   59,   63,   51,   55,   60,   61,
-       54,   56,   62,   65,   60,   60,   58,   66,   64,   61,
-       67,   59,   91,   62,   68,   60,   64,   69,   63,   70,
-       71,   67,   72,   69,   70,   61,   65,   68,   70,   73,
-       75,   66,   67,   74,   67,   72,   78,   78,   74,  259,
-       71,   91,   73,   87,   76,   76,   75,   76,   76,   77,
-
-       77,   79,   79,   79,   80,   80,   80,   77,   81,   81,
-       81,   82,   83,   84,   85,   86,   87,   88,   82,   90,
-       89,   88,   92,   93,   86,   94,   95,   97,   84,   89,
-       83,   93,   85,   98,   96,   99,   90,   95,   96,  100,
-      104,  101,  107,  102,  100,  103,  106,  110,  105,   98,
-      108,   92,  102,  106,  103,   94,   97,  105,  111,  108,
-      113,  109,  107,  104,   99,  101,  109,  114,  116,  117,
-      118,  110,  119,  120,  120,  121,  111,  122,  126,  129,
-      125,  128,  113,  127,  129,  255,  135,  114,  119,  142,
-      121,  126,  133,  117,  118,  122,  125,  127,  116,  128,
-
-      134,  133,  135,  137,  139,  138,  141,  142,  137,  134,
-      138,  143,  145,  146,  147,  139,  143,  145,  147,  148,
-      149,  150,  141,  151,  153,  152,  154,  155,  157,  149,
-      156,  158,  160,  153,  159,  154,  148,  253,  146,  161,
-      158,  171,  166,  168,  157,  150,  162,  151,  152,  156,
-      159,  155,  167,  169,  162,  166,  160,  172,  161,  167,
-      173,  168,  169,  174,  176,  171,  175,  179,  172,  177,
-      178,  179,  183,  176,  184,  185,  173,  186,  187,  178,
-      188,  183,  191,  190,  189,  192,  194,  174,  185,  175,
-      189,  177,  190,  186,  199,  200,  196,  187,  195,  191,
-
-      192,  184,  197,  195,  194,  196,  201,  199,  202,  188,
-      204,  197,  203,  206,  208,  211,  212,  218,  214,  200,
-      222,  227,  223,  211,  201,  219,  203,  224,  228,  212,
-      202,  206,  204,  228,  219,  229,  224,  230,  240,  222,
-      223,  208,  214,  231,  229,  227,  237,  218,  242,  231,
-      237,  241,  250,  243,  244,  245,  247,  240,  246,  230,
-      239,  248,  249,  251,  242,  238,  239,  239,  250,  254,
-      239,  243,  252,  239,  245,  247,  241,  252,  244,  256,
-      246,  257,  254,  239,  249,  248,  258,  261,  256,  251,
-      236,  235,  234,  233,  232,  226,  225,  221,  261,  220,
-
-      217,  216,  215,  213,  258,  257,  264,  264,  210,  264,
-      265,  209,  265,  265,  266,  266,  266,  266,  207,  205,
-      198,  193,  182,  181,  180,  170,  165,  164,  163,  144,
-      140,  136,  132,  131,  130,  124,  123,  115,  112,   41,
-       38,   36,   35,   14,    9,    5,    3,  263,  263,  263,
-      263,  263,  263,  263,  263,  263,  263,  263,  263,  263,
-      263,  263,  263,  263,  263,  263,  263,  263,  263,  263,
-      263,  263,  263,  263,  263,  263,  263,  263,  263,  263,
-      263,  263,  263,  263,  263,  263,  263
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,   10,   10,   10,   11,   11,
+       11,   11,   12,   12,   12,   12,   15,   11,   17,   18,
+       19,   12,   16,   20,   22,   19,  271,   17,   26,   28,
+      266,   22,   15,  264,   16,  263,   11,   18,   21,   16,
+
+       28,  259,   19,  257,   11,  242,   20,   18,   12,   17,
+      240,   16,   19,   26,   17,   21,   21,   25,   22,   15,
+       23,   16,   11,   29,   18,   24,   16,   28,   19,   23,
+       24,   30,   20,   18,   24,   31,   25,   16,  239,   26,
+       27,   32,   21,   21,   24,   27,   33,   29,  238,  237,
+       30,   23,  236,   32,   49,   34,   23,   24,   31,   49,
+       50,   24,   27,   25,   34,   50,   33,   40,   40,   40,
+       40,   24,   27,   29,   52,   61,   40,   30,   51,   52,
+       32,   43,   43,   43,   31,   54,   49,   53,   27,   56,
+       61,   34,   50,   33,  230,   41,   41,   41,   41,   44,
+
+       44,   44,   44,   40,   41,   53,   52,   51,   44,   45,
+       45,   45,   45,   56,   54,  229,  225,   61,   45,   46,
+       46,   46,   46,   46,   46,   48,   48,   48,   48,   55,
+      224,   41,   53,   51,   48,   44,   67,   55,   93,   56,
+       54,   57,   62,  221,   67,   45,   47,   47,   47,   47,
+       59,   47,   47,   47,   47,   47,   47,   58,   57,   62,
+       60,   48,   58,   59,   55,   60,   58,  220,   66,   93,
+       58,   67,   68,  219,   63,   69,   65,  217,   47,   47,
+       47,   47,   47,   47,   63,   57,   62,   65,   71,   58,
+       59,   66,   60,   58,  214,   68,   72,   58,   70,   69,
+
+       63,   71,   72,   73,   74,   75,  212,  101,   73,   70,
+       76,   63,   73,   95,   65,   78,  107,   66,   75,  211,
+       70,   68,   70,   76,   74,   69,   63,   64,   71,   72,
+       95,   78,   77,   64,   64,   73,   70,   77,  101,   73,
+       83,   83,   83,   64,   64,   75,   70,  107,   70,  209,
+       76,   74,   84,   84,   84,   84,   64,   95,   78,  202,
+       64,   64,   87,  187,   77,   79,   79,   79,   79,   87,
+       64,   64,   80,   80,   79,   80,   80,   80,   81,   81,
+       81,   81,   64,   82,   82,   82,   88,   81,   89,   90,
+       91,   82,   85,   85,   85,   85,   87,   92,   96,   94,
+
+       97,   79,   98,   89,   88,  100,   92,   90,   94,  102,
+       98,   99,  103,   91,   81,  104,  100,  106,   82,  186,
+      108,  111,  185,  109,  104,  108,  105,   96,  114,   97,
+       89,   88,  109,   92,   90,   94,  103,   98,  102,   91,
+      110,   99,  105,  100,  111,  112,  106,  115,  114,  110,
+      113,  104,  108,   96,  112,   97,  115,  113,  116,  109,
+      118,  117,  103,  116,  102,  120,  123,   99,  121,  105,
+      111,  124,  106,  125,  128,  114,  110,  126,  118,  132,
+      173,  112,  171,  115,  113,  117,  129,  120,  121,  128,
+      116,  133,  132,  126,  134,  124,  123,  125,  127,  127,
+
+      127,  140,  142,  141,  129,  118,  135,  133,  134,  136,
+      140,  117,  141,  120,  136,  121,  128,  145,  142,  132,
+      126,  124,  123,  125,  135,  146,  147,  152,  148,  156,
+      146,  129,  147,  145,  133,  134,  153,  140,  149,  141,
+      155,  136,  151,  149,  154,  142,  148,  151,  157,  155,
+      162,  135,  152,  156,  158,  159,  160,  146,  161,  147,
+      145,  154,  165,  170,  159,  160,  164,  153,  163,  162,
+      149,  166,  157,  148,  151,  164,  155,  158,  152,  156,
+      167,  168,  161,  174,  163,  175,  165,  166,  154,  168,
+      174,  159,  160,  172,  176,  179,  162,  178,  157,  167,
+
+      180,  175,  164,  158,  177,  182,  172,  184,  161,  189,
+      192,  163,  165,  178,  166,  177,  168,  174,  176,  179,
+      181,  183,  188,  180,  190,  191,  167,  182,  175,  181,
+      183,  188,  193,  172,  195,  169,  189,  190,  184,  192,
+      178,  191,  177,  195,  176,  179,  194,  150,  197,  180,
+      196,  193,  194,  182,  198,  199,  181,  183,  188,  198,
+      199,  203,  189,  197,  190,  192,  200,  196,  191,  204,
+      195,  201,  216,  205,  203,  200,  206,  208,  193,  194,
+      201,  207,  210,  213,  222,  216,  198,  199,  215,  226,
+      197,  205,  144,  204,  196,  207,  215,  218,  206,  208,
+
+      210,  203,  200,  227,  218,  231,  223,  201,  226,  245,
+      213,  228,  216,  241,  222,  223,  143,  232,  205,  204,
+      228,  227,  207,  215,  206,  208,  244,  210,  233,  231,
+      234,  218,  232,  235,  245,  226,  213,  233,  246,  235,
+      222,  248,  223,  247,  241,  244,  139,  228,  227,  249,
+      251,  250,  234,  252,  246,  231,  255,  258,  253,  232,
+      245,  247,  138,  265,  233,  248,  235,  254,  249,  251,
+      258,  137,  244,  250,  265,  260,  261,  252,  234,  243,
+      253,  246,  255,  254,  260,  243,  243,  262,  247,  243,
+      131,  248,  243,  256,  130,  249,  251,  258,  256,  250,
+
+      261,  265,  243,  252,  122,  262,  253,  119,  255,   42,
+      254,  260,  243,  243,   39,   36,  243,   35,   14,  243,
+        9,    7,    5,    3,    0,  256,  261,    0,  243,    0,
+        0,    0,  262,  268,  268,  268,  269,    0,  269,  270,
+      270,  270,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+      267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+
+      267,  267,  267,  267,  267,  267,  267,  267
     } ;
 
 static yy_state_type yy_last_accepting_state;
@@ -661,7 +737,7 @@ int yy_flex_debug = 0;
 char *yytext;
 #line 1 "testpatternl.l"
 /*
- * "$Id: testpatternl.l,v 1.22 2008/06/08 01:03:51 rlk Exp $"
+ * "$Id: testpatternl.l,v 1.25 2009/06/14 17:12:44 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -721,7 +797,7 @@ do							\
  while (0)
 
 
-#line 725 "testpatternl.c"
+#line 801 "testpatternl.c"
 
 #define INITIAL 0
 
@@ -739,6 +815,35 @@ do							\
 
 static int yy_init_globals (void );
 
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int yylex_destroy (void );
+
+int yyget_debug (void );
+
+void yyset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE yyget_extra (void );
+
+void yyset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *yyget_in (void );
+
+void yyset_in  (FILE * in_str  );
+
+FILE *yyget_out (void );
+
+void yyset_out  (FILE * out_str  );
+
+int yyget_leng (void );
+
+char *yyget_text (void );
+
+int yyget_lineno (void );
+
+void yyset_lineno (int line_number  );
+
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
  */
@@ -781,7 +886,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
+#define ECHO fwrite( yytext, yyleng, 1, yyout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -792,7 +897,7 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -874,10 +979,10 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 73 "testpatternl.l"
+#line 77 "testpatternl.l"
 
 
-#line 881 "testpatternl.c"
+#line 986 "testpatternl.c"
 
 	if ( !(yy_init) )
 		{
@@ -930,13 +1035,13 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 264 )
+				if ( yy_current_state >= 268 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 548 );
+		while ( yy_base[yy_current_state] != 843 );
 
 yy_find_action:
 		yy_act = yy_accept[yy_current_state];
@@ -962,277 +1067,242 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 75 "testpatternl.l"
-yylval.sval = yytext;DBG(CYAN); return CYAN;
-	YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 76 "testpatternl.l"
-yylval.sval = yytext;DBG(L_CYAN); return L_CYAN;
-	YY_BREAK
-case 3:
-YY_RULE_SETUP
-#line 77 "testpatternl.l"
-yylval.sval = yytext;DBG(MAGENTA); return MAGENTA;
-	YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 78 "testpatternl.l"
-yylval.sval = yytext;DBG(L_MAGENTA); return L_MAGENTA;
-	YY_BREAK
-case 5:
-YY_RULE_SETUP
 #line 79 "testpatternl.l"
-yylval.sval = yytext;DBG(YELLOW); return YELLOW;
+DBG(GAMMA); return GAMMA;
 	YY_BREAK
-case 6:
+case 2:
 YY_RULE_SETUP
 #line 80 "testpatternl.l"
-yylval.sval = yytext;DBG(D_YELLOW); return D_YELLOW;
+DBG(LEVEL); return LEVEL;
 	YY_BREAK
-case 7:
+case 3:
 YY_RULE_SETUP
 #line 81 "testpatternl.l"
-yylval.sval = yytext;DBG(BLACK); return BLACK;
+DBG(STEPS); return STEPS;
 	YY_BREAK
-case 8:
+case 4:
 YY_RULE_SETUP
 #line 82 "testpatternl.l"
-yylval.sval = yytext;DBG(L_BLACK); return L_BLACK;
+DBG(INK_LIMIT); return INK_LIMIT;
 	YY_BREAK
-case 9:
+case 5:
 YY_RULE_SETUP
 #line 83 "testpatternl.l"
-DBG(GAMMA); return GAMMA;
+DBG(PRINTER); return PRINTER;
 	YY_BREAK
-case 10:
+case 6:
 YY_RULE_SETUP
 #line 84 "testpatternl.l"
-DBG(LEVEL); return LEVEL;
+DBG(PARAMETER); return PARAMETER;
 	YY_BREAK
-case 11:
+case 7:
 YY_RULE_SETUP
 #line 85 "testpatternl.l"
-DBG(STEPS); return STEPS;
+DBG(PARAMETER_INT); return PARAMETER_INT;
 	YY_BREAK
-case 12:
+case 8:
 YY_RULE_SETUP
 #line 86 "testpatternl.l"
-DBG(INK_LIMIT); return INK_LIMIT;
+DBG(PARAMETER_BOOL); return PARAMETER_BOOL;
 	YY_BREAK
-case 13:
+case 9:
 YY_RULE_SETUP
 #line 87 "testpatternl.l"
-DBG(PRINTER); return PRINTER;
+DBG(PARAMETER); return PARAMETER;
 	YY_BREAK
-case 14:
+case 10:
 YY_RULE_SETUP
 #line 88 "testpatternl.l"
-DBG(PARAMETER); return PARAMETER;
+DBG(PARAMETER_FLOAT); return PARAMETER_FLOAT;
 	YY_BREAK
-case 15:
+case 11:
 YY_RULE_SETUP
 #line 89 "testpatternl.l"
-DBG(PARAMETER_INT); return PARAMETER_INT;
+DBG(PARAMETER_CURVE); return PARAMETER_CURVE;
 	YY_BREAK
-case 16:
+case 12:
 YY_RULE_SETUP
 #line 90 "testpatternl.l"
-DBG(PARAMETER_BOOL); return PARAMETER_BOOL;
+DBG(DENSITY); return DENSITY;
 	YY_BREAK
-case 17:
+case 13:
 YY_RULE_SETUP
 #line 91 "testpatternl.l"
-DBG(PARAMETER); return PARAMETER;
+DBG(TOP); return TOP;
 	YY_BREAK
-case 18:
+case 14:
 YY_RULE_SETUP
 #line 92 "testpatternl.l"
-DBG(PARAMETER_FLOAT); return PARAMETER_FLOAT;
+DBG(LEFT); return LEFT;
 	YY_BREAK
-case 19:
+case 15:
 YY_RULE_SETUP
 #line 93 "testpatternl.l"
-DBG(PARAMETER_CURVE); return PARAMETER_CURVE;
+DBG(HSIZE); return HSIZE;
 	YY_BREAK
-case 20:
+case 16:
 YY_RULE_SETUP
 #line 94 "testpatternl.l"
-DBG(DENSITY); return DENSITY;
+DBG(VSIZE); return VSIZE;
 	YY_BREAK
-case 21:
+case 17:
 YY_RULE_SETUP
 #line 95 "testpatternl.l"
-DBG(TOP); return TOP;
+DBG(BLACKLINE); return BLACKLINE;
 	YY_BREAK
-case 22:
+case 18:
 YY_RULE_SETUP
 #line 96 "testpatternl.l"
-DBG(LEFT); return LEFT;
+DBG(PATTERN); return PATTERN;
 	YY_BREAK
-case 23:
+case 19:
 YY_RULE_SETUP
 #line 97 "testpatternl.l"
-DBG(HSIZE); return HSIZE;
+DBG(XPATTERN); return XPATTERN;
 	YY_BREAK
-case 24:
+case 20:
 YY_RULE_SETUP
 #line 98 "testpatternl.l"
-DBG(VSIZE); return VSIZE;
+DBG(IMAGE); return IMAGE;
 	YY_BREAK
-case 25:
+case 21:
 YY_RULE_SETUP
 #line 99 "testpatternl.l"
-DBG(BLACKLINE); return BLACKLINE;
+DBG(EXTENDED); return EXTENDED;
 	YY_BREAK
-case 26:
+case 22:
 YY_RULE_SETUP
 #line 100 "testpatternl.l"
-DBG(PATTERN); return PATTERN;
+DBG(GRID); return GRID;
 	YY_BREAK
-case 27:
+case 23:
 YY_RULE_SETUP
 #line 101 "testpatternl.l"
-DBG(XPATTERN); return XPATTERN;
+DBG(CHANNEL); return CHANNEL;
 	YY_BREAK
-case 28:
+case 24:
 YY_RULE_SETUP
 #line 102 "testpatternl.l"
-DBG(IMAGE); return IMAGE;
+DBG(PAGESIZE); return PAGESIZE;
 	YY_BREAK
-case 29:
+case 25:
 YY_RULE_SETUP
 #line 103 "testpatternl.l"
-DBG(EXTENDED); return EXTENDED;
+DBG(SEMI); return SEMI;
 	YY_BREAK
-case 30:
+case 26:
 YY_RULE_SETUP
 #line 104 "testpatternl.l"
-DBG(GRID); return GRID;
+DBG(MODE); return MODE;
 	YY_BREAK
-case 31:
+case 27:
 YY_RULE_SETUP
 #line 105 "testpatternl.l"
-DBG(CHANNEL); return CHANNEL;
+yylval.ival = CMYK;DBG(CMYK); return CMYK;
 	YY_BREAK
-case 32:
+case 28:
 YY_RULE_SETUP
 #line 106 "testpatternl.l"
-DBG(PAGESIZE); return PAGESIZE;
+yylval.ival = CMYK;DBG(KCMY); return KCMY;
 	YY_BREAK
-case 33:
+case 29:
 YY_RULE_SETUP
 #line 107 "testpatternl.l"
-DBG(SEMI); return SEMI;
+yylval.ival = RGB;DBG(RGB); return RGB;
 	YY_BREAK
-case 34:
+case 30:
 YY_RULE_SETUP
 #line 108 "testpatternl.l"
-DBG(MODE); return MODE;
+yylval.ival = RGB;DBG(CMY); return CMY;
 	YY_BREAK
-case 35:
+case 31:
 YY_RULE_SETUP
 #line 109 "testpatternl.l"
-yylval.ival = CMYK;DBG(CMYK); return CMYK;
+yylval.ival = GRAY;DBG(GRAY); return GRAY;
 	YY_BREAK
-case 36:
+case 32:
 YY_RULE_SETUP
 #line 110 "testpatternl.l"
-yylval.ival = CMYK;DBG(KCMY); return KCMY;
+yylval.ival = GRAY;DBG(GRAY); return GRAY;
 	YY_BREAK
-case 37:
+case 33:
 YY_RULE_SETUP
 #line 111 "testpatternl.l"
-yylval.ival = RGB;DBG(RGB); return RGB;
+yylval.ival = WHITE;DBG(WHITE); return WHITE;
 	YY_BREAK
-case 38:
+case 34:
 YY_RULE_SETUP
 #line 112 "testpatternl.l"
-yylval.ival = RGB;DBG(CMY); return CMY;
+DBG(OUTPUT); return OUTPUT;
 	YY_BREAK
-case 39:
+case 35:
 YY_RULE_SETUP
 #line 113 "testpatternl.l"
-yylval.ival = GRAY;DBG(GRAY); return GRAY;
+DBG(MESSAGE); return MESSAGE;
 	YY_BREAK
-case 40:
+case 36:
 YY_RULE_SETUP
 #line 114 "testpatternl.l"
-yylval.ival = GRAY;DBG(GRAY); return GRAY;
+DBG(NOSCALE); return NOSCALE;
 	YY_BREAK
-case 41:
+case 37:
 YY_RULE_SETUP
 #line 115 "testpatternl.l"
-yylval.ival = WHITE;DBG(WHITE); return WHITE;
+DBG(START_JOB); return START_JOB;
 	YY_BREAK
-case 42:
+case 38:
 YY_RULE_SETUP
 #line 116 "testpatternl.l"
-DBG(OUTPUT); return OUTPUT;
+DBG(END_JOB); return END_JOB;
 	YY_BREAK
-case 43:
+case 39:
 YY_RULE_SETUP
 #line 117 "testpatternl.l"
-DBG(MESSAGE); return MESSAGE;
-	YY_BREAK
-case 44:
-YY_RULE_SETUP
-#line 118 "testpatternl.l"
-DBG(NOSCALE); return NOSCALE;
+DBG(END); return END;
 	YY_BREAK
-case 45:
+case 40:
 YY_RULE_SETUP
 #line 119 "testpatternl.l"
-DBG(START_JOB); return START_JOB;
+yylval.sval = yytext;DBG(COLOR); return COLOR;
 	YY_BREAK
-case 46:
+case 41:
 YY_RULE_SETUP
 #line 120 "testpatternl.l"
-DBG(END_JOB); return END_JOB;
-	YY_BREAK
-case 47:
-YY_RULE_SETUP
-#line 121 "testpatternl.l"
-DBG(END); return END;
-	YY_BREAK
-case 48:
-YY_RULE_SETUP
-#line 124 "testpatternl.l"
 yylval.ival = strtol(yytext, NULL, 0); yylval.dval = (double) yylval.ival; DBG(tINT); return tINT;
 	YY_BREAK
-case 49:
+case 42:
 YY_RULE_SETUP
-#line 125 "testpatternl.l"
+#line 121 "testpatternl.l"
 yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE;
 	YY_BREAK
-case 50:
-/* rule 50 can match eol */
+case 43:
+/* rule 43 can match eol */
 YY_RULE_SETUP
-#line 126 "testpatternl.l"
+#line 122 "testpatternl.l"
 yylval.sval = c_strstrip(yytext); DBG(tSTRING); return tSTRING;
 	YY_BREAK
-case 51:
+case 44:
 YY_RULE_SETUP
-#line 127 "testpatternl.l"
+#line 123 "testpatternl.l"
 DBG(whitespace); 	/* Skip blanks/tabs */
 	YY_BREAK
-case 52:
+case 45:
 YY_RULE_SETUP
-#line 128 "testpatternl.l"
+#line 124 "testpatternl.l"
 DBG(comment); 	/* Skip comments */
 	YY_BREAK
-case 53:
-/* rule 53 can match eol */
+case 46:
+/* rule 46 can match eol */
 YY_RULE_SETUP
-#line 129 "testpatternl.l"
+#line 125 "testpatternl.l"
 DBG(newline); mylineno++;
 	YY_BREAK
-case 54:
+case 47:
 YY_RULE_SETUP
-#line 130 "testpatternl.l"
+#line 126 "testpatternl.l"
 ECHO;
 	YY_BREAK
-#line 1236 "testpatternl.c"
+#line 1306 "testpatternl.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1463,7 +1533,7 @@ static int yy_get_next_buffer (void)
 
 		/* Read in more data. */
 		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
+			(yy_n_chars), (size_t) num_to_read );
 
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
@@ -1487,6 +1557,14 @@ static int yy_get_next_buffer (void)
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
 	(yy_n_chars) += number_to_move;
 	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
 	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
@@ -1516,7 +1594,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 264 )
+			if ( yy_current_state >= 268 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1544,11 +1622,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 264 )
+		if ( yy_current_state >= 268 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 263);
+	yy_is_jam = (yy_current_state == 267);
 
 	return yy_is_jam ? 0 : yy_current_state;
 }
@@ -1902,7 +1980,9 @@ static void yyensure_buffer_stack (void)
 		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
-		
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+								  
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
 				
 		(yy_buffer_stack_max) = num_to_alloc;
@@ -1920,6 +2000,8 @@ static void yyensure_buffer_stack (void)
 								((yy_buffer_stack),
 								num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
 
 		/* zero only the new slots.*/
 		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
@@ -1964,7 +2046,7 @@ YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
 
 /** Setup the input buffer state to scan a string. The next call to yylex() will
  * scan from a @e copy of @a str.
- * @param str a NUL-terminated string to scan
+ * @param yystr a NUL-terminated string to scan
  * 
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
@@ -2042,6 +2124,15 @@ static void yy_fatal_error (yyconst char* msg )
 
 /* Accessor  methods (get/set functions) to struct members. */
 
+/** Get the current line number.
+ * 
+ */
+int yyget_lineno  (void)
+{
+        
+    return yylineno;
+}
+
 /** Get the input stream.
  * 
  */
@@ -2075,6 +2166,16 @@ char *yyget_text  (void)
         return yytext;
 }
 
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void yyset_lineno (int  line_number )
+{
+    
+    yylineno = line_number;
+}
+
 /** Set the input stream. This does not discard the current
  * input buffer.
  * @param in_str A readable stream.
@@ -2199,4 +2300,4 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 130 "testpatternl.l"
+#line 126 "testpatternl.l"
diff --git a/src/testpattern/testpatternl.l b/src/testpattern/testpatternl.l
index a6894c9..825bf08 100644
--- a/src/testpattern/testpatternl.l
+++ b/src/testpattern/testpatternl.l
@@ -1,5 +1,5 @@
 /*
- * "$Id: testpatternl.l,v 1.22 2008/06/08 01:03:51 rlk Exp $"
+ * "$Id: testpatternl.l,v 1.25 2009/06/14 17:12:44 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -64,22 +64,18 @@ do							\
 
 %option noyywrap
 
+ldigit		[1-9]
 digit		[0-9]
-integer		([-+]|0[xX])?{digit}+
+odigit		[0-7]
+xdigit		[0-9a-fA-F]
+integer		([-+]?(0|{ldigit}{digit}*))|(0{odigit}*)|(0[xX]{xdigit}+)
 float		[-+]?{digit}+(\.{digit}+)?([eE][-+]?{digit}+)?
-string		([\"][^\"]+[\"])|([a-zA-Z0-9_][-a-zA-Z0-9_]*)|([\'][^\']*[\'])
+string		([\"][^\"]*[\"])|([a-zA-Z0-9_][-a-zA-Z0-9_]*)|([\'][^\']*[\'])
 ws		[ \t]+
+color		((l_)?(cyan|magenta|yellow|black))|(l_l_black)|(d_yellow)
 
 %%
 
-cyan			yylval.sval = yytext;DBG(CYAN); return CYAN;
-l_cyan			yylval.sval = yytext;DBG(L_CYAN); return L_CYAN;
-magenta			yylval.sval = yytext;DBG(MAGENTA); return MAGENTA;
-l_magenta		yylval.sval = yytext;DBG(L_MAGENTA); return L_MAGENTA;
-yellow			yylval.sval = yytext;DBG(YELLOW); return YELLOW;
-d_yellow		yylval.sval = yytext;DBG(D_YELLOW); return D_YELLOW;
-black			yylval.sval = yytext;DBG(BLACK); return BLACK;
-l_black			yylval.sval = yytext;DBG(L_BLACK); return L_BLACK;
 gamma			DBG(GAMMA); return GAMMA;
 level			DBG(LEVEL); return LEVEL;
 steps			DBG(STEPS); return STEPS;
@@ -120,7 +116,7 @@ start_job		DBG(START_JOB); return START_JOB;
 end_job			DBG(END_JOB); return END_JOB;
 end			DBG(END); return END;
 
-
+{color}			yylval.sval = yytext;DBG(COLOR); return COLOR;
 {integer}		yylval.ival = strtol(yytext, NULL, 0); yylval.dval = (double) yylval.ival; DBG(tINT); return tINT;
 {float}			yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE;
 {string}		yylval.sval = c_strstrip(yytext); DBG(tSTRING); return tSTRING;
diff --git a/src/testpattern/testpatterny.c b/src/testpattern/testpatterny.c
index 1b62843..c31b9e5 100644
--- a/src/testpattern/testpatterny.c
+++ b/src/testpattern/testpatterny.c
@@ -69,104 +69,88 @@
      tINT = 258,
      tDOUBLE = 259,
      tSTRING = 260,
-     CYAN = 261,
-     L_CYAN = 262,
-     MAGENTA = 263,
-     L_MAGENTA = 264,
-     YELLOW = 265,
-     D_YELLOW = 266,
-     BLACK = 267,
-     L_BLACK = 268,
-     GAMMA = 269,
-     LEVEL = 270,
-     STEPS = 271,
-     INK_LIMIT = 272,
-     PRINTER = 273,
-     PARAMETER = 274,
-     PARAMETER_INT = 275,
-     PARAMETER_BOOL = 276,
-     PARAMETER_FLOAT = 277,
-     PARAMETER_CURVE = 278,
-     DENSITY = 279,
-     TOP = 280,
-     LEFT = 281,
-     HSIZE = 282,
-     VSIZE = 283,
-     BLACKLINE = 284,
-     NOSCALE = 285,
-     PATTERN = 286,
-     XPATTERN = 287,
-     EXTENDED = 288,
-     IMAGE = 289,
-     GRID = 290,
-     SEMI = 291,
-     CHANNEL = 292,
-     CMYK = 293,
-     KCMY = 294,
-     RGB = 295,
-     CMY = 296,
-     GRAY = 297,
-     WHITE = 298,
-     RAW = 299,
-     MODE = 300,
-     PAGESIZE = 301,
-     MESSAGE = 302,
-     OUTPUT = 303,
-     START_JOB = 304,
-     END_JOB = 305,
-     END = 306
+     COLOR = 261,
+     GAMMA = 262,
+     LEVEL = 263,
+     STEPS = 264,
+     INK_LIMIT = 265,
+     PRINTER = 266,
+     PARAMETER = 267,
+     PARAMETER_INT = 268,
+     PARAMETER_BOOL = 269,
+     PARAMETER_FLOAT = 270,
+     PARAMETER_CURVE = 271,
+     DENSITY = 272,
+     TOP = 273,
+     LEFT = 274,
+     HSIZE = 275,
+     VSIZE = 276,
+     BLACKLINE = 277,
+     NOSCALE = 278,
+     PATTERN = 279,
+     XPATTERN = 280,
+     EXTENDED = 281,
+     IMAGE = 282,
+     GRID = 283,
+     SEMI = 284,
+     CHANNEL = 285,
+     CMYK = 286,
+     KCMY = 287,
+     RGB = 288,
+     CMY = 289,
+     GRAY = 290,
+     WHITE = 291,
+     MODE = 292,
+     PAGESIZE = 293,
+     MESSAGE = 294,
+     OUTPUT = 295,
+     START_JOB = 296,
+     END_JOB = 297,
+     END = 298
    };
 #endif
 /* Tokens.  */
 #define tINT 258
 #define tDOUBLE 259
 #define tSTRING 260
-#define CYAN 261
-#define L_CYAN 262
-#define MAGENTA 263
-#define L_MAGENTA 264
-#define YELLOW 265
-#define D_YELLOW 266
-#define BLACK 267
-#define L_BLACK 268
-#define GAMMA 269
-#define LEVEL 270
-#define STEPS 271
-#define INK_LIMIT 272
-#define PRINTER 273
-#define PARAMETER 274
-#define PARAMETER_INT 275
-#define PARAMETER_BOOL 276
-#define PARAMETER_FLOAT 277
-#define PARAMETER_CURVE 278
-#define DENSITY 279
-#define TOP 280
-#define LEFT 281
-#define HSIZE 282
-#define VSIZE 283
-#define BLACKLINE 284
-#define NOSCALE 285
-#define PATTERN 286
-#define XPATTERN 287
-#define EXTENDED 288
-#define IMAGE 289
-#define GRID 290
-#define SEMI 291
-#define CHANNEL 292
-#define CMYK 293
-#define KCMY 294
-#define RGB 295
-#define CMY 296
-#define GRAY 297
-#define WHITE 298
-#define RAW 299
-#define MODE 300
-#define PAGESIZE 301
-#define MESSAGE 302
-#define OUTPUT 303
-#define START_JOB 304
-#define END_JOB 305
-#define END 306
+#define COLOR 261
+#define GAMMA 262
+#define LEVEL 263
+#define STEPS 264
+#define INK_LIMIT 265
+#define PRINTER 266
+#define PARAMETER 267
+#define PARAMETER_INT 268
+#define PARAMETER_BOOL 269
+#define PARAMETER_FLOAT 270
+#define PARAMETER_CURVE 271
+#define DENSITY 272
+#define TOP 273
+#define LEFT 274
+#define HSIZE 275
+#define VSIZE 276
+#define BLACKLINE 277
+#define NOSCALE 278
+#define PATTERN 279
+#define XPATTERN 280
+#define EXTENDED 281
+#define IMAGE 282
+#define GRID 283
+#define SEMI 284
+#define CHANNEL 285
+#define CMYK 286
+#define KCMY 287
+#define RGB 288
+#define CMY 289
+#define GRAY 290
+#define WHITE 291
+#define MODE 292
+#define PAGESIZE 293
+#define MESSAGE 294
+#define OUTPUT 295
+#define START_JOB 296
+#define END_JOB 297
+#define END 298
 
 
 
@@ -271,7 +255,7 @@ typedef int YYSTYPE;
 
 
 /* Line 216 of yacc.c.  */
-#line 275 "testpatterny.c"
+#line 259 "testpatterny.c"
 
 #ifdef short
 # undef short
@@ -484,22 +468,22 @@ union yyalloc
 #endif
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  67
+#define YYFINAL  60
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   186
+#define YYLAST   166
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  52
+#define YYNTOKENS  44
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  75
+#define YYNNTS  71
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  133
+#define YYNRULES  120
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  193
+#define YYNSTATES  172
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   306
+#define YYMAXUTOK   298
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -536,8 +520,7 @@ static const yytype_uint8 yytranslate[] =
        5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51
+      35,    36,    37,    38,    39,    40,    41,    42,    43
 };
 
 #if YYDEBUG
@@ -546,78 +529,72 @@ static const yytype_uint8 yytranslate[] =
 static const yytype_uint16 yyprhs[] =
 {
        0,     0,     3,     5,     7,     9,    11,    13,    15,    17,
-      19,    21,    23,    26,    29,    32,    35,    38,    41,    45,
-      47,    49,    51,    53,    55,    57,    59,    62,    66,    70,
-      74,    78,    81,    84,    87,    90,    93,    97,    99,   101,
-     105,   109,   113,   117,   121,   123,   125,   127,   129,   131,
-     134,   137,   140,   143,   146,   149,   152,   156,   158,   161,
-     162,   164,   167,   172,   178,   180,   182,   184,   187,   188,
-     190,   192,   194,   200,   204,   207,   210,   214,   217,   221,
-     226,   232,   239,   241,   243,   245,   247,   249,   251,   253,
-     256,   258,   260,   262,   264,   266,   268,   270,   272,   274,
-     276,   278,   280,   282,   284,   286,   288,   290,   292,   294,
-     296,   298,   300,   302,   304,   306,   308,   310,   313,   315,
-     317,   319,   321,   324,   325,   328,   330,   331,   334,   336,
-     338,   339,   342,   343
+      19,    22,    24,    26,    28,    30,    32,    34,    36,    39,
+      41,    43,    46,    50,    54,    58,    62,    65,    68,    71,
+      74,    77,    81,    83,    85,    89,    93,    97,   101,   105,
+     107,   109,   111,   113,   115,   118,   121,   124,   127,   130,
+     133,   136,   140,   142,   145,   146,   148,   151,   156,   162,
+     164,   166,   168,   171,   172,   174,   176,   178,   184,   188,
+     191,   194,   198,   200,   201,   204,   207,   209,   212,   214,
+     216,   218,   220,   222,   224,   226,   228,   230,   232,   234,
+     236,   238,   240,   242,   244,   246,   248,   250,   252,   254,
+     256,   258,   260,   262,   264,   267,   269,   271,   273,   275,
+     278,   279,   282,   284,   285,   288,   290,   292,   293,   296,
+     297
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {
-     125,     0,    -1,     6,    -1,     7,    -1,     8,    -1,     9,
-      -1,    10,    -1,    11,    -1,    12,    -1,    13,    -1,     4,
-      -1,     3,    -1,    38,     3,    -1,    39,     3,    -1,    40,
-       3,    -1,    41,     3,    -1,    42,     3,    -1,    43,     3,
-      -1,    33,     3,     3,    -1,    55,    -1,    56,    -1,    57,
-      -1,    58,    -1,    59,    -1,    60,    -1,    61,    -1,    45,
-      62,    -1,    15,    53,    54,    -1,    15,     3,    54,    -1,
-      14,    53,    54,    -1,    14,     3,    54,    -1,    14,    54,
-      -1,    16,     3,    -1,    17,    54,    -1,    18,     5,    -1,
-      46,     5,    -1,    46,     3,     3,    -1,    72,    -1,    73,
-      -1,    19,     5,     5,    -1,    20,     5,     3,    -1,    21,
-       5,     3,    -1,    22,     5,    54,    -1,    23,     5,     5,
-      -1,    75,    -1,    76,    -1,    78,    -1,    79,    -1,    77,
-      -1,    24,    54,    -1,    25,    54,    -1,    26,    54,    -1,
-      27,    54,    -1,    28,    54,    -1,    29,     3,    -1,    30,
-       3,    -1,    54,    54,    54,    -1,    88,    -1,    89,    88,
-      -1,    -1,    89,    -1,    88,    90,    -1,    53,    54,    54,
-      54,    -1,    37,     3,    54,    54,    54,    -1,    92,    -1,
-      93,    -1,    94,    -1,    95,    94,    -1,    -1,    95,    -1,
-      91,    -1,    96,    -1,    54,    54,    54,    54,    54,    -1,
-      31,    98,    97,    -1,    32,    97,    -1,    35,     3,    -1,
-      34,     3,     3,    -1,    47,     5,    -1,    47,     5,     5,
-      -1,    47,     5,     5,     5,    -1,    47,     5,     5,     5,
-       5,    -1,    47,     5,     5,     5,     5,     5,    -1,   103,
-      -1,   104,    -1,   105,    -1,   106,    -1,   107,    -1,   108,
-      -1,    48,    -1,    48,     5,    -1,   110,    -1,   111,    -1,
-     112,    -1,    49,    -1,    50,    -1,    66,    -1,    67,    -1,
-      64,    -1,    65,    -1,    68,    -1,    69,    -1,    70,    -1,
-      71,    -1,    80,    -1,    81,    -1,    82,    -1,    83,    -1,
-      84,    -1,    85,    -1,    86,    -1,    87,    -1,    63,    -1,
-      74,    -1,   109,    -1,   113,    -1,   114,    -1,   115,    -1,
-     116,    36,    -1,    99,    -1,   100,    -1,   101,    -1,   109,
-      -1,   118,    36,    -1,    -1,   120,   119,    -1,   102,    -1,
-      -1,   122,   117,    -1,   120,    -1,   121,    -1,    -1,    51,
-      36,    -1,    -1,   122,   126,   123,   124,    -1
+     113,     0,    -1,     4,    -1,     3,    -1,    31,    -1,    32,
+      -1,    33,    -1,    34,    -1,    35,    -1,    36,    -1,    26,
+       3,    -1,    46,    -1,    47,    -1,    48,    -1,    49,    -1,
+      50,    -1,    51,    -1,    52,    -1,    53,     3,    -1,    53,
+      -1,    54,    -1,    37,    55,    -1,     8,     6,    45,    -1,
+       8,     3,    45,    -1,     7,     6,    45,    -1,     7,     3,
+      45,    -1,     7,    45,    -1,     9,     3,    -1,    10,    45,
+      -1,    11,     5,    -1,    38,     5,    -1,    38,     3,     3,
+      -1,    65,    -1,    66,    -1,    12,     5,     5,    -1,    13,
+       5,     3,    -1,    14,     5,     3,    -1,    15,     5,    45,
+      -1,    16,     5,     5,    -1,    68,    -1,    69,    -1,    71,
+      -1,    72,    -1,    70,    -1,    17,    45,    -1,    18,    45,
+      -1,    19,    45,    -1,    20,    45,    -1,    21,    45,    -1,
+      22,     3,    -1,    23,     3,    -1,    45,    45,    45,    -1,
+      81,    -1,    82,    81,    -1,    -1,    82,    -1,    81,    83,
+      -1,     6,    45,    45,    45,    -1,    30,     3,    45,    45,
+      45,    -1,    85,    -1,    86,    -1,    87,    -1,    88,    87,
+      -1,    -1,    88,    -1,    84,    -1,    89,    -1,    45,    45,
+      45,    45,    45,    -1,    24,    91,    90,    -1,    25,    90,
+      -1,    28,     3,    -1,    27,     3,     3,    -1,     5,    -1,
+      -1,    97,    96,    -1,    39,    97,    -1,    40,    -1,    40,
+       5,    -1,    99,    -1,   100,    -1,    41,    -1,    42,    -1,
+      59,    -1,    60,    -1,    57,    -1,    58,    -1,    61,    -1,
+      62,    -1,    63,    -1,    64,    -1,    73,    -1,    74,    -1,
+      75,    -1,    76,    -1,    77,    -1,    78,    -1,    79,    -1,
+      80,    -1,    56,    -1,    67,    -1,    98,    -1,   101,    -1,
+     102,    -1,   103,    -1,   104,    29,    -1,    92,    -1,    93,
+      -1,    94,    -1,    98,    -1,   106,    29,    -1,    -1,   108,
+     107,    -1,    95,    -1,    -1,   110,   105,    -1,   108,    -1,
+     109,    -1,    -1,    43,    29,    -1,    -1,   110,   114,   111,
+     112,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   145,   145,   145,   145,   145,   146,   146,   146,   146,
-     148,   148,   151,   163,   175,   187,   199,   211,   223,   235,
-     235,   235,   235,   235,   235,   235,   238,   241,   251,   260,
-     270,   279,   286,   293,   300,   309,   318,   327,   327,   330,
-     340,   349,   358,   367,   381,   381,   381,   381,   381,   383,
-     390,   397,   404,   411,   418,   426,   434,   449,   449,   452,
-     452,   455,   458,   472,   485,   485,   488,   488,   491,   491,
-     494,   494,   497,   512,   515,   530,   541,   558,   564,   571,
-     579,   588,   599,   599,   599,   599,   599,   602,   605,   614,
-     619,   619,   622,   625,   629,   633,   633,   633,   633,   633,
-     633,   634,   634,   634,   634,   634,   634,   634,   635,   635,
-     635,   635,   635,   635,   636,   636,   636,   639,   643,   643,
-     643,   643,   646,   650,   650,   653,   657,   657,   660,   660,
-     663,   663,   668,   667
+       0,   139,   139,   139,   144,   154,   164,   174,   184,   194,
+     204,   214,   214,   214,   214,   214,   214,   214,   217,   225,
+     225,   228,   231,   241,   250,   260,   269,   276,   283,   290,
+     299,   308,   317,   317,   320,   330,   339,   348,   357,   371,
+     371,   371,   371,   371,   373,   380,   387,   394,   401,   408,
+     416,   424,   439,   439,   442,   442,   445,   448,   462,   475,
+     475,   478,   478,   481,   481,   484,   484,   487,   502,   505,
+     520,   531,   548,   555,   555,   558,   561,   571,   577,   577,
+     580,   584,   588,   588,   588,   588,   588,   588,   589,   589,
+     589,   589,   589,   589,   589,   590,   590,   590,   590,   590,
+     590,   591,   591,   591,   594,   598,   598,   598,   598,   601,
+     605,   605,   608,   612,   612,   615,   615,   618,   618,   623,
+     622
 };
 #endif
 
@@ -626,28 +603,26 @@ static const yytype_uint16 yyrline[] =
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "tINT", "tDOUBLE", "tSTRING", "CYAN",
-  "L_CYAN", "MAGENTA", "L_MAGENTA", "YELLOW", "D_YELLOW", "BLACK",
-  "L_BLACK", "GAMMA", "LEVEL", "STEPS", "INK_LIMIT", "PRINTER",
-  "PARAMETER", "PARAMETER_INT", "PARAMETER_BOOL", "PARAMETER_FLOAT",
-  "PARAMETER_CURVE", "DENSITY", "TOP", "LEFT", "HSIZE", "VSIZE",
-  "BLACKLINE", "NOSCALE", "PATTERN", "XPATTERN", "EXTENDED", "IMAGE",
-  "GRID", "SEMI", "CHANNEL", "CMYK", "KCMY", "RGB", "CMY", "GRAY", "WHITE",
-  "RAW", "MODE", "PAGESIZE", "MESSAGE", "OUTPUT", "START_JOB", "END_JOB",
-  "END", "$accept", "COLOR", "NUMBER", "cmykspec", "kcmyspec", "rgbspec",
-  "cmyspec", "grayspec", "whitespec", "extendedspec", "modespec",
-  "inputspec", "level", "channel_level", "gamma", "channel_gamma",
-  "global_gamma", "steps", "ink_limit", "printer", "page_size_name",
-  "page_size_custom", "page_size", "parameter_string", "parameter_int",
-  "parameter_bool", "parameter_float", "parameter_curve", "parameter",
-  "density", "top", "left", "hsize", "vsize", "blackline", "noscale",
-  "color_block1", "color_blocks1a", "color_blocks1b", "color_blocks1",
-  "color_block2a", "color_block2b", "color_block2", "color_blocks2a",
-  "color_blocks2", "color_blocks", "patvars", "pattern", "xpattern",
-  "grid", "image", "Message0", "Message1", "Message2", "Message3",
-  "Message4", "A_Message", "message", "Output0", "Output1", "A_Output",
-  "output", "start_job", "end_job", "A_Rule", "Rule", "A_Pattern",
-  "Pattern", "Patterns", "Image", "Rules", "Output", "EOF", "Thing", "@1", 0
+  "$end", "error", "$undefined", "tINT", "tDOUBLE", "tSTRING", "COLOR",
+  "GAMMA", "LEVEL", "STEPS", "INK_LIMIT", "PRINTER", "PARAMETER",
+  "PARAMETER_INT", "PARAMETER_BOOL", "PARAMETER_FLOAT", "PARAMETER_CURVE",
+  "DENSITY", "TOP", "LEFT", "HSIZE", "VSIZE", "BLACKLINE", "NOSCALE",
+  "PATTERN", "XPATTERN", "EXTENDED", "IMAGE", "GRID", "SEMI", "CHANNEL",
+  "CMYK", "KCMY", "RGB", "CMY", "GRAY", "WHITE", "MODE", "PAGESIZE",
+  "MESSAGE", "OUTPUT", "START_JOB", "END_JOB", "END", "$accept", "NUMBER",
+  "cmykspec", "kcmyspec", "rgbspec", "cmyspec", "grayspec", "whitespec",
+  "extendedspec", "modespec1", "modespec2", "modespec", "inputspec",
+  "level", "channel_level", "gamma", "channel_gamma", "global_gamma",
+  "steps", "ink_limit", "printer", "page_size_name", "page_size_custom",
+  "page_size", "parameter_string", "parameter_int", "parameter_bool",
+  "parameter_float", "parameter_curve", "parameter", "density", "top",
+  "left", "hsize", "vsize", "blackline", "noscale", "color_block1",
+  "color_blocks1a", "color_blocks1b", "color_blocks1", "color_block2a",
+  "color_block2b", "color_block2", "color_blocks2a", "color_blocks2",
+  "color_blocks", "patvars", "pattern", "xpattern", "grid", "image",
+  "Message", "Messages", "message", "Output0", "Output1", "output",
+  "start_job", "end_job", "A_Rule", "Rule", "A_Pattern", "Pattern",
+  "Patterns", "Image", "Rules", "Print", "EOF", "Thing", "@1", 0
 };
 #endif
 
@@ -660,47 +635,44 @@ static const yytype_uint16 yytoknum[] =
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
      285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306
+     295,   296,   297,   298
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
-       0,    52,    53,    53,    53,    53,    53,    53,    53,    53,
-      54,    54,    55,    56,    57,    58,    59,    60,    61,    62,
-      62,    62,    62,    62,    62,    62,    63,    64,    65,    66,
-      67,    68,    69,    70,    71,    72,    73,    74,    74,    75,
-      76,    77,    78,    79,    80,    80,    80,    80,    80,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,    89,    90,
-      90,    91,    92,    93,    94,    94,    95,    95,    96,    96,
-      97,    97,    98,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,   108,   108,   108,   108,   109,   110,   111,
-     112,   112,   113,   114,   115,   116,   116,   116,   116,   116,
-     116,   116,   116,   116,   116,   116,   116,   116,   116,   116,
-     116,   116,   116,   116,   116,   116,   116,   117,   118,   118,
-     118,   118,   119,   120,   120,   121,   122,   122,   123,   123,
-     124,   124,   126,   125
+       0,    44,    45,    45,    46,    47,    48,    49,    50,    51,
+      52,    53,    53,    53,    53,    53,    53,    53,    54,    55,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    67,    68,    69,    70,    71,    72,    73,
+      73,    73,    73,    73,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    82,    83,    83,    84,    85,    86,    87,
+      87,    88,    88,    89,    89,    90,    90,    91,    92,    93,
+      94,    95,    96,    97,    97,    98,    99,   100,   101,   101,
+     102,   103,   104,   104,   104,   104,   104,   104,   104,   104,
+     104,   104,   104,   104,   104,   104,   104,   104,   104,   104,
+     104,   104,   104,   104,   105,   106,   106,   106,   106,   107,
+     108,   108,   109,   110,   110,   111,   111,   112,   112,   114,
+     113
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {
        0,     2,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     2,     2,     2,     2,     2,     2,     3,     1,
-       1,     1,     1,     1,     1,     1,     2,     3,     3,     3,
-       3,     2,     2,     2,     2,     2,     3,     1,     1,     3,
-       3,     3,     3,     3,     1,     1,     1,     1,     1,     2,
-       2,     2,     2,     2,     2,     2,     3,     1,     2,     0,
-       1,     2,     4,     5,     1,     1,     1,     2,     0,     1,
-       1,     1,     5,     3,     2,     2,     3,     2,     3,     4,
-       5,     6,     1,     1,     1,     1,     1,     1,     1,     2,
+       2,     1,     1,     1,     1,     1,     1,     1,     2,     1,
+       1,     2,     3,     3,     3,     3,     2,     2,     2,     2,
+       2,     3,     1,     1,     3,     3,     3,     3,     3,     1,
+       1,     1,     1,     1,     2,     2,     2,     2,     2,     2,
+       2,     3,     1,     2,     0,     1,     2,     4,     5,     1,
+       1,     1,     2,     0,     1,     1,     1,     5,     3,     2,
+       2,     3,     1,     0,     2,     2,     1,     2,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     2,     1,     1,
-       1,     1,     2,     0,     2,     1,     0,     2,     1,     1,
-       0,     2,     0,     4
+       1,     1,     1,     1,     2,     1,     1,     1,     1,     2,
+       0,     2,     1,     0,     2,     1,     1,     0,     2,     0,
+       4
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -708,79 +680,75 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-     126,   132,     0,     0,     0,     0,     0,     0,     0,     0,
+     113,   119,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    88,    93,    94,   111,    97,    98,    95,
-      96,    99,   100,   101,   102,    37,    38,   112,    44,    45,
-      48,    46,    47,   103,   104,   105,   106,   107,   108,   109,
-     110,    82,    83,    84,    85,    86,    87,   113,    90,    91,
-      92,   114,   115,   116,     0,   127,   123,     1,    11,    10,
-       2,     3,     4,     5,     6,     7,     8,     9,     0,    31,
-       0,     0,    32,    11,    33,    34,     0,     0,     0,     0,
-       0,    49,    50,    51,    52,    53,    54,    55,     0,     0,
-       0,     0,     0,     0,     0,    19,    20,    21,    22,    23,
-      24,    25,    26,     0,    35,    77,    89,   117,     0,   125,
-     128,   129,   130,    30,    29,    28,    27,    39,    40,    41,
-      42,    43,     0,    12,    13,    14,    15,    16,    17,    36,
-      78,     0,     0,    68,     0,   118,   119,   120,   121,     0,
-     124,     0,   133,    18,    79,    76,     0,    68,     0,     0,
-       0,    59,    70,    64,    65,    66,    69,    71,    74,    75,
-     122,   131,    80,     0,    73,     0,     0,     0,    57,    60,
-      61,    67,    81,     0,     0,     0,    56,    58,     0,     0,
-      62,    72,    63
+       0,     0,    73,    76,    80,    81,    98,    84,    85,    82,
+      83,    86,    87,    88,    89,    32,    33,    99,    39,    40,
+      43,    41,    42,    90,    91,    92,    93,    94,    95,    96,
+      97,   100,    78,    79,   101,   102,   103,     0,   114,   110,
+       1,     3,     2,     0,    26,     0,     0,    27,     3,    28,
+      29,     0,     0,     0,     0,     0,    44,    45,    46,    47,
+      48,    49,    50,     0,     4,     5,     6,     7,     8,     9,
+      11,    12,    13,    14,    15,    16,    17,    19,    20,    21,
+       0,    30,    75,    77,   104,     0,   112,   115,   116,   117,
+      25,    24,    23,    22,    34,    35,    36,    37,    38,    10,
+      18,    31,    72,    74,     0,     0,    63,     0,   105,   106,
+     107,   108,     0,   111,     0,   120,    71,     0,    63,     0,
+       0,     0,    54,    65,    59,    60,    61,    64,    66,    69,
+      70,   109,   118,     0,    68,     0,     0,     0,    52,    55,
+      56,    62,     0,     0,     0,    51,    53,     0,    57,     0,
+      67,    58
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,   159,   160,   105,   106,   107,   108,   109,   110,   111,
-     112,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,   161,   179,   180,   162,
-     163,   164,   165,   166,   167,   168,   157,   145,   146,   147,
-     119,    51,    52,    53,    54,    55,    56,    57,    58,    59,
-      60,    61,    62,    63,    64,    65,   149,   150,   120,   121,
-       1,   122,   152,     2,    66
+      -1,   141,    90,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,    26,    27,    28,    29,    30,    31,    32,    33,
+      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
+      44,    45,    46,    47,    48,    49,    50,   142,   159,   160,
+     143,   144,   145,   146,   147,   148,   149,   138,   128,   129,
+     130,   106,   123,   102,    51,    52,    53,    54,    55,    56,
+      57,    58,   132,   133,   107,   108,     1,   109,   135,     2,
+      59
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -119
+#define YYPACT_NINF -109
 static const yytype_int8 yypact[] =
 {
-    -119,     1,     9,    81,    92,    -2,     2,    39,    40,    55,
-      57,    63,    64,     2,     2,     2,     2,     2,    31,    67,
-      73,    -1,    66,    68,  -119,  -119,  -119,  -119,  -119,  -119,
-    -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,
-    -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,
-    -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,
-    -119,  -119,  -119,  -119,    36,  -119,    42,  -119,     2,  -119,
-    -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,     2,  -119,
-       2,     2,  -119,  -119,  -119,  -119,    69,    77,    78,     2,
-      91,  -119,  -119,  -119,  -119,  -119,  -119,  -119,    79,    94,
-     104,   105,   106,   107,   114,  -119,  -119,  -119,  -119,  -119,
-    -119,  -119,  -119,   115,  -119,   116,  -119,  -119,   117,  -119,
-      32,  -119,    71,  -119,  -119,  -119,  -119,  -119,  -119,  -119,
-    -119,  -119,   120,  -119,  -119,  -119,  -119,  -119,  -119,  -119,
-     119,   122,     2,    29,   123,  -119,  -119,  -119,  -119,    83,
-    -119,    93,  -119,  -119,   125,  -119,     2,    29,   124,     2,
-       2,     2,  -119,  -119,  -119,  -119,    46,  -119,  -119,  -119,
-    -119,  -119,   126,     2,  -119,     2,     2,     2,  -119,     2,
-    -119,  -119,  -119,     2,     2,     2,  -119,  -119,     2,     2,
-    -119,  -119,  -119
+    -109,     8,     7,    -2,    36,    37,    32,    38,    39,    49,
+      51,    52,    56,    32,    32,    32,    32,    32,    67,    69,
+      33,    50,  -109,    68,  -109,  -109,  -109,  -109,  -109,  -109,
+    -109,  -109,  -109,  -109,  -109,  -109,  -109,  -109,  -109,  -109,
+    -109,  -109,  -109,  -109,  -109,  -109,  -109,  -109,  -109,  -109,
+    -109,  -109,  -109,  -109,  -109,  -109,  -109,    45,  -109,    48,
+    -109,    32,  -109,    32,  -109,    32,    32,  -109,  -109,  -109,
+    -109,    71,    74,    75,    32,    76,  -109,  -109,  -109,  -109,
+    -109,  -109,  -109,    77,  -109,  -109,  -109,  -109,  -109,  -109,
+    -109,  -109,  -109,  -109,  -109,  -109,  -109,    79,  -109,  -109,
+      80,  -109,    81,  -109,  -109,    82,  -109,    13,  -109,    41,
+    -109,  -109,  -109,  -109,  -109,  -109,  -109,  -109,  -109,  -109,
+    -109,  -109,  -109,  -109,    84,    32,     2,    85,  -109,  -109,
+    -109,  -109,    60,  -109,    61,  -109,  -109,    32,     2,    32,
+      88,    32,    32,  -109,  -109,  -109,  -109,     3,  -109,  -109,
+    -109,  -109,  -109,    32,  -109,    32,    32,    32,  -109,    32,
+    -109,  -109,    32,    32,    32,  -109,  -109,    32,  -109,    32,
+    -109,  -109
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
-    -119,     4,    -3,  -119,  -119,  -119,  -119,  -119,  -119,  -119,
-    -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,
-    -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,
-    -119,  -119,  -119,  -119,  -119,  -119,  -118,  -119,  -119,  -119,
-    -119,  -119,   -38,  -119,  -119,   -25,  -119,  -119,  -119,  -119,
-    -119,  -119,  -119,  -119,  -119,  -119,  -119,    13,  -119,  -119,
-    -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,  -119,
-    -119,  -119,  -119,  -119,  -119
+    -109,    -3,  -109,  -109,  -109,  -109,  -109,  -109,  -109,  -109,
+    -109,  -109,  -109,  -109,  -109,  -109,  -109,  -109,  -109,  -109,
+    -109,  -109,  -109,  -109,  -109,  -109,  -109,  -109,  -109,  -109,
+    -109,  -109,  -109,  -109,  -109,  -109,  -109,  -108,  -109,  -109,
+    -109,  -109,  -109,   -68,  -109,  -109,   -46,  -109,  -109,  -109,
+    -109,  -109,  -109,  -109,   -14,  -109,  -109,  -109,  -109,  -109,
+    -109,  -109,  -109,  -109,  -109,  -109,  -109,  -109,  -109,  -109,
+    -109
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -790,74 +758,68 @@ static const yytype_int8 yypgoto[] =
 #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =
 {
-      79,    82,   113,    84,   114,    83,    69,    78,    81,    67,
-      91,    92,    93,    94,    95,     3,     4,     5,     6,     7,
+      64,    61,    62,    69,    63,    68,    62,    60,   139,   139,
+      76,    77,    78,    79,    80,     3,     4,     5,     6,     7,
        8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    83,    69,    96,    70,    71,    72,    73,    74,
-      75,    76,    77,   178,    85,    86,    20,    21,    22,    23,
-      24,    25,    70,    71,    72,    73,    74,    75,    76,    77,
-      87,   187,    88,   142,   143,   123,   158,   144,    89,    90,
-      97,   115,   117,   116,   127,   124,   118,   125,   126,    22,
-     128,   129,   132,   158,    68,    69,   130,    70,    71,    72,
-      73,    74,    75,    76,    77,    80,   131,   133,    70,    71,
-      72,    73,    74,    75,    76,    77,    98,   134,   135,   136,
-     137,    99,   100,   101,   102,   103,   104,   138,   139,   170,
-     141,   140,   151,   153,   154,   155,   169,   175,   181,   171,
-     172,   182,   174,   148,     0,     0,     0,     0,     0,   156,
+      18,    19,   140,   140,   158,    68,    62,   125,   126,    65,
+      67,   127,    66,    70,    71,    20,    21,    22,    23,    24,
+      25,   166,    22,   100,    72,   101,    73,    74,   110,    83,
+     111,    75,   112,   113,    84,    85,    86,    87,    88,    89,
+      81,   117,    82,   103,   104,   105,   114,   115,   116,   161,
+     119,   118,   120,   121,   134,   124,   122,   136,   150,   151,
+     152,   156,   154,   131,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   173,     0,     0,   176,   177,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     183,     0,   184,   185,   186,     0,     0,     0,     0,     0,
-     188,   189,   190,     0,     0,   191,   192
+       0,     0,   137,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   153,     0,   155,     0,   157,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     162,     0,   163,   164,   165,     0,     0,     0,     0,   167,
+     168,   169,     0,     0,   170,     0,   171
 };
 
 static const yytype_int16 yycheck[] =
 {
-       3,     3,     3,     6,     5,     3,     4,     3,     4,     0,
-      13,    14,    15,    16,    17,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,     3,     4,     3,     6,     7,     8,     9,    10,
-      11,    12,    13,   161,     5,     5,    45,    46,    47,    48,
-      49,    50,     6,     7,     8,     9,    10,    11,    12,    13,
-       5,   179,     5,    31,    32,    68,    37,    35,     5,     5,
-       3,     5,    36,     5,     5,    78,    34,    80,    81,    47,
-       3,     3,     3,    37,     3,     4,    89,     6,     7,     8,
-       9,    10,    11,    12,    13,     3,     5,     3,     6,     7,
-       8,     9,    10,    11,    12,    13,    33,     3,     3,     3,
-       3,    38,    39,    40,    41,    42,    43,     3,     3,    36,
-       3,     5,    51,     3,     5,     3,     3,     3,   166,    36,
-       5,     5,   157,   120,    -1,    -1,    -1,    -1,    -1,   142,
+       3,     3,     4,     6,     6,     3,     4,     0,     6,     6,
+      13,    14,    15,    16,    17,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    30,    30,   142,     3,     4,    24,    25,     3,
+       3,    28,     6,     5,     5,    37,    38,    39,    40,    41,
+      42,   159,    39,     3,     5,     5,     5,     5,    61,    26,
+      63,     5,    65,    66,    31,    32,    33,    34,    35,    36,
+       3,    74,     3,     5,    29,    27,     5,     3,     3,   147,
+       3,     5,     3,     3,    43,     3,     5,     3,     3,    29,
+      29,     3,   138,   107,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   156,    -1,    -1,   159,   160,    -1,    -1,
+      -1,    -1,   125,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   137,    -1,   139,    -1,   141,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     173,    -1,   175,   176,   177,    -1,    -1,    -1,    -1,    -1,
-     183,   184,   185,    -1,    -1,   188,   189
+     153,    -1,   155,   156,   157,    -1,    -1,    -1,    -1,   162,
+     163,   164,    -1,    -1,   167,    -1,   169
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,   122,   125,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      45,    46,    47,    48,    49,    50,    63,    64,    65,    66,
-      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      87,   103,   104,   105,   106,   107,   108,   109,   110,   111,
-     112,   113,   114,   115,   116,   117,   126,     0,     3,     4,
-       6,     7,     8,     9,    10,    11,    12,    13,    53,    54,
-       3,    53,     3,     3,    54,     5,     5,     5,     5,     5,
-       5,    54,    54,    54,    54,    54,     3,     3,    33,    38,
-      39,    40,    41,    42,    43,    55,    56,    57,    58,    59,
-      60,    61,    62,     3,     5,     5,     5,    36,    34,   102,
-     120,   121,   123,    54,    54,    54,    54,     5,     3,     3,
-      54,     5,     3,     3,     3,     3,     3,     3,     3,     3,
-       5,     3,    31,    32,    35,    99,   100,   101,   109,   118,
-     119,    51,   124,     3,     5,     3,    54,    98,    37,    53,
-      54,    88,    91,    92,    93,    94,    95,    96,    97,     3,
-      36,    36,     5,    54,    97,     3,    54,    54,    88,    89,
-      90,    94,     5,    54,    54,    54,    54,    88,    54,    54,
-      54,    54,    54
+       0,   110,   113,     7,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+      37,    38,    39,    40,    41,    42,    56,    57,    58,    59,
+      60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
+      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
+      80,    98,    99,   100,   101,   102,   103,   104,   105,   114,
+       0,     3,     4,     6,    45,     3,     6,     3,     3,    45,
+       5,     5,     5,     5,     5,     5,    45,    45,    45,    45,
+      45,     3,     3,    26,    31,    32,    33,    34,    35,    36,
+      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
+       3,     5,    97,     5,    29,    27,    95,   108,   109,   111,
+      45,    45,    45,    45,     5,     3,     3,    45,     5,     3,
+       3,     3,     5,    96,     3,    24,    25,    28,    92,    93,
+      94,    98,   106,   107,    43,   112,     3,    45,    91,     6,
+      30,    45,    81,    84,    85,    86,    87,    88,    89,    90,
+       3,    29,    29,    45,    90,    45,     3,    45,    81,    82,
+      83,    87,    45,    45,    45,    45,    81,    45,    45,    45,
+      45,    45
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -1671,150 +1633,152 @@ yyreduce:
   YY_REDUCE_PRINT (yyn);
   switch (yyn)
     {
-        case 12:
-#line 152 "testpatterny.y"
+        case 3:
+#line 140 "testpatterny.y"
+    {
+	}
+    break;
+
+  case 4:
+#line 145 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>cmykspec %d\n", (yyvsp[(2) - (2)].ival));
+	    fprintf(stderr, ">>>cmykspec\n");
 	  global_image_type = "CMYK";
 	  global_channel_depth = 4;
 	  global_invert_data = 0;
-	  if ((yyvsp[(2) - (2)].ival) == 8 || (yyvsp[(2) - (2)].ival) == 16)
-	    global_bit_depth = (yyvsp[(2) - (2)].ival);
 	}
     break;
 
-  case 13:
-#line 164 "testpatterny.y"
+  case 5:
+#line 155 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>kcmyspec %d\n", (yyvsp[(2) - (2)].ival));
+	    fprintf(stderr, ">>>kcmyspec\n");
 	  global_image_type = "KCMY";
 	  global_channel_depth = 4;
 	  global_invert_data = 0;
-	  if ((yyvsp[(2) - (2)].ival) == 8 || (yyvsp[(2) - (2)].ival) == 16)
-	    global_bit_depth = (yyvsp[(2) - (2)].ival);
 	}
     break;
 
-  case 14:
-#line 176 "testpatterny.y"
+  case 6:
+#line 165 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>rgbspec %d\n", (yyvsp[(2) - (2)].ival));
+	    fprintf(stderr, ">>>rgbspec\n");
 	  global_image_type = "RGB";
 	  global_channel_depth = 3;
 	  global_invert_data = 1;
-	  if ((yyvsp[(2) - (2)].ival) == 8 || (yyvsp[(2) - (2)].ival) == 16)
-	    global_bit_depth = (yyvsp[(2) - (2)].ival);
 	}
     break;
 
-  case 15:
-#line 188 "testpatterny.y"
+  case 7:
+#line 175 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>cmyspec %d\n", (yyvsp[(2) - (2)].ival));
+	    fprintf(stderr, ">>>cmyspec\n");
 	  global_image_type = "CMY";
 	  global_channel_depth = 3;
 	  global_invert_data = 0;
-	  if ((yyvsp[(2) - (2)].ival) == 8 || (yyvsp[(2) - (2)].ival) == 16)
-	    global_bit_depth = (yyvsp[(2) - (2)].ival);
 	}
     break;
 
-  case 16:
-#line 200 "testpatterny.y"
+  case 8:
+#line 185 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>grayspec %d\n", (yyvsp[(2) - (2)].ival));
+	    fprintf(stderr, ">>>grayspec\n");
 	  global_image_type = "Grayscale";
 	  global_channel_depth = 1;
 	  global_invert_data = 0;
-	  if ((yyvsp[(2) - (2)].ival) == 8 || (yyvsp[(2) - (2)].ival) == 16)
-	    global_bit_depth = (yyvsp[(2) - (2)].ival);
 	}
     break;
 
-  case 17:
-#line 212 "testpatterny.y"
+  case 9:
+#line 195 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>whitespec %d\n", (yyvsp[(2) - (2)].ival));
+	    fprintf(stderr, ">>>whitespec\n");
 	  global_image_type = "Whitescale";
 	  global_channel_depth = 1;
 	  global_invert_data = 1;
-	  if ((yyvsp[(2) - (2)].ival) == 8 || (yyvsp[(2) - (2)].ival) == 16)
-	    global_bit_depth = (yyvsp[(2) - (2)].ival);
 	}
     break;
 
-  case 18:
-#line 224 "testpatterny.y"
+  case 10:
+#line 205 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>extendedspec %d\n", (yyvsp[(2) - (3)].ival));
+	    fprintf(stderr, ">>>extendedspec %d\n", (yyvsp[(2) - (2)].ival));
 	  global_image_type = "Raw";
 	  global_invert_data = 0;
-	  global_channel_depth = (yyvsp[(2) - (3)].ival);
-	  if ((yyvsp[(2) - (3)].ival) == 8 || (yyvsp[(2) - (3)].ival) == 16)
-	    global_bit_depth = (yyvsp[(3) - (3)].ival);
+	  global_channel_depth = (yyvsp[(2) - (2)].ival);
 	}
     break;
 
-  case 27:
-#line 242 "testpatterny.y"
+  case 18:
+#line 218 "testpatterny.y"
     {
-	  int channel = find_color((yyvsp[(2) - (3)]).sval);
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>level %s %f\n", (yyvsp[(2) - (3)]).sval, (yyvsp[(3) - (3)]).dval);
+	    fprintf(stderr, ">>>modespec2 %d\n", (yyvsp[(2) - (2)].ival));
+	  if ((yyvsp[(2) - (2)].ival) == 8 || (yyvsp[(2) - (2)].ival) == 16)
+	    global_bit_depth = (yyvsp[(2) - (2)].ival);
+	}
+    break;
+
+  case 22:
+#line 232 "testpatterny.y"
+    {
+	  int channel = find_color((yyvsp[(2) - (3)].sval));
+	  if (getenv("STP_TESTPATTERN_DEBUG"))
+	    fprintf(stderr, ">>>level %s %f\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].dval));
 	  if (channel >= 0)
-	    global_levels[channel] = (yyvsp[(3) - (3)]).dval;
+	    global_levels[channel] = (yyvsp[(3) - (3)].dval);
 	}
     break;
 
-  case 28:
-#line 252 "testpatterny.y"
+  case 23:
+#line 242 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>channel_level %d %f\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)]).dval);
+	    fprintf(stderr, ">>>channel_level %d %f\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].dval));
 	  if ((yyvsp[(2) - (3)].ival) >= 0 && (yyvsp[(2) - (3)].ival) <= STP_CHANNEL_LIMIT)
-	    global_levels[(yyvsp[(2) - (3)].ival)] = (yyvsp[(3) - (3)]).dval;
+	    global_levels[(yyvsp[(2) - (3)].ival)] = (yyvsp[(3) - (3)].dval);
 	}
     break;
 
-  case 29:
-#line 261 "testpatterny.y"
+  case 24:
+#line 251 "testpatterny.y"
     {
-	  int channel = find_color((yyvsp[(2) - (3)]).sval);
+	  int channel = find_color((yyvsp[(2) - (3)].sval));
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>gamma %s %f\n", (yyvsp[(2) - (3)]).sval, (yyvsp[(3) - (3)]).dval);
+	    fprintf(stderr, ">>>gamma %s %f\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].dval));
 	  if (channel >= 0)
-	    global_gammas[channel] = (yyvsp[(3) - (3)]).dval;
+	    global_gammas[channel] = (yyvsp[(3) - (3)].dval);
 	}
     break;
 
-  case 30:
-#line 271 "testpatterny.y"
+  case 25:
+#line 261 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>channel_gamma %d %f\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)]).dval);
+	    fprintf(stderr, ">>>channel_gamma %d %f\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].dval));
 	  if ((yyvsp[(2) - (3)].ival) >= 0 && (yyvsp[(2) - (3)].ival) <= STP_CHANNEL_LIMIT)
-	    global_gammas[(yyvsp[(2) - (3)].ival)] = (yyvsp[(3) - (3)]).dval;
+	    global_gammas[(yyvsp[(2) - (3)].ival)] = (yyvsp[(3) - (3)].dval);
 	}
     break;
 
-  case 31:
-#line 280 "testpatterny.y"
+  case 26:
+#line 270 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>global_gamma %f\n", (yyvsp[(2) - (2)]).dval);
-	  global_gamma = (yyvsp[(2) - (2)]).dval;
+	    fprintf(stderr, ">>>global_gamma %f\n", (yyvsp[(2) - (2)].dval));
+	  global_gamma = (yyvsp[(2) - (2)].dval);
 	}
     break;
 
-  case 32:
-#line 287 "testpatterny.y"
+  case 27:
+#line 277 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>steps %d\n", (yyvsp[(2) - (2)].ival));
@@ -1822,17 +1786,17 @@ yyreduce:
 	}
     break;
 
-  case 33:
-#line 294 "testpatterny.y"
+  case 28:
+#line 284 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>ink_limit %f\n", (yyvsp[(2) - (2)]).dval);
-	  global_ink_limit = (yyvsp[(2) - (2)]).dval;
+	    fprintf(stderr, ">>>ink_limit %f\n", (yyvsp[(2) - (2)].dval));
+	  global_ink_limit = (yyvsp[(2) - (2)].dval);
 	}
     break;
 
-  case 34:
-#line 301 "testpatterny.y"
+  case 29:
+#line 291 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>printer %s\n", (yyvsp[(2) - (2)].sval));
@@ -1841,8 +1805,8 @@ yyreduce:
 	}
     break;
 
-  case 35:
-#line 310 "testpatterny.y"
+  case 30:
+#line 300 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>page_size_name %s\n", (yyvsp[(2) - (2)].sval));
@@ -1851,8 +1815,8 @@ yyreduce:
 	}
     break;
 
-  case 36:
-#line 319 "testpatterny.y"
+  case 31:
+#line 309 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>page_size_custom %d %d\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].ival));
@@ -1861,8 +1825,8 @@ yyreduce:
 	}
     break;
 
-  case 39:
-#line 331 "testpatterny.y"
+  case 34:
+#line 321 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>parameter_string %s %s\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval));
@@ -1872,8 +1836,8 @@ yyreduce:
 	}
     break;
 
-  case 40:
-#line 341 "testpatterny.y"
+  case 35:
+#line 331 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>parameter_int %s %d\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].ival));
@@ -1882,8 +1846,8 @@ yyreduce:
 	}
     break;
 
-  case 41:
-#line 350 "testpatterny.y"
+  case 36:
+#line 340 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>parameter_bool %s %d\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].ival));
@@ -1892,18 +1856,18 @@ yyreduce:
 	}
     break;
 
-  case 42:
-#line 359 "testpatterny.y"
+  case 37:
+#line 349 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>parameter_float %s %f\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)]).dval);
-	  stp_set_float_parameter(global_vars, (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)]).dval);
+	    fprintf(stderr, ">>>parameter_float %s %f\n", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].dval));
+	  stp_set_float_parameter(global_vars, (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].dval));
 	  free((yyvsp[(2) - (3)].sval));
 	}
     break;
 
-  case 43:
-#line 368 "testpatterny.y"
+  case 38:
+#line 358 "testpatterny.y"
     {
 	  stp_curve_t *curve = stp_curve_create_from_string((yyvsp[(3) - (3)].sval));
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
@@ -1917,53 +1881,53 @@ yyreduce:
 	}
     break;
 
-  case 49:
-#line 384 "testpatterny.y"
+  case 44:
+#line 374 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>density %f\n", (yyvsp[(2) - (2)]).dval);
-	  global_density = (yyvsp[(2) - (2)]).dval;
+	    fprintf(stderr, ">>>density %f\n", (yyvsp[(2) - (2)].dval));
+	  global_density = (yyvsp[(2) - (2)].dval);
 	}
     break;
 
-  case 50:
-#line 391 "testpatterny.y"
+  case 45:
+#line 381 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>top %f\n", (yyvsp[(2) - (2)]).dval);
-	  global_xtop = (yyvsp[(2) - (2)]).dval;
+	    fprintf(stderr, ">>>top %f\n", (yyvsp[(2) - (2)].dval));
+	  global_xtop = (yyvsp[(2) - (2)].dval);
 	}
     break;
 
-  case 51:
-#line 398 "testpatterny.y"
+  case 46:
+#line 388 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
- 	    fprintf(stderr, ">>>left %f\n", (yyvsp[(2) - (2)]).dval);
-	  global_xleft = (yyvsp[(2) - (2)]).dval;
+ 	    fprintf(stderr, ">>>left %f\n", (yyvsp[(2) - (2)].dval));
+	  global_xleft = (yyvsp[(2) - (2)].dval);
 	}
     break;
 
-  case 52:
-#line 405 "testpatterny.y"
+  case 47:
+#line 395 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>hsize %f\n", (yyvsp[(2) - (2)]).dval);
-	  global_hsize = (yyvsp[(2) - (2)]).dval;
+	    fprintf(stderr, ">>>hsize %f\n", (yyvsp[(2) - (2)].dval));
+	  global_hsize = (yyvsp[(2) - (2)].dval);
 	}
     break;
 
-  case 53:
-#line 412 "testpatterny.y"
+  case 48:
+#line 402 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>vsize %f\n", (yyvsp[(2) - (2)]).dval);
-	  global_vsize = (yyvsp[(2) - (2)]).dval;
+	    fprintf(stderr, ">>>vsize %f\n", (yyvsp[(2) - (2)].dval));
+	  global_vsize = (yyvsp[(2) - (2)].dval);
 	}
     break;
 
-  case 54:
-#line 419 "testpatterny.y"
+  case 49:
+#line 409 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>blackline %d\n", (yyvsp[(2) - (2)].ival));
@@ -1971,8 +1935,8 @@ yyreduce:
 	}
     break;
 
-  case 55:
-#line 427 "testpatterny.y"
+  case 50:
+#line 417 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>noscale %d\n", (yyvsp[(2) - (2)].ival));
@@ -1980,69 +1944,69 @@ yyreduce:
 	}
     break;
 
-  case 56:
-#line 435 "testpatterny.y"
+  case 51:
+#line 425 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>color_block1 %f %f %f (%d)\n", (yyvsp[(1) - (3)]).dval, (yyvsp[(2) - (3)]).dval, (yyvsp[(3) - (3)]).dval,
+	    fprintf(stderr, ">>>color_block1 %f %f %f (%d)\n", (yyvsp[(1) - (3)].dval), (yyvsp[(2) - (3)].dval), (yyvsp[(3) - (3)].dval),
 		    current_index);
 	  if (current_index < STP_CHANNEL_LIMIT)
 	    {
-	      current_testpattern->d.pattern.mins[current_index] = (yyvsp[(1) - (3)]).dval;
-	      current_testpattern->d.pattern.vals[current_index] = (yyvsp[(2) - (3)]).dval;
-	      current_testpattern->d.pattern.gammas[current_index] = (yyvsp[(3) - (3)]).dval;
+	      current_testpattern->d.pattern.mins[current_index] = (yyvsp[(1) - (3)].dval);
+	      current_testpattern->d.pattern.vals[current_index] = (yyvsp[(2) - (3)].dval);
+	      current_testpattern->d.pattern.gammas[current_index] = (yyvsp[(3) - (3)].dval);
 	      current_index++;
 	    }
 	}
     break;
 
-  case 62:
-#line 459 "testpatterny.y"
+  case 57:
+#line 449 "testpatterny.y"
     {
-	  int channel = find_color((yyvsp[(1) - (4)]).sval);
+	  int channel = find_color((yyvsp[(1) - (4)].sval));
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>color_block2a %s %f %f %f\n", (yyvsp[(1) - (4)]).sval, (yyvsp[(2) - (4)]).dval, (yyvsp[(3) - (4)]).dval, (yyvsp[(4) - (4)]).dval);
+	    fprintf(stderr, ">>>color_block2a %s %f %f %f\n", (yyvsp[(1) - (4)].sval), (yyvsp[(2) - (4)].dval), (yyvsp[(3) - (4)].dval), (yyvsp[(4) - (4)].dval));
 	  if (channel >= 0 && channel < STP_CHANNEL_LIMIT)
 	    {
-	      current_testpattern->d.pattern.mins[channel] = (yyvsp[(2) - (4)]).dval;
-	      current_testpattern->d.pattern.vals[channel] = (yyvsp[(3) - (4)]).dval;
-	      current_testpattern->d.pattern.gammas[channel] = (yyvsp[(4) - (4)]).dval;
+	      current_testpattern->d.pattern.mins[channel] = (yyvsp[(2) - (4)].dval);
+	      current_testpattern->d.pattern.vals[channel] = (yyvsp[(3) - (4)].dval);
+	      current_testpattern->d.pattern.gammas[channel] = (yyvsp[(4) - (4)].dval);
 	    }
 	}
     break;
 
-  case 63:
-#line 473 "testpatterny.y"
+  case 58:
+#line 463 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>color_block2b %d %f %f %f\n", (yyvsp[(2) - (5)].ival), (yyvsp[(3) - (5)]).dval, (yyvsp[(4) - (5)]).dval, (yyvsp[(5) - (5)]).dval);
+	    fprintf(stderr, ">>>color_block2b %d %f %f %f\n", (yyvsp[(2) - (5)].ival), (yyvsp[(3) - (5)].dval), (yyvsp[(4) - (5)].dval), (yyvsp[(5) - (5)].dval));
 	  if ((yyvsp[(2) - (5)].ival) >= 0 && (yyvsp[(2) - (5)].ival) < STP_CHANNEL_LIMIT)
 	    {
-	      current_testpattern->d.pattern.mins[(yyvsp[(2) - (5)].ival)] = (yyvsp[(3) - (5)]).dval;
-	      current_testpattern->d.pattern.vals[(yyvsp[(2) - (5)].ival)] = (yyvsp[(4) - (5)]).dval;
-	      current_testpattern->d.pattern.gammas[(yyvsp[(2) - (5)].ival)] = (yyvsp[(5) - (5)]).dval;
+	      current_testpattern->d.pattern.mins[(yyvsp[(2) - (5)].ival)] = (yyvsp[(3) - (5)].dval);
+	      current_testpattern->d.pattern.vals[(yyvsp[(2) - (5)].ival)] = (yyvsp[(4) - (5)].dval);
+	      current_testpattern->d.pattern.gammas[(yyvsp[(2) - (5)].ival)] = (yyvsp[(5) - (5)].dval);
 	    }
 	}
     break;
 
-  case 72:
-#line 498 "testpatterny.y"
+  case 67:
+#line 488 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>patvars %f %f %f %f %f\n", (yyvsp[(1) - (5)]).dval, (yyvsp[(2) - (5)]).dval, (yyvsp[(3) - (5)]).dval, (yyvsp[(4) - (5)]).dval, (yyvsp[(5) - (5)]).dval);
+	    fprintf(stderr, ">>>patvars %f %f %f %f %f\n", (yyvsp[(1) - (5)].dval), (yyvsp[(2) - (5)].dval), (yyvsp[(3) - (5)].dval), (yyvsp[(4) - (5)].dval), (yyvsp[(5) - (5)].dval));
 	  current_testpattern->type = E_PATTERN;
-	  current_testpattern->d.pattern.lower = (yyvsp[(1) - (5)]).dval;
-	  current_testpattern->d.pattern.upper = (yyvsp[(2) - (5)]).dval;
-	  current_testpattern->d.pattern.levels[1] = (yyvsp[(3) - (5)]).dval;
-	  current_testpattern->d.pattern.levels[2] = (yyvsp[(4) - (5)]).dval;
-	  current_testpattern->d.pattern.levels[3] = (yyvsp[(5) - (5)]).dval;
+	  current_testpattern->d.pattern.lower = (yyvsp[(1) - (5)].dval);
+	  current_testpattern->d.pattern.upper = (yyvsp[(2) - (5)].dval);
+	  current_testpattern->d.pattern.levels[1] = (yyvsp[(3) - (5)].dval);
+	  current_testpattern->d.pattern.levels[2] = (yyvsp[(4) - (5)].dval);
+	  current_testpattern->d.pattern.levels[3] = (yyvsp[(5) - (5)].dval);
 	  current_testpattern = get_next_testpattern();
 	  current_index = 0;
 	}
     break;
 
-  case 74:
-#line 516 "testpatterny.y"
+  case 69:
+#line 506 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>xpattern\n");
@@ -2057,8 +2021,8 @@ yyreduce:
 	}
     break;
 
-  case 75:
-#line 531 "testpatterny.y"
+  case 70:
+#line 521 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>grid %d\n", (yyvsp[(2) - (2)].ival));
@@ -2069,8 +2033,8 @@ yyreduce:
 	}
     break;
 
-  case 76:
-#line 542 "testpatterny.y"
+  case 71:
+#line 532 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>image %d %d\n", (yyvsp[(2) - (3)].ival), (yyvsp[(3) - (3)].ival));
@@ -2087,58 +2051,16 @@ yyreduce:
 	}
     break;
 
-  case 77:
-#line 559 "testpatterny.y"
-    {
-	  fprintf(stderr,"%s",(yyvsp[(2) - (2)].sval));
-	  free((yyvsp[(2) - (2)].sval));
-	}
-    break;
-
-  case 78:
-#line 565 "testpatterny.y"
-    {
-	  fprintf(stderr,"%s%s", (yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval));
-	  free((yyvsp[(2) - (3)].sval));
-	  free((yyvsp[(3) - (3)].sval));
-	}
-    break;
-
-  case 79:
-#line 572 "testpatterny.y"
-    {
-	  fprintf(stderr,"%s%s%s", (yyvsp[(2) - (4)].sval), (yyvsp[(3) - (4)].sval), (yyvsp[(4) - (4)].sval));
-	  free((yyvsp[(2) - (4)].sval));
-	  free((yyvsp[(3) - (4)].sval));
-	  free((yyvsp[(4) - (4)].sval));
-	}
-    break;
-
-  case 80:
-#line 580 "testpatterny.y"
-    {
-	  fprintf(stderr, "%s%s%s%s", (yyvsp[(2) - (5)].sval), (yyvsp[(3) - (5)].sval), (yyvsp[(4) - (5)].sval), (yyvsp[(5) - (5)].sval));
-	  free((yyvsp[(2) - (5)].sval));
-	  free((yyvsp[(3) - (5)].sval));
-	  free((yyvsp[(4) - (5)].sval));
-	  free((yyvsp[(5) - (5)].sval));
-	}
-    break;
-
-  case 81:
-#line 589 "testpatterny.y"
+  case 72:
+#line 549 "testpatterny.y"
     {
-	  fprintf(stderr, "%s%s%s%s%s", (yyvsp[(2) - (6)].sval), (yyvsp[(3) - (6)].sval), (yyvsp[(4) - (6)].sval), (yyvsp[(5) - (6)].sval), (yyvsp[(6) - (6)].sval));
-	  free((yyvsp[(2) - (6)].sval));
-	  free((yyvsp[(3) - (6)].sval));
-	  free((yyvsp[(4) - (6)].sval));
-	  free((yyvsp[(5) - (6)].sval));
-	  free((yyvsp[(6) - (6)].sval));
+	  fprintf(stderr,"%s",(yyvsp[(1) - (1)].sval));
+	  free((yyvsp[(1) - (1)].sval));
 	}
     break;
 
-  case 88:
-#line 606 "testpatterny.y"
+  case 76:
+#line 562 "testpatterny.y"
     {
 	  close_output();
 	  if (global_output)
@@ -2148,45 +2070,45 @@ yyreduce:
 	}
     break;
 
-  case 89:
-#line 615 "testpatterny.y"
+  case 77:
+#line 572 "testpatterny.y"
     {
 	  global_output = (yyvsp[(2) - (2)].sval);
 	}
     break;
 
-  case 93:
-#line 626 "testpatterny.y"
+  case 80:
+#line 581 "testpatterny.y"
     { start_job = 1; }
     break;
 
-  case 94:
-#line 630 "testpatterny.y"
+  case 81:
+#line 585 "testpatterny.y"
     { end_job = 1; }
     break;
 
-  case 117:
-#line 640 "testpatterny.y"
+  case 104:
+#line 595 "testpatterny.y"
     { global_did_something = 1; }
     break;
 
-  case 122:
-#line 647 "testpatterny.y"
+  case 109:
+#line 602 "testpatterny.y"
     { global_did_something = 1; }
     break;
 
-  case 125:
-#line 654 "testpatterny.y"
+  case 112:
+#line 609 "testpatterny.y"
     { global_did_something = 1; }
     break;
 
-  case 131:
-#line 664 "testpatterny.y"
+  case 118:
+#line 619 "testpatterny.y"
     { return 0; }
     break;
 
-  case 132:
-#line 668 "testpatterny.y"
+  case 119:
+#line 623 "testpatterny.y"
     {
 	  current_testpattern = get_next_testpattern();
 	}
@@ -2194,7 +2116,7 @@ yyreduce:
 
 
 /* Line 1267 of yacc.c.  */
-#line 2198 "testpatterny.c"
+#line 2120 "testpatterny.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2408,6 +2330,6 @@ yyreturn:
 }
 
 
-#line 674 "testpatterny.y"
+#line 629 "testpatterny.y"
 
 
diff --git a/src/testpattern/testpatterny.h b/src/testpattern/testpatterny.h
index c36836e..c0aea0f 100644
--- a/src/testpattern/testpatterny.h
+++ b/src/testpattern/testpatterny.h
@@ -42,104 +42,88 @@
      tINT = 258,
      tDOUBLE = 259,
      tSTRING = 260,
-     CYAN = 261,
-     L_CYAN = 262,
-     MAGENTA = 263,
-     L_MAGENTA = 264,
-     YELLOW = 265,
-     D_YELLOW = 266,
-     BLACK = 267,
-     L_BLACK = 268,
-     GAMMA = 269,
-     LEVEL = 270,
-     STEPS = 271,
-     INK_LIMIT = 272,
-     PRINTER = 273,
-     PARAMETER = 274,
-     PARAMETER_INT = 275,
-     PARAMETER_BOOL = 276,
-     PARAMETER_FLOAT = 277,
-     PARAMETER_CURVE = 278,
-     DENSITY = 279,
-     TOP = 280,
-     LEFT = 281,
-     HSIZE = 282,
-     VSIZE = 283,
-     BLACKLINE = 284,
-     NOSCALE = 285,
-     PATTERN = 286,
-     XPATTERN = 287,
-     EXTENDED = 288,
-     IMAGE = 289,
-     GRID = 290,
-     SEMI = 291,
-     CHANNEL = 292,
-     CMYK = 293,
-     KCMY = 294,
-     RGB = 295,
-     CMY = 296,
-     GRAY = 297,
-     WHITE = 298,
-     RAW = 299,
-     MODE = 300,
-     PAGESIZE = 301,
-     MESSAGE = 302,
-     OUTPUT = 303,
-     START_JOB = 304,
-     END_JOB = 305,
-     END = 306
+     COLOR = 261,
+     GAMMA = 262,
+     LEVEL = 263,
+     STEPS = 264,
+     INK_LIMIT = 265,
+     PRINTER = 266,
+     PARAMETER = 267,
+     PARAMETER_INT = 268,
+     PARAMETER_BOOL = 269,
+     PARAMETER_FLOAT = 270,
+     PARAMETER_CURVE = 271,
+     DENSITY = 272,
+     TOP = 273,
+     LEFT = 274,
+     HSIZE = 275,
+     VSIZE = 276,
+     BLACKLINE = 277,
+     NOSCALE = 278,
+     PATTERN = 279,
+     XPATTERN = 280,
+     EXTENDED = 281,
+     IMAGE = 282,
+     GRID = 283,
+     SEMI = 284,
+     CHANNEL = 285,
+     CMYK = 286,
+     KCMY = 287,
+     RGB = 288,
+     CMY = 289,
+     GRAY = 290,
+     WHITE = 291,
+     MODE = 292,
+     PAGESIZE = 293,
+     MESSAGE = 294,
+     OUTPUT = 295,
+     START_JOB = 296,
+     END_JOB = 297,
+     END = 298
    };
 #endif
 /* Tokens.  */
 #define tINT 258
 #define tDOUBLE 259
 #define tSTRING 260
-#define CYAN 261
-#define L_CYAN 262
-#define MAGENTA 263
-#define L_MAGENTA 264
-#define YELLOW 265
-#define D_YELLOW 266
-#define BLACK 267
-#define L_BLACK 268
-#define GAMMA 269
-#define LEVEL 270
-#define STEPS 271
-#define INK_LIMIT 272
-#define PRINTER 273
-#define PARAMETER 274
-#define PARAMETER_INT 275
-#define PARAMETER_BOOL 276
-#define PARAMETER_FLOAT 277
-#define PARAMETER_CURVE 278
-#define DENSITY 279
-#define TOP 280
-#define LEFT 281
-#define HSIZE 282
-#define VSIZE 283
-#define BLACKLINE 284
-#define NOSCALE 285
-#define PATTERN 286
-#define XPATTERN 287
-#define EXTENDED 288
-#define IMAGE 289
-#define GRID 290
-#define SEMI 291
-#define CHANNEL 292
-#define CMYK 293
-#define KCMY 294
-#define RGB 295
-#define CMY 296
-#define GRAY 297
-#define WHITE 298
-#define RAW 299
-#define MODE 300
-#define PAGESIZE 301
-#define MESSAGE 302
-#define OUTPUT 303
-#define START_JOB 304
-#define END_JOB 305
-#define END 306
+#define COLOR 261
+#define GAMMA 262
+#define LEVEL 263
+#define STEPS 264
+#define INK_LIMIT 265
+#define PRINTER 266
+#define PARAMETER 267
+#define PARAMETER_INT 268
+#define PARAMETER_BOOL 269
+#define PARAMETER_FLOAT 270
+#define PARAMETER_CURVE 271
+#define DENSITY 272
+#define TOP 273
+#define LEFT 274
+#define HSIZE 275
+#define VSIZE 276
+#define BLACKLINE 277
+#define NOSCALE 278
+#define PATTERN 279
+#define XPATTERN 280
+#define EXTENDED 281
+#define IMAGE 282
+#define GRID 283
+#define SEMI 284
+#define CHANNEL 285
+#define CMYK 286
+#define KCMY 287
+#define RGB 288
+#define CMY 289
+#define GRAY 290
+#define WHITE 291
+#define MODE 292
+#define PAGESIZE 293
+#define MESSAGE 294
+#define OUTPUT 295
+#define START_JOB 296
+#define END_JOB 297
+#define END 298
 
 
 
diff --git a/src/testpattern/testpatterny.y b/src/testpattern/testpatterny.y
index 7682d8d..c00abeb 100644
--- a/src/testpattern/testpatterny.y
+++ b/src/testpattern/testpatterny.y
@@ -1,5 +1,5 @@
 /*
- * "$Id: testpatterny.y,v 1.33 2008/12/07 20:03:08 rlk Exp $"
+ * "$Id: testpatterny.y,v 1.39 2009/06/14 19:38:08 rlk Exp $"
  *
  *   Test pattern generator for Gimp-Print
  *
@@ -90,15 +90,8 @@ find_color(const char *name)
 %token <ival> tINT
 %token <dval> tDOUBLE
 %token <sval> tSTRING
+%token <sval> COLOR
 
-%token CYAN
-%token L_CYAN
-%token MAGENTA
-%token L_MAGENTA
-%token YELLOW
-%token D_YELLOW
-%token BLACK
-%token L_BLACK
 %token GAMMA
 %token LEVEL
 %token STEPS
@@ -129,7 +122,6 @@ find_color(const char *name)
 %token CMY
 %token GRAY
 %token WHITE
-%token RAW
 %token MODE
 %token PAGESIZE
 %token MESSAGE
@@ -138,101 +130,99 @@ find_color(const char *name)
 %token END_JOB
 %token END
 
+%type <dval> NUMBER
+
 %start Thing
 
 %%
 
-COLOR: CYAN | L_CYAN | MAGENTA | L_MAGENTA
-	| YELLOW | D_YELLOW | BLACK | L_BLACK
-;
 NUMBER: tDOUBLE | tINT
+	{
+	}
 ;
 
-cmykspec: CMYK tINT
+cmykspec: CMYK
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>cmykspec %d\n", $2);
+	    fprintf(stderr, ">>>cmykspec\n");
 	  global_image_type = "CMYK";
 	  global_channel_depth = 4;
 	  global_invert_data = 0;
-	  if ($2 == 8 || $2 == 16)
-	    global_bit_depth = $2;
 	}
 ;
 
-kcmyspec: KCMY tINT
+kcmyspec: KCMY
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>kcmyspec %d\n", $2);
+	    fprintf(stderr, ">>>kcmyspec\n");
 	  global_image_type = "KCMY";
 	  global_channel_depth = 4;
 	  global_invert_data = 0;
-	  if ($2 == 8 || $2 == 16)
-	    global_bit_depth = $2;
 	}
 ;
 
-rgbspec: RGB tINT
+rgbspec: RGB
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>rgbspec %d\n", $2);
+	    fprintf(stderr, ">>>rgbspec\n");
 	  global_image_type = "RGB";
 	  global_channel_depth = 3;
 	  global_invert_data = 1;
-	  if ($2 == 8 || $2 == 16)
-	    global_bit_depth = $2;
 	}
 ;
 
-cmyspec: CMY tINT
+cmyspec: CMY
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>cmyspec %d\n", $2);
+	    fprintf(stderr, ">>>cmyspec\n");
 	  global_image_type = "CMY";
 	  global_channel_depth = 3;
 	  global_invert_data = 0;
-	  if ($2 == 8 || $2 == 16)
-	    global_bit_depth = $2;
 	}
 ;
 
-grayspec: GRAY tINT
+grayspec: GRAY
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>grayspec %d\n", $2);
+	    fprintf(stderr, ">>>grayspec\n");
 	  global_image_type = "Grayscale";
 	  global_channel_depth = 1;
 	  global_invert_data = 0;
-	  if ($2 == 8 || $2 == 16)
-	    global_bit_depth = $2;
 	}
 ;
 
-whitespec: WHITE tINT
+whitespec: WHITE
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>whitespec %d\n", $2);
+	    fprintf(stderr, ">>>whitespec\n");
 	  global_image_type = "Whitescale";
 	  global_channel_depth = 1;
 	  global_invert_data = 1;
-	  if ($2 == 8 || $2 == 16)
-	    global_bit_depth = $2;
 	}
 ;
 
-extendedspec: EXTENDED tINT tINT
+extendedspec: EXTENDED tINT
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
 	    fprintf(stderr, ">>>extendedspec %d\n", $2);
 	  global_image_type = "Raw";
 	  global_invert_data = 0;
 	  global_channel_depth = $2;
-	  if ($2 == 8 || $2 == 16)
-	    global_bit_depth = $3;
 	}
 ;
 
-modespec: cmykspec | kcmyspec | rgbspec | cmyspec | grayspec | whitespec | extendedspec
+modespec1: cmykspec | kcmyspec | rgbspec | cmyspec | grayspec | whitespec | extendedspec
+;
+
+modespec2: modespec1 tINT
+	{
+	  if (getenv("STP_TESTPATTERN_DEBUG"))
+	    fprintf(stderr, ">>>modespec2 %d\n", $2);
+	  if ($2 == 8 || $2 == 16)
+	    global_bit_depth = $2;
+	}
+
+modespec: modespec1 | modespec2
 ;
 
 inputspec: MODE modespec
@@ -240,47 +230,47 @@ inputspec: MODE modespec
 
 level: LEVEL COLOR NUMBER
 	{
-	  int channel = find_color($2.sval);
+	  int channel = find_color($2);
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>level %s %f\n", $2.sval, $3.dval);
+	    fprintf(stderr, ">>>level %s %f\n", $2, $3);
 	  if (channel >= 0)
-	    global_levels[channel] = $3.dval;
+	    global_levels[channel] = $3;
 	}
 ;
 
 channel_level: LEVEL tINT NUMBER
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>channel_level %d %f\n", $2, $3.dval);
+	    fprintf(stderr, ">>>channel_level %d %f\n", $2, $3);
 	  if ($2 >= 0 && $2 <= STP_CHANNEL_LIMIT)
-	    global_levels[$2] = $3.dval;
+	    global_levels[$2] = $3;
 	}
 ;
 
 gamma: GAMMA COLOR NUMBER
 	{
-	  int channel = find_color($2.sval);
+	  int channel = find_color($2);
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>gamma %s %f\n", $2.sval, $3.dval);
+	    fprintf(stderr, ">>>gamma %s %f\n", $2, $3);
 	  if (channel >= 0)
-	    global_gammas[channel] = $3.dval;
+	    global_gammas[channel] = $3;
 	}
 ;
 
 channel_gamma: GAMMA tINT NUMBER
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>channel_gamma %d %f\n", $2, $3.dval);
+	    fprintf(stderr, ">>>channel_gamma %d %f\n", $2, $3);
 	  if ($2 >= 0 && $2 <= STP_CHANNEL_LIMIT)
-	    global_gammas[$2] = $3.dval;
+	    global_gammas[$2] = $3;
 	}
 ;
 
 global_gamma: GAMMA NUMBER
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>global_gamma %f\n", $2.dval);
-	  global_gamma = $2.dval;
+	    fprintf(stderr, ">>>global_gamma %f\n", $2);
+	  global_gamma = $2;
 	}
 ;
 steps: STEPS tINT
@@ -293,8 +283,8 @@ steps: STEPS tINT
 ink_limit: INK_LIMIT NUMBER
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>ink_limit %f\n", $2.dval);
-	  global_ink_limit = $2.dval;
+	    fprintf(stderr, ">>>ink_limit %f\n", $2);
+	  global_ink_limit = $2;
 	}
 ;
 printer: PRINTER tSTRING
@@ -358,8 +348,8 @@ parameter_bool: PARAMETER_BOOL tSTRING tINT
 parameter_float: PARAMETER_FLOAT tSTRING NUMBER
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>parameter_float %s %f\n", $2, $3.dval);
-	  stp_set_float_parameter(global_vars, $2, $3.dval);
+	    fprintf(stderr, ">>>parameter_float %s %f\n", $2, $3);
+	  stp_set_float_parameter(global_vars, $2, $3);
 	  free($2);
 	}
 ;
@@ -383,36 +373,36 @@ parameter: parameter_string | parameter_int | parameter_float | parameter_curve
 density: DENSITY NUMBER
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>density %f\n", $2.dval);
-	  global_density = $2.dval;
+	    fprintf(stderr, ">>>density %f\n", $2);
+	  global_density = $2;
 	}
 ;
 top: TOP NUMBER
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>top %f\n", $2.dval);
-	  global_xtop = $2.dval;
+	    fprintf(stderr, ">>>top %f\n", $2);
+	  global_xtop = $2;
 	}
 ;
 left: LEFT NUMBER
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
- 	    fprintf(stderr, ">>>left %f\n", $2.dval);
-	  global_xleft = $2.dval;
+ 	    fprintf(stderr, ">>>left %f\n", $2);
+	  global_xleft = $2;
 	}
 ;
 hsize: HSIZE NUMBER
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>hsize %f\n", $2.dval);
-	  global_hsize = $2.dval;
+	    fprintf(stderr, ">>>hsize %f\n", $2);
+	  global_hsize = $2;
 	}
 ;
 vsize: VSIZE NUMBER
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>vsize %f\n", $2.dval);
-	  global_vsize = $2.dval;
+	    fprintf(stderr, ">>>vsize %f\n", $2);
+	  global_vsize = $2;
 	}
 ;
 blackline: BLACKLINE tINT
@@ -434,13 +424,13 @@ noscale: NOSCALE tINT
 color_block1: NUMBER NUMBER NUMBER
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>color_block1 %f %f %f (%d)\n", $1.dval, $2.dval, $3.dval,
+	    fprintf(stderr, ">>>color_block1 %f %f %f (%d)\n", $1, $2, $3,
 		    current_index);
 	  if (current_index < STP_CHANNEL_LIMIT)
 	    {
-	      current_testpattern->d.pattern.mins[current_index] = $1.dval;
-	      current_testpattern->d.pattern.vals[current_index] = $2.dval;
-	      current_testpattern->d.pattern.gammas[current_index] = $3.dval;
+	      current_testpattern->d.pattern.mins[current_index] = $1;
+	      current_testpattern->d.pattern.vals[current_index] = $2;
+	      current_testpattern->d.pattern.gammas[current_index] = $3;
 	      current_index++;
 	    }
 	}
@@ -457,14 +447,14 @@ color_blocks1: color_block1 color_blocks1b
 
 color_block2a: COLOR NUMBER NUMBER NUMBER
 	{
-	  int channel = find_color($1.sval);
+	  int channel = find_color($1);
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>color_block2a %s %f %f %f\n", $1.sval, $2.dval, $3.dval, $4.dval);
+	    fprintf(stderr, ">>>color_block2a %s %f %f %f\n", $1, $2, $3, $4);
 	  if (channel >= 0 && channel < STP_CHANNEL_LIMIT)
 	    {
-	      current_testpattern->d.pattern.mins[channel] = $2.dval;
-	      current_testpattern->d.pattern.vals[channel] = $3.dval;
-	      current_testpattern->d.pattern.gammas[channel] = $4.dval;
+	      current_testpattern->d.pattern.mins[channel] = $2;
+	      current_testpattern->d.pattern.vals[channel] = $3;
+	      current_testpattern->d.pattern.gammas[channel] = $4;
 	    }
 	}
 ;
@@ -472,12 +462,12 @@ color_block2a: COLOR NUMBER NUMBER NUMBER
 color_block2b: CHANNEL tINT NUMBER NUMBER NUMBER
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>color_block2b %d %f %f %f\n", $2, $3.dval, $4.dval, $5.dval);
+	    fprintf(stderr, ">>>color_block2b %d %f %f %f\n", $2, $3, $4, $5);
 	  if ($2 >= 0 && $2 < STP_CHANNEL_LIMIT)
 	    {
-	      current_testpattern->d.pattern.mins[$2] = $3.dval;
-	      current_testpattern->d.pattern.vals[$2] = $4.dval;
-	      current_testpattern->d.pattern.gammas[$2] = $5.dval;
+	      current_testpattern->d.pattern.mins[$2] = $3;
+	      current_testpattern->d.pattern.vals[$2] = $4;
+	      current_testpattern->d.pattern.gammas[$2] = $5;
 	    }
 	}
 ;
@@ -497,13 +487,13 @@ color_blocks: color_blocks1 | color_blocks2
 patvars: NUMBER NUMBER NUMBER NUMBER NUMBER
 	{
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>patvars %f %f %f %f %f\n", $1.dval, $2.dval, $3.dval, $4.dval, $5.dval);
+	    fprintf(stderr, ">>>patvars %f %f %f %f %f\n", $1, $2, $3, $4, $5);
 	  current_testpattern->type = E_PATTERN;
-	  current_testpattern->d.pattern.lower = $1.dval;
-	  current_testpattern->d.pattern.upper = $2.dval;
-	  current_testpattern->d.pattern.levels[1] = $3.dval;
-	  current_testpattern->d.pattern.levels[2] = $4.dval;
-	  current_testpattern->d.pattern.levels[3] = $5.dval;
+	  current_testpattern->d.pattern.lower = $1;
+	  current_testpattern->d.pattern.upper = $2;
+	  current_testpattern->d.pattern.levels[1] = $3;
+	  current_testpattern->d.pattern.levels[2] = $4;
+	  current_testpattern->d.pattern.levels[3] = $5;
 	  current_testpattern = get_next_testpattern();
 	  current_index = 0;
 	}
@@ -555,51 +545,17 @@ image: IMAGE tINT tINT
 	}
 ;
 
-Message0: MESSAGE tSTRING
-	{
-	  fprintf(stderr,"%s",$2);
-	  free($2);
-	}
-;
-Message1: MESSAGE tSTRING tSTRING
-	{
-	  fprintf(stderr,"%s%s", $2, $3);
-	  free($2);
-	  free($3);
-	}
-;
-Message2: MESSAGE tSTRING tSTRING tSTRING
-	{
-	  fprintf(stderr,"%s%s%s", $2, $3, $4);
-	  free($2);
-	  free($3);
-	  free($4);
-	}
-;
-Message3: MESSAGE tSTRING tSTRING tSTRING tSTRING
-	{
-	  fprintf(stderr, "%s%s%s%s", $2, $3, $4, $5);
-	  free($2);
-	  free($3);
-	  free($4);
-	  free($5);
-	}
-;
-Message4: MESSAGE tSTRING tSTRING tSTRING tSTRING tSTRING
+Message: tSTRING
 	{
-	  fprintf(stderr, "%s%s%s%s%s", $2, $3, $4, $5, $6);
-	  free($2);
-	  free($3);
-	  free($4);
-	  free($5);
-	  free($6);
+	  fprintf(stderr,"%s",$1);
+	  free($1);
 	}
 ;
 
-A_Message: Message0 | Message1 | Message2 | Message3 | Message4
+Messages: /* empty */ | Messages Message
 ;
 
-message: A_Message
+message: MESSAGE Messages
 ;
 
 Output0: OUTPUT
@@ -610,16 +566,15 @@ Output0: OUTPUT
 	  global_output = NULL;
 	  output = stdout;
 	}
+;
 
 Output1: OUTPUT tSTRING
 	{
 	  global_output = $2;
 	}
-
-A_Output: Output0 | Output1
 ;
 
-output: A_Output
+output: Output0 | Output1
 ;
 
 start_job: START_JOB
@@ -657,7 +612,7 @@ Image: image
 Rules: /* empty */ | Rules Rule
 ;
 
-Output: Patterns | Image
+Print: Patterns | Image
 ;
 
 EOF: /* empty */ | END SEMI
@@ -668,7 +623,7 @@ Thing: 	Rules
 	{
 	  current_testpattern = get_next_testpattern();
 	}
-	Output EOF
+	Print EOF
 ;
 
 %%
diff --git a/src/xml/Makefile.am b/src/xml/Makefile.am
index d202566..09ebcd8 100644
--- a/src/xml/Makefile.am
+++ b/src/xml/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.4 2008/11/01 18:42:11 rleigh Exp $
+## $Id: Makefile.am,v 1.5 2009/05/30 14:10:31 rlk Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -56,7 +56,7 @@ xmli18n-tmp.h: xml-stamp extract-strings
 	mv $@.tmp $@
 
 
-dist-hook: xmli18n-tmp.h
+dist-hook: xmli18n-tmp.h xml-stamp
 # xmli18n-tmp.h is needed by po/POTFILES.in at dist time
 
 ## Clean
diff --git a/src/xml/Makefile.in b/src/xml/Makefile.in
index 1fbed1d..acf4061 100644
--- a/src/xml/Makefile.in
+++ b/src/xml/Makefile.in
@@ -46,11 +46,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -115,10 +118,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -128,16 +127,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -182,6 +180,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -193,6 +192,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -205,8 +205,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -240,8 +244,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -286,6 +289,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -298,6 +302,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
@@ -731,7 +736,7 @@ xmli18n-tmp.h: xml-stamp extract-strings
 	./extract-strings `cat xml-stamp | sed -e 's;^;$(srcdir)/;'` > $@.tmp
 	mv $@.tmp $@
 
-dist-hook: xmli18n-tmp.h
+dist-hook: xmli18n-tmp.h xml-stamp
 # 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/src/xml/escp2/Makefile.am b/src/xml/escp2/Makefile.am
index 4673658..5e60f6f 100644
--- a/src/xml/escp2/Makefile.am
+++ b/src/xml/escp2/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.8 2008/10/24 00:37:14 rleigh Exp $
+## $Id: Makefile.am,v 1.9 2009/05/30 14:10:32 rlk Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -50,6 +50,8 @@ xml-stamp: media/xml-stamp			\
 	mv $@.tmp $@
 
 all-local: xml-stamp
+
+dist-hook: xml-stamp
 ## Clean
 
 CLEANFILES = xml-stamp
diff --git a/src/xml/escp2/Makefile.in b/src/xml/escp2/Makefile.in
index 17852a1..f4a8999 100644
--- a/src/xml/escp2/Makefile.in
+++ b/src/xml/escp2/Makefile.in
@@ -43,11 +43,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -87,10 +90,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -100,16 +99,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -154,6 +152,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -165,6 +164,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -177,8 +177,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -212,8 +216,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -258,6 +261,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -270,6 +274,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
@@ -497,6 +502,9 @@ distdir: $(DISTFILES)
 	      || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 check-am: all-am
 check: check-recursive
 all-am: Makefile all-local
@@ -587,7 +595,7 @@ uninstall-am:
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am all-local check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive distclean \
+	clean-libtool ctags ctags-recursive dist-hook distclean \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-dvi install-dvi-am \
@@ -636,6 +644,8 @@ xml-stamp: media/xml-stamp			\
 	mv $@.tmp $@
 
 all-local: xml-stamp
+
+dist-hook: xml-stamp
 # 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/src/xml/escp2/inks/Makefile.am b/src/xml/escp2/inks/Makefile.am
index 5095c6a..9879089 100644
--- a/src/xml/escp2/inks/Makefile.am
+++ b/src/xml/escp2/inks/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.7 2008/12/07 20:03:09 rlk Exp $
+## $Id: Makefile.am,v 1.9 2009/05/30 14:10:32 rlk Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -43,6 +43,7 @@ pkgxmldata_DATA =				\
 	f360_photo7_japan.xml			\
 	f360_ultrachrome.xml			\
 	f360_ultrachrome_k3.xml			\
+	f360_ultrachrome_k3v.xml		\
 	nx100.xml				\
 	photo_gen0.xml				\
 	photo_gen1.xml				\
@@ -73,6 +74,7 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am
 
 all-local: xml-stamp
 
+dist-hook: xml-stamp
 CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 
 EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/inks/Makefile.in b/src/xml/escp2/inks/Makefile.in
index 904de98..993abe3 100644
--- a/src/xml/escp2/inks/Makefile.in
+++ b/src/xml/escp2/inks/Makefile.in
@@ -44,11 +44,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -85,10 +88,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -98,16 +97,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -152,6 +150,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -163,6 +162,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -175,8 +175,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -210,8 +214,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -256,6 +259,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -268,6 +272,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
@@ -291,6 +296,7 @@ pkgxmldata_DATA = \
 	f360_photo7_japan.xml			\
 	f360_ultrachrome.xml			\
 	f360_ultrachrome_k3.xml			\
+	f360_ultrachrome_k3v.xml		\
 	nx100.xml				\
 	photo_gen0.xml				\
 	photo_gen1.xml				\
@@ -403,6 +409,9 @@ distdir: $(DISTFILES)
 	    || 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 $(DATA) all-local
@@ -492,9 +501,9 @@ uninstall-am: uninstall-pkgxmldataDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool distclean distclean-generic distclean-libtool \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-dvi \
+	clean-libtool 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-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-pkgxmldataDATA install-ps \
@@ -527,6 +536,8 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am
 	mv $@.tmp $@
 
 all-local: xml-stamp
+
+dist-hook: xml-stamp
 # 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/src/xml/escp2/inks/artisan.xml b/src/xml/escp2/inks/artisan.xml
index 791f6e1..283c12f 100644
--- a/src/xml/escp2/inks/artisan.xml
+++ b/src/xml/escp2/inks/artisan.xml
@@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="artisan_black" index="0">
-    <subchannel color="0" subchannel="0" headOffset="1">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="artisan_photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0" headOffset="1">
+    <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="artisan_photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="artisan_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="artisan_photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0" headOffset="1">
+    <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="artisan_photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="artisan_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="artisan_black" index="0">
-    <subchannel color="0" subchannel="0" headOffset="1">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="artisan_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0" headOffset="1">
+    <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="artisan_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="artisan_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="artisan_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0" headOffset="1">
+    <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="artisan_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="artisan_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="artisan_cyan" index="0">
-    <subchannel color="2" subchannel="0" headOffset="1">
+    <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="artisan_magenta" index="1">
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="artisan_yellow" index="2">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="artisan_black" index="0">
-    <subchannel color="0" subchannel="0" headOffset="1">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="artisan_cyan" index="1">
-    <subchannel color="2" subchannel="0" headOffset="1">
+    <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="artisan_magenta" index="2">
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="artisan_yellow" index="3">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
   <Channels>
    <channel name="artisan_cyan" index="0">
-    <subchannel color="2" subchannel="0" headOffset="1">
+    <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_artisan_cyan" index="1">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="artisan_magenta" index="2">
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_artisan_magenta" index="3">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="artisan_yellow" index="4">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="artisan_black" index="0">
-    <subchannel color="0" subchannel="0" headOffset="1">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="artisan_cyan" index="1">
-    <subchannel color="2" subchannel="0" headOffset="1">
+    <subchannel color="2" subchannel="0" headOffset="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_artisan_cyan" index="2">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="artisan_magenta" index="3">
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_artisan_magenta" index="4">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="artisan_yellow" index="5">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/b500.xml b/src/xml/escp2/inks/b500.xml
index 661b168..b05cc3a 100644
--- a/src/xml/escp2/inks/b500.xml
+++ b/src/xml/escp2/inks/b500.xml
@@ -32,28 +32,28 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="b500_black" index="0">
-    <subchannel color="0" subchannel="4">
+    <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SplitChannels count="2">0 64</SplitChannels>
     </subchannel>
    </channel>
    <channel name="b500_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="4">
+    <subchannel color="2" subchannel="4" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SplitChannels count="2">2 66</SplitChannels>
     </subchannel>
    </channel>
    <channel name="b500_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="4">
+    <subchannel color="1" subchannel="4" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SplitChannels count="2">1 65</SplitChannels>
     </subchannel>
    </channel>
    <channel name="b500_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="4">
+    <subchannel color="4" subchannel="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
      <SplitChannels count="2">4 68</SplitChannels>
     </subchannel>
@@ -65,21 +65,21 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="b500_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="4">
+    <subchannel color="2" subchannel="4" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SplitChannels count="2">2 66</SplitChannels>
     </subchannel>
    </channel>
    <channel name="b500_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="4">
+    <subchannel color="1" subchannel="4" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SplitChannels count="2">1 65</SplitChannels>
     </subchannel>
    </channel>
    <channel name="b500_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>e
-    <subchannel color="4" subchannel="4">
+    <subchannel color="4" subchannel="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
      <SplitChannels count="2">4 68</SplitChannels>
     </subchannel>
@@ -90,7 +90,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="b500_black" index="0">
-    <subchannel color="0" subchannel="4">
+    <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SplitChannels count="2">0 64</SplitChannels>
     </subchannel>
@@ -101,19 +101,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="b500_cyan" index="0">
-    <subchannel color="2" subchannel="4">
+    <subchannel color="2" subchannel="4" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SplitChannels count="2">2 66</SplitChannels>
     </subchannel>
    </channel>
    <channel name="b500_magenta" index="1">
-    <subchannel color="1" subchannel="4">
+    <subchannel color="1" subchannel="4" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SplitChannels count="2">1 65</SplitChannels>
     </subchannel>
    </channel>
    <channel name="b500_yellow" index="2">
-    <subchannel color="4" subchannel="4">
+    <subchannel color="4" subchannel="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
      <SplitChannels count="2">4 68</SplitChannels>
     </subchannel>
@@ -124,25 +124,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="b500_black" index="0">
-    <subchannel color="0" subchannel="4">
+    <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SplitChannels count="2">0 64</SplitChannels>
     </subchannel>
    </channel>
    <channel name="b500_cyan" index="1">
-    <subchannel color="2" subchannel="4">
+    <subchannel color="2" subchannel="4" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SplitChannels count="2">2 66</SplitChannels>
     </subchannel>
    </channel>
    <channel name="b500_magenta" index="2">
-    <subchannel color="1" subchannel="4">
+    <subchannel color="1" subchannel="4" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SplitChannels count="2">1 65</SplitChannels>
     </subchannel>
    </channel>
    <channel name="b500_yellow" index="3">
-    <subchannel color="4" subchannel="4">
+    <subchannel color="4" subchannel="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
      <SplitChannels count="2">4 68</SplitChannels>
     </subchannel>
diff --git a/src/xml/escp2/inks/c120.xml b/src/xml/escp2/inks/c120.xml
index ca26273..40f360f 100644
--- a/src/xml/escp2/inks/c120.xml
+++ b/src/xml/escp2/inks/c120.xml
@@ -32,26 +32,26 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="c120_black" index="0">
-    <subchannel color="0" subchannel="4">
+    <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SplitChannels count="2">0 64</SplitChannels>
     </subchannel>
    </channel>
    <channel name="c120_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="c120_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="120">
+    <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="c120_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" headOffset="240">
+    <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -62,19 +62,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="c120_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="c120_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="120">
+    <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="c120_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" headOffset="240">
+    <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -84,7 +84,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="c120_black" index="0">
-    <subchannel color="0" subchannel="4">
+    <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SplitChannels count="2">0 64</SplitChannels>
     </subchannel>
@@ -95,17 +95,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="c120_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="c120_magenta" index="1">
-    <subchannel color="1" headOffset="120">
+    <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="c120_yellow" index="2">
-    <subchannel color="4" headOffset="240">
+    <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -115,23 +115,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="c120_black" index="0">
-    <subchannel color="0" subchannel="4">
+    <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SplitChannels count="2">0 64</SplitChannels>
     </subchannel>
    </channel>
    <channel name="c120_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="c120_magenta" index="2">
-    <subchannel color="1" headOffset="120">
+    <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="c120_yellow" index="3">
-    <subchannel color="4" headOffset="240">
+    <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/c64.xml b/src/xml/escp2/inks/c64.xml
index ee18fad..bcae2c3 100644
--- a/src/xml/escp2/inks/c64.xml
+++ b/src/xml/escp2/inks/c64.xml
@@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="c64_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="c64_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="c64_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="90">
+    <subchannel color="1" headOffset="90" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="c64_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" headOffset="180">
+    <subchannel color="4" headOffset="180" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="c64_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="c64_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="90">
+    <subchannel color="1" headOffset="90" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="c64_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" headOffset="180">
+    <subchannel color="4" headOffset="180" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="c64_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="c64_magenta" index="1">
-    <subchannel color="1" headOffset="90">
+    <subchannel color="1" headOffset="90" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="c64_yellow" index="2">
-    <subchannel color="4" headOffset="180">
+    <subchannel color="4" headOffset="180" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="c64_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="c64_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="c64_magenta" index="2">
-    <subchannel color="1" headOffset="90">
+    <subchannel color="1" headOffset="90" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="c64_yellow" index="3">
-    <subchannel color="4" headOffset="180">
+    <subchannel color="4" headOffset="180" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -143,23 +143,58 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
   <Channels>
    <channel name="c64_quadtone" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+    </subchannel>
+    <subchannel color="2" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1" headOffset="90" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4" headOffset="180" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="MISQuadtone" text="MIS Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="c64_quadtone" index="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
     </subchannel>
-    <subchannel color="2">
+    <subchannel color="1" headOffset="90" name="Gray3" text="Gray 3" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="Gray3Trans"/>
      <SubchannelValueParam name="Gray3Value"/>
      <SubchannelScaleParam name="Gray3Scale"/>
     </subchannel>
-    <subchannel color="1" headOffset="90">
+    <subchannel color="4" headOffset="180" name="Gray2" text="Gray 2" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="Gray2Trans"/>
      <SubchannelValueParam name="Gray2Value"/>
      <SubchannelScaleParam name="Gray2Scale"/>
     </subchannel>
-    <subchannel color="4" headOffset="180">
+    <subchannel color="2" name="Gray1" text="Gray 1" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="Gray1Trans"/>
      <SubchannelValueParam name="Gray1Value"/>
diff --git a/src/xml/escp2/inks/c80.xml b/src/xml/escp2/inks/c80.xml
index 1012631..7528a47 100644
--- a/src/xml/escp2/inks/c80.xml
+++ b/src/xml/escp2/inks/c80.xml
@@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="c80_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="c80_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="c80_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="120">
+    <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="c80_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" headOffset="240">
+    <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="c80_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="c80_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="120">
+    <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="c80_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" headOffset="240">
+    <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="c80_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="c80_magenta" index="1">
-    <subchannel color="1" headOffset="120">
+    <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="c80_yellow" index="2">
-    <subchannel color="4" headOffset="240">
+    <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="c80_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="c80_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="c80_magenta" index="2">
-    <subchannel color="1" headOffset="120">
+    <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="c80_yellow" index="3">
-    <subchannel color="4" headOffset="240">
+    <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -144,25 +144,60 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
   <Channels>
    <channel name="c80_quadtone" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
     </subchannel>
-    <subchannel color="2">
+    <subchannel color="2" name="Gray3" text="Gray 3" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
      <SubchannelValueParam name="Gray3Value"/>
      <SubchannelScaleParam name="Gray3Scale"/>
     </subchannel>
-    <subchannel color="1" headOffset="120">
+    <subchannel color="1" headOffset="120" name="Gray2" text="Gray 2" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
      <SubchannelValueParam name="Gray2Value"/>
      <SubchannelScaleParam name="Gray2Scale"/>
     </subchannel>
-    <subchannel color="4" headOffset="240">
+    <subchannel color="4" headOffset="240" name="Gray1" text="Gray 1" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="MISQuadtone" text="MIS Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="c80_quadtone" index="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+    </subchannel>
+    <subchannel color="1" headOffset="120" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="4" headOffset="240" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="2" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
      <SubchannelValueParam name="Gray1Value"/>
      <SubchannelScaleParam name="Gray1Scale"/>
     </subchannel>
diff --git a/src/xml/escp2/inks/c82.xml b/src/xml/escp2/inks/c82.xml
index 732a6c3..66d6e47 100644
--- a/src/xml/escp2/inks/c82.xml
+++ b/src/xml/escp2/inks/c82.xml
@@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="c80_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="c80_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="c80_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="120">
+    <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="c80_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" headOffset="240">
+    <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="c80_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="c80_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="120">
+    <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="c80_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" headOffset="240">
+    <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="c80_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="c80_magenta" index="1">
-    <subchannel color="1" headOffset="120">
+    <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="c80_yellow" index="2">
-    <subchannel color="4" headOffset="240">
+    <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="c80_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="c80_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="c80_magenta" index="2">
-    <subchannel color="1" headOffset="120">
+    <subchannel color="1" headOffset="120" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="c80_yellow" index="3">
-    <subchannel color="4" headOffset="240">
+    <subchannel color="4" headOffset="240" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -144,25 +144,60 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
   <Channels>
    <channel name="c80_quadtone" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
     </subchannel>
-    <subchannel color="2">
+    <subchannel color="2" name="Gray3" text="Gray 3" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
      <SubchannelValueParam name="Gray3Value"/>
      <SubchannelScaleParam name="Gray3Scale"/>
     </subchannel>
-    <subchannel color="1" headOffset="120">
+    <subchannel color="1" headOffset="120" name="Gray2" text="Gray 2" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
      <SubchannelValueParam name="Gray2Value"/>
      <SubchannelScaleParam name="Gray2Scale"/>
     </subchannel>
-    <subchannel color="4" headOffset="240">
+    <subchannel color="4" headOffset="240" name="Gray1" text="Gray 1" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="MISQuadtone" text="MIS Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="c80_quadtone" index="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+    </subchannel>
+    <subchannel color="1" headOffset="120" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="4" headOffset="240" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="2" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
      <SubchannelValueParam name="Gray1Value"/>
      <SubchannelScaleParam name="Gray1Scale"/>
     </subchannel>
diff --git a/src/xml/escp2/inks/claria.xml b/src/xml/escp2/inks/claria.xml
index 30c0abb..5874a95 100644
--- a/src/xml/escp2/inks/claria.xml
+++ b/src/xml/escp2/inks/claria.xml
@@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="claria_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="claria_photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1" headOffset="2">
+    <subchannel color="2" subchannel="1" headOffset="2" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="claria_photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0" headOffset="2">
+    <subchannel color="1" subchannel="0" headOffset="2" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="claria_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0" headOffset="2">
+    <subchannel color="4" subchannel="0" headOffset="2" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="claria_photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1" headOffset="2">
+    <subchannel color="2" subchannel="1" headOffset="2" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="claria_photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0" headOffset="2">
+    <subchannel color="1" subchannel="0" headOffset="2" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="claria_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>e
-    <subchannel color="4" subchannel="0" headOffset="2">
+    <subchannel color="4" subchannel="0" headOffset="2" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="claria_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="claria_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="claria_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0" headOffset="2">
+    <subchannel color="1" subchannel="0" headOffset="2" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="claria_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0" headOffset="2">
+    <subchannel color="4" subchannel="0" headOffset="2" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="claria_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="claria_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0" headOffset="2">
+    <subchannel color="1" subchannel="0" headOffset="2" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="claria_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0" headOffset="2">
+    <subchannel color="4" subchannel="0" headOffset="2" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="claria_cyan" index="0">
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="claria_magenta" index="1">
-    <subchannel color="1" subchannel="0" headOffset="2">
+    <subchannel color="1" subchannel="0" headOffset="2" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="claria_yellow" index="2">
-    <subchannel color="4" subchannel="0" headOffset="2">
+    <subchannel color="4" subchannel="0" headOffset="2" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="claria_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="claria_cyan" index="1">
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="claria_magenta" index="2">
-    <subchannel color="1" subchannel="0" headOffset="2">
+    <subchannel color="1" subchannel="0" headOffset="2" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="claria_yellow" index="3">
-    <subchannel color="4" subchannel="0" headOffset="2">
+    <subchannel color="4" subchannel="0" headOffset="2" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
   <Channels>
    <channel name="claria_cyan" index="0">
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_claria_cyan" index="1">
-    <subchannel color="2" subchannel="1" headOffset="2">
+    <subchannel color="2" subchannel="1" headOffset="2" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="claria_magenta" index="2">
-    <subchannel color="1" subchannel="0" headOffset="2">
+    <subchannel color="1" subchannel="0" headOffset="2" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_claria_magenta" index="3">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="claria_yellow" index="4">
-    <subchannel color="4" subchannel="0" headOffset="2">
+    <subchannel color="4" subchannel="0" headOffset="2" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="claria_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="claria_cyan" index="1">
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_claria_cyan" index="2">
-    <subchannel color="2" subchannel="1" headOffset="2">
+    <subchannel color="2" subchannel="1" headOffset="2" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="claria_magenta" index="3">
-    <subchannel color="1" subchannel="0" headOffset="2">
+    <subchannel color="1" subchannel="0" headOffset="2" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_claria_magenta" index="4">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="claria_yellow" index="5">
-    <subchannel color="4" subchannel="0" headOffset="2">
+    <subchannel color="4" subchannel="0" headOffset="2" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/cmy.xml b/src/xml/escp2/inks/cmy.xml
index 8637a69..d6d362f 100644
--- a/src/xml/escp2/inks/cmy.xml
+++ b/src/xml/escp2/inks/cmy.xml
@@ -33,19 +33,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/cmykrb.xml b/src/xml/escp2/inks/cmykrb.xml
index 4355a52..589ced0 100644
--- a/src/xml/escp2/inks/cmykrb.xml
+++ b/src/xml/escp2/inks/cmykrb.xml
@@ -89,49 +89,49 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYKRBG" text="Six Color Photo" InkID="OTHER">
   <Channels>
    <channel name="f360_photo_black" index="0">
-    <subchannel color="0" subchannel="4" headOffset="1">
+    <subchannel color="0" subchannel="4" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
     <HueCurve ref="cmykrbCyan"/>
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
     <HueCurve ref="cmykrbMagenta"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
     <HueCurve ref="cmykrbYellow"/>
-    <subchannel color="4" headOffset="1">
+    <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_red" index="4">
     <HueCurveParam name="RedHueCurve"/>
     <HueCurve ref="cmykrbRed"/>
-    <subchannel color="7">
+    <subchannel color="7" name="Red" text="Red" translate="text">
      <ChannelDensityParam name="RedDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_blue" index="5">
     <HueCurveParam name="BlueHueCurve"/>
     <HueCurve ref="cmykrbBlue"/>
-    <subchannel color="8" headOffset="1">
+    <subchannel color="8" headOffset="1" name="Blue" text="Blue" translate="text">
      <ChannelDensityParam name="BlueDensity"/>
     </subchannel>
    </channel>
   </Channels>
   <AuxChannels>
    <channel name="standard_gloss" index="0">
-    <subchannel color="9">
+    <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text">
      <ChannelDensityParam name="GlossDensity"/>
     </subchannel>
    </channel>
@@ -143,42 +143,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    <channel name="r800_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
     <HueCurve ref="cmykrbCyan"/>
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
     <HueCurve ref="cmykrbMagenta"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
     <HueCurve ref="cmykrbYellow"/>
-    <subchannel color="4" headOffset="1">
+    <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_red" index="4">
     <HueCurveParam name="RedHueCurve"/>
     <HueCurve ref="cmykrbRed"/>
-    <subchannel color="7">
+    <subchannel color="7" name="Red" text="Red" translate="text">
      <ChannelDensityParam name="RedDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_blue" index="5">
     <HueCurveParam name="BlueHueCurve"/>
     <HueCurve ref="cmykrbBlue"/>
-    <subchannel color="8" headOffset="1">
+    <subchannel color="8" headOffset="1" name="Blue" text="Blue" translate="text">
      <ChannelDensityParam name="BlueDensity"/>
     </subchannel>
    </channel>
   </Channels>
   <AuxChannels>
    <channel name="standard_gloss" index="0">
-    <subchannel color="9">
+    <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text">
      <ChannelDensityParam name="GlossDensity"/>
     </subchannel>
    </channel>
@@ -188,29 +188,29 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYKG" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="f360_photo_black" index="0">
-    <subchannel color="0" subchannel="4" headOffset="1">
+    <subchannel color="0" subchannel="4" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_cyan" index="1">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_yellow" index="3">
-    <subchannel color="4" headOffset="1">
+    <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
   </Channels>
   <AuxChannels>
    <channel name="standard_gloss" index="0">
-    <subchannel color="9">
+    <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text">
      <ChannelDensityParam name="GlossDensity"/>
     </subchannel>
    </channel>
@@ -220,24 +220,24 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="RGBG" text="Three Color Composite" InkID="CMYK">
   <Channels>
    <channel name="f360_standard_cyan" index="1">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_yellow" index="3">
-    <subchannel color="4" headOffset="1">
+    <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
   </Channels>
   <AuxChannels>
    <channel name="standard_gloss" index="0">
-    <subchannel color="9">
+    <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text">
      <ChannelDensityParam name="GlossDensity"/>
     </subchannel>
    </channel>
@@ -247,7 +247,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -257,12 +257,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlackGloss" text="One Color Raw Enhanced Gloss" InkID="Extended">
   <Channels>
    <channel name="f360_photo_black" index="0">
-    <subchannel color="0" subchannel="4" headOffset="1">
+    <subchannel color="0" subchannel="4" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_gloss" index="1">
-    <subchannel color="9">
+    <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text">
      <ChannelDensityParam name="GlossDensity"/>
     </subchannel>
    </channel>
@@ -272,17 +272,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="f360_standard_cyan" index="0">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_yellow" index="2">
-    <subchannel color="4" headOffset="1">
+    <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -292,22 +292,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYGloss" text="Three Color Raw Gloss" InkID="Extended">
   <Channels>
    <channel name="f360_standard_cyan" index="0">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_yellow" index="2">
-    <subchannel color="4" headOffset="1">
+    <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_gloss" index="3">
-    <subchannel color="9">
+    <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text">
      <ChannelDensityParam name="GlossDensity"/>
     </subchannel>
    </channel>
@@ -317,27 +317,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYKGloss" text="Four Color Raw Gloss" InkID="Extended">
   <Channels>
    <channel name="f360_photo_black" index="0">
-    <subchannel color="0" subchannel="4" headOffset="1">
+    <subchannel color="0" subchannel="4" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_cyan" index="1">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_yellow" index="3">
-    <subchannel color="4" headOffset="1">
+    <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_gloss" index="4">
-    <subchannel color="9">
+    <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text">
      <ChannelDensityParam name="GlossDensity"/>
     </subchannel>
    </channel>
@@ -347,37 +347,37 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYKRB" text="Six Color Enhanced Gloss Raw" InkID="Extended">
   <Channels>
    <channel name="f360_photo_black" index="0">
-    <subchannel color="0" subchannel="4" headOffset="1">
+    <subchannel color="0" subchannel="4" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_cyan" index="1">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_yellow" index="3">
-    <subchannel color="4" headOffset="1">
+    <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_red" index="4">
-    <subchannel color="7">
+    <subchannel color="7" name="Red" text="Red" translate="text">
      <ChannelDensityParam name="RedDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_blue" index="5">
-    <subchannel color="8" headOffset="1">
+    <subchannel color="8" headOffset="1" name="Blue" text="Blue" translate="text">
      <ChannelDensityParam name="BlueDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_gloss" index="6">
-    <subchannel color="9">
+    <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text">
      <ChannelDensityParam name="GlossDensity"/>
     </subchannel>
    </channel>
@@ -387,42 +387,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYKPRB" text="Seven Color Enhanced Gloss Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="MatteBlack" text="Matte Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_photo_black" index="1">
-    <subchannel color="0" subchannel="4" headOffset="1">
+    <subchannel color="0" subchannel="4" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_cyan" index="2">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_magenta" index="3">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_yellow" index="4">
-    <subchannel color="4" headOffset="1">
+    <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_red" index="5">
-    <subchannel color="7">
+    <subchannel color="7" name="Red" text="Red" translate="text">
      <ChannelDensityParam name="RedDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_blue" index="6">
-    <subchannel color="8" headOffset="1">
+    <subchannel color="8" headOffset="1" name="Blue" text="Blue" translate="text">
      <ChannelDensityParam name="BlueDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_gloss" index="7">
-    <subchannel color="9">
+    <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text">
      <ChannelDensityParam name="GlossDensity"/>
     </subchannel>
    </channel>
@@ -443,42 +443,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYKRB" text="Six Color Photo" InkID="OTHER">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
     <HueCurve ref="cmykrbCyan"/>
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
     <HueCurve ref="cmykrbMagenta"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
     <HueCurve ref="cmykrbYellow"/>
-    <subchannel color="4" headOffset="1">
+    <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_red" index="4">
     <HueCurveParam name="RedHueCurve"/>
     <HueCurve ref="cmykrbRed"/>
-    <subchannel color="7">
+    <subchannel color="7" name="Red" text="Red" translate="text">
      <ChannelDensityParam name="RedDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_blue" index="5">
     <HueCurveParam name="BlueHueCurve"/>
     <HueCurve ref="cmykrbBlue"/>
-    <subchannel color="8" headOffset="1">
+    <subchannel color="8" headOffset="1" name="Blue" text="Blue" translate="text">
      <ChannelDensityParam name="BlueDensity"/>
     </subchannel>
    </channel>
@@ -490,35 +490,35 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    <channel name="r800_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
     <HueCurve ref="cmykrbCyan"/>
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
     <HueCurve ref="cmykrbMagenta"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
     <HueCurve ref="cmykrbYellow"/>
-    <subchannel color="4" headOffset="1">
+    <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_red" index="4">
     <HueCurveParam name="RedHueCurve"/>
     <HueCurve ref="cmykrbRed"/>
-    <subchannel color="7">
+    <subchannel color="7" name="Red" text="Red" translate="text">
      <ChannelDensityParam name="RedDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_blue" index="5">
     <HueCurveParam name="BlueHueCurve"/>
     <HueCurve ref="cmykrbBlue"/>
-    <subchannel color="8" headOffset="1">
+    <subchannel color="8" headOffset="1" name="Blue" text="Blue" translate="text">
      <ChannelDensityParam name="BlueDensity"/>
     </subchannel>
    </channel>
@@ -528,22 +528,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYKG" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_cyan" index="1">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_yellow" index="3">
-    <subchannel color="4" headOffset="1">
+    <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -553,17 +553,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="RGBG" text="Three Color Composite" InkID="CMYK">
   <Channels>
    <channel name="f360_standard_cyan" index="1">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_yellow" index="3">
-    <subchannel color="4" headOffset="1">
+    <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -573,7 +573,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -583,17 +583,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="f360_standard_cyan" index="0">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_yellow" index="2">
-    <subchannel color="4" headOffset="1">
+    <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -603,22 +603,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYKGloss" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_cyan" index="1">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_yellow" index="3">
-    <subchannel color="4" headOffset="1">
+    <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -628,32 +628,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYKRB" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_cyan" index="1">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_yellow" index="3">
-    <subchannel color="4" headOffset="1">
+    <subchannel color="4" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_red" index="4">
-    <subchannel color="7">
+    <subchannel color="7" name="Red" text="Red" translate="text">
      <ChannelDensityParam name="RedDensity"/>
     </subchannel>
    </channel>
    <channel name="r800_blue" index="5">
-    <subchannel color="8" headOffset="1">
+    <subchannel color="8" headOffset="1" name="Blue" text="Blue" translate="text">
      <ChannelDensityParam name="BlueDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/cmykro.xml b/src/xml/escp2/inks/cmykro.xml
index 3a68f1b..d03abb9 100644
--- a/src/xml/escp2/inks/cmykro.xml
+++ b/src/xml/escp2/inks/cmykro.xml
@@ -88,49 +88,49 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYKROG" text="Six Color Photo" InkID="OTHER">
   <Channels>
    <channel name="f360_photo_black" index="0">
-    <subchannel color="0" subchannel="4">
+    <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
     <HueCurve ref="cmykroCyan"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
     <HueCurve ref="cmykroMagenta"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
     <HueCurve ref="cmykroYellow"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_red" index="4">
     <HueCurveParam name="RedHueCurve"/>
     <HueCurve ref="cmykroRed"/>
-    <subchannel color="7">
+    <subchannel color="7" name="Red" text="Red" translate="text">
      <ChannelDensityParam name="RedDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_orange" index="5">
     <HueCurveParam name="OrangeHueCurve"/>
     <HueCurve ref="cmykroOrange"/>
-    <subchannel color="10">
+    <subchannel color="10" name="Orange" text="Orange" translate="text">
      <ChannelDensityParam name="OrangeDensity"/>
     </subchannel>
    </channel>
   </Channels>
   <AuxChannels>
    <channel name="standard_gloss" index="0">
-    <subchannel color="9">
+    <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text">
      <ChannelDensityParam name="GlossDensity"/>
     </subchannel>
    </channel>
@@ -142,42 +142,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    <channel name="r1900_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
     <HueCurve ref="cmykroCyan"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
     <HueCurve ref="cmykroMagenta"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
     <HueCurve ref="cmykroYellow"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_red" index="4">
     <HueCurveParam name="RedHueCurve"/>
     <HueCurve ref="cmykroRed"/>
-    <subchannel color="7">
+    <subchannel color="7" name="Red" text="Red" translate="text">
      <ChannelDensityParam name="RedDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_orange" index="5">
     <HueCurveParam name="OrangeHueCurve"/>
     <HueCurve ref="cmykroOrange"/>
-    <subchannel color="10">
+    <subchannel color="10" name="Orange" text="Orange" translate="text">
      <ChannelDensityParam name="OrangeDensity"/>
     </subchannel>
    </channel>
   </Channels>
   <AuxChannels>
    <channel name="standard_gloss" index="0">
-    <subchannel color="9">
+    <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text">
      <ChannelDensityParam name="GlossDensity"/>
     </subchannel>
    </channel>
@@ -187,29 +187,29 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYKG" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="f360_photo_black" index="0">
-    <subchannel color="0" subchannel="4">
+    <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
   </Channels>
   <AuxChannels>
    <channel name="standard_gloss" index="0">
-    <subchannel color="9">
+    <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text">
      <ChannelDensityParam name="GlossDensity"/>
     </subchannel>
    </channel>
@@ -219,24 +219,24 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="RGBG" text="Three Color Composite" InkID="CMYK">
   <Channels>
    <channel name="f360_standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
   </Channels>
   <AuxChannels>
    <channel name="standard_gloss" index="0">
-    <subchannel color="9">
+    <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text">
      <ChannelDensityParam name="GlossDensity"/>
     </subchannel>
    </channel>
@@ -246,7 +246,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -256,12 +256,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlackGloss" text="One Color Raw Enhanced Gloss" InkID="Extended">
   <Channels>
    <channel name="f360_photo_black" index="0">
-    <subchannel color="0" subchannel="4">
+    <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_gloss" index="1">
-    <subchannel color="9">
+    <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text">
      <ChannelDensityParam name="GlossDensity"/>
     </subchannel>
    </channel>
@@ -271,17 +271,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="f360_standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -291,22 +291,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYGloss" text="Three Color Raw Gloss" InkID="Extended">
   <Channels>
    <channel name="f360_standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_gloss" index="3">
-    <subchannel color="9">
+    <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text">
      <ChannelDensityParam name="GlossDensity"/>
     </subchannel>
    </channel>
@@ -316,27 +316,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYKGloss" text="Four Color Raw Gloss" InkID="Extended">
   <Channels>
    <channel name="f360_photo_black" index="0">
-    <subchannel color="0" subchannel="4">
+    <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_gloss" index="4">
-    <subchannel color="9">
+    <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text">
      <ChannelDensityParam name="GlossDensity"/>
     </subchannel>
    </channel>
@@ -346,37 +346,37 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYKRO" text="Six Color Enhanced Gloss Raw" InkID="Extended">
   <Channels>
    <channel name="f360_photo_black" index="0">
-    <subchannel color="0" subchannel="4">
+    <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_red" index="4">
-    <subchannel color="7">
+    <subchannel color="7" name="Red" text="Red" translate="text">
      <ChannelDensityParam name="RedDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_orange" index="5">
-    <subchannel color="10">
+    <subchannel color="10" name="Orange" text="Orange" translate="text">
      <ChannelDensityParam name="OrangeDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_gloss" index="6">
-    <subchannel color="9">
+    <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text">
      <ChannelDensityParam name="GlossDensity"/>
     </subchannel>
    </channel>
@@ -386,42 +386,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYKPRO" text="Seven Color Enhanced Gloss Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="MatteBlack" text="MatteBlack" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_photo_black" index="1">
-    <subchannel color="0" subchannel="4">
+    <subchannel color="0" subchannel="4" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_cyan" index="2">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_magenta" index="3">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_yellow" index="4">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_red" index="5">
-    <subchannel color="7">
+    <subchannel color="7" name="Red" text="Red" translate="text">
      <ChannelDensityParam name="RedDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_orange" index="6">
-    <subchannel color="10">
+    <subchannel color="10" name="Orange" text="Orange" translate="text">
      <ChannelDensityParam name="OrangeDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_gloss" index="7">
-    <subchannel color="9">
+    <subchannel color="9" name="Gloss" text="Gloss Optimizer" translate="text">
      <ChannelDensityParam name="GlossDensity"/>
     </subchannel>
    </channel>
@@ -442,42 +442,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYKRO" text="Six Color Photo" InkID="OTHER">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0" headOffset="1">
+    <subchannel color="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
     <HueCurve ref="cmykroCyan"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
     <HueCurve ref="cmykroMagenta"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
     <HueCurve ref="cmykroYellow"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_red" index="4">
     <HueCurveParam name="RedHueCurve"/>
     <HueCurve ref="cmykroRed"/>
-    <subchannel color="7">
+    <subchannel color="7" name="Red" text="Red" translate="text">
      <ChannelDensityParam name="RedDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_orange" index="5">
     <HueCurveParam name="OrangeHueCurve"/>
     <HueCurve ref="cmykroOrange"/>
-    <subchannel color="10">
+    <subchannel color="10" name="Orange" text="Orange" translate="text">
      <ChannelDensityParam name="OrangeDensity"/>
     </subchannel>
    </channel>
@@ -489,35 +489,35 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    <channel name="r1900_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
     <HueCurve ref="cmykroCyan"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
     <HueCurve ref="cmykroMagenta"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
     <HueCurve ref="cmykroYellow"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_red" index="4">
     <HueCurveParam name="RedHueCurve"/>
     <HueCurve ref="cmykroRed"/>
-    <subchannel color="7">
+    <subchannel color="7" name="Red" text="Red" translate="text">
      <ChannelDensityParam name="RedDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_orange" index="5">
     <HueCurveParam name="OrangeHueCurve"/>
     <HueCurve ref="cmykroOrange"/>
-    <subchannel color="10">
+    <subchannel color="10" name="Orange" text="Orange" translate="text">
      <ChannelDensityParam name="OrangeDensity"/>
     </subchannel>
    </channel>
@@ -527,22 +527,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYKG" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0" headOffset="1">
+    <subchannel color="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -552,17 +552,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="RGBG" text="Three Color Composite" InkID="CMYK">
   <Channels>
    <channel name="f360_standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -572,7 +572,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0" headOffset="1">
+    <subchannel color="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -582,42 +582,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="f360_standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
   </Channels>
  </InkName>
 
- <InkName translate="text" name="PhysicalCMYKGloss" text="Four Color Raw" InkID="Extended">
+ <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0" headOffset="1">
+    <subchannel color="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -627,32 +627,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYKRO" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0" headOffset="1">
+    <subchannel color="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_red" index="4">
-    <subchannel color="7">
+    <subchannel color="7" name="Red" text="Red" translate="text">
      <ChannelDensityParam name="RedDensity"/>
     </subchannel>
    </channel>
    <channel name="r1900_orange" index="5">
-    <subchannel color="10">
+    <subchannel color="10" name="Orange" text="Orange" translate="text">
      <ChannelDensityParam name="OrangeDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/cx3650.xml b/src/xml/escp2/inks/cx3650.xml
index c237561..77d908b 100644
--- a/src/xml/escp2/inks/cx3650.xml
+++ b/src/xml/escp2/inks/cx3650.xml
@@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="cx3650_standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" headOffset="2">
+    <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="cx3650_standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" headOffset="2">
+    <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="cx3650_standard_cyan" index="0">
-    <subchannel color="2" headOffset="2">
+    <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="1">
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="cx3650_standard_cyan" index="1">
-    <subchannel color="2" headOffset="2">
+    <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="2">
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -143,25 +143,60 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
   <Channels>
    <channel name="cx3650_quadtone" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
     </subchannel>
-    <subchannel color="2" headOffset="2">
+    <subchannel color="2" headOffset="2" name="Gray3" text="Gray 3" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
      <SubchannelValueParam name="Gray3Value"/>
      <SubchannelScaleParam name="Gray3Scale"/>
     </subchannel>
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Gray2" text="Gray 2" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
      <SubchannelValueParam name="Gray2Value"/>
      <SubchannelScaleParam name="Gray2Scale"/>
     </subchannel>
-    <subchannel color="4">
+    <subchannel color="4" name="Gray1" text="Gray 1" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="MISQuadtone" text="MIS Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="cx3650_quadtone" index="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+    </subchannel>
+    <subchannel color="1" headOffset="2" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="4" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="2" headOffset="2" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
      <SubchannelValueParam name="Gray1Value"/>
      <SubchannelScaleParam name="Gray1Scale"/>
     </subchannel>
diff --git a/src/xml/escp2/inks/defaultblack.xml b/src/xml/escp2/inks/defaultblack.xml
index 3a12214..2d0f6e6 100644
--- a/src/xml/escp2/inks/defaultblack.xml
+++ b/src/xml/escp2/inks/defaultblack.xml
@@ -29,7 +29,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Default Black" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0" shade="1.000000">
+    <subchannel color="0" shade="1.000000" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/f360.xml b/src/xml/escp2/inks/f360.xml
index 0a10492..ef33d13 100644
--- a/src/xml/escp2/inks/f360.xml
+++ b/src/xml/escp2/inks/f360.xml
@@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="f360_standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="f360_standard_cyan" index="0">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="1">
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_cyan" index="1">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="2">
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -144,25 +144,60 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
   <Channels>
    <channel name="f360_quadtone" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
     </subchannel>
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Gray3" text="Gray 3" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
      <SubchannelValueParam name="Gray3Value"/>
      <SubchannelScaleParam name="Gray3Scale"/>
     </subchannel>
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Gray2" text="Gray 2" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
      <SubchannelValueParam name="Gray2Value"/>
      <SubchannelScaleParam name="Gray2Scale"/>
     </subchannel>
-    <subchannel color="4">
+    <subchannel color="4" name="Gray1" text="Gray 1" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="MISQuadtone" text="MIS Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="f360_quadtone" index="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+    </subchannel>
+    <subchannel color="1" headOffset="1" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="4" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="2" headOffset="1" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
      <SubchannelValueParam name="Gray1Value"/>
      <SubchannelScaleParam name="Gray1Scale"/>
     </subchannel>
diff --git a/src/xml/escp2/inks/f360_photo.xml b/src/xml/escp2/inks/f360_photo.xml
index e4e5295..0efd6b9 100644
--- a/src/xml/escp2/inks/f360_photo.xml
+++ b/src/xml/escp2/inks/f360_photo.xml
@@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0" headOffset="1">
+    <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0" headOffset="1">
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="f360_photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0" headOffset="1">
+    <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0" headOffset="1">
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_cyan" index="1">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="2">
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
   <Channels>
    <channel name="f360_standard_cyan" index="0">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="1">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="2">
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="3">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_photo_yellow" index="4">
-    <subchannel color="4" subchannel="0" headOffset="1">
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_cyan" index="1">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="2">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="3">
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="4">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_photo_yellow" index="5">
-    <subchannel color="4" subchannel="0" headOffset="1">
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/f360_photo7_japan.xml b/src/xml/escp2/inks/f360_photo7_japan.xml
index 9f821a7..bc18d1f 100644
--- a/src/xml/escp2/inks/f360_photo7_japan.xml
+++ b/src/xml/escp2/inks/f360_photo7_japan.xml
@@ -35,17 +35,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="Photo7J" text="Seven Color Photo" InkID="CcMmYKk">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0" headOffset="1">
+    <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -54,11 +54,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -67,11 +67,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo2_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="2">
+    <subchannel color="4" subchannel="2" name="DarkYellow" text="Dark Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
      <SubchannelTransitionParam name="DarkYellowTrans"/>
     </subchannel>
-    <subchannel color="4" subchannel="0" headOffset="1">
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
      <SubchannelTransitionParam name="DarkYellowTrans"/>
      <SubchannelValueParam name="DarkYellowValue"/>
@@ -85,11 +85,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="f360_photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0" headOffset="1">
+    <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -98,11 +98,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -111,11 +111,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo2_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="2">
+    <subchannel color="4" subchannel="2" name="DarkYellow" text="Dark Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
      <SubchannelTransitionParam name="DarkYellowTrans"/>
     </subchannel>
-    <subchannel color="4" subchannel="0" headOffset="1">
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
      <SubchannelTransitionParam name="DarkYellowTrans"/>
      <SubchannelValueParam name="DarkYellowValue"/>
@@ -128,17 +128,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0" headOffset="1">
+    <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -147,11 +147,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -160,7 +160,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0" headOffset="1">
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -171,11 +171,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="f360_photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0" headOffset="1">
+    <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -184,11 +184,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -197,7 +197,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0" headOffset="1">
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -207,25 +207,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -236,19 +236,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -258,7 +258,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -268,17 +268,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -288,22 +288,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -313,27 +313,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
   <Channels>
    <channel name="f360_standard_cyan" index="0">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="1">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="2">
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="3">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_photo_yellow" index="4">
-    <subchannel color="4" subchannel="0" headOffset="1">
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -343,72 +343,72 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_cyan" index="1">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="2">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="3">
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="4">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_photo_yellow" index="5">
-    <subchannel color="4" subchannel="0" headOffset="1">
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
   </Channels>
  </InkName>
 
- <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended">
+ <InkName translate="text" name="PhysicalCcMmYYk" text="Seven Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
-   <channel name="extended_black" index="1">
-    <subchannel color="0" subchannel="1">
-     <ChannelDensityParam name="BlackDensity"/>
-    </subchannel>
-   </channel>
-   <channel name="f360_standard_cyan" index="2">
-    <subchannel color="2" headOffset="1">
+   <channel name="f360_standard_cyan" index="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
-   <channel name="extended_cyan" index="3">
-    <subchannel color="2" subchannel="1">
+   <channel name="extended_cyan" index="2">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
-   <channel name="f360_standard_magenta" index="4">
-    <subchannel color="1" headOffset="1">
+   <channel name="f360_standard_magenta" index="3">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
-   <channel name="extended_magenta" index="5">
-    <subchannel color="1" subchannel="1">
+   <channel name="extended_magenta" index="4">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
+   <channel name="extended_yellow" index="5">
+    <subchannel color="4" subchannel="2" name="DarkYellow" text="Dark Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
    <channel name="f360_photo_yellow" index="6">
-    <subchannel color="4" subchannel="0" headOffset="1">
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/f360_ultrachrome.xml b/src/xml/escp2/inks/f360_ultrachrome.xml
index f565001..464e060 100644
--- a/src/xml/escp2/inks/f360_ultrachrome.xml
+++ b/src/xml/escp2/inks/f360_ultrachrome.xml
@@ -35,11 +35,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
   <Channels>
    <channel name="f360_photo2_black" index="0">
-    <subchannel color="0" subchannel="0" headOffset="1">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
     </subchannel>
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
      <SubchannelValueParam name="GrayValue"/>
@@ -48,11 +48,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0" headOffset="1">
+    <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -61,11 +61,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo_magenta" index="2">
      <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -74,7 +74,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo_yellow" index="3">
      <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0" headOffset="1">
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -84,17 +84,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0" headOffset="1">
+    <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -103,11 +103,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo_magenta" index="2">
      <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -116,7 +116,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo_yellow" index="3">
      <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0" headOffset="1">
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -127,11 +127,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="f360_photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0" headOffset="1">
+    <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -140,11 +140,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo_magenta" index="2">
      <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -153,7 +153,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo_yellow" index="3">
      <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0" headOffset="1">
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -163,25 +163,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
      <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
      <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -192,19 +192,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
      <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
      <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -214,11 +214,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk">
   <Channels>
    <channel name="f360_photo2_black" index="0">
-    <subchannel color="0" subchannel="0" headOffset="1">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
     </subchannel>
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
      <SubchannelValueParam name="GrayValue"/>
@@ -231,7 +231,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -241,12 +241,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_black" index="1">
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -256,17 +256,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -276,22 +276,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -301,27 +301,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
   <Channels>
    <channel name="f360_standard_cyan" index="0">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="1">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="2">
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="3">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_photo_yellow" index="4">
-    <subchannel color="4" subchannel="0" headOffset="1">
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -331,32 +331,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_cyan" index="1">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="2">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="3">
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="4">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_photo_yellow" index="5">
-    <subchannel color="4" subchannel="0" headOffset="1">
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -366,45 +366,45 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_black" index="1">
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_cyan" index="2">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="3">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="4">
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="5">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_photo_yellow" index="6">
-    <subchannel color="4" subchannel="0" headOffset="1">
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
   </Channels>
  </InkName>
  </InkList>
- <InkList translate="text" name="ultramatte"
- text="UltraChrome Matte Black">
+
+  <InkList translate="text" name="ultramatte" text="UltraChrome Matte Black">
  <Shades>
   <shade count="2">1.000000 0.330000</shade>
   <shade count="2">1.000000 0.330000</shade>
@@ -418,11 +418,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
   <Channels>
    <channel name="f360_photo2_black" index="0">
-    <subchannel color="0" subchannel="0" headOffset="1">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
     </subchannel>
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
      <SubchannelValueParam name="GrayValue"/>
@@ -430,11 +430,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="f360_photo_cyan" index="1">
-    <subchannel color="2" subchannel="0" headOffset="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -442,11 +443,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="f360_photo_magenta" index="2">
-    <subchannel color="1" subchannel="0" headOffset="1">
+     <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -454,7 +456,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="f360_photo_yellow" index="3">
-    <subchannel color="4" subchannel="0" headOffset="1">
+     <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -464,16 +467,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_photo_cyan" index="1">
-    <subchannel color="2" subchannel="0" headOffset="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -481,11 +485,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="f360_photo_magenta" index="2">
-    <subchannel color="1" subchannel="0" headOffset="1">
+     <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -493,7 +498,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="f360_photo_yellow" index="3">
-    <subchannel color="4" subchannel="0" headOffset="1">
+     <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -503,11 +509,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
   <Channels>
    <channel name="f360_photo_cyan" index="1">
-    <subchannel color="2" subchannel="0" headOffset="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -515,11 +522,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="f360_photo_magenta" index="2">
-    <subchannel color="1" subchannel="0" headOffset="1">
+     <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -527,7 +535,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="f360_photo_yellow" index="3">
-    <subchannel color="4" subchannel="0" headOffset="1">
+     <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -537,22 +546,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+     <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+     <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -562,17 +574,20 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
   <Channels>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+     <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+     <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -582,11 +597,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk">
   <Channels>
    <channel name="f360_photo2_black" index="0">
-    <subchannel color="0" subchannel="0" headOffset="1">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
     </subchannel>
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
      <SubchannelValueParam name="GrayValue"/>
@@ -599,7 +614,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -609,12 +624,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_black" index="1">
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -624,17 +639,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -644,22 +659,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -669,27 +684,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
   <Channels>
    <channel name="f360_standard_cyan" index="0">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="1">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="2">
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="3">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_photo_yellow" index="4">
-    <subchannel color="4" subchannel="0" headOffset="1">
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -699,32 +714,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_cyan" index="1">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="2">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="3">
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="4">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_photo_yellow" index="5">
-    <subchannel color="4" subchannel="0" headOffset="1">
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -734,37 +749,37 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_black" index="1">
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_cyan" index="2">
-    <subchannel color="2" headOffset="1">
+    <subchannel color="2" headOffset="1" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="3">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="4">
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="5">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_photo_yellow" index="6">
-    <subchannel color="4" subchannel="0" headOffset="1">
+    <subchannel color="4" subchannel="0" headOffset="1" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/f360_ultrachrome_k3.xml b/src/xml/escp2/inks/f360_ultrachrome_k3.xml
index d9a64f6..0d3b142 100644
--- a/src/xml/escp2/inks/f360_ultrachrome_k3.xml
+++ b/src/xml/escp2/inks/f360_ultrachrome_k3.xml
@@ -36,17 +36,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK8" text="Eight Color Photo" InkID="CcMmYKk">
   <Channels>
    <channel name="f360_photo3_black" index="0">
-    <subchannel color="0" subchannel="0" headOffset="1">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="DarkGrayTrans"/>
     </subchannel>
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="DarkGrayTrans"/>
      <SubchannelValueParam name="DarkGrayValue"/>
      <SubchannelScaleParam name="DarkGrayScale"/>
     </subchannel>
-    <subchannel color="0" subchannel="3" headOffset="1">
+    <subchannel color="0" subchannel="3" headOffset="1" name="LightLightBlack" text="Light Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="LightGrayTrans"/>
      <SubchannelValueParam name="LightGrayValue"/>
@@ -55,11 +55,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360x_photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1" headOffset="1">
+    <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -68,11 +68,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -81,7 +81,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -91,11 +91,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
   <Channels>
    <channel name="f360_photo2_black" index="0">
-    <subchannel color="0" subchannel="0" headOffset="1">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
     </subchannel>
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
      <SubchannelValueParam name="GrayValue"/>
@@ -104,11 +104,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360x_photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1" headOffset="1">
+    <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -117,11 +117,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -130,7 +130,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -140,17 +140,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="f360_black" index="0">
-    <subchannel color="0" subchannel="0" headOffset="1">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360x_photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1" headOffset="1">
+    <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -159,11 +159,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -172,7 +172,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -183,11 +183,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="f360x_photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1" headOffset="1">
+    <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -196,11 +196,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360_photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -209,7 +209,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -219,25 +219,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="f360_black" index="0">
-    <subchannel color="0" subchannel="0" headOffset="1">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -248,19 +248,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -270,42 +270,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYKkk" text="Eight Color Raw" InkID="Extended">
   <Channels>
    <channel name="f360_black" index="0">
-    <subchannel color="0" subchannel="0" headOffset="1">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_black" index="1">
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_extended_photo3_black" index="2">
-    <subchannel color="0" subchannel="3" headOffset="1">
+    <subchannel color="0" subchannel="3" headOffset="1" name="LightLightBlack" text="Light Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="3">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_extended_cyan" index="4">
-    <subchannel color="2" subchannel="1" headOffset="1">
+    <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="5">
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="6">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="7">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -328,17 +328,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK8" text="Eight Color Photo" InkID="CcMmYKk">
   <Channels>
    <channel name="f360_photo3_black" index="0">
-    <subchannel color="0" subchannel="0" headOffset="1">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="DarkGrayTrans"/>
     </subchannel>
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="DarkGrayTrans"/>
      <SubchannelValueParam name="DarkGrayValue"/>
      <SubchannelScaleParam name="DarkGrayScale"/>
     </subchannel>
-    <subchannel color="0" subchannel="3" headOffset="1">
+    <subchannel color="0" subchannel="3" headOffset="1" name="LightLightBlack" text="Light Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="LightGrayTrans"/>
      <SubchannelValueParam name="LightGrayValue"/>
@@ -346,11 +346,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="f360x_photo_cyan" index="1">
-    <subchannel color="2" subchannel="0">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1" headOffset="1">
+    <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -358,11 +359,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="f360_photo_magenta" index="2">
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -370,7 +372,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -380,11 +383,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
   <Channels>
    <channel name="f360_photo2_black" index="0">
-    <subchannel color="0" subchannel="0" headOffset="1">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
     </subchannel>
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
      <SubchannelValueParam name="GrayValue"/>
@@ -392,11 +395,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="f360x_photo_cyan" index="1">
-    <subchannel color="2" subchannel="0">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1" headOffset="1">
+    <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -404,11 +408,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="f360_photo_magenta" index="2">
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -416,7 +421,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -426,16 +432,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="f360_black" index="0">
-    <subchannel color="0" subchannel="0" headOffset="1">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360x_photo_cyan" index="1">
-    <subchannel color="2" subchannel="0">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1" headOffset="1">
+    <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -443,11 +450,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="f360_photo_magenta" index="2">
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -455,7 +463,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -465,11 +474,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
   <Channels>
    <channel name="f360x_photo_cyan" index="1">
-    <subchannel color="2" subchannel="0">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1" headOffset="1">
+    <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -477,11 +487,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="f360_photo_magenta" index="2">
-    <subchannel color="1" subchannel="0" headOffset="1">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -489,7 +500,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -499,22 +511,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="f360_black" index="0">
-    <subchannel color="0" subchannel="0" headOffset="1">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="2">
-    <subchannel color="1" headOffset="1">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -524,17 +539,20 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMY" text="Three Color Composite" InkID="CMYK">
   <Channels>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="2">
-    <subchannel color="1" headOffset="1">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -544,42 +562,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYKkk" text="Eight Color Raw" InkID="Extended">
   <Channels>
    <channel name="f360_black" index="0">
-    <subchannel color="0" subchannel="0" headOffset="1">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_black" index="1">
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_extended_photo3_black" index="2">
-    <subchannel color="0" subchannel="3" headOffset="1">
+    <subchannel color="0" subchannel="3" headOffset="1" name="LightLightBlack" text="Light Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="3">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_extended_cyan" index="4">
-    <subchannel color="2" subchannel="1" headOffset="1">
+    <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="5">
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="6">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="7">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/f360_ultrachrome_k3v.xml b/src/xml/escp2/inks/f360_ultrachrome_k3v.xml
new file mode 100644
index 0000000..4660f47
--- /dev/null
+++ b/src/xml/escp2/inks/f360_ultrachrome_k3v.xml
@@ -0,0 +1,608 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 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.
+</copyright>
+<escp2:InkGroup name="f360_ultrachrome_k3v">
+<InkList translate="text" name="ultra3photo" text="Photo Black">
+ <Shades>
+  <shade count="3">1.000000 0.480000 0.160000</shade>
+  <shade count="2">1.000000 0.340000</shade>
+  <shade count="2">1.000000 0.250000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK8" text="Eight Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="f360_photo3_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+     <SubchannelValueParam name="DarkGrayValue"/>
+     <SubchannelScaleParam name="DarkGrayScale"/>
+    </subchannel>
+    <subchannel color="0" subchannel="3" headOffset="1" name="LightLightBlack" text="Light Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="LightGrayTrans"/>
+     <SubchannelValueParam name="LightGrayValue"/>
+     <SubchannelScaleParam name="LightGrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="f360_photo2_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="f360_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="f360x_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="f360_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMY" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKkk" text="Eight Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_extended_photo3_black" index="2">
+    <subchannel color="0" subchannel="3" headOffset="1" name="LightLightBlack" text="Light Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="3">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_extended_cyan" index="4">
+    <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="5">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="6">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="7">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="ultra3matte" text="Matte Black">
+ <Shades>
+  <shade count="3">1.000000 0.278000 0.093000</shade>
+  <shade count="2">1.000000 0.340000</shade>
+  <shade count="2">1.000000 0.250000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+  <shade count="1">1.000000</shade>
+ </Shades>
+
+ <InkName translate="text" name="PhotoCMYK8" text="Eight Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="f360_photo3_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="DarkGrayTrans"/>
+     <SubchannelValueParam name="DarkGrayValue"/>
+     <SubchannelScaleParam name="DarkGrayScale"/>
+    </subchannel>
+    <subchannel color="0" subchannel="3" headOffset="1" name="LightLightBlack" text="Light Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="LightGrayTrans"/>
+     <SubchannelValueParam name="LightGrayValue"/>
+     <SubchannelScaleParam name="LightGrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
+  <Channels>
+   <channel name="f360_photo2_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelValueParam name="GrayValue"/>
+     <SubchannelScaleParam name="GrayScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
+  <Channels>
+   <channel name="f360_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360x_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
+  <Channels>
+   <channel name="f360x_photo_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+     <SubchannelTransitionParam name="LightCyanTrans"/>
+     <SubchannelValueParam name="LightCyanValue"/>
+     <SubchannelScaleParam name="LightCyanScale"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_photo_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" headOffset="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+     <SubchannelTransitionParam name="LightMagentaTrans"/>
+     <SubchannelValueParam name="LightMagentaValue"/>
+     <SubchannelScaleParam name="LightMagentaScale"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
+  <Channels>
+   <channel name="f360_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="CMY" text="Three Color Composite" InkID="CMYK">
+  <Channels>
+   <channel name="standard_cyan" index="1">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="2">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="3">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+
+ <InkName translate="text" name="PhysicalCMYKkk" text="Eight Color Raw" InkID="Extended">
+  <Channels>
+   <channel name="f360_black" index="0">
+    <subchannel color="0" subchannel="0" headOffset="1" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_black" index="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_extended_photo3_black" index="2">
+    <subchannel color="0" subchannel="3" headOffset="1" name="LightLightBlack" text="Light Light Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_cyan" index="3">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_extended_cyan" index="4">
+    <subchannel color="2" subchannel="1" headOffset="1" name="LightCyan" text="Light Cyan" translate="text">
+     <ChannelDensityParam name="CyanDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="f360_standard_magenta" index="5">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="extended_magenta" index="6">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
+     <ChannelDensityParam name="MagentaDensity"/>
+    </subchannel>
+   </channel>
+   <channel name="standard_yellow" index="7">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
+     <ChannelDensityParam name="YellowDensity"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+</escp2:InkGroup>
+</gutenprint>
diff --git a/src/xml/escp2/inks/nx100.xml b/src/xml/escp2/inks/nx100.xml
index f0a8d1c..7c3538f 100644
--- a/src/xml/escp2/inks/nx100.xml
+++ b/src/xml/escp2/inks/nx100.xml
@@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="c64_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="c64_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="c64_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="90">
+    <subchannel color="1" headOffset="90" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="c64_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" headOffset="180">
+    <subchannel color="4" headOffset="180" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="c64_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="c64_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="90">
+    <subchannel color="1" headOffset="90" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="c64_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" headOffset="180">
+    <subchannel color="4" headOffset="180" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="c64_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="c64_magenta" index="1">
-    <subchannel color="1" headOffset="90">
+    <subchannel color="1" headOffset="90" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="c64_yellow" index="2">
-    <subchannel color="4" headOffset="180">
+    <subchannel color="4" headOffset="180" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="c64_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="c64_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="c64_magenta" index="2">
-    <subchannel color="1" headOffset="90">
+    <subchannel color="1" headOffset="90" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="c64_yellow" index="3">
-    <subchannel color="4" headOffset="180">
+    <subchannel color="4" headOffset="180" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/photo_gen0.xml b/src/xml/escp2/inks/photo_gen0.xml
index 8a61dcd..9231583 100644
--- a/src/xml/escp2/inks/photo_gen0.xml
+++ b/src/xml/escp2/inks/photo_gen0.xml
@@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="1">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="3">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="4">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="2">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="3">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="4">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="5">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -290,25 +290,60 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
   <Channels>
    <channel name="quadtone" index="0">
-    <subchannel color="0">
-     <ChannelDensityParam name="BlackDensity" />
-     <SubchannelTransitionParam name="GrayTrans"/>
+    <subchannel color="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+    </subchannel>
+    <subchannel color="2" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="1" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="4" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="MISQuadtone" text="MIS Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="quadtone" index="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
     </subchannel>
-    <subchannel color="2">
+    <subchannel color="1" name="Gray3" text="Gray 3" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
      <SubchannelValueParam name="Gray3Value"/>
      <SubchannelScaleParam name="Gray3Scale"/>
     </subchannel>
-    <subchannel color="1">
+    <subchannel color="4" name="Gray2" text="Gray 2" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
      <SubchannelValueParam name="Gray2Value"/>
      <SubchannelScaleParam name="Gray2Scale"/>
     </subchannel>
-    <subchannel color="4">
+    <subchannel color="2" name="Gray1" text="Gray 1" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
      <SubchannelValueParam name="Gray1Value"/>
      <SubchannelScaleParam name="Gray1Scale"/>
     </subchannel>
@@ -316,5 +351,52 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
+
+<InkList translate="text" name="MISHextone" text="MIS Six Tone">
+ <Shades>
+  <shade count="6">1.000000 0.750000 0.500000 0.450000 0.250000 0.150000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Hextone" text="Hextone" InkID="Hextone">
+  <Channels>
+   <channel name="hextone" index="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray5Trans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="0" name="Gray5" text="Gray 5" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray5Trans"/>
+     <SubchannelValueParam name="HGray5Value"/>
+     <SubchannelScaleParam name="HGray5Scale"/>
+    </subchannel>
+    <subchannel color="4" subchannel="0" name="Gray4" text="Gray 4" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray4Trans"/>
+     <SubchannelValueParam name="HGray4Value"/>
+     <SubchannelScaleParam name="HGray4Scale"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray3Trans"/>
+     <SubchannelValueParam name="HGray3Value"/>
+     <SubchannelScaleParam name="HGray3Scale"/>
+    </subchannel>
+    <subchannel color="2" subchannel="0" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray2Trans"/>
+     <SubchannelValueParam name="HGray2Value"/>
+     <SubchannelScaleParam name="HGray2Scale"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray1Trans"/>
+     <SubchannelValueParam name="HGray1Value"/>
+     <SubchannelScaleParam name="HGray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
 </escp2:InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/photo_gen1.xml b/src/xml/escp2/inks/photo_gen1.xml
index e616e0e..7bf0e59 100644
--- a/src/xml/escp2/inks/photo_gen1.xml
+++ b/src/xml/escp2/inks/photo_gen1.xml
@@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="1">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="3">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="4">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="2">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="3">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="4">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="5">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -290,25 +290,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
   <Channels>
    <channel name="quadtone" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
     </subchannel>
-    <subchannel color="2">
+    <subchannel color="2" name="Gray3" text="Gray 3" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
      <SubchannelValueParam name="Gray3Value"/>
      <SubchannelScaleParam name="Gray3Scale"/>
     </subchannel>
-    <subchannel color="1">
+    <subchannel color="1" name="Gray2" text="Gray 2" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
      <SubchannelValueParam name="Gray2Value"/>
      <SubchannelScaleParam name="Gray2Scale"/>
     </subchannel>
-    <subchannel color="4">
+    <subchannel color="4" name="Gray1" text="Gray 1" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
      <SubchannelValueParam name="Gray1Value"/>
      <SubchannelScaleParam name="Gray1Scale"/>
     </subchannel>
@@ -316,5 +316,87 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
+
+<InkList translate="text" name="MISQuadtone" text="MIS Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="quadtone" index="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+    </subchannel>
+    <subchannel color="1" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="4" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="2" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="MISHextone" text="MIS Six Tone">
+ <Shades>
+  <shade count="6">1.000000 0.750000 0.500000 0.450000 0.250000 0.150000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Hextone" text="Hextone" InkID="Hextone">
+  <Channels>
+   <channel name="hextone" index="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray5Trans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="0" name="Gray5" text="Gray 5" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray5Trans"/>
+     <SubchannelValueParam name="HGray5Value"/>
+     <SubchannelScaleParam name="HGray5Scale"/>
+    </subchannel>
+    <subchannel color="4" subchannel="0" name="Gray4" text="Gray 4" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray4Trans"/>
+     <SubchannelValueParam name="HGray4Value"/>
+     <SubchannelScaleParam name="HGray4Scale"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray3Trans"/>
+     <SubchannelValueParam name="HGray3Value"/>
+     <SubchannelScaleParam name="HGray3Scale"/>
+    </subchannel>
+    <subchannel color="2" subchannel="0" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray2Trans"/>
+     <SubchannelValueParam name="HGray2Value"/>
+     <SubchannelScaleParam name="HGray2Scale"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray1Trans"/>
+     <SubchannelValueParam name="HGray1Value"/>
+     <SubchannelScaleParam name="HGray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
 </escp2:InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/photo_gen2.xml b/src/xml/escp2/inks/photo_gen2.xml
index bb6d6eb..ebddcbc 100644
--- a/src/xml/escp2/inks/photo_gen2.xml
+++ b/src/xml/escp2/inks/photo_gen2.xml
@@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="1">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="3">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="4">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -249,38 +249,39 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="2">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="3">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="4">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="5">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
   </Channels>
  </InkName>
 </InkList>
+
 <InkList translate="text" name="quadtone" text="Quadtone">
  <Shades>
   <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
@@ -289,25 +290,60 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
   <Channels>
    <channel name="quadtone" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
     </subchannel>
-    <subchannel color="2">
+    <subchannel color="2" name="Gray3" text="Gray 3" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
      <SubchannelValueParam name="Gray3Value"/>
      <SubchannelScaleParam name="Gray3Scale"/>
     </subchannel>
-    <subchannel color="1">
+    <subchannel color="1" name="Gray2" text="Gray 2" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
      <SubchannelValueParam name="Gray2Value"/>
      <SubchannelScaleParam name="Gray2Scale"/>
     </subchannel>
-    <subchannel color="4">
+    <subchannel color="4" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="MISQuadtone" text="MIS Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="quadtone" index="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
+    </subchannel>
+    <subchannel color="1" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="4" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="2" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
      <SubchannelValueParam name="Gray1Value"/>
      <SubchannelScaleParam name="Gray1Scale"/>
     </subchannel>
@@ -315,5 +351,52 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
+
+<InkList translate="text" name="MISHextone" text="MIS Six Tone">
+ <Shades>
+  <shade count="6">1.000000 0.750000 0.500000 0.450000 0.250000 0.150000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Hextone" text="Hextone" InkID="Hextone">
+  <Channels>
+   <channel name="hextone" index="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray5Trans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="0" name="Gray5" text="Gray 5" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray5Trans"/>
+     <SubchannelValueParam name="HGray5Value"/>
+     <SubchannelScaleParam name="HGray5Scale"/>
+    </subchannel>
+    <subchannel color="4" subchannel="0" name="Gray4" text="Gray 4" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray4Trans"/>
+     <SubchannelValueParam name="HGray4Value"/>
+     <SubchannelScaleParam name="HGray4Scale"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray3Trans"/>
+     <SubchannelValueParam name="HGray3Value"/>
+     <SubchannelScaleParam name="HGray3Scale"/>
+    </subchannel>
+    <subchannel color="2" subchannel="0" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray2Trans"/>
+     <SubchannelValueParam name="HGray2Value"/>
+     <SubchannelScaleParam name="HGray2Scale"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray1Trans"/>
+     <SubchannelValueParam name="HGray1Value"/>
+     <SubchannelScaleParam name="HGray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
 </escp2:InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/photo_gen3.xml b/src/xml/escp2/inks/photo_gen3.xml
index 923f2b6..9b23ff4 100644
--- a/src/xml/escp2/inks/photo_gen3.xml
+++ b/src/xml/escp2/inks/photo_gen3.xml
@@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="1">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="3">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="4">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="2">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="3">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="4">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="5">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -290,25 +290,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
   <Channels>
    <channel name="quadtone" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
     </subchannel>
-    <subchannel color="2">
+    <subchannel color="2" name="Gray3" text="Gray 3" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
      <SubchannelValueParam name="Gray3Value"/>
      <SubchannelScaleParam name="Gray3Scale"/>
     </subchannel>
-    <subchannel color="1">
+    <subchannel color="1" name="Gray2" text="Gray 2" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
      <SubchannelValueParam name="Gray2Value"/>
      <SubchannelScaleParam name="Gray2Scale"/>
     </subchannel>
-    <subchannel color="4">
+    <subchannel color="4" name="Gray1" text="Gray 1" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
      <SubchannelValueParam name="Gray1Value"/>
      <SubchannelScaleParam name="Gray1Scale"/>
     </subchannel>
@@ -316,5 +316,87 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
+
+<InkList translate="text" name="MISQuadtone" text="MIS Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="quadtone" index="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+    </subchannel>
+    <subchannel color="1" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="4" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="2" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="MISHextone" text="MIS Six Tone">
+ <Shades>
+  <shade count="6">1.000000 0.750000 0.500000 0.450000 0.250000 0.150000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Hextone" text="Hextone" InkID="Hextone">
+  <Channels>
+   <channel name="hextone" index="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray5Trans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="0" name="Gray5" text="Gray 5" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray5Trans"/>
+     <SubchannelValueParam name="HGray5Value"/>
+     <SubchannelScaleParam name="HGray5Scale"/>
+    </subchannel>
+    <subchannel color="4" subchannel="0" name="Gray4" text="Gray 4" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray4Trans"/>
+     <SubchannelValueParam name="HGray4Value"/>
+     <SubchannelScaleParam name="HGray4Scale"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray3Trans"/>
+     <SubchannelValueParam name="HGray3Value"/>
+     <SubchannelScaleParam name="HGray3Scale"/>
+    </subchannel>
+    <subchannel color="2" subchannel="0" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray2Trans"/>
+     <SubchannelValueParam name="HGray2Value"/>
+     <SubchannelScaleParam name="HGray2Scale"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray1Trans"/>
+     <SubchannelValueParam name="HGray1Value"/>
+     <SubchannelScaleParam name="HGray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
 </escp2:InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/photo_gen3_4.xml b/src/xml/escp2/inks/photo_gen3_4.xml
index fb85d5e..7d40057 100644
--- a/src/xml/escp2/inks/photo_gen3_4.xml
+++ b/src/xml/escp2/inks/photo_gen3_4.xml
@@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -144,25 +144,60 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
   <Channels>
    <channel name="quadtone" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
     </subchannel>
-    <subchannel color="2">
+    <subchannel color="2" name="Gray3" text="Gray 3" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
      <SubchannelValueParam name="Gray3Value"/>
      <SubchannelScaleParam name="Gray3Scale"/>
     </subchannel>
-    <subchannel color="1">
+    <subchannel color="1" name="Gray2" text="Gray 2" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
      <SubchannelValueParam name="Gray2Value"/>
      <SubchannelScaleParam name="Gray2Scale"/>
     </subchannel>
-    <subchannel color="4">
+    <subchannel color="4" name="Gray1" text="Gray 1" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="MISQuadtone" text="MIS Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="quadtone" index="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+    </subchannel>
+    <subchannel color="1" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="4" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="2" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
      <SubchannelValueParam name="Gray1Value"/>
      <SubchannelScaleParam name="Gray1Scale"/>
     </subchannel>
diff --git a/src/xml/escp2/inks/photo_gen4.xml b/src/xml/escp2/inks/photo_gen4.xml
index 6c08316..1457e32 100644
--- a/src/xml/escp2/inks/photo_gen4.xml
+++ b/src/xml/escp2/inks/photo_gen4.xml
@@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="1">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="3">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="4">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="2">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="3">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="4">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="5">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/photo_pigment.xml b/src/xml/escp2/inks/photo_pigment.xml
index c5d047b..f7781ec 100644
--- a/src/xml/escp2/inks/photo_pigment.xml
+++ b/src/xml/escp2/inks/photo_pigment.xml
@@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="1">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="3">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="4">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="2">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="3">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="4">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="5">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/picturemate_4.xml b/src/xml/escp2/inks/picturemate_4.xml
index 5b1e6fe..b48f5f3 100644
--- a/src/xml/escp2/inks/picturemate_4.xml
+++ b/src/xml/escp2/inks/picturemate_4.xml
@@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Photo" InkID="CMYK">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -60,22 +60,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/picturemate_6.xml b/src/xml/escp2/inks/picturemate_6.xml
index 9ccb684..fa5068a 100644
--- a/src/xml/escp2/inks/picturemate_6.xml
+++ b/src/xml/escp2/inks/picturemate_6.xml
@@ -34,7 +34,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYKRB" text="Six Color Photo" InkID="OTHER">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -52,7 +52,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
      </sequence>
     </curve>
     </HueCurve>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
@@ -70,7 +70,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
      </sequence>
     </curve>
     </HueCurve>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
@@ -88,7 +88,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
      </sequence>
     </curve>
     </HueCurve>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -106,7 +106,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
      </sequence>
     </curve>
     </HueCurve>
-    <subchannel color="7">
+    <subchannel color="7" name="Red" text="Red" translate="text">
      <ChannelDensityParam name="RedDensity"/>
     </subchannel>
    </channel>
@@ -124,7 +124,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
      </sequence>
     </curve>
     </HueCurve>
-    <subchannel color="8" headOffset="1">
+    <subchannel color="8" headOffset="1" name="Blue" text="Blue" translate="text">
      <ChannelDensityParam name="BlueDensity"/>
     </subchannel>
    </channel>
@@ -134,22 +134,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Photo" InkID="CMYK">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -159,32 +159,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYKRB" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_red" index="4">
-    <subchannel color="7">
+    <subchannel color="7" name="Red" text="Red" translate="text">
      <ChannelDensityParam name="RedDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_blue" index="5">
-    <subchannel color="8" headOffset="1">
+    <subchannel color="8" headOffset="1" name="Blue" text="Blue" translate="text">
      <ChannelDensityParam name="BlueDensity"/>
     </subchannel>
    </channel>
@@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="picturemate_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/pro_gen1.xml b/src/xml/escp2/inks/pro_gen1.xml
index 9d9dca6..dab731f 100644
--- a/src/xml/escp2/inks/pro_gen1.xml
+++ b/src/xml/escp2/inks/pro_gen1.xml
@@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="1">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="3">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="4">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="2">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="3">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="4">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="5">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -290,25 +290,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
   <Channels>
    <channel name="quadtone" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
     </subchannel>
-    <subchannel color="2">
+    <subchannel color="2" name="Gray3" text="Gray 3" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
      <SubchannelValueParam name="Gray3Value"/>
      <SubchannelScaleParam name="Gray3Scale"/>
     </subchannel>
-    <subchannel color="1">
+    <subchannel color="1" name="Gray2" text="Gray 2" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
      <SubchannelValueParam name="Gray2Value"/>
      <SubchannelScaleParam name="Gray2Scale"/>
     </subchannel>
-    <subchannel color="4">
+    <subchannel color="4" name="Gray1" text="Gray 1" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
      <SubchannelValueParam name="Gray1Value"/>
      <SubchannelScaleParam name="Gray1Scale"/>
     </subchannel>
@@ -316,5 +316,87 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
+
+<InkList translate="text" name="MISQuadtone" text="MIS Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="quadtone" index="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+    </subchannel>
+    <subchannel color="1" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="4" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="2" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="MISHextone" text="MIS Six Tone">
+ <Shades>
+  <shade count="6">1.000000 0.750000 0.500000 0.450000 0.250000 0.150000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Hextone" text="Hextone" InkID="Hextone">
+  <Channels>
+   <channel name="hextone" index="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray5Trans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="0" name="Gray5" text="Gray 5" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray5Trans"/>
+     <SubchannelValueParam name="HGray5Value"/>
+     <SubchannelScaleParam name="HGray5Scale"/>
+    </subchannel>
+    <subchannel color="4" subchannel="0" name="Gray4" text="Gray 4" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray4Trans"/>
+     <SubchannelValueParam name="HGray4Value"/>
+     <SubchannelScaleParam name="HGray4Scale"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray3Trans"/>
+     <SubchannelValueParam name="HGray3Value"/>
+     <SubchannelScaleParam name="HGray3Scale"/>
+    </subchannel>
+    <subchannel color="2" subchannel="0" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray2Trans"/>
+     <SubchannelValueParam name="HGray2Value"/>
+     <SubchannelScaleParam name="HGray2Scale"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray1Trans"/>
+     <SubchannelValueParam name="HGray1Value"/>
+     <SubchannelScaleParam name="HGray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
 </escp2:InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/pro_gen2.xml b/src/xml/escp2/inks/pro_gen2.xml
index 0eaac3a..bf21a18 100644
--- a/src/xml/escp2/inks/pro_gen2.xml
+++ b/src/xml/escp2/inks/pro_gen2.xml
@@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="1">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="3">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="4">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="2">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="3">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="4">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="5">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -290,25 +290,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
   <Channels>
    <channel name="quadtone" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
     </subchannel>
-    <subchannel color="2">
+    <subchannel color="2" name="Gray3" text="Gray 3" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
      <SubchannelValueParam name="Gray3Value"/>
      <SubchannelScaleParam name="Gray3Scale"/>
     </subchannel>
-    <subchannel color="1">
+    <subchannel color="1" name="Gray2" text="Gray 2" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
      <SubchannelValueParam name="Gray2Value"/>
      <SubchannelScaleParam name="Gray2Scale"/>
     </subchannel>
-    <subchannel color="4">
+    <subchannel color="4" name="Gray1" text="Gray 1" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
      <SubchannelValueParam name="Gray1Value"/>
      <SubchannelScaleParam name="Gray1Scale"/>
     </subchannel>
@@ -316,5 +316,87 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   </Channels>
  </InkName>
 </InkList>
+
+<InkList translate="text" name="MISQuadtone" text="MIS Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="quadtone" index="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+    </subchannel>
+    <subchannel color="1" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="4" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="2" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="MISHextone" text="MIS Six Tone">
+ <Shades>
+  <shade count="6">1.000000 0.750000 0.500000 0.450000 0.250000 0.150000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Hextone" text="Hextone" InkID="Hextone">
+  <Channels>
+   <channel name="hextone" index="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray5Trans"/>
+    </subchannel>
+    <subchannel color="1" subchannel="0" name="Gray5" text="Gray 5" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray5Trans"/>
+     <SubchannelValueParam name="HGray5Value"/>
+     <SubchannelScaleParam name="HGray5Scale"/>
+    </subchannel>
+    <subchannel color="4" subchannel="0" name="Gray4" text="Gray 4" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray4Trans"/>
+     <SubchannelValueParam name="HGray4Value"/>
+     <SubchannelScaleParam name="HGray4Scale"/>
+    </subchannel>
+    <subchannel color="1" subchannel="1" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray3Trans"/>
+     <SubchannelValueParam name="HGray3Value"/>
+     <SubchannelScaleParam name="HGray3Scale"/>
+    </subchannel>
+    <subchannel color="2" subchannel="0" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray2Trans"/>
+     <SubchannelValueParam name="HGray2Value"/>
+     <SubchannelScaleParam name="HGray2Scale"/>
+    </subchannel>
+    <subchannel color="2" subchannel="1" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="HGray1Trans"/>
+     <SubchannelValueParam name="HGray1Value"/>
+     <SubchannelScaleParam name="HGray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
 </escp2:InkGroup>
 </gutenprint>
diff --git a/src/xml/escp2/inks/pro_pigment.xml b/src/xml/escp2/inks/pro_pigment.xml
index 59caecb..baf5b93 100644
--- a/src/xml/escp2/inks/pro_pigment.xml
+++ b/src/xml/escp2/inks/pro_pigment.xml
@@ -34,17 +34,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -53,11 +53,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -66,7 +66,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -77,11 +77,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -90,11 +90,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -103,7 +103,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,25 +113,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -142,19 +142,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -164,7 +164,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -174,17 +174,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -194,22 +194,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -219,27 +219,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="1">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="3">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="4">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -249,32 +249,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="2">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="3">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="4">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="5">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/pro_ultrachrome.xml b/src/xml/escp2/inks/pro_ultrachrome.xml
index 9ef31f3..675aa57 100644
--- a/src/xml/escp2/inks/pro_ultrachrome.xml
+++ b/src/xml/escp2/inks/pro_ultrachrome.xml
@@ -35,11 +35,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
   <Channels>
    <channel name="photo2_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
     </subchannel>
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
      <SubchannelValueParam name="GrayValue"/>
@@ -48,11 +48,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -61,11 +61,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -74,7 +74,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -84,17 +84,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -103,11 +103,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -116,7 +116,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -127,11 +127,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -140,11 +140,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -153,7 +153,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -163,25 +163,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -192,19 +192,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -214,11 +214,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk">
   <Channels>
    <channel name="photo2_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
     </subchannel>
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
      <SubchannelValueParam name="GrayValue"/>
@@ -231,7 +231,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -241,12 +241,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_black" index="1">
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -256,17 +256,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -276,22 +276,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -301,27 +301,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="1">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="3">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="4">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -331,32 +331,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="2">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="3">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="4">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="5">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -366,37 +366,37 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_black" index="1">
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="2">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="3">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="4">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="5">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="6">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -418,11 +418,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
   <Channels>
    <channel name="photo2_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
     </subchannel>
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
      <SubchannelValueParam name="GrayValue"/>
@@ -430,11 +430,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="photo_cyan" index="1">
-    <subchannel color="2" subchannel="0">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -442,11 +443,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="photo_magenta" index="2">
-    <subchannel color="1" subchannel="0">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -454,7 +456,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="3">
-    <subchannel color="4" subchannel="0">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -464,16 +467,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_cyan" index="1">
-    <subchannel color="2" subchannel="0">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -481,11 +485,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="photo_magenta" index="2">
-    <subchannel color="1" subchannel="0">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -493,7 +498,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="3">
-    <subchannel color="4" subchannel="0">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -503,11 +509,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
   <Channels>
    <channel name="photo_cyan" index="1">
-    <subchannel color="2" subchannel="0">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -515,11 +522,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="photo_magenta" index="2">
-    <subchannel color="1" subchannel="0">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -527,7 +535,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="3">
-    <subchannel color="4" subchannel="0">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -537,22 +546,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -562,17 +574,20 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
   <Channels>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -582,11 +597,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk">
   <Channels>
    <channel name="photo2_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
     </subchannel>
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
      <SubchannelValueParam name="GrayValue"/>
@@ -599,7 +614,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -609,12 +624,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_black" index="1">
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -624,17 +639,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -644,22 +659,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -669,27 +684,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="1">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="3">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="4">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -699,32 +714,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="2">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="3">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="4">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="5">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -734,37 +749,37 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_black" index="1">
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="2">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="3">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="4">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="5">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="6">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/pro_ultrachrome_k3.xml b/src/xml/escp2/inks/pro_ultrachrome_k3.xml
index 8038997..2e41ed2 100644
--- a/src/xml/escp2/inks/pro_ultrachrome_k3.xml
+++ b/src/xml/escp2/inks/pro_ultrachrome_k3.xml
@@ -36,17 +36,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK8" text="Eight Color Photo" InkID="CcMmYKk">
   <Channels>
    <channel name="photo3_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="DarkGrayTrans"/>
     </subchannel>
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="DarkGrayTrans"/>
      <SubchannelValueParam name="DarkGrayValue"/>
      <SubchannelScaleParam name="DarkGrayScale"/>
     </subchannel>
-    <subchannel color="0" subchannel="2">
+    <subchannel color="0" subchannel="2" name="LightLightBlack" text="Light Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="LightGrayTrans"/>
      <SubchannelValueParam name="LightGrayValue"/>
@@ -55,11 +55,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360x_photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -68,11 +68,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -81,7 +81,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -91,11 +91,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
   <Channels>
    <channel name="photo2_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
     </subchannel>
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
      <SubchannelValueParam name="GrayValue"/>
@@ -104,11 +104,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="f360x_photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -117,11 +117,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -130,7 +130,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -140,17 +140,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360x_photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -159,11 +159,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -172,7 +172,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -183,11 +183,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="f360x_photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -196,11 +196,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -209,7 +209,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -219,25 +219,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -248,19 +248,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -270,42 +270,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYKkk" text="Eight Color Raw" InkID="Extended">
   <Channels>
    <channel name="black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_black" index="1">
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_photo3_black" index="2">
-    <subchannel color="0" subchannel="3">
+    <subchannel color="0" subchannel="3" name="LightLightBlack" text="Light Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="3">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="4">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="5">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="6">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="7">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -328,17 +328,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK8" text="Eight Color Photo" InkID="CcMmYKk">
   <Channels>
    <channel name="photo3_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="DarkGrayTrans"/>
     </subchannel>
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="DarkGrayTrans"/>
      <SubchannelValueParam name="DarkGrayValue"/>
      <SubchannelScaleParam name="DarkGrayScale"/>
     </subchannel>
-    <subchannel color="0" subchannel="3">
+    <subchannel color="0" subchannel="3" name="LightLightBlack" text="Light Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="LightGrayTrans"/>
      <SubchannelValueParam name="LightGrayValue"/>
@@ -346,11 +346,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="f360x_photo_cyan" index="1">
-    <subchannel color="2" subchannel="0">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -358,11 +359,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="photo_magenta" index="2">
-    <subchannel color="1" subchannel="0">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -370,7 +372,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -380,11 +383,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
   <Channels>
    <channel name="photo2_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
     </subchannel>
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
      <SubchannelValueParam name="GrayValue"/>
@@ -392,11 +395,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="f360x_photo_cyan" index="1">
-    <subchannel color="2" subchannel="0">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -404,11 +408,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="photo_magenta" index="2">
-    <subchannel color="1" subchannel="0">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -416,7 +421,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -426,16 +432,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="f360x_photo_cyan" index="1">
-    <subchannel color="2" subchannel="0">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -443,11 +450,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="photo_magenta" index="2">
-    <subchannel color="1" subchannel="0">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -455,7 +463,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -465,11 +474,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
   <Channels>
    <channel name="f360x_photo_cyan" index="1">
-    <subchannel color="2" subchannel="0">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -477,11 +487,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="photo_magenta" index="2">
-    <subchannel color="1" subchannel="0">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -489,7 +500,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -499,22 +511,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -524,17 +539,20 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMY" text="Three Color Composite" InkID="CMYK">
   <Channels>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -544,42 +562,42 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYKkk" text="Eight Color Raw" InkID="Extended">
   <Channels>
    <channel name="black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_black" index="1">
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_photo3_black" index="2">
-    <subchannel color="0" subchannel="3">
+    <subchannel color="0" subchannel="3" name="LightLightBlack" text="Light Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="3">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="4">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="5">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="6">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="7">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/standard.xml b/src/xml/escp2/inks/standard.xml
index afd21c4..6c811e5 100644
--- a/src/xml/escp2/inks/standard.xml
+++ b/src/xml/escp2/inks/standard.xml
@@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -144,25 +144,60 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
   <Channels>
    <channel name="quadtone" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
     </subchannel>
-    <subchannel color="2">
+    <subchannel color="2" name="Gray3" text="Gray 3" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
      <SubchannelValueParam name="Gray3Value"/>
      <SubchannelScaleParam name="Gray3Scale"/>
     </subchannel>
-    <subchannel color="1">
+    <subchannel color="1" name="Gray2" text="Gray 2" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
      <SubchannelValueParam name="Gray2Value"/>
      <SubchannelScaleParam name="Gray2Scale"/>
     </subchannel>
-    <subchannel color="4">
+    <subchannel color="4" name="Gray1" text="Gray 1" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="MISQuadtone" text="MIS Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="quadtone" index="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+    </subchannel>
+    <subchannel color="1" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="4" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="2" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
      <SubchannelValueParam name="Gray1Value"/>
      <SubchannelScaleParam name="Gray1Scale"/>
     </subchannel>
diff --git a/src/xml/escp2/inks/standard_gen0.xml b/src/xml/escp2/inks/standard_gen0.xml
index 7c04253..32f36c0 100644
--- a/src/xml/escp2/inks/standard_gen0.xml
+++ b/src/xml/escp2/inks/standard_gen0.xml
@@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -144,25 +144,60 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
   <Channels>
    <channel name="quadtone" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
     </subchannel>
-    <subchannel color="2">
+    <subchannel color="2" name="Gray3" text="Gray 3" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
      <SubchannelValueParam name="Gray3Value"/>
      <SubchannelScaleParam name="Gray3Scale"/>
     </subchannel>
-    <subchannel color="1">
+    <subchannel color="1" name="Gray2" text="Gray 2" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
      <SubchannelValueParam name="Gray2Value"/>
      <SubchannelScaleParam name="Gray2Scale"/>
     </subchannel>
-    <subchannel color="4">
+    <subchannel color="4" name="Gray1" text="Gray 1" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
-     <SubchannelTransitionParam name="GrayTrans"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
+     <SubchannelValueParam name="Gray1Value"/>
+     <SubchannelScaleParam name="Gray1Scale"/>
+    </subchannel>
+   </channel>
+  </Channels>
+ </InkName>
+</InkList>
+
+<InkList translate="text" name="MISQuadtone" text="MIS Quadtone">
+ <Shades>
+  <shade count="4">1.000000 0.750000 0.500000 0.250000</shade>
+ </Shades>
+
+ <InkName translate="text" name="Quadtone" text="Quadtone" InkID="Quadtone">
+  <Channels>
+   <channel name="quadtone" index="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+    </subchannel>
+    <subchannel color="1" name="Gray3" text="Gray 3" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray3Trans"/>
+     <SubchannelValueParam name="Gray3Value"/>
+     <SubchannelScaleParam name="Gray3Scale"/>
+    </subchannel>
+    <subchannel color="4" name="Gray2" text="Gray 2" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray2Trans"/>
+     <SubchannelValueParam name="Gray2Value"/>
+     <SubchannelScaleParam name="Gray2Scale"/>
+    </subchannel>
+    <subchannel color="2" name="Gray1" text="Gray 1" translate="text">
+     <ChannelDensityParam name="BlackDensity"/>
+     <SubchannelTransitionParam name="Gray1Trans"/>
      <SubchannelValueParam name="Gray1Value"/>
      <SubchannelScaleParam name="Gray1Scale"/>
     </subchannel>
diff --git a/src/xml/escp2/inks/ultrachrome.xml b/src/xml/escp2/inks/ultrachrome.xml
index 2a3b442..e82a5e1 100644
--- a/src/xml/escp2/inks/ultrachrome.xml
+++ b/src/xml/escp2/inks/ultrachrome.xml
@@ -35,11 +35,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
   <Channels>
    <channel name="photo2_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
     </subchannel>
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
      <SubchannelValueParam name="GrayValue"/>
@@ -48,11 +48,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -61,11 +61,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -74,7 +74,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -84,17 +84,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -103,11 +103,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -116,7 +116,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -127,11 +127,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="photo_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" subchannel="0">
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -140,11 +140,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" subchannel="0">
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -153,7 +153,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    </channel>
    <channel name="photo_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -163,25 +163,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -192,19 +192,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -214,11 +214,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk">
   <Channels>
    <channel name="photo2_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
     </subchannel>
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
      <SubchannelValueParam name="GrayValue"/>
@@ -231,7 +231,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -241,12 +241,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_black" index="1">
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -256,17 +256,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -276,22 +276,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -301,27 +301,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="1">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="3">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="4">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -331,32 +331,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="2">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="3">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="4">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="5">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -366,37 +366,37 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_black" index="1">
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="2">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="3">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="4">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="5">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="6">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -418,11 +418,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK7" text="Seven Color Photo" InkID="CcMmYKk">
   <Channels>
    <channel name="photo2_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
     </subchannel>
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
      <SubchannelValueParam name="GrayValue"/>
@@ -430,11 +430,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="photo_cyan" index="1">
-    <subchannel color="2" subchannel="0">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -442,11 +443,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="photo_magenta" index="2">
-    <subchannel color="1" subchannel="0">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -454,7 +456,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="3">
-    <subchannel color="4" subchannel="0">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -464,16 +467,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMYK" text="Six Color Photo" InkID="CcMmYK">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_cyan" index="1">
-    <subchannel color="2" subchannel="0">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -481,11 +485,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="photo_magenta" index="2">
-    <subchannel color="1" subchannel="0">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -493,7 +498,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="3">
-    <subchannel color="4" subchannel="0">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -503,11 +509,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhotoCMY" text="Five Color Photo Composite" InkID="CcMmYK">
   <Channels>
    <channel name="photo_cyan" index="1">
-    <subchannel color="2" subchannel="0">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" subchannel="0" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
     </subchannel>
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
      <SubchannelTransitionParam name="LightCyanTrans"/>
      <SubchannelValueParam name="LightCyanValue"/>
@@ -515,11 +522,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="photo_magenta" index="2">
-    <subchannel color="1" subchannel="0">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" subchannel="0" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
     </subchannel>
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
      <SubchannelTransitionParam name="LightMagentaTrans"/>
      <SubchannelValueParam name="LightMagentaValue"/>
@@ -527,7 +535,8 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="3">
-    <subchannel color="4" subchannel="0">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -537,22 +546,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -562,17 +574,20 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="RGB" text="Three Color Composite" InkID="CMYK">
   <Channels>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <HueCurveParam name="CyanHueCurve"/>
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <HueCurveParam name="MagentaHueCurve"/>
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <HueCurveParam name="YellowHueCurve"/>
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -582,11 +597,11 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="Gray2" text="Two Level Grayscale" InkID="CcMmYKk">
   <Channels>
    <channel name="photo2_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
     </subchannel>
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SubchannelTransitionParam name="GrayTrans"/>
      <SubchannelValueParam name="GrayValue"/>
@@ -599,7 +614,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -609,12 +624,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack2" text="Two Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_black" index="1">
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -624,17 +639,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="1">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -644,22 +659,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -669,27 +684,27 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmY" text="Five Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_cyan" index="0">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="1">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="2">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="3">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="4">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -699,32 +714,32 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYK" text="Six Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="1">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="2">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="3">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="4">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="5">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -734,37 +749,37 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCcMmYKk" text="Seven Color Raw" InkID="Extended">
   <Channels>
    <channel name="photo_black" index="0">
-    <subchannel color="0" subchannel="0">
+    <subchannel color="0" subchannel="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_black" index="1">
-    <subchannel color="0" subchannel="1">
+    <subchannel color="0" subchannel="1" name="LightBlack" text="Light Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_cyan" index="2">
-    <subchannel color="2">
+    <subchannel color="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_cyan" index="3">
-    <subchannel color="2" subchannel="1">
+    <subchannel color="2" subchannel="1" name="LightCyan" text="Light Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_magenta" index="4">
-    <subchannel color="1">
+    <subchannel color="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="extended_magenta" index="5">
-    <subchannel color="1" subchannel="1">
+    <subchannel color="1" subchannel="1" name="LightMagenta" text="Light Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="photo_yellow" index="6">
-    <subchannel color="4" subchannel="0">
+    <subchannel color="4" subchannel="0" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/wf40.xml b/src/xml/escp2/inks/wf40.xml
index 6bf5a9a..72c5a26 100644
--- a/src/xml/escp2/inks/wf40.xml
+++ b/src/xml/escp2/inks/wf40.xml
@@ -32,26 +32,26 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="wf40_black" index="0">
-    <subchannel color="0" subchannel="6">
+    <subchannel color="0" subchannel="6" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SplitChannels count="3">0 64 96</SplitChannels>
     </subchannel>
    </channel>
    <channel name="wf40_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" headOffset="2">
+    <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="wf40_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="wf40_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -62,19 +62,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="wf40_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" headOffset="2">
+    <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="wf40_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="wf40_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -84,7 +84,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="wf40_black" index="0">
-    <subchannel color="0" subchannel="6">
+    <subchannel color="0" subchannel="6" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SplitChannels count="3">0 64 96</SplitChannels>
     </subchannel>
@@ -95,17 +95,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="wf40_cyan" index="0">
-    <subchannel color="2" headOffset="2">
+    <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="wf40_magenta" index="1">
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="wf40_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -115,23 +115,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="wf40_black" index="0">
-    <subchannel color="0" subchannel="6">
+    <subchannel color="0" subchannel="6" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
      <SplitChannels count="3">0 64 96</SplitChannels>
     </subchannel>
    </channel>
    <channel name="wf40_cyan" index="1">
-    <subchannel color="2" headOffset="2">
+    <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="wf40_magenta" index="2">
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="wf40_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/wf500.xml b/src/xml/escp2/inks/wf500.xml
index 5fc2282..30685b1 100644
--- a/src/xml/escp2/inks/wf500.xml
+++ b/src/xml/escp2/inks/wf500.xml
@@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="cx3650_standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" headOffset="2">
+    <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="cx3650_standard_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" headOffset="2">
+    <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="cx3650_standard_cyan" index="0">
-    <subchannel color="2" headOffset="2">
+    <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="1">
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="cx3650_standard_cyan" index="1">
-    <subchannel color="2" headOffset="2">
+    <subchannel color="2" headOffset="2" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="f360_standard_magenta" index="2">
-    <subchannel color="1" headOffset="1">
+    <subchannel color="1" headOffset="1" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="standard_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inks/x80.xml b/src/xml/escp2/inks/x80.xml
index 6c24d24..5aa670d 100644
--- a/src/xml/escp2/inks/x80.xml
+++ b/src/xml/escp2/inks/x80.xml
@@ -32,25 +32,25 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="CMYK" text="Four Color Standard" InkID="CMYK">
   <Channels>
    <channel name="x80_black" index="0">
-    <subchannel color="0" headOffset="48">
+    <subchannel color="0" headOffset="48" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="x80_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" headOffset="96">
+    <subchannel color="2" headOffset="96" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="x80_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="48">
+    <subchannel color="1" headOffset="48" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="x80_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -61,19 +61,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <Channels>
    <channel name="x80_cyan" index="1">
     <HueCurveParam name="CyanHueCurve"/>
-    <subchannel color="2" headOffset="96">
+    <subchannel color="2" headOffset="96" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="x80_magenta" index="2">
     <HueCurveParam name="MagentaHueCurve"/>
-    <subchannel color="1" headOffset="48">
+    <subchannel color="1" headOffset="48" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="x80_yellow" index="3">
     <HueCurveParam name="YellowHueCurve"/>
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -83,7 +83,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalBlack" text="One Color Raw" InkID="Extended">
   <Channels>
    <channel name="standard_black" index="0">
-    <subchannel color="0">
+    <subchannel color="0" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
@@ -93,17 +93,17 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMY" text="Three Color Raw" InkID="Extended">
   <Channels>
    <channel name="x80_cyan" index="0">
-    <subchannel color="2" headOffset="96">
+    <subchannel color="2" headOffset="96" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="x80_magenta" index="1">
-    <subchannel color="1" headOffset="48">
+    <subchannel color="1" headOffset="48" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="x80_yellow" index="2">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
@@ -113,22 +113,22 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <InkName translate="text" name="PhysicalCMYK" text="Four Color Raw" InkID="Extended">
   <Channels>
    <channel name="x80_black" index="0">
-    <subchannel color="0" headOffset="48">
+    <subchannel color="0" headOffset="48" name="Black" text="Black" translate="text">
      <ChannelDensityParam name="BlackDensity"/>
     </subchannel>
    </channel>
    <channel name="x80_cyan" index="1">
-    <subchannel color="2" headOffset="96">
+    <subchannel color="2" headOffset="96" name="Cyan" text="Cyan" translate="text">
      <ChannelDensityParam name="CyanDensity"/>
     </subchannel>
    </channel>
    <channel name="x80_magenta" index="2">
-    <subchannel color="1" headOffset="48">
+    <subchannel color="1" headOffset="48" name="Magenta" text="Magenta" translate="text">
      <ChannelDensityParam name="MagentaDensity"/>
     </subchannel>
    </channel>
    <channel name="x80_yellow" index="3">
-    <subchannel color="4">
+    <subchannel color="4" name="Yellow" text="Yellow" translate="text">
      <ChannelDensityParam name="YellowDensity"/>
     </subchannel>
    </channel>
diff --git a/src/xml/escp2/inputslots/Makefile.am b/src/xml/escp2/inputslots/Makefile.am
index 68b80b6..65fa848 100644
--- a/src/xml/escp2/inputslots/Makefile.am
+++ b/src/xml/escp2/inputslots/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.5 2008/12/10 00:44:12 rlk Exp $
+## $Id: Makefile.am,v 1.7 2009/05/30 14:10:32 rlk Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -35,6 +35,7 @@ pkgxmldata_DATA =				\
 	pro_roll_feed.xml			\
 	r1800.xml				\
 	r2400.xml				\
+	r2880.xml				\
 	rx680.xml				\
 	rx700.xml				\
 	spro5000.xml				\
@@ -48,6 +49,7 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am
 
 all-local: xml-stamp
 
+dist-hook: xml-stamp
 CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 
 EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/inputslots/Makefile.in b/src/xml/escp2/inputslots/Makefile.in
index 4d7e430..1917798 100644
--- a/src/xml/escp2/inputslots/Makefile.in
+++ b/src/xml/escp2/inputslots/Makefile.in
@@ -44,11 +44,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -85,10 +88,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -98,16 +97,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -152,6 +150,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -163,6 +162,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -175,8 +175,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -210,8 +214,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -256,6 +259,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -268,6 +272,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
@@ -283,6 +288,7 @@ pkgxmldata_DATA = \
 	pro_roll_feed.xml			\
 	r1800.xml				\
 	r2400.xml				\
+	r2880.xml				\
 	rx680.xml				\
 	rx700.xml				\
 	spro5000.xml				\
@@ -378,6 +384,9 @@ distdir: $(DISTFILES)
 	    || 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 $(DATA) all-local
@@ -467,9 +476,9 @@ uninstall-am: uninstall-pkgxmldataDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool distclean distclean-generic distclean-libtool \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-dvi \
+	clean-libtool 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-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-pkgxmldataDATA install-ps \
@@ -502,6 +511,8 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am
 	mv $@.tmp $@
 
 all-local: xml-stamp
+
+dist-hook: xml-stamp
 # 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/src/xml/escp2/inputslots/artisan.xml b/src/xml/escp2/inputslots/artisan.xml
index cefc25f..96a2418 100644
--- a/src/xml/escp2/inputslots/artisan.xml
+++ b/src/xml/escp2/inputslots/artisan.xml
@@ -22,12 +22,12 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
 </copyright>
 <escp2:InputSlots name="artisan">
 
- <slot translate="text" name="LowerFront" text="Lower Front Tray">
+ <slot translate="text" name="LowerFront" text="Main Tray">
   <Duplex><Tumble/></Duplex>
   <InitSequence>PP\003\000\000\001\001</InitSequence>
  </slot>
 
- <slot translate="text" name="UpperFront" text="Upper Front Tray">
+ <slot translate="text" name="UpperFront" text="Photo Tray">
   <Duplex><Tumble/></Duplex>
   <InitSequence>PP\003\000\000\001\002</InitSequence>
  </slot>
diff --git a/src/xml/escp2/inputslots/r2400.xml b/src/xml/escp2/inputslots/r2400.xml
index 4d94dcf..82a2a50 100644
--- a/src/xml/escp2/inputslots/r2400.xml
+++ b/src/xml/escp2/inputslots/r2400.xml
@@ -30,6 +30,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <slot translate="text" name="Velvet" text="Manual Sheet Guide">
   <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\003\000</InitSequence>
   <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+  <ExtraHeight>360</ExtraHeight>
  </slot>
 
  <slot translate="text" name="Matte" text="Manual Feed (Front)">
diff --git a/src/xml/escp2/inputslots/r2880.xml b/src/xml/escp2/inputslots/r2880.xml
new file mode 100644
index 0000000..17f709a
--- /dev/null
+++ b/src/xml/escp2/inputslots/r2880.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 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.
+</copyright>
+<escp2:InputSlots name="r2400">
+
+ <slot translate="text" name="Standard" text="Standard">
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\001\377</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="Velvet" text="Manual Sheet Guide">
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\003\000</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="Matte" text="Manual Feed (Front)">
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\000</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="CD" text="Print to CD">
+  <CD/>
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\000PP\003\000\000\002\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\000</DeinitSequence>
+ </slot>
+
+ <slot translate="text" name="Roll" text="Roll Feed">
+  <RollFeed><DontEject/></RollFeed>
+  <InitSequence>IR\002\000\000\001EX\006\000\000\000\000\000\005\001PP\003\000\000\003\001</InitSequence>
+  <DeinitSequence>IR\002\000\000\002</DeinitSequence>
+ </slot>
+</escp2:InputSlots>
+</gutenprint>
diff --git a/src/xml/escp2/media/Makefile.am b/src/xml/escp2/media/Makefile.am
index 731a904..781b64a 100644
--- a/src/xml/escp2/media/Makefile.am
+++ b/src/xml/escp2/media/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.10 2008/12/20 02:51:54 rlk Exp $
+## $Id: Makefile.am,v 1.13 2009/05/30 14:10:32 rlk Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -26,6 +26,7 @@ include $(top_srcdir)/scripts/global.mk
 pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/media
 
 pkgxmldata_DATA =				\
+	artisan.xml				\
 	b500.xml				\
 	c120.xml				\
 	c64.xml					\
@@ -42,6 +43,7 @@ pkgxmldata_DATA =				\
 	f360_photo7_japan.xml			\
 	f360_ultrachrome.xml			\
 	f360_ultrachrome_k3.xml			\
+	f360_ultrachrome_k3v.xml		\
 	nx100.xml				\
 	photo_gen0.xml				\
 	photo_gen1.xml				\
@@ -72,6 +74,7 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am
 
 all-local: xml-stamp
 
+dist-hook: xml-stamp
 CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 
 EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/media/Makefile.in b/src/xml/escp2/media/Makefile.in
index f955a7d..bc407ad 100644
--- a/src/xml/escp2/media/Makefile.in
+++ b/src/xml/escp2/media/Makefile.in
@@ -44,11 +44,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -85,10 +88,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -98,16 +97,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -152,6 +150,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -163,6 +162,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -175,8 +175,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -210,8 +214,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -256,6 +259,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -268,12 +272,14 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
 pkgxmldatadir = $(pkgdatadir)/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/xml/escp2/media
 pkgxmldata_DATA = \
+	artisan.xml				\
 	b500.xml				\
 	c120.xml				\
 	c64.xml					\
@@ -290,6 +296,7 @@ pkgxmldata_DATA = \
 	f360_photo7_japan.xml			\
 	f360_ultrachrome.xml			\
 	f360_ultrachrome_k3.xml			\
+	f360_ultrachrome_k3v.xml		\
 	nx100.xml				\
 	photo_gen0.xml				\
 	photo_gen1.xml				\
@@ -402,6 +409,9 @@ distdir: $(DISTFILES)
 	    || 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 $(DATA) all-local
@@ -491,9 +501,9 @@ uninstall-am: uninstall-pkgxmldataDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool distclean distclean-generic distclean-libtool \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-dvi \
+	clean-libtool 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-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-pkgxmldataDATA install-ps \
@@ -526,6 +536,8 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am
 	mv $@.tmp $@
 
 all-local: xml-stamp
+
+dist-hook: xml-stamp
 # 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/src/xml/escp2/media/artisan.xml b/src/xml/escp2/media/artisan.xml
new file mode 100644
index 0000000..576f7cb
--- /dev/null
+++ b/src/xml/escp2/media/artisan.xml
@@ -0,0 +1,1317 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 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.
+</copyright>
+<escp2:papers name="claria">
+<feature name="PlatenGap"/>
+<feature name="PaperMedia"/>
+<feature name="PrintMethod"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	-0.01	-0.03	-0.06	-0.1	-0.15	-0.2	-0.25
+	-0.3	-0.35	-0.38	-0.4	-0.42	-0.46	-0.49	-0.52
+	-0.55	-0.57	-0.57	-0.55	-0.52	-0.48	-0.4	-0.3
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	0	0	-0.02	-0.04	-0.08	-0.13
+	-0.18	-0.18	-0.19	-0.16	-0.13	-0.1	-0.07	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.66	0.67	0.69	0.73	0.77	0.83	0.87	0.89
+	0.91	0.88	0.84	0.78	0.78	0.8	0.82	0.85
+	0.87	0.9	0.94	0.97	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1	0.99	0.98	0.96	0.94	0.92	0.88
+	0.84	0.72	0.69	0.67	0.66	0.66	0.66	0.66
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.5	1.5	1.5	1.5	1.5
+	1.5	1.4	1.3	1.2	1.1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.1	1.3	1.55	1.8	1.95	2	2
+	2	2	2	1.95	1.8	1.55	1.3	1.1
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x11</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BrightWhite" text="Bright White Paper" class="plain">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x21</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x21</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.692000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
+ <parameter type="integer" name="PaperMedia">7</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency">
+ <parameter type="integer" name="PaperMedia">9</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain">
+ <parameter type="integer" name="PaperMedia">9</parameter>
+ <parameter type="integer" name="PrintMethod">0x20</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x40</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
+ <parameter type="integer" name="PaperMedia">10</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x55</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.600000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x55</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="PresentationMatte" text="Premium Presentation Paper Matte" class="good">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x55</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x11</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x10</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x51</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.709000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.750000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x55</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo">
+ <parameter type="integer" name="PaperMedia">6</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">11</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="UltraGlossyPhoto" text="Ultra Glossy Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">38</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">12</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">13</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="UltraLuster" text="Ultra Premium Photo Paper Luster" class="premium">
+ <parameter type="integer" name="PaperMedia">38</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="CD" text="CD or DVD" class="premium">
+ <parameter type="integer" name="PaperMedia">91</parameter>
+ <parameter type="integer" name="PrintMethod">0xb1</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb1</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.750000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.300000</parameter>
+  <parameter type="float" name="GCRLower">0.250000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"class="premium">
+ <parameter type="integer" name="PaperMedia">19</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
+ <parameter type="integer" name="PaperMedia">23</parameter>
+ <parameter type="integer" name="PrintMethod">0x41</parameter>
+
+ <resolution name="360x90sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x41</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x52</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x55</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xb2</parameter>
+ </resolution>
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.833000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.750000</parameter>
+  <parameter type="float" name="GCRLower">0.200000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain">
+
+ <ink translate="text" name="None" text="EPSON Standard Inks">
+  <parameter type="float" name="Density">0.540000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.250000</parameter>
+  <parameter type="float" name="BlackTrans">0.500000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.500000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">0.700000</parameter>
+  <parameter type="float" name="YellowBalance">0.700000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/c64.xml b/src/xml/escp2/media/c64.xml
index 86698bb..47ec5e7 100644
--- a/src/xml/escp2/media/c64.xml
+++ b/src/xml/escp2/media/c64.xml
@@ -96,6 +96,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
@@ -134,6 +151,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Postcard" text="Postcard" class="plain">
@@ -172,6 +206,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
@@ -210,6 +261,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Transparency" text="Transparencies" class="transparency">
@@ -248,6 +316,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Envelope" text="Envelopes" class="plain">
@@ -286,6 +371,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
@@ -324,6 +426,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Matte" text="Matte Paper" class="good">
@@ -362,6 +481,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
@@ -400,6 +536,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
@@ -438,6 +591,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
@@ -476,6 +646,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Photo" text="Photo Paper" class="photo">
@@ -514,6 +701,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
@@ -553,6 +757,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
@@ -592,6 +813,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
@@ -630,6 +868,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
@@ -669,6 +924,23 @@ class="photo">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
@@ -707,6 +979,23 @@ class="photo">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
@@ -745,6 +1034,23 @@ class="photo">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Other" text="Other" class="plain">
@@ -783,6 +1089,23 @@ class="photo">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 </escp2:papers>
 </gutenprint>
diff --git a/src/xml/escp2/media/c80.xml b/src/xml/escp2/media/c80.xml
index 5a3bbc8..b9b37d9 100644
--- a/src/xml/escp2/media/c80.xml
+++ b/src/xml/escp2/media/c80.xml
@@ -96,6 +96,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
@@ -134,6 +151,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Postcard" text="Postcard" class="plain">
@@ -172,6 +206,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
@@ -210,6 +261,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Transparency" text="Transparencies" class="transparency">
@@ -248,6 +316,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Envelope" text="Envelopes" class="plain">
@@ -286,6 +371,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
@@ -324,6 +426,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Matte" text="Matte Paper" class="good">
@@ -362,6 +481,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
@@ -400,6 +536,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
@@ -438,6 +591,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
@@ -476,6 +646,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Photo" text="Photo Paper" class="photo"
@@ -515,6 +702,23 @@ PreferredInktype="RGB">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
@@ -554,6 +758,23 @@ class="premium" PreferredInktype="RGB">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
@@ -593,6 +814,23 @@ class="premium" PreferredInktype="RGB">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium"
@@ -632,6 +870,23 @@ PreferredInktype="RGB">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
@@ -671,6 +926,23 @@ class="photo" PreferredInktype="RGB">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
@@ -709,6 +981,23 @@ class="photo" PreferredInktype="RGB">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
@@ -747,6 +1036,23 @@ class="photo" PreferredInktype="RGB">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Other" text="Other" class="plain">
@@ -785,6 +1091,23 @@ class="photo" PreferredInktype="RGB">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 </escp2:papers>
 </gutenprint>
diff --git a/src/xml/escp2/media/c82.xml b/src/xml/escp2/media/c82.xml
index 0e084c7..1f2b76a 100644
--- a/src/xml/escp2/media/c82.xml
+++ b/src/xml/escp2/media/c82.xml
@@ -96,6 +96,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
@@ -134,6 +151,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Postcard" text="Postcard" class="plain">
@@ -172,6 +206,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
@@ -210,6 +261,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Transparency" text="Transparencies" class="transparency">
@@ -248,6 +316,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Envelope" text="Envelopes" class="plain">
@@ -286,6 +371,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
@@ -324,6 +426,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Matte" text="Matte Paper" class="good">
@@ -362,6 +481,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
@@ -400,6 +536,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
@@ -438,6 +591,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
@@ -476,6 +646,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Photo" text="Photo Paper" class="photo">
@@ -514,6 +701,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
@@ -553,6 +757,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
@@ -592,6 +813,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
@@ -630,6 +868,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
@@ -669,6 +924,23 @@ class="photo">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
@@ -707,6 +979,23 @@ class="photo">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
@@ -745,6 +1034,23 @@ class="photo">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Other" text="Other" class="plain">
@@ -783,6 +1089,23 @@ class="photo">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 </escp2:papers>
 </gutenprint>
diff --git a/src/xml/escp2/media/cx3650.xml b/src/xml/escp2/media/cx3650.xml
index 07d5ea0..f1638c1 100644
--- a/src/xml/escp2/media/cx3650.xml
+++ b/src/xml/escp2/media/cx3650.xml
@@ -96,6 +96,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
@@ -134,6 +151,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Postcard" text="Postcard" class="plain">
@@ -172,6 +206,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
@@ -210,6 +261,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Transparency" text="Transparencies" class="transparency">
@@ -248,6 +316,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Envelope" text="Envelopes" class="plain">
@@ -286,6 +371,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
@@ -324,6 +426,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Matte" text="Matte Paper" class="good">
@@ -362,6 +481,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
@@ -400,6 +536,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
@@ -438,6 +591,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
@@ -476,6 +646,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Photo" text="Photo Paper" class="photo">
@@ -514,6 +701,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
@@ -553,6 +757,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
@@ -592,6 +813,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
@@ -630,6 +868,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
@@ -669,6 +924,23 @@ class="photo">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
@@ -707,6 +979,23 @@ class="photo">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
@@ -745,6 +1034,23 @@ class="photo">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Other" text="Other" class="plain">
@@ -783,6 +1089,23 @@ class="photo">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 </escp2:papers>
 </gutenprint>
diff --git a/src/xml/escp2/media/f360.xml b/src/xml/escp2/media/f360.xml
index 574d0fb..d9762a1 100644
--- a/src/xml/escp2/media/f360.xml
+++ b/src/xml/escp2/media/f360.xml
@@ -96,6 +96,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
@@ -134,6 +151,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Postcard" text="Postcard" class="plain">
@@ -172,6 +206,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
@@ -210,6 +261,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Transparency" text="Transparencies" class="transparency">
@@ -248,6 +316,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Envelope" text="Envelopes" class="plain">
@@ -286,6 +371,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
@@ -324,6 +426,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Matte" text="Matte Paper" class="good">
@@ -362,6 +481,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
@@ -400,6 +536,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
@@ -438,6 +591,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
@@ -476,6 +646,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Photo" text="Photo Paper" class="photo">
@@ -514,6 +701,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
@@ -553,6 +757,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
@@ -592,6 +813,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
@@ -630,6 +868,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
@@ -669,6 +924,23 @@ class="photo">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
@@ -707,6 +979,23 @@ class="photo">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
@@ -745,6 +1034,23 @@ class="photo">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Other" text="Other" class="plain">
@@ -783,6 +1089,23 @@ class="photo">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 </escp2:papers>
 </gutenprint>
diff --git a/src/xml/escp2/media/f360_ultrachrome_k3v.xml b/src/xml/escp2/media/f360_ultrachrome_k3v.xml
new file mode 100644
index 0000000..5fb8a99
--- /dev/null
+++ b/src/xml/escp2/media/f360_ultrachrome_k3v.xml
@@ -0,0 +1,1468 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 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.
+</copyright>
+<escp2:papers name="f360_ultrachrome_k3">
+<feature name="PlatenGap"/>
+<feature name="PaperMedia"/>
+<feature name="PrintMethod"/>
+<feature name="FeedSequence"/>
+<Curves>
+ <namedParam name="hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0.06	0.1	0.1	0.06	0	-0.06	-0.12
+	-0.18	-0.21	-0.22	-0.22	-0.22	-0.22	-0.22	-0.22
+	-0.22	-0.28	-0.34	-0.4	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.07	-0.11	-0.15	-0.17	-0.18
+	-0.19	-0.2	-0.19	-0.18	-0.16	-0.12	-0.08	-0.04
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.55	0.57	0.61	0.64	0.67	0.69	0.72	0.75
+	0.83	0.8	0.76	0.76	0.78	0.79	0.83	0.86
+	0.93	0.95	0.97	0.97	0.97	0.97	0.96	0.96
+	0.96	0.97	0.97	0.98	0.99	1	1	1
+	1	0.98	0.97	0.95	0.93	0.91	0.88	0.83
+	0.83	0.71	0.65	0.61	0.58	0.56	0.55	0.55
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1.05	1.1	1.15	1.15	1.15
+	1.15	1.15	1.15	1.1	1.1	1.05	1.05	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.45	1.35	1.25	1.15	1.05
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_hue_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="-6" upper-bound="6">
+	0	0.06	0.1	0.1	0.06	0	-0.06	-0.12
+	-0.18	-0.21	-0.22	-0.22	-0.22	-0.22	-0.22	-0.22
+	-0.22	-0.28	-0.34	-0.4	-0.5	-0.4	-0.3	-0.2
+	-0.12	-0.07	-0.04	-0.02	0	0	0	0
+	0	0	-0.03	-0.07	-0.11	-0.15	-0.19	-0.22
+	-0.25	-0.22	-0.19	-0.15	-0.12	-0.1	-0.06	-0.03
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_lum_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	0.55	0.57	0.61	0.64	0.67	0.69	0.72	0.75
+	0.75	0.71	0.7	0.7	0.72	0.76	0.81	0.87
+	0.93	0.95	0.97	0.98	0.98	0.97	0.96	0.96
+	0.96	0.97	0.98	0.98	0.99	1	1	1
+	1	0.98	0.97	0.96	0.95	0.93	0.9	0.87
+	0.83	0.71	0.65	0.61	0.58	0.56	0.55	0.55
+   </sequence>
+  </curve>
+ </namedParam>
+ <namedParam name="premium_sat_map">
+  <curve wrap="wrap" type="linear" gamma="0" piecewise="false">
+   <sequence count="48" lower-bound="0" upper-bound="4">
+	1	1	1	1.05	1.1	1.15	1.15	1.15
+	1.15	1.15	1.15	1.1	1.1	1.05	1.05	1
+	1	1	1	1	1	1	1	1
+	1	1	1	1	1	1	1	1
+	1	1.05	1.15	1.25	1.35	1.45	1.5	1.5
+	1.5	1.5	1.5	1.45	1.35	1.25	1.15	1.05
+   </sequence>
+  </curve>
+ </namedParam>
+</Curves>
+<paper translate="text" name="Plain" text="Plain Paper" class="plain" PreferredInkset="UltraMatte">
+ <parameter type="integer" name="PaperMedia">0</parameter>
+ <parameter type="integer" name="PrintMethod">0x21</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Postcard" text="Postcard" class="plain" PreferredInkset="UltraMatte">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x21</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="PaperMedia">7</parameter>
+ <parameter type="integer" name="PrintMethod">0x21</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Transparency" text="Transparencies" class="transparency" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="PaperMedia">9</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Envelope" text="Envelopes" class="plain" PreferredInkset="UltraMatte">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x21</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="BackFilm" text="Back Light Film" class="transparency" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="PaperMedia">10</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x20</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x71</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Matte" text="Matte Paper" class="good" PreferredInkset="UltraMatte">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x73</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good" PreferredInkset="UltraMatte">
+ <parameter type="integer" name="PaperMedia">5</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x75</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Inkjet" text="Inkjet Paper" class="good" PreferredInkset="UltraMatte">
+ <parameter type="integer" name="PaperMedia">1</parameter>
+ <parameter type="integer" name="PrintMethod">0x21</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.300000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="PaperMedia">3</parameter>
+ <parameter type="integer" name="PrintMethod">0x21</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x21</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Photo" text="Photo Paper" class="photo" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="PaperMedia">6</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x75</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper" class="premium" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="PaperMedia">11</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x75</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper" class="premium" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="PaperMedia">12</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x75</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="PaperMedia">13</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x75</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">0.920000</parameter>
+  <parameter type="curve" name="HueMap" ref="premium_hue_map"/>
+  <parameter type="curve" name="LumMap" ref="premium_lum_map"/>
+  <parameter type="curve" name="SatMap" ref="premium_sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ArchivalMatte" text="Archival Matte Paper" class="premium" PreferredInkset="UltraMatte">
+ <parameter type="integer" name="PaperMedia">15</parameter>
+ <parameter type="integer" name="PrintMethod">0x73</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0x73</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">0.600000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+ </paper>
+
+<paper translate="text" name="WaterColorRadiant" text="Watercolor Paper - Radiant White" class="premium" PreferredInkset="UltraMatte">
+ <parameter type="integer" name="PaperMedia">15</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x75</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.920000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.400000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper" class="photo" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="PaperMedia">19</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x75</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium" PreferredInkset="UltraMatte">
+ <parameter type="integer" name="PaperMedia">15</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x75</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium" PreferredInkset="UltraPhoto">
+ <parameter type="integer" name="PaperMedia">23</parameter>
+ <parameter type="integer" name="PrintMethod">0x50</parameter>
+
+ <resolution name="360x180sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720x360sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x720sw">
+  <parameter type="integer" name="PrintMethod">0x50</parameter>
+ </resolution>
+ <resolution name="1440x1440ov">
+  <parameter type="integer" name="PrintMethod">0x80</parameter>
+ </resolution>
+ <resolution name="2880x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x1440sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="2880x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+ <resolution name="5760x2880sw">
+  <parameter type="integer" name="PrintMethod">0xa0</parameter>
+ </resolution>
+
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+
+<paper translate="text" name="Other" text="Other" class="plain" PreferredInkset="UltraMatte">
+ <ink translate="text" name="ultra3photo" text="Photo Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="ultra3matte" text="Matte Black">
+  <parameter type="float" name="Density">0.720000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.100000</parameter>
+  <parameter type="float" name="BlackTrans">0.400000</parameter>
+  <parameter type="float" name="GCRLower">0.000000</parameter>
+  <parameter type="float" name="GCRUpper">0.000000</parameter>
+  <parameter type="float" name="CyanBalance">0.900000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+</paper>
+</escp2:papers>
+</gutenprint>
diff --git a/src/xml/escp2/media/photo_gen0.xml b/src/xml/escp2/media/photo_gen0.xml
index 71c858f..9db93ed 100644
--- a/src/xml/escp2/media/photo_gen0.xml
+++ b/src/xml/escp2/media/photo_gen0.xml
@@ -95,6 +95,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
@@ -132,6 +166,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Postcard" text="Postcard" class="plain">
@@ -169,6 +237,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
@@ -206,6 +308,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Transparency" text="Transparencies" class="transparency">
@@ -243,6 +379,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Envelope" text="Envelopes" class="plain">
@@ -280,6 +450,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
@@ -317,6 +521,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Matte" text="Matte Paper" class="good">
@@ -354,6 +592,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
@@ -391,6 +663,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
@@ -428,6 +734,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
@@ -465,6 +805,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Photo" text="Photo Paper" class="photo">
@@ -502,6 +876,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
@@ -540,6 +948,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
@@ -578,6 +1020,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
@@ -615,6 +1091,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
@@ -653,6 +1163,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
@@ -690,6 +1234,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
@@ -727,6 +1305,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Other" text="Other" class="plain">
@@ -764,6 +1376,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 </escp2:papers>
 </gutenprint>
diff --git a/src/xml/escp2/media/photo_gen1.xml b/src/xml/escp2/media/photo_gen1.xml
index aa2c0fd..a2bf3c8 100644
--- a/src/xml/escp2/media/photo_gen1.xml
+++ b/src/xml/escp2/media/photo_gen1.xml
@@ -96,6 +96,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
@@ -134,6 +168,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Postcard" text="Postcard" class="plain">
@@ -172,6 +240,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
@@ -210,6 +312,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Transparency" text="Transparencies" class="transparency">
@@ -248,6 +384,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Envelope" text="Envelopes" class="plain">
@@ -286,6 +456,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
@@ -324,6 +528,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Matte" text="Matte Paper" class="good">
@@ -362,6 +600,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
@@ -400,6 +672,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
@@ -438,6 +744,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
@@ -476,6 +816,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Photo" text="Photo Paper" class="photo">
@@ -514,6 +888,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
@@ -553,6 +961,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
@@ -592,6 +1034,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
@@ -630,6 +1106,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
@@ -669,6 +1179,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
@@ -707,6 +1251,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
@@ -745,6 +1323,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Other" text="Other" class="plain">
@@ -783,6 +1395,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 </escp2:papers>
 </gutenprint>
diff --git a/src/xml/escp2/media/photo_gen2.xml b/src/xml/escp2/media/photo_gen2.xml
index 9f042cb..da3e7c7 100644
--- a/src/xml/escp2/media/photo_gen2.xml
+++ b/src/xml/escp2/media/photo_gen2.xml
@@ -96,6 +96,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
@@ -134,6 +168,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Postcard" text="Postcard" class="plain">
@@ -172,6 +240,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
@@ -210,6 +312,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Transparency" text="Transparencies" class="transparency">
@@ -248,6 +384,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Envelope" text="Envelopes" class="plain">
@@ -286,6 +456,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
@@ -324,6 +528,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Matte" text="Matte Paper" class="good">
@@ -362,6 +600,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
@@ -400,6 +672,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
@@ -438,6 +744,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
@@ -476,6 +816,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Photo" text="Photo Paper" class="photo">
@@ -514,6 +888,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
@@ -553,6 +961,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
@@ -592,6 +1034,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
@@ -630,6 +1106,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
@@ -669,6 +1179,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
@@ -707,6 +1251,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
@@ -745,6 +1323,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Other" text="Other" class="plain">
@@ -783,6 +1395,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 </escp2:papers>
 </gutenprint>
diff --git a/src/xml/escp2/media/photo_gen3.xml b/src/xml/escp2/media/photo_gen3.xml
index 1b5fbdc..5841d9c 100644
--- a/src/xml/escp2/media/photo_gen3.xml
+++ b/src/xml/escp2/media/photo_gen3.xml
@@ -96,6 +96,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
@@ -134,6 +185,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Postcard" text="Postcard" class="plain">
@@ -172,6 +274,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
@@ -210,6 +363,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Transparency" text="Transparencies" class="transparency">
@@ -248,6 +452,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Envelope" text="Envelopes" class="plain">
@@ -286,6 +541,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
@@ -324,6 +630,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Matte" text="Matte Paper" class="good">
@@ -362,6 +719,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
@@ -400,6 +808,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
@@ -438,6 +897,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
@@ -476,6 +986,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Photo" text="Photo Paper" class="photo">
@@ -514,6 +1075,57 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
@@ -553,6 +1165,57 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
@@ -592,6 +1255,57 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
@@ -630,6 +1344,57 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
@@ -669,6 +1434,57 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
@@ -707,6 +1523,57 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
@@ -745,6 +1612,57 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Other" text="Other" class="plain">
@@ -783,6 +1701,57 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 </escp2:papers>
 </gutenprint>
diff --git a/src/xml/escp2/media/photo_gen3_4.xml b/src/xml/escp2/media/photo_gen3_4.xml
index 3aee075..71b2c83 100644
--- a/src/xml/escp2/media/photo_gen3_4.xml
+++ b/src/xml/escp2/media/photo_gen3_4.xml
@@ -96,6 +96,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Hextone" text="Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
@@ -134,6 +168,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Hextone" text="Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Postcard" text="Postcard" class="plain">
@@ -172,6 +240,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Hextone" text="Hextone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
@@ -210,6 +312,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Hextone" text="Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Transparency" text="Transparencies" class="transparency">
@@ -248,6 +384,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Hextone" text="Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Envelope" text="Envelopes" class="plain">
@@ -286,6 +456,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Hextone" text="Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
@@ -324,6 +528,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Hextone" text="Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Matte" text="Matte Paper" class="good">
@@ -362,6 +600,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Hextone" text="Hextone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
@@ -400,6 +672,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Hextone" text="Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
@@ -438,6 +744,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Hextone" text="Hextone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
@@ -476,6 +816,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Hextone" text="Hextone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Photo" text="Photo Paper" class="photo">
@@ -514,6 +888,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Hextone" text="Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
@@ -553,6 +961,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Hextone" text="Hextone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
@@ -592,6 +1034,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Hextone" text="Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
@@ -630,6 +1106,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Hextone" text="Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
@@ -669,6 +1179,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Hextone" text="Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
@@ -707,6 +1251,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Hextone" text="Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
@@ -745,6 +1323,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Hextone" text="Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Other" text="Other" class="plain">
@@ -783,6 +1395,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="Hextone" text="Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 </escp2:papers>
 </gutenprint>
diff --git a/src/xml/escp2/media/pro_gen1.xml b/src/xml/escp2/media/pro_gen1.xml
index 852e535..85bff88 100644
--- a/src/xml/escp2/media/pro_gen1.xml
+++ b/src/xml/escp2/media/pro_gen1.xml
@@ -99,6 +99,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
@@ -138,6 +172,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Postcard" text="Postcard" class="plain">
@@ -177,6 +245,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
@@ -216,6 +318,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Transparency" text="Transparencies" class="transparency">
@@ -255,6 +391,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Envelope" text="Envelopes" class="plain">
@@ -294,6 +464,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
@@ -333,6 +537,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Matte" text="Matte Paper" class="good">
@@ -372,6 +610,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
@@ -411,6 +683,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
@@ -450,6 +756,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
@@ -489,6 +829,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Photo" text="Photo Paper" class="photo">
@@ -528,6 +902,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
@@ -568,6 +976,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
@@ -608,6 +1050,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
@@ -647,6 +1123,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
@@ -687,6 +1197,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
@@ -726,6 +1270,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
@@ -765,6 +1343,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Other" text="Other" class="plain">
@@ -804,6 +1416,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 </escp2:papers>
 </gutenprint>
diff --git a/src/xml/escp2/media/pro_gen2.xml b/src/xml/escp2/media/pro_gen2.xml
index 958e667..21424e7 100644
--- a/src/xml/escp2/media/pro_gen2.xml
+++ b/src/xml/escp2/media/pro_gen2.xml
@@ -100,6 +100,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
@@ -140,6 +174,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Postcard" text="Postcard" class="plain">
@@ -180,6 +248,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
@@ -220,6 +322,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Transparency" text="Transparencies" class="transparency">
@@ -260,6 +396,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Envelope" text="Envelopes" class="plain">
@@ -300,6 +470,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
@@ -340,6 +544,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Matte" text="Matte Paper" class="good">
@@ -380,6 +618,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
@@ -420,6 +692,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
@@ -460,6 +766,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
@@ -500,6 +840,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Photo" text="Photo Paper" class="photo">
@@ -540,6 +914,40 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
@@ -581,6 +989,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
@@ -622,6 +1064,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
@@ -662,6 +1138,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
@@ -703,6 +1213,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
@@ -743,6 +1287,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
@@ -783,6 +1361,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Other" text="Other" class="plain">
@@ -823,6 +1435,40 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
+
+ <ink translate="text" name="MISHextone" text="MIS Hextone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 </escp2:papers>
 </gutenprint>
diff --git a/src/xml/escp2/media/standard.xml b/src/xml/escp2/media/standard.xml
index c70d443..cdc0e88 100644
--- a/src/xml/escp2/media/standard.xml
+++ b/src/xml/escp2/media/standard.xml
@@ -96,6 +96,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
@@ -134,6 +151,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Postcard" text="Postcard" class="plain">
@@ -172,6 +206,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
@@ -210,6 +261,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Transparency" text="Transparencies" class="transparency">
@@ -248,6 +316,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Envelope" text="Envelopes" class="plain">
@@ -286,6 +371,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
@@ -324,6 +426,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Matte" text="Matte Paper" class="good">
@@ -362,6 +481,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
@@ -400,6 +536,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
@@ -438,6 +591,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
@@ -476,6 +646,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Photo" text="Photo Paper" class="photo">
@@ -514,6 +701,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
@@ -553,6 +757,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
@@ -592,6 +813,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
@@ -630,6 +868,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
@@ -669,6 +924,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
@@ -707,6 +979,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
@@ -745,6 +1034,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Other" text="Other" class="plain">
@@ -783,6 +1089,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 </escp2:papers>
 </gutenprint>
diff --git a/src/xml/escp2/media/standard_gen0.xml b/src/xml/escp2/media/standard_gen0.xml
index 49141f1..a4d5e98 100644
--- a/src/xml/escp2/media/standard_gen0.xml
+++ b/src/xml/escp2/media/standard_gen0.xml
@@ -95,6 +95,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="PlainFast" text="Plain Paper Fast Load" class="plain">
@@ -132,6 +149,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Postcard" text="Postcard" class="plain">
@@ -169,6 +203,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.830000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyFilm" text="Glossy Film" class="photo">
@@ -206,6 +257,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Transparency" text="Transparencies" class="transparency">
@@ -243,6 +311,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Envelope" text="Envelopes" class="plain">
@@ -280,6 +365,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="BackFilm" text="Back Light Film" class="transparency">
@@ -317,6 +419,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.750000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Matte" text="Matte Paper" class="good">
@@ -354,6 +473,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.800000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="MatteHeavy" text="Matte Paper Heavyweight" class="good">
@@ -391,6 +527,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Inkjet" text="Inkjet Paper" class="good">
@@ -428,6 +581,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.850000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.100000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Coated" text="Photo Quality Inkjet Paper" class="good">
@@ -465,6 +635,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Photo" text="Photo Paper" class="photo">
@@ -502,6 +689,23 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPhoto" text="Premium Glossy Photo Paper"
@@ -540,6 +744,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.100000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Semigloss" text="Premium Semigloss Photo Paper"
@@ -578,6 +799,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Luster" text="Premium Luster Photo Paper" class="premium">
@@ -615,6 +853,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="GlossyPaper" text="Photo Quality Glossy Paper"
@@ -653,6 +908,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.999000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Ilford" text="Ilford Heavy Paper" class="premium">
@@ -690,6 +962,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">1.350000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="ColorLife" text="ColorLife Paper" class="premium">
@@ -727,6 +1016,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">1.000000</parameter>
+  <parameter type="float" name="SubchannelCutoff">1.000000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.150000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 
 <paper translate="text" name="Other" text="Other" class="plain">
@@ -764,6 +1070,23 @@ class="premium">
   <parameter type="curve" name="LumMap" ref="lum_map"/>
   <parameter type="curve" name="SatMap" ref="sat_map"/>
  </ink>
+
+ <ink translate="text" name="MISQuadtone" text="MISQuadtone">
+  <parameter type="float" name="Density">0.615000</parameter>
+  <parameter type="float" name="SubchannelCutoff">0.500000</parameter>
+  <parameter type="float" name="BlackTrans">1.000000</parameter>
+  <parameter type="float" name="GCRLower">0.075000</parameter>
+  <parameter type="float" name="GCRUpper">0.900000</parameter>
+  <parameter type="float" name="CyanBalance">1.000000</parameter>
+  <parameter type="float" name="MagentaBalance">1.000000</parameter>
+  <parameter type="float" name="YellowBalance">1.000000</parameter>
+  <parameter type="float" name="BlackDensity">1.000000</parameter>
+  <parameter type="float" name="Saturation">1.000000</parameter>
+  <parameter type="float" name="Gamma">1.000000</parameter>
+  <parameter type="curve" name="HueMap" ref="hue_map"/>
+  <parameter type="curve" name="LumMap" ref="lum_map"/>
+  <parameter type="curve" name="SatMap" ref="sat_map"/>
+ </ink>
 </paper>
 </escp2:papers>
 </gutenprint>
diff --git a/src/xml/escp2/mediasizes/Makefile.am b/src/xml/escp2/mediasizes/Makefile.am
index 588be38..5b7afcb 100644
--- a/src/xml/escp2/mediasizes/Makefile.am
+++ b/src/xml/escp2/mediasizes/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.3 2008/10/24 00:37:14 rleigh Exp $
+## $Id: Makefile.am,v 1.4 2009/05/30 14:10:32 rlk Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -36,6 +36,7 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am
 
 all-local: xml-stamp
 
+dist-hook: xml-stamp
 CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 
 EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/mediasizes/Makefile.in b/src/xml/escp2/mediasizes/Makefile.in
index 017b1c5..b86829e 100644
--- a/src/xml/escp2/mediasizes/Makefile.in
+++ b/src/xml/escp2/mediasizes/Makefile.in
@@ -44,11 +44,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -85,10 +88,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -98,16 +97,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -152,6 +150,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -163,6 +162,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -175,8 +175,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -210,8 +214,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -256,6 +259,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -268,6 +272,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
@@ -366,6 +371,9 @@ distdir: $(DISTFILES)
 	    || 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 $(DATA) all-local
@@ -455,9 +463,9 @@ uninstall-am: uninstall-pkgxmldataDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool distclean distclean-generic distclean-libtool \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-dvi \
+	clean-libtool 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-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-pkgxmldataDATA install-ps \
@@ -490,6 +498,8 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am
 	mv $@.tmp $@
 
 all-local: xml-stamp
+
+dist-hook: xml-stamp
 # 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/src/xml/escp2/model/Makefile.am b/src/xml/escp2/model/Makefile.am
index 97d744a..e416c58 100644
--- a/src/xml/escp2/model/Makefile.am
+++ b/src/xml/escp2/model/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.14 2008/12/10 00:44:12 rlk Exp $
+## $Id: Makefile.am,v 1.16 2009/05/30 14:10:32 rlk Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -123,7 +123,8 @@ pkgxmldata_DATA =				\
 	model_94.xml				\
 	model_95.xml				\
 	model_96.xml				\
-	model_97.xml
+	model_97.xml				\
+	model_98.xml
 
 xml-stamp: $(pkgxmldata_DATA) Makefile.am
 	-rm -f $@ $@.tmp
@@ -133,6 +134,7 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am
 
 all-local: xml-stamp
 
+dist-hook: xml-stamp
 CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 
 EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/model/Makefile.in b/src/xml/escp2/model/Makefile.in
index 6070456..3053266 100644
--- a/src/xml/escp2/model/Makefile.in
+++ b/src/xml/escp2/model/Makefile.in
@@ -44,11 +44,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -85,10 +88,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -98,16 +97,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -152,6 +150,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -163,6 +162,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -175,8 +175,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -210,8 +214,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -256,6 +259,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -268,6 +272,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
@@ -371,7 +376,8 @@ pkgxmldata_DATA = \
 	model_94.xml				\
 	model_95.xml				\
 	model_96.xml				\
-	model_97.xml
+	model_97.xml				\
+	model_98.xml
 
 CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 EXTRA_DIST = $(pkgxmldata_DATA)
@@ -463,6 +469,9 @@ distdir: $(DISTFILES)
 	    || 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 $(DATA) all-local
@@ -552,9 +561,9 @@ uninstall-am: uninstall-pkgxmldataDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool distclean distclean-generic distclean-libtool \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-dvi \
+	clean-libtool 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-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-pkgxmldataDATA install-ps \
@@ -587,6 +596,8 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am
 	mv $@.tmp $@
 
 all-local: xml-stamp
+
+dist-hook: xml-stamp
 # 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/src/xml/escp2/model/model_77.xml b/src/xml/escp2/model/model_77.xml
index 1083c9f..2ec951b 100644
--- a/src/xml/escp2/model/model_77.xml
+++ b/src/xml/escp2/model/model_77.xml
@@ -21,16 +21,16 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 </copyright>
 <escp2:model id="77">
- <media src="escp2/media/c64.xml"/>
+ <media src="escp2/media/photo_gen3_4.xml"/>
  <inputSlots src="escp2/inputslots/cd_roll_feed.xml"/>
  <qualityPresets src="escp2/qualitypresets/standard.xml"/>
- <inkGroup src="escp2/inks/c64.xml"/>
+ <inkGroup src="escp2/inks/photo_gen3_4.xml"/>
  <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
  <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
  <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
  <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
  <commandSet>2000</commandSet>
- <borderless>Yes</borderless>
+ <borderless>Full</borderless>
  <supportsVariableDropsizes/>
  <hasFastGraymode/>
  <sendZeroAdvance/>
@@ -46,7 +46,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <baseSeparation>360</baseSeparation>
  <resolutionScale>14400</resolutionScale>
  <minimumResolution>360 120</minimumResolution>
- <maximumResolution>2880 1440</maximumResolution>
+ <maximumResolution>5760 1440</maximumResolution>
  <separationRows>1</separationRows>
  <zeroMarginOffset>80</zeroMarginOffset>
  <microLeftMargin>42</microLeftMargin>
@@ -56,20 +56,19 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <minimumMediaSize>144 144</minimumMediaSize>
  <maximumMediaSize>612 86400</maximumMediaSize>
  <maximumImageableArea>612 86400</maximumImageableArea>
- <margins interleave="soft" media="sheet">9 9 0 0</margins>
- <margins interleave="printer" media="sheet">9 9 0 0</margins>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
  <margins interleave="soft" media="roll">9 9 0 0</margins>
  <margins interleave="printer" media="roll">9 9 0 0</margins>
  <CDOffset>204 191</CDOffset>
  <CDMediaSize>595 842</CDMediaSize>
+ <extraBottom>24</extraBottom>
  <AlignmentChoices>4 15 0 0</AlignmentChoices>
  <ChannelNames>
   <ChannelName translate="name" name="Black"/>
   <ChannelName translate="name" name="Cyan"/>
   <ChannelName translate="name" name="Magenta"/>
   <ChannelName translate="name" name="Yellow"/>
-  <ChannelName translate="name" name="Light Cyan"/>
-  <ChannelName translate="name" name="Light Magenta"/>
  </ChannelNames>
  <resolutions>
   <resolution translate="text" name="360x120sw" text="360 x 120 DPI Economy">
@@ -150,6 +149,14 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
    <parameter type="integer" name="escp2_bits">2</parameter>
    <parameter type="float" name="DropSize1">1.000000</parameter>
   </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.283000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
  </resolutions>
 </escp2:model>
 </gutenprint>
diff --git a/src/xml/escp2/model/model_95.xml b/src/xml/escp2/model/model_95.xml
index 9d3545c..d4c0987 100644
--- a/src/xml/escp2/model/model_95.xml
+++ b/src/xml/escp2/model/model_95.xml
@@ -29,7 +29,7 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  <preinitRemoteSequence>PM\002\000\000\000</preinitRemoteSequence>
  <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
  <commandSet>2000</commandSet>
- <borderless>Yes</borderless>
+ <borderless>Full</borderless>
  <supportsVariableDropsizes/>
  <hasFastGraymode/>
  <sendZeroAdvance/>
diff --git a/src/xml/escp2/model/model_96.xml b/src/xml/escp2/model/model_96.xml
index dac4c6e..ec776fd 100644
--- a/src/xml/escp2/model/model_96.xml
+++ b/src/xml/escp2/model/model_96.xml
@@ -21,14 +21,14 @@ xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.
  *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 </copyright>
 <escp2:model id="96">
- <media src="escp2/media/claria.xml"/>
+ <media src="escp2/media/artisan.xml"/>
  <inputSlots src="escp2/inputslots/artisan.xml"/>
  <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
  <inkGroup src="escp2/inks/artisan.xml"/>
  <mediaSizes src="escp2/mediasizes/standard.xml"/>
  <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
  <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
- <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence>
+ <preinitRemoteSequence>JS\014\000\000GUTENPRINT\000SN\001\000\000</preinitRemoteSequence>
  <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
  <commandSet>2000</commandSet>
  <borderless>Yes</borderless>
diff --git a/src/xml/escp2/model/model_98.xml b/src/xml/escp2/model/model_98.xml
new file mode 100644
index 0000000..ed8eb85
--- /dev/null
+++ b/src/xml/escp2/model/model_98.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ *   Copyright 2008 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.
+</copyright>
+<escp2:model id="98">
+ <media src="escp2/media/f360_ultrachrome_k3v.xml"/>
+ <inputSlots src="escp2/inputslots/r2880.xml"/>
+ <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
+ <inkGroup src="escp2/inks/f360_ultrachrome_k3v.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Full</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <hasInterchangeableInkCartridges/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+  <Nozzles>180</Nozzles>
+  <MinNozzles>1</MinNozzles>
+  <FirstNozzle>0</FirstNozzle>
+  <NozzleSeparation>2</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>8</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 180</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>96</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>180</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>2073600</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 0</margins>
+ <margins interleave="printer" media="sheet">9 9 0 0</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <CDOffset>221 262</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+  <ChannelName translate="name" name="Light Light Black"/>
+  <ChannelName translate="name" name="Vivid Light Magenta"/>
+  <ChannelName translate="name" name="Light Cyan"/>
+  <ChannelName translate="name" name="Light Black"/>
+  <ChannelName translate="name" name="Black"/>
+  <ChannelName translate="name" name="Cyan"/>
+  <ChannelName translate="name" name="Vivid Magenta"/>
+  <ChannelName translate="name" name="Yellow"/>
+ </ChannelNames>
+ <resolutions>
+  <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+   <physicalResolution>360 180</physicalResolution>
+   <parameter type="float" name="escp2_density">3.270000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="360sw" text="360 DPI">
+   <physicalResolution>360 360</physicalResolution>
+   <parameter type="float" name="escp2_density">1.630000</parameter>
+   <parameter type="integer" name="escp2_ink_type">16</parameter>
+   <parameter type="integer" name="escp2_base_res">360</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+   <physicalResolution>720 360</physicalResolution>
+   <parameter type="float" name="escp2_density">3.110000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.180000</parameter>
+   <parameter type="float" name="DropSize2">0.440000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="720sw" text="720 DPI">
+   <physicalResolution>720 720</physicalResolution>
+   <parameter type="float" name="escp2_density">1.550000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.180000</parameter>
+   <parameter type="float" name="DropSize2">0.440000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+   <physicalResolution>1440 720</physicalResolution>
+   <parameter type="float" name="escp2_density">0.775000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.180000</parameter>
+   <parameter type="float" name="DropSize2">0.440000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <printedResolution>1440 1440</printedResolution>
+   <parameter type="float" name="escp2_density">0.387000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.180000</parameter>
+   <parameter type="float" name="DropSize2">0.440000</parameter>
+   <parameter type="float" name="DropSize3">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+   <physicalResolution>2880 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.420000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">0.410000</parameter>
+   <parameter type="float" name="DropSize2">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+   <physicalResolution>5760 1440</physicalResolution>
+   <parameter type="float" name="escp2_density">0.513000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+   <physicalResolution>2880 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.513000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+  <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI">
+   <physicalResolution>5760 2880</physicalResolution>
+   <parameter type="float" name="escp2_density">0.255000</parameter>
+   <parameter type="integer" name="escp2_ink_type">18</parameter>
+   <parameter type="integer" name="escp2_base_res">720</parameter>
+   <parameter type="integer" name="escp2_bits">2</parameter>
+   <parameter type="float" name="DropSize1">1.000000</parameter>
+  </resolution>
+ </resolutions>
+</escp2:model>
+</gutenprint>
diff --git a/src/xml/escp2/qualitypresets/Makefile.am b/src/xml/escp2/qualitypresets/Makefile.am
index 3c73802..cc77328 100644
--- a/src/xml/escp2/qualitypresets/Makefile.am
+++ b/src/xml/escp2/qualitypresets/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.3 2008/10/24 00:37:14 rleigh Exp $
+## $Id: Makefile.am,v 1.4 2009/05/30 14:10:32 rlk Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -40,6 +40,7 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am
 
 all-local: xml-stamp
 
+dist-hook: xml-stamp
 CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 
 EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/qualitypresets/Makefile.in b/src/xml/escp2/qualitypresets/Makefile.in
index 79a910a..39a8ab9 100644
--- a/src/xml/escp2/qualitypresets/Makefile.in
+++ b/src/xml/escp2/qualitypresets/Makefile.in
@@ -44,11 +44,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -85,10 +88,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -98,16 +97,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -152,6 +150,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -163,6 +162,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -175,8 +175,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -210,8 +214,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -256,6 +259,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -268,6 +272,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
@@ -370,6 +375,9 @@ distdir: $(DISTFILES)
 	    || 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 $(DATA) all-local
@@ -459,9 +467,9 @@ uninstall-am: uninstall-pkgxmldataDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool distclean distclean-generic distclean-libtool \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-dvi \
+	clean-libtool 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-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-pkgxmldataDATA install-ps \
@@ -494,6 +502,8 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am
 	mv $@.tmp $@
 
 all-local: xml-stamp
+
+dist-hook: xml-stamp
 # 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/src/xml/escp2/weaves/Makefile.am b/src/xml/escp2/weaves/Makefile.am
index f114e9a..4de7cd3 100644
--- a/src/xml/escp2/weaves/Makefile.am
+++ b/src/xml/escp2/weaves/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.2 2008/10/24 00:37:14 rleigh Exp $
+## $Id: Makefile.am,v 1.3 2009/05/30 14:10:32 rlk Exp $
 ## Copyright (C) 2008 Robert Krawitz
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -39,6 +39,7 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am
 
 all-local: xml-stamp
 
+dist-hook: xml-stamp
 CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
 
 EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/weaves/Makefile.in b/src/xml/escp2/weaves/Makefile.in
index 86a9dbd..1f949eb 100644
--- a/src/xml/escp2/weaves/Makefile.in
+++ b/src/xml/escp2/weaves/Makefile.in
@@ -44,11 +44,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -85,10 +88,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -98,16 +97,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -152,6 +150,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -163,6 +162,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -175,8 +175,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -210,8 +214,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -256,6 +259,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -268,6 +272,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
@@ -369,6 +374,9 @@ distdir: $(DISTFILES)
 	    || 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 $(DATA) all-local
@@ -458,9 +466,9 @@ uninstall-am: uninstall-pkgxmldataDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool distclean distclean-generic distclean-libtool \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-dvi \
+	clean-libtool 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-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-pkgxmldataDATA install-ps \
@@ -493,6 +501,8 @@ xml-stamp: $(pkgxmldata_DATA) Makefile.am
 	mv $@.tmp $@
 
 all-local: xml-stamp
+
+dist-hook: xml-stamp
 # 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/src/xml/papers.xml b/src/xml/papers.xml
index fcda4f8..8d83276 100644
--- a/src/xml/papers.xml
+++ b/src/xml/papers.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-   "$Id: papers.xml,v 1.5 2008/07/28 12:25:23 rlk Exp $"
+   "$Id: papers.xml,v 1.7 2009/04/14 01:09:42 rlk Exp $"
 
    XML description of papers known to libgutenprint.
    You can add additional paper sizes here.
@@ -138,6 +138,16 @@
       <right value="18"/>
       <bottom value="45"/>
     </paper>
+    <paper name="w297h421">
+      <description translate="value" value="Epson L Photo Paper (tear-off borders)"/>
+      <width value="297"/>
+      <height value="421"/>
+      <unit value="english-extended"/>
+      <top value="17"/>
+      <left value="22"/>
+      <right value="22"/>
+      <bottom value="43"/>
+    </paper>
     <paper name="w360h504">
       <description translate="value" value="5x7"/>
       <width value="360"/>
diff --git a/src/xml/printers.xml b/src/xml/printers.xml
index d04e97a..c52bc41 100644
--- a/src/xml/printers.xml
+++ b/src/xml/printers.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-   "$Id: printers.xml,v 1.28 2008/12/21 10:49:50 faust3 Exp $"
+   "$Id: printers.xml,v 1.37 2009/06/20 08:35:32 faust3 Exp $"
 
    XML description of printers known to libgutenprint
    You can add additional printers here, but the underlying driver has
@@ -141,6 +141,7 @@
       <printer translate="name" name="Canon PIXMA iP6000D" driver="bjc-PIXMA-iP6000D" manufacturer="Canon" model="3006000" parameters="PIXMA_iP4000_params" />
       <printer translate="name" name="Canon PIXMA iP6700" driver="bjc-PIXMA-iP6700" manufacturer="Canon" model="3006700" parameters="PIXMA_iP4000_params" />
       <printer translate="name" name="Canon PIXMA iP8500" driver="bjc-PIXMA-iP8500" manufacturer="Canon" model="3008500" parameters="PIXMA_iP4000_params" />
+      <printer translate="name" name="Canon PIXMA iX4000" driver="bjc-PIXMA-iX4000" manufacturer="Canon" model="4005000" parameters="PIXMA_iX5000_params" />
       <printer translate="name" name="Canon PIXMA iX5000" driver="bjc-PIXMA-iX5000" manufacturer="Canon" model="4005000" parameters="PIXMA_iX5000_params" />
       <printer translate="name" name="Canon PIXMA Pro9500" driver="bjc-PIXMA-Pro9500" manufacturer="Canon" model="7009500" parameters="PIXMA_iP4000_params" />
       <printer translate="name" name="Canon PIXMA MP150" driver="bjc-MULTIPASS-MP150" manufacturer="Canon" model="5000150" parameters="PIXMA_iP4000_params" />
@@ -280,7 +281,7 @@
       <printer translate="name" name="Epson Stylus Office BX300F" driver="escp2-of-bx300f" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Office BX600FW" driver="escp2-of-bx600fw" manufacturer="Epson" model="92" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Office SX600FW" driver="escp2-of-sx600fw" manufacturer="Epson" model="92" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus Offixe TX300F" driver="escp2-of-tx300f" manufacturer="Epson" model="94" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Office TX300F" driver="escp2-of-tx300f" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Office TX600FW" driver="escp2-of-tx600fw" manufacturer="Epson" model="92" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo" driver="escp2-photo" manufacturer="Epson" model="9" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo 700" driver="escp2-700" manufacturer="Epson" model="7" parameters="standard_params" />
@@ -343,6 +344,7 @@
       <printer translate="name" name="Epson Stylus Photo R1800" driver="escp2-r1800" manufacturer="Epson" model="67" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo R1900" driver="escp2-r1900" manufacturer="Epson" model="91" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo R2400" driver="escp2-r2400" manufacturer="Epson" model="71" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus Photo R2880" driver="escp2-r2880" manufacturer="Epson" model="98" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo RX400" driver="escp2-rx400" manufacturer="Epson" model="84" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo RX420" driver="escp2-rx420" manufacturer="Epson" model="84" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo RX425" driver="escp2-rx425" manufacturer="Epson" model="84" parameters="standard_params" />
@@ -364,7 +366,7 @@
       <printer translate="name" name="Epson Stylus Photo RX690" driver="escp2-rx690" manufacturer="Epson" model="97" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Photo RX700" driver="escp2-rx700" manufacturer="Epson" model="70" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Photo TX700W" driver="escp2-tx700w" manufacturer="Epson" model="96" parameters="claria_params" />
-      <printer translate="name" name="Epson Stylus Photo TX800W" driver="escp2-tx800w" manufacturer="Epson" model="96" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus Photo TX800FW" driver="escp2-tx800w" manufacturer="Epson" model="96" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus Pro 5000" driver="escp2-5000" manufacturer="Epson" model="27" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus Pro 5500" driver="escp2-5500" manufacturer="Epson" model="40" parameters="pro_5500_params" />
       <printer translate="name" name="Epson Stylus Pro 7000" driver="escp2-7000" manufacturer="Epson" model="28" parameters="standard_params" />
@@ -430,6 +432,7 @@
       <printer translate="name" name="Epson Stylus D120" driver="escp2-d120" manufacturer="Epson" model="85" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus DX3800" driver="escp2-dx3800" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus DX3850" driver="escp2-dx3850" manufacturer="Epson" model="72" parameters="standard_params" />
+      <printer translate="name" name="Epson Stylus DX4000" driver="escp2-dx4000" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus DX4050" driver="escp2-dx4050" manufacturer="Epson" model="72" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus DX4200" driver="escp2-dx4200" manufacturer="Epson" model="95" parameters="cx3500_params" />
       <printer translate="name" name="Epson Stylus DX4250" driver="escp2-dx4250" manufacturer="Epson" model="95" parameters="cx3500_params" />
@@ -448,7 +451,7 @@
       <printer translate="name" name="Epson Stylus NX200" driver="escp2-nx200" manufacturer="Epson" model="93" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus NX300" driver="escp2-nx300" manufacturer="Epson" model="94" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus NX400" driver="escp2-nx400" manufacturer="Epson" model="93" parameters="standard_params" />
-      <printer translate="name" name="Epson Stylus PX700FW" driver="escp2-px700fw" manufacturer="Epson" model="96" parameters="claria_params" />
+      <printer translate="name" name="Epson Stylus PX700W" driver="escp2-px700fw" manufacturer="Epson" model="96" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus PX800FW" driver="escp2-px800fw" manufacturer="Epson" model="96" parameters="claria_params" />
       <printer translate="name" name="Epson Stylus S20" driver="escp2-s20" manufacturer="Epson" model="66" parameters="standard_params" />
       <printer translate="name" name="Epson Stylus SX100" driver="escp2-sx100" manufacturer="Epson" model="94" parameters="standard_params" />
@@ -586,6 +589,7 @@
       <printer translate="name" name="Epson PX V630" driver="escp2-pxv630" manufacturer="Epson" model="69" parameters="standard_params" />
       <printer translate="name" name="Epson PX V780" driver="escp2-pxv780" manufacturer="Epson" model="85" parameters="standard_params" />
       <printer translate="name" name="Epson PX 5500" driver="escp2-px5500" manufacturer="Epson" model="71" parameters="standard_params" />
+      <printer translate="name" name="Epson PX G5600" driver="escp2-pxg5600" manufacturer="Epson" model="98" parameters="standard_params" />
       <printer translate="name" name="Epson PX 7000" driver="escp2-px7000" manufacturer="Epson" model="48" parameters="standard_params" />
       <printer translate="name" name="Epson PX 9000" driver="escp2-px9000" manufacturer="Epson" model="49" parameters="standard_params" />
     </family>
@@ -709,11 +713,9 @@
       <printer translate="name" name="Gestetner 2712" driver="gestetner-2712" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner 3212" driver="gestetner-3212" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner 3502" driver="gestetner-3502" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner 3532" driver="gestetner-3532" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner 4235g" driver="gestetner-4235g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 3532/4235g" driver="gestetner-4235g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner 4502" driver="gestetner-4502" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner 4532" driver="gestetner-4532" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner 4245g" driver="gestetner-4245g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner 4532/4245g" driver="gestetner-4245g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner 6002" driver="gestetner-6002" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner 7502" driver="gestetner-7502" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner 9002" driver="gestetner-9002" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
@@ -726,49 +728,31 @@
       <printer translate="name" name="Gestetner DSm620d" driver="gestetner-dsm620d" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner DSm622" driver="gestetner-dsm622" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner DSm627" driver="gestetner-dsm627" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm635" driver="gestetner-dsm635" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm635G" driver="gestetner-dsm635g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm645" driver="gestetner-dsm645" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DS645G" driver="gestetner-ds645g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm635/635G" driver="gestetner-dsm635g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm645/645G" driver="gestetner-ds645g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner DSm651" driver="gestetner-dsm651" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner DSm660" driver="gestetner-dsm660" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner DSm675" driver="gestetner-dsm675" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner DSm725" driver="gestetner-dsm725" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner DSm730" driver="gestetner-dsm730" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm735" driver="gestetner-dsm735" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm735G" driver="gestetner-dsm735g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm745" driver="gestetner-dsm745" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm745G" driver="gestetner-dsm745g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP1100" driver="gestetner-mp1100" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm7110" driver="gestetner-dsm7110" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP1350" driver="gestetner-mp1350" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm7135" driver="gestetner-dsm7135" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP1600" driver="gestetner-mp1600" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm716" driver="gestetner-dsm716" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP2000" driver="gestetner-mp2000" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm721d" driver="gestetner-dsm721d" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP2500" driver="gestetner-mp2500" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm625" driver="gestetner-dsm625" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP3500" driver="gestetner-mp3500" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm735e" driver="gestetner-dsm735e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP4500" driver="gestetner-mp4500" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm745e" driver="gestetner-dsm745e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP5500" driver="gestetner-mp5500" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm755" driver="gestetner-dsm755" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP6500" driver="gestetner-mp6500" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm765" driver="gestetner-dsm765" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP7500" driver="gestetner-mp7500" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm775" driver="gestetner-dsm775" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP9000" driver="gestetner-mp9000" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm790" driver="gestetner-dsm790" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP 161" driver="gestetner-mp_161" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm416" driver="gestetner-dsm416" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP 2510" driver="gestetner-mp_2510" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm725e" driver="gestetner-dsm725e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm735/735G" driver="gestetner-dsm735g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner DSm745/745G" driver="gestetner-dsm745g" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP1100/DSm7110" driver="gestetner-dsm7110" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP1350/DSm7135" driver="gestetner-dsm7135" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP1600/DSm716" driver="gestetner-dsm716" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP2000/DSm721d" driver="gestetner-dsm721d" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP2500/DSm625" driver="gestetner-dsm625" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP3500/DSm735e" driver="gestetner-dsm735e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP4500/DSm745e" driver="gestetner-dsm745e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP5500/DSm755" driver="gestetner-dsm755" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP6500/DSm765" driver="gestetner-dsm765" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP7500/DSm775" driver="gestetner-dsm775" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP9000/DSm790" driver="gestetner-dsm790" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 161/DSm416" driver="gestetner-dsm416" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 2510/DSm725e" driver="gestetner-dsm725e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner MP 2550" driver="gestetner-mp_2550" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner MP 2550B" driver="gestetner-mp_2550b" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner MP 3010" driver="gestetner-mp_3010" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Gestetner DSm730e" driver="gestetner-dsm730e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Gestetner MP 3010/DSm730e" driver="gestetner-dsm730e" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner MP 3350" driver="gestetner-mp_3350" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner MP 3350B" driver="gestetner-mp_3350b" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Gestetner MP 4000" driver="gestetner-mp_4000" manufacturer="Gestetner" model="6" parameters="pcl_laser_params" />
@@ -1192,50 +1176,28 @@
       <printer translate="name" name="Lanier LD230" driver="lanier-ld230" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Lanier LD235" driver="lanier-ld235" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Lanier LD245" driver="lanier-ld245" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 2500" driver="lanier-mp_2500" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD125" driver="lanier-ld125" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 1100" driver="lanier-mp_1100" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD1100" driver="lanier-ld1100" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 1350" driver="lanier-mp_1350" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD1135" driver="lanier-ld1135" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 1600" driver="lanier-mp_1600" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD316" driver="lanier-ld316" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 161" driver="lanier-mp_161" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD016" driver="lanier-ld016" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 2000" driver="lanier-mp_2000" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD320d" driver="lanier-ld320d" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 2510" driver="lanier-mp_2510" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD325" driver="lanier-ld325" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 2550B" driver="lanier-mp_2550b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD425B" driver="lanier-ld425b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 2550" driver="lanier-mp_2550" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD425" driver="lanier-ld425" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 3010" driver="lanier-mp_3010" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD330" driver="lanier-ld330" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 3350B" driver="lanier-mp_3350b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD433B" driver="lanier-ld433b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 3350" driver="lanier-mp_3350" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD433" driver="lanier-ld433" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 3500" driver="lanier-mp_3500" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD335" driver="lanier-ld335" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 4000B" driver="lanier-mp_4000b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD040B" driver="lanier-ld040b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 4000" driver="lanier-mp_4000" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD040" driver="lanier-ld040" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 4500" driver="lanier-mp_4500" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD345" driver="lanier-ld345" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 5000B" driver="lanier-mp_5000b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD050B" driver="lanier-ld050b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 5000" driver="lanier-mp_5000" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD050" driver="lanier-ld050" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 5500" driver="lanier-mp_5500" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD255" driver="lanier-ld255" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 6500" driver="lanier-mp_6500" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD265" driver="lanier-ld265" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 7500" driver="lanier-mp_7500" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD275" driver="lanier-ld275" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier MP 9000" driver="lanier-mp_9000" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Lanier LD190" driver="lanier-ld190" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP2500/LD125" driver="lanier-ld125" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 1100/LD1100" driver="lanier-ld1100" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 1350/LD1135" driver="lanier-ld1135" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 1600/LD316" driver="lanier-ld316" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 161/LD016" driver="lanier-ld016" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 2000/LD320d" driver="lanier-ld320d" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 2510/LD325" driver="lanier-ld325" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 2550B/LD425B" driver="lanier-ld425b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 2550/LD425" driver="lanier-ld425" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 3010/LD330" driver="lanier-ld330" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 3350B/LD433B" driver="lanier-ld433b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 3350/LD433" driver="lanier-ld433" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 3500/LD335" driver="lanier-ld335" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 4000B/LD040B" driver="lanier-ld040b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 4000/LD040" driver="lanier-ld040" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 4500/LD345" driver="lanier-ld345" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 5000B/LD050B" driver="lanier-ld050b" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 5000/LD050" driver="lanier-ld050" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 5500/LD255" driver="lanier-ld255" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 6500/LD265" driver="lanier-ld265" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 7500/LD275" driver="lanier-ld275" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Lanier MP 9000/LD190" driver="lanier-ld190" manufacturer="Lanier" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Lexmark 4076" driver="lexmark-4076" manufacturer="Lexmark" model="500" parameters="pcl_inkjet_params" />
       <printer translate="name" name="Lexmark Optra E" driver="lexmark-optra_e" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Lexmark Optra E+" driver="lexmark-optra_eplus" manufacturer="Lexmark" model="6" parameters="pcl_laser_params" />
@@ -1255,39 +1217,17 @@
       <printer translate="name" name="NEC SuperScript 1260" driver="nec-ssc_1260" manufacturer="NEC" model="2" parameters="pcl_laser_params" />
       <printer translate="name" name="NEC SuperScript 1400" driver="nec-ssc_1400" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="NEC SuperScript 1800" driver="nec-ssc_1800" manufacturer="NEC" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 10515" driver="nrg-10515" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 10518" driver="nrg-10518" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 10512" driver="nrg-10512" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 2205" driver="nrg-2205" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 2238" driver="nrg-2238" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 2212" driver="nrg-2212" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 2705" driver="nrg-2705" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 2738" driver="nrg-2738" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 2712" driver="nrg-2712" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 3205" driver="nrg-3205" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 3238" driver="nrg-3238" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 3212" driver="nrg-3212" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 3525" driver="nrg-3525" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 3508" driver="nrg-3508" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 3502" driver="nrg-3502" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 3545" driver="nrg-3545" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 3518" driver="nrg-3518" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 3532" driver="nrg-3532" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 4525" driver="nrg-4525" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 4508" driver="nrg-4508" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 4502" driver="nrg-4502" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 4545" driver="nrg-4545" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 4518" driver="nrg-4518" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 4532" driver="nrg-4532" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 6002" driver="nrg-6002" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 6005" driver="nrg-6005" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 6008" driver="nrg-6008" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 7502" driver="nrg-7502" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 7505" driver="nrg-7505" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 7508" driver="nrg-7508" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 9005" driver="nrg-9005" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 9008" driver="nrg-9008" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="NRG 9002" driver="nrg-9002" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 10515/10518/10512" driver="nrg-10512" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 2205/2238/2212" driver="nrg-2212" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 2705/2738/2712" driver="nrg-2712" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 3205/3238/3212" driver="nrg-3212" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 3525/3508/3502" driver="nrg-3502" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 3545/3518/3532" driver="nrg-3532" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 4525/4508/4502" driver="nrg-4502" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 4545/4518/4532" driver="nrg-4532" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 6002/6005/6008" driver="nrg-6008" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 7502/7505/7508" driver="nrg-7508" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="NRG 9005/9008/9002" driver="nrg-9002" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="NRG DSm415" driver="nrg-dsm415" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="NRG DSm615" driver="nrg-dsm615" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="NRG DSm616" driver="nrg-dsm616" manufacturer="NRG" model="6" parameters="pcl_laser_params" />
@@ -1439,10 +1379,8 @@
       <printer translate="name" name="Savin 2522" driver="savin-2522" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 2527" driver="savin-2527" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 2532" driver="savin-2532" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 2535" driver="savin-2535" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 2235" driver="savin-2235" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 2545" driver="savin-2545" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 2245" driver="savin-2245" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 2535/2235" driver="savin-2235" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 2545/2245" driver="savin-2245" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 2560" driver="savin-2560" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 2575" driver="savin-2575" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 3515" driver="savin-3515" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
@@ -1452,14 +1390,10 @@
       <printer translate="name" name="Savin 4018d" driver="savin-4018d" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 4022" driver="savin-4022" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 4027" driver="savin-4027" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 4035" driver="savin-4035" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 4135g" driver="savin-4135g" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 4035e" driver="savin-4035e" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 4135eG" driver="savin-4135eg" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 4045" driver="savin-4045" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 4145g" driver="savin-4145g" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 4045e" driver="savin-4045e" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 4145eG" driver="savin-4145eg" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4035/4135g" driver="savin-4135g" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4035e/4135eG" driver="savin-4135eg" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4045/4145g" driver="savin-4145g" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 4045e/4145eG" driver="savin-4145eg" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 4051" driver="savin-4051" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 4060" driver="savin-4060" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 4075" driver="savin-4075" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
@@ -1472,11 +1406,9 @@
       <printer translate="name" name="Savin 8025e" driver="savin-8025e" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 8030" driver="savin-8030" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 8030e" driver="savin-8030e" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 8035" driver="savin-8035" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 8035g" driver="savin-8035g" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8035/8035g" driver="savin-8035g" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 8035e" driver="savin-8035e" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 8045" driver="savin-8045" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
-      <printer translate="name" name="Savin 8045g" driver="savin-8045g" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
+      <printer translate="name" name="Savin 8045/8045g" driver="savin-8045g" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 8045e" driver="savin-8045e" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 8055" driver="savin-8055" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
       <printer translate="name" name="Savin 8065" driver="savin-8065" manufacturer="Savin" model="6" parameters="pcl_laser_params" />
@@ -1547,6 +1479,7 @@
       <printer translate="name" name="Canon SELPHY-CP-400" driver="canon-cp400" manufacturer="Canon" model="1001" />
       <printer translate="name" name="Canon SELPHY-CP-500" driver="canon-cp500" manufacturer="Canon" model="1001" />
       <printer translate="name" name="Canon SELPHY-CP-510" driver="canon-cp510" manufacturer="Canon" model="1001" />
+      <printer translate="name" name="Canon SELPHY-CP-520" driver="canon-cp520" manufacturer="Canon" model="1004" />
       <printer translate="name" name="Canon SELPHY-CP-600" driver="canon-cp600" manufacturer="Canon" model="1001" />
       <printer translate="name" name="Canon SELPHY-CP-710" driver="canon-cp710" manufacturer="Canon" model="1001" />
       <printer translate="name" name="Canon SELPHY-CP-720" driver="canon-cp720" manufacturer="Canon" model="1001" />
@@ -1566,6 +1499,8 @@
       <printer translate="name" name="Fujifilm FinePix-NX-500" driver="fujifilm-nx500" manufacturer="Fujifilm" model="3002" />
       <printer translate="name" name="Kodak Easyshare-Printer-Dock" driver="kodak-dock" manufacturer="Kodak" model="4000"/>
       <printer translate="name" name="Shinko CHC-S9045" driver="shinko-chcs9045" manufacturer="Shinko" model="5000"/>
+      <printer translate="name" name="Dai Nippon Printing DS40" driver="dnp-ds40" manufacturer="DNP" model="6000"/>
+      <printer translate="name" name="Dai Nippon Printing DS80" driver="dnp-ds80" manufacturer="DNP" model="6001"/>
     </family>
     <family name="raw">
       <printer translate="name" name="RAW DATA 16 bit" driver="raw-data-16" manufacturer="" model="0" />
diff --git a/test/Makefile.in b/test/Makefile.in
index 8e1e65e..6ff1406 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -50,11 +50,14 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.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
@@ -127,10 +130,6 @@ CUPS_CFLAGS = @CUPS_CFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CUPS_LIBS = @CUPS_LIBS@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
@@ -140,16 +139,15 @@ DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 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@
+FGREP = @FGREP@
 FIND = @FIND@
 FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
 FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
@@ -194,6 +192,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
@@ -205,6 +204,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
 LIBS = $(INTLLIBS) @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
@@ -217,8 +217,12 @@ MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
+NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -252,8 +256,7 @@ abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -298,6 +301,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -310,6 +314,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
diff --git a/test/parse-escp2 b/test/parse-escp2
index 4664955..30839fa 100755
--- a/test/parse-escp2
+++ b/test/parse-escp2
@@ -556,7 +556,9 @@ while (! $atend) {
 					$horizontal_position / $horizontal_unit);
 			    }
 			} elsif ($xchar eq "d") {
-			    printf " (nop)";
+			    if ($opt_v) {
+				printf " (nop)";
+			    }
 			}
 		    }
 		    $found = 1;
diff --git a/test/run-weavetest b/test/run-weavetest
index f1375d8..2444c66 100755
--- a/test/run-weavetest
+++ b/test/run-weavetest
@@ -18,7 +18,7 @@ if [ -z "$STP_MODULE_PATH" ] ; then
     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'
+passes='1,1,1 2,1,1 1,2,1 1,2,2 1,4,1 4,1,1 1,8,1 1,16,1 4,2,1 4,4,1 4,8,1 4,16,1 2,2,1 2,4,1 2,8,1 2,16,1 1,4,2 1,8,2 1,16,2 2,2,2 2,4,2 2,8,2 2,16,2 8,1,1 4,4,2 4,8,2 8,2,1 8,4,1 8,8,1 16,1,1 16,2,1 16,4,1'
 
 # All numbers of jets used by any printer.
 jets='1 2 4 8 15 16 20 21 24 29 32 47 48 59 60 64 90 96 128 144 180 192 208 358 360 384'
diff --git a/test/unprint.c b/test/unprint.c
index cef064b..2fa8789 100644
--- a/test/unprint.c
+++ b/test/unprint.c
@@ -1,4 +1,4 @@
-/* $Id: unprint.c,v 1.42 2008/07/18 02:03:48 rlk Exp $ */
+/* $Id: unprint.c,v 1.44 2009/03/07 19:38:00 rlk Exp $ */
 /*
  * Generate PPM files from printer output
  *
@@ -36,6 +36,12 @@
 #define inline __inline__
 #endif
 
+typedef enum {
+  QT_NONE,
+  QT_QUAD,
+  QT_MIS
+} quadtone_t;
+
 /*
  * Printer state variable.
  */
@@ -65,7 +71,7 @@ typedef struct {
   int right_edge;
   int top_edge;
   int bottom_edge;
-  int quadtone;
+  quadtone_t quadtone;
 } pstate_t;
 
 /* We'd need about a gigabyte of ram to hold a ppm file of an 8.5 x 11
@@ -132,7 +138,7 @@ line_type **page=NULL;
  */
 
 /* convert either Epson1 or Epson2 color encoding into a sequential encoding */
-static inline int
+static int
 seqcolor(int c)
 {
   switch (c)
@@ -289,7 +295,7 @@ static float ink_colors[MAX_INKS][4] =
  {  .1, 1,   1,   1 },		/* 2  C */
  { 1,   1,    .1, 1 },		/* 3  Y */
  { 1,    .7, 1,   1 },		/* 4  m */
- {  .4, 1,   1,   1 },		/* 5  c */
+ {  .7, 1,   1,   1 },		/* 5  c */
  {  .7,  .7,  .7, 1 },		/* 6  k */
  {  .7,  .7, 0,   1 },		/* 7  dY */
  { 1,   0,   0,   1 },		/* 8  R */
@@ -306,12 +312,14 @@ static float ink_colors[MAX_INKS][4] =
  { 1,   1,    .1, 1 },		/* 19 Y */
 };
 
-static float quadtone_inks[] = { 0.0, .25, .5, .75 };
+static float quadtone_inks[] = { 0.0, .5, .25, .75, .9, .8 };
+
+static float mis_quadtone_inks[] = { 0.0, .25, .75, .5, .55, .85 };
 
 static float bpp_shift[] = { 0, 1, 3, 7, 15, 31, 63, 127, 255 };
 
 static inline void
-mix_ink(ppmpixel p, int color, unsigned int amount, float *ink, int quadtone)
+mix_ink(ppmpixel p, int color, unsigned int amount, float *ink, quadtone_t quadtone)
 {
   /* this is pretty crude */
 
@@ -321,12 +329,20 @@ mix_ink(ppmpixel p, int color, unsigned int amount, float *ink, int quadtone)
       float size;
 
       size = (float) amount / bpp_shift[pstate.bpp];
-      if (quadtone)
-	for (i = 0; i < 3; i++)
-	  p[i] *= (1 - size) + size * quadtone_inks[color];
-      else
-	for (i = 0; i < 3; i++)
-	  p[i] *= (1 - size) + size * ink[i];
+      switch (quadtone)
+	{
+	case QT_QUAD:
+	  for (i = 0; i < 3; i++)
+	    p[i] *= (1 - size) + size * quadtone_inks[color];
+	  break;
+	case QT_MIS:
+	  for (i = 0; i < 3; i++)
+	    p[i] *= (1 - size) + size * mis_quadtone_inks[color];
+	  break;
+	default:
+	  for (i = 0; i < 3; i++)
+	    p[i] *= (1 - size) + size * ink[i];
+	}
     }
 }
 
@@ -1672,7 +1688,10 @@ main(int argc,char *argv[])
 	      no_output = 1;
 	      break;
 	    case 'Q':
-	      pstate.quadtone = 1;
+	      pstate.quadtone = QT_QUAD;
+	      break;
+	    case 'M':
+	      pstate.quadtone = QT_MIS;
 	      break;
 	    case 'u':
 	      unweave = 1;